Fixing specs.

Rakefile

@@ -8,7 +8,6 @@ RSpec::Core::RakeTask.new(:rspec) do |spec|
 end
 
 task :simpletest do
-  puts "Running php unit tests ..."
   if system("which php > /dev/null")
     system "php test/all_tests.php"
   else
@@ -17,8 +16,11 @@ task :simpletest do
 end
 
 task :test_all do
-  Rake::Task["rspec"].invoke
+  puts "Running php unit tests ..."
   Rake::Task["simpletest"].invoke
+
+  puts "Running rspec specs ..."
+  Rake::Task["rspec"].invoke
 end
 
 task :default => :test_all

lib/meta_wordpress.rb

@@ -1,8 +1,4 @@
-#$:.unshift(File.expand_path(File.dirname(__FILE__)))
+require 'haml'
 
-if File.exists? 'Gemfile'
-  require 'haml'
-
-  require File.expand_path('haml/helpers', File.dirname(__FILE__))
-  require File.expand_path('haml/filters', File.dirname(__FILE__))
-end
+require File.expand_path('haml/helpers', File.dirname(__FILE__))
+require File.expand_path('haml/filters', File.dirname(__FILE__))

lib/meta_wordpress/cli.rb

@@ -37,7 +37,7 @@ def bootstrap(theme_folder = nil)
       inside(theme_folder || '.') do
         copy_guard_file
         create_asset_folders
-        create_views_folders
+        create_views_folder
         create_view_helpers
         copy_functions_php
         copy_php_lib

lib/meta_wordpress/cli/bootstrap_actions.rb

@@ -17,8 +17,8 @@ def create_asset_folders
       end
     end
 
-    def create_views_folders
-      empty_directory source_path('views'), :verbose => false
+    def create_views_folder
+      empty_directory 'views', :verbose => false
     end
 
     def create_view_helpers

spec/lib/meta_wordpress/cli_spec.rb

@@ -43,7 +43,7 @@
   end
 
   describe "#create_views_folder" do
-    before { bootstrap.create_views_folders }
+    before { bootstrap.create_views_folder }
     subject { "views" }
 
     it { should have_been_created_in(project_path) }
@@ -80,6 +80,7 @@
 
   describe "#ask_for_theme_details" do
     it "should ask for details" do
+      bootstrap.instance_variable_set("@theme_folder", 'Foo')
       details = %w(Theme\ name Theme\ url Author(s) Author(s)\ URL Description Version License License\ URL Tags Text\ domain)
       # http://www.arailsdemo.com/posts/57
       $stdin.should_receive(:gets).and_return(*details)

spec/spec_helper.rb

@@ -1,14 +1,12 @@
 require 'rubygems'
 require 'bundler'
 require 'tmpdir'
-require File.dirname(__FILE__) + '/support/file_matchers'
+require File.join(File.dirname(__FILE__), 'support', 'file_matchers')
 
 Bundler.setup
 
 require 'rspec'
-
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'meta_wordpress'
+require File.join(File.dirname(__FILE__), '..', 'lib', 'meta_wordpress')
 
 FIXTURES_DIR = Pathname.new(__FILE__).dirname + 'fixtures'
 
@@ -17,7 +15,7 @@
 
   # https://github.com/docwhat/homedir/blob/homedir3/spec/spec_helper.rb#L14
   config.before(:each) do
-    $0                  = "wp"
+    $0                  = "meta_wordpress"
     ARGV.clear
     @directory          = Dir.mktmpdir('tmp-spec-')
     @orig_directory     = Dir.pwd

test/unit/layout_test.php

@@ -18,9 +18,7 @@ function testStatePersists() {
   }
 }
 
-
 class TestOfLayout extends UnitTestCase {
-
   function __construct() {
     parent::__construct('Layout class tests');
   }
@@ -34,10 +32,6 @@ function testSetLayout() {
     $this->assertEqual($this->layout->layout, 'foo');
   }
 
-  function testSetLayoutAgain() {
-    $this->assertNotEqual($this->layout->layout, 'foo');
-  }
-
   function testGetLayout() {}
 }