rsutphin-shenandoah 0.1.0 → 0.1.1

data/ChangeLog.markdown

@@ -1,3 +1,18 @@
+0.1.2
+=====
+
+* Fix javascript spec template (generated code was not correct)
+* Only generate the spec helper require when spec_helper.js exists
+
+0.1.1
+=====
+
+* Correct bug in Shenandoah::Tasks which made plain-Rakefile use not work
+* Add task descriptions for all the tasks -- visible with rake -T
+* Automatically absolutize locator paths for plain-Rakefile use
+* Allow specs to be constrained using rake task arguments instead of an env var
+* Allow spec generator to be invoked from any project (not just rails projects) via `rake shen:generate[spec_name]`
+
 0.1.0
 =====
 

data/README.markdown

@@ -78,7 +78,7 @@ To run the specs from the command line:
 
 To run an individual spec file called "application_spec.js":
 
-    $ rake shen:spec SHEN_SPEC=application
+    $ rake shen:spec[application]
 
 To start the server:
 
@@ -103,7 +103,7 @@ To run all the specs from the command_line:
 
 To run an individual spec file called "application_spec.js":
 
-    $ rake shen:spec SHEN_SPEC=application
+    $ rake shen:spec[application]
 
 To start the server:
 

data/Rakefile

@@ -22,6 +22,7 @@ begin
     # Have to use rspec 1.2.4 for buildr compat
     gem.add_development_dependency('rspec', '= 1.2.4')
     gem.add_development_dependency('rack-test', '>= 0.3.0')
+    gem.add_development_dependency('hpricot', '>= 0.8.1')
     gem.add_development_dependency('rspec_hpricot_matchers', '>= 1.0.0')
     gem.add_development_dependency('braid', '>= 0.5.0')
     
@@ -31,6 +32,13 @@ begin
     gem.add_development_dependency('net-sftp', '= 2.0.2')
     gem.add_development_dependency('highline', '= 1.5.0')
     gem.add_development_dependency('hoe', '= 1.12.2')
+    gem.add_development_dependency('rubyzip', '= 0.9.1')
+    gem.add_development_dependency('builder', '= 2.1.2')
+    gem.add_development_dependency('rubyforge', '= 1.0.3')
+    gem.add_development_dependency('rjb', '= 1.1.6')
+    gem.add_development_dependency('Antwrap', '= 0.7.0')
+    gem.add_development_dependency('xml-simple', '= 1.0.12')
+    gem.add_development_dependency('archive-tar-minitar', '= 0.5.2')
   end
 
   Jeweler::RubyforgeTasks.new
@@ -41,6 +49,7 @@ end
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
+  spec.verbose = true
   spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
@@ -54,18 +63,27 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+def version
   if File.exist?('VERSION.yml')
     config = YAML.load(File.read('VERSION.yml'))
-    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
+    "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
   else
-    version = ""
+    ""
   end
+end
 
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "shenandoah #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+desc "Uninstall the current (development) version of the gem"
+task :uninstall do |t|
+  system("sudo gem uninstall shenandoah -v #{version}")
+end
+
+task :build => [:gemspec]
+task :install => [:uninstall]

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 0
+:patch: 2

data/lib/shenandoah/locator.rb

@@ -5,13 +5,15 @@ module Shenandoah
     attr_accessor :main_path, :spec_path, :tmp_path
 
     def initialize(options = {})
-      @main_path = options[:main_path] || "lib"
-      @spec_path = options[:spec_path] || "spec"
-      @tmp_path = options[:tmp_path] || ENV['TMPDIR'] || "tmp"
+      @main_path = File.expand_path(options[:main_path] || "lib")
+      @spec_path = File.expand_path(options[:spec_path] || "spec")
+      @tmp_path = File.expand_path(options[:tmp_path] || ENV['TMPDIR'] || "tmp")
     end
 
     def spec_files
       FileList["#{spec_path}/**/*_spec.js"]
     end
+    
+    private 
   end
 end

data/lib/shenandoah/runner.rb

@@ -28,7 +28,7 @@ module Shenandoah
       create_shell_html
       create_shell_js
 
-      rlwrap = `which rlwrap`.chomp
+      rlwrap = `which rlwrap`.chomp.sub(/^no.*/, '') # some versions of which report errors on stdout
       cmd = "#{rlwrap} #{rhino_command('-f', shell_js_path, '-f', '-')}"
       $stderr.puts "Starting shell with #{cmd}"
       system(cmd)

data/lib/shenandoah/tasks.rb

@@ -1,6 +1,9 @@
 require 'rake'
+require 'shenandoah/locator'
 require 'shenandoah/runner'
 require 'shenandoah/server'
+require 'rails_generator'
+require 'rails_generator/scripts/generate'
 
 module Shenandoah
   class Tasks
@@ -18,26 +21,58 @@ module Shenandoah
       create_serve_task
       create_shell_task
       create_run_task
+      create_gen_task
     end
     
-    def run_specs
+    def run_specs(pattern=nil)
       files = @locator.spec_files
       if ENV['SHEN_SPEC']
+        trace "limiting shenandoah specs based on #{ENV['SHEN_SPEC'].inspect}"
         files = files.select { |f| f =~ /#{ENV['SHEN_SPEC']}/ }
       end
+      if pattern
+        trace "limiting shenandoah specs based on #{pattern.inspect}"
+        files = files.select { |f| f =~ /#{pattern}/ }
+      end
+      trace "running shenandoah specs\n - #{files.join("\n - ")}"
       successes = @runner.run_console(files)
       if (successes.size != files.size)
         raise "Shenandoah specs failed!"
       end
     end
     
+    def generate_spec(name)
+      raise "Please specify a spec name.  E.g., shen:generate[foo]." unless name
+      ::Rails::Generator::Base::prepend_sources( 
+        ::Rails::Generator::PathSource.new(
+          :shenandoah, File.join(File.dirname(__FILE__), '../../rails_generators'))
+      )
+      # These branches are functionally equivalent. They change the logging
+      # that rails_generator emits to omit the WD when the target is under
+      # the WD.
+      ENV['SHEN_SPEC_PATH'], dest =
+        if @locator.spec_path =~ /^#{FileUtils.pwd}\/?/
+          [@locator.spec_path.sub(/^#{FileUtils.pwd}\/?/, ''), FileUtils.pwd]
+        else
+          [@locator.spec_path, '']
+        end
+      ::Rails::Generator::Scripts::Generate.new.run(
+        ['shen_spec', '-t', name], :destination => dest,
+        :quiet => Rake.application.options.quiet)
+    end
+    
     protected
     
+    def trace(msg)
+      $stderr.puts msg if Rake.application.options.trace
+    end
+    
     def default_locator_type
       DefaultLocator
     end
     
     def create_serve_task
+      desc "Start the in-browser JavaScript spec runner on http://localhost:4410/"
       task('shen:serve') do |t|
         Shenandoah::Server.set :locator, @locator
         if @options[:project_name]
@@ -48,14 +83,23 @@ module Shenandoah
     end
     
     def create_shell_task
+      desc "Start the Shenandoah interactive JavaScript shell"
       task('shen:shell') do |t|
         @runner.run_shell
       end
     end
     
     def create_run_task
-      task('shen:spec') do |t|
-        run_specs
+      desc "Run the JavaScript specs"
+      task('shen:spec', :pattern) do |t, args|
+        run_specs args.pattern
+      end
+    end
+    
+    def create_gen_task
+      desc "Generate a skeleton spec.  Give the spec name as a task arg -- i.e. shen:generate[commands]."
+      task('shen:generate', :basename) do |t, args|
+        generate_spec args.basename
       end
     end
   end

data/rails_generators/shen_spec/shen_spec_generator.rb

@@ -5,7 +5,6 @@ module Shenandoah
   module Generators
     class ShenSpecGenerator < ::Rails::Generator::NamedBase
       def manifest
-        spec_path = Shenandoah::Rails::Locator.new.spec_path.sub %r{^#{RAILS_ROOT}/}, ''
         record do |m|
           m.directory "#{spec_path}/#{File.dirname(file_path)}"
           m.template 'javascript_spec.js.erb', "#{spec_path}/#{file_path}_spec.js"
@@ -13,6 +12,10 @@ module Shenandoah
         end
       end
 
+      def spec_path
+        ENV['SHEN_SPEC_PATH'] || Shenandoah::Rails::Locator.new.spec_path.sub(%r{^#{RAILS_ROOT}/}, '')
+      end
+
       def file_path
         super.sub /_spec$/, ''
       end
@@ -22,6 +25,10 @@ module Shenandoah
         mod_spec = mods_rev.reverse.collect { |m| m.downcase }.join('.')
         [mod_spec, klass].reject { |p| p == "" }.join '.'
       end
+      
+      def spec_helper?
+        File.exist?("#{destination_root}/#{spec_path}/spec_helper.js")
+      end
     end
   end
 end

data/rails_generators/shen_spec/templates/javascript_spec.js.erb

@@ -1,8 +1,12 @@
+<% if spec_helper? -%>
 require_spec('spec_helper.js');
+<% end -%>
 require_main('<%= file_path %>.js');
 
-describe('<%= javascript_class_name %>', function () {
-  it("needs tests", function () {
-    expect("you").to(include, "some tests");
+Screw.Unit(function () {
+  describe('<%= javascript_class_name %>', function () {
+    it("needs tests", function () {
+      expect("you").to(include, "some tests");
+    });
   });
 });

data/shenandoah.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shenandoah}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhett Sutphin"]
-  s.date = %q{2009-06-16}
+  s.date = %q{2009-07-14}
   s.email = %q{rhett@detailedbalance.net}
   s.extra_rdoc_files = [
     "ChangeLog.markdown",
@@ -115,6 +115,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rails>, [">= 2.1.0"])
       s.add_development_dependency(%q<rspec>, ["= 1.2.4"])
       s.add_development_dependency(%q<rack-test>, [">= 0.3.0"])
+      s.add_development_dependency(%q<hpricot>, [">= 0.8.1"])
       s.add_development_dependency(%q<rspec_hpricot_matchers>, [">= 1.0.0"])
       s.add_development_dependency(%q<braid>, [">= 0.5.0"])
       s.add_development_dependency(%q<rake>, ["= 0.8.4"])
@@ -122,6 +123,13 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<net-sftp>, ["= 2.0.2"])
       s.add_development_dependency(%q<highline>, ["= 1.5.0"])
       s.add_development_dependency(%q<hoe>, ["= 1.12.2"])
+      s.add_development_dependency(%q<rubyzip>, ["= 0.9.1"])
+      s.add_development_dependency(%q<builder>, ["= 2.1.2"])
+      s.add_development_dependency(%q<rubyforge>, ["= 1.0.3"])
+      s.add_development_dependency(%q<rjb>, ["= 1.1.6"])
+      s.add_development_dependency(%q<Antwrap>, ["= 0.7.0"])
+      s.add_development_dependency(%q<xml-simple>, ["= 1.0.12"])
+      s.add_development_dependency(%q<archive-tar-minitar>, ["= 0.5.2"])
     else
       s.add_dependency(%q<sinatra>, [">= 0.9.2"])
       s.add_dependency(%q<haml>, [">= 2.0.9"])
@@ -129,6 +137,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rails>, [">= 2.1.0"])
       s.add_dependency(%q<rspec>, ["= 1.2.4"])
       s.add_dependency(%q<rack-test>, [">= 0.3.0"])
+      s.add_dependency(%q<hpricot>, [">= 0.8.1"])
       s.add_dependency(%q<rspec_hpricot_matchers>, [">= 1.0.0"])
       s.add_dependency(%q<braid>, [">= 0.5.0"])
       s.add_dependency(%q<rake>, ["= 0.8.4"])
@@ -136,6 +145,13 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<net-sftp>, ["= 2.0.2"])
       s.add_dependency(%q<highline>, ["= 1.5.0"])
       s.add_dependency(%q<hoe>, ["= 1.12.2"])
+      s.add_dependency(%q<rubyzip>, ["= 0.9.1"])
+      s.add_dependency(%q<builder>, ["= 2.1.2"])
+      s.add_dependency(%q<rubyforge>, ["= 1.0.3"])
+      s.add_dependency(%q<rjb>, ["= 1.1.6"])
+      s.add_dependency(%q<Antwrap>, ["= 0.7.0"])
+      s.add_dependency(%q<xml-simple>, ["= 1.0.12"])
+      s.add_dependency(%q<archive-tar-minitar>, ["= 0.5.2"])
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0.9.2"])
@@ -144,6 +160,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rails>, [">= 2.1.0"])
     s.add_dependency(%q<rspec>, ["= 1.2.4"])
     s.add_dependency(%q<rack-test>, [">= 0.3.0"])
+    s.add_dependency(%q<hpricot>, [">= 0.8.1"])
     s.add_dependency(%q<rspec_hpricot_matchers>, [">= 1.0.0"])
     s.add_dependency(%q<braid>, [">= 0.5.0"])
     s.add_dependency(%q<rake>, ["= 0.8.4"])
@@ -151,5 +168,12 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<net-sftp>, ["= 2.0.2"])
     s.add_dependency(%q<highline>, ["= 1.5.0"])
     s.add_dependency(%q<hoe>, ["= 1.12.2"])
+    s.add_dependency(%q<rubyzip>, ["= 0.9.1"])
+    s.add_dependency(%q<builder>, ["= 2.1.2"])
+    s.add_dependency(%q<rubyforge>, ["= 1.0.3"])
+    s.add_dependency(%q<rjb>, ["= 1.1.6"])
+    s.add_dependency(%q<Antwrap>, ["= 0.7.0"])
+    s.add_dependency(%q<xml-simple>, ["= 1.0.12"])
+    s.add_dependency(%q<archive-tar-minitar>, ["= 0.5.2"])
   end
 end

data/spec/rails_generators/shen_spec_generator_spec.rb

@@ -36,12 +36,9 @@ describe "shen_spec generator" do
       'themes/light/alison' => ['themes/light/alison', 'themes.light.Alison']
     }.each do |input, (expected_filename, expected_classname)|
       describe "for '#{input}'" do
-        before do
-          generate(input)
-        end
-
         describe "the HTML" do
           before do
+            generate(input)
             @html = File.read("#{RAILS_ROOT}/test/javascript/#{expected_filename}.html")
           end
 
@@ -60,19 +57,38 @@ describe "shen_spec generator" do
 
         describe "the JS" do
           before do
-            @js = File.read("#{RAILS_ROOT}/test/javascript/#{expected_filename}_spec.js")
+            @input = input
+            @filename = expected_filename
+          end
+          
+          def js
+            @js ||= begin
+              generate(@input)
+              File.read("#{RAILS_ROOT}/test/javascript/#{@filename}_spec.js")
+            end
+          end
+
+          it "builds a Screw.Unit spec" do
+            js.should =~ %r{Screw.Unit}
+          end
+
+          it "requires the spec_helper if it exists" do
+            FileUtils.mkdir_p "#{RAILS_ROOT}/test/javascript"
+            File.open("#{RAILS_ROOT}/test/javascript/spec_helper.js", 'w') { }
+            js.should =~ %r{require_spec\('spec_helper.js'\);\n}
           end
 
-          it "requires the spec_helper" do
-            @js.should =~ %r{require_spec\('spec_helper.js'\);}
+          it "does not require the spec_helper if it does not" do
+            js.should_not =~ %r{require_spec\('spec_helper.js'\);}
+            js.should =~ %r{^require_main} # ensure no blank line
           end
 
           it "requires the presumed main file" do
-            @js.should =~ %r{require_main\('#{expected_filename}.js'\);}
+            js.should =~ %r{require_main\('#{expected_filename}.js'\);}
           end
 
           it "describes the main file" do
-            @js.should =~ %r{describe\('#{expected_classname}', function \(\) \{}
+            js.should =~ %r{describe\('#{expected_classname}', function \(\) \{}
           end
         end
       end

data/spec/shenandoah/buildr/locator_spec.rb

@@ -25,9 +25,9 @@ describe Shenandoah::Buildr::Locator do
   
   it "allows main to be overriden with test.using" do |variable|
     p = define('another', :base_dir => tmpdir) do
-      test.using :main_path => "foo"
+      test.using :main_path => "/foo"
     end
     
-    Shenandoah::Buildr::Locator.new(p).main_path.should == "foo"
+    Shenandoah::Buildr::Locator.new(p).main_path.should == "/foo"
   end
 end

data/spec/shenandoah/locator_spec.rb

@@ -11,12 +11,12 @@ describe Shenandoah::DefaultLocator do
       @loc = Shenandoah::DefaultLocator.new
     end
 
-    it "has main_path = lib" do
-      @loc.main_path.should == "lib"
+    it "has main_path = `pwd`/lib" do
+      @loc.main_path.should == File.join(FileUtils.pwd, "lib")
     end
 
-    it "has spec_path = spec" do
-      @loc.spec_path.should == "spec"
+    it "has spec_path = `pwd`/spec" do
+      @loc.spec_path.should == File.join(FileUtils.pwd, "spec")
     end
 
     it "uses the TMPDIR env var for tmp" do
@@ -25,21 +25,31 @@ describe Shenandoah::DefaultLocator do
     end
 
     it "has tmp_path = tmp" do
-      @loc.tmp_path.should == "tmp"
+      @loc.tmp_path.should == File.join(FileUtils.pwd, "tmp")
     end
   end
 
   describe "initializing from options" do
     it "uses an explicit main path" do
-      Shenandoah::DefaultLocator.new(:main_path => 'main').main_path.should == 'main'
+      Shenandoah::DefaultLocator.new(:main_path => '/main').main_path.should == '/main'
     end
 
     it "uses an explicit spec path" do
-      Shenandoah::DefaultLocator.new(:spec_path => 'foo').spec_path.should == 'foo'
+      Shenandoah::DefaultLocator.new(:spec_path => '/foo').spec_path.should == '/foo'
     end
 
     it "uses an explicit tmp path" do
-      Shenandoah::DefaultLocator.new(:tmp_path => 'foo').tmp_path.should == 'foo'
+      Shenandoah::DefaultLocator.new(:tmp_path => '/foo/tmp').tmp_path.should == '/foo/tmp'
+    end
+
+    describe "with relative paths" do
+      %w(main_path spec_path tmp_path).each do |kind|
+        k = kind.to_sym
+        it "absolutizes #{kind} against the working directory" do
+          Shenandoah::DefaultLocator.new(k => 'bar').send(k).should == 
+            File.join(FileUtils.pwd, 'bar')
+        end
+      end
     end
   end
 

data/spec/shenandoah/rails/tasks_spec.rb

@@ -26,7 +26,7 @@ describe Shenandoah::Rails::Tasks do
   end
 
   it "uses the explicitly provided locator over all others" do
-    loc = Shenandoah::DefaultLocator.new(:main_path => 'foo')
-    Shenandoah::Rails::Tasks.new(:locator => loc).locator.main_path.should == 'foo'
+    loc = Shenandoah::DefaultLocator.new(:main_path => '/foo')
+    Shenandoah::Rails::Tasks.new(:locator => loc).locator.main_path.should == '/foo'
   end
 end

data/spec/shenandoah/runner_spec.rb

@@ -68,25 +68,19 @@ describe Shenandoah::Runner do
 
   describe "#run_shell" do
     before do
-      script_contents = ERB.new(<<-RUBY).result(binding)
-        # This is a small script to invoke Runner#run_shell so that it's
-        # input and output can be controlled for testing
-        <% $LOAD_PATH.select { |p| p =~ /shenandoah/ }.each do |p| %>
-          $LOAD_PATH.unshift(<%= p.inspect %>)
-        <% end %>
+      tmpscript "spec_shell.rb", <<-RUBY
         require 'rubygems'
         require 'shenandoah/runner'
         require 'shenandoah/locator'
 
         loc = Shenandoah::DefaultLocator.new(
-          :main_path => <%= @locator.main_path.inspect %>,
-          :spec_path => <%= @locator.spec_path.inspect %>,
-          :tmp_path => <%= @locator.tmp_path.inspect %>
+          :main_path => #{@locator.main_path.inspect},
+          :spec_path => #{@locator.spec_path.inspect},
+          :tmp_path => #{@locator.tmp_path.inspect}
         )
 
         Shenandoah::Runner.new(loc).run_shell
       RUBY
-      tmpfile "spec_shell.rb", script_contents
     end
 
     def run_shell(jslines)

data/spec/shenandoah/tasks_spec.rb

@@ -3,23 +3,24 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'shenandoah/tasks'
 require 'shenandoah/locator'
 require 'shenandoah/rails/locator'
+require 'open3'
 
 describe Shenandoah::Tasks do
   describe "init" do
     include Shenandoah::Spec::Tmpfile
-    
+
     it "uses a DefaultLocator by default" do
       Shenandoah::Tasks.new.locator.class.should == Shenandoah::DefaultLocator
     end
 
     it "configures the default locator with the provided options" do
-      Shenandoah::Tasks.new(:main_path => 'foo').locator.main_path.should == 'foo'
+      Shenandoah::Tasks.new(:main_path => '/foo').locator.main_path.should == '/foo'
     end
-    
+
     it "uses an explictly provided locator, ignoring other options" do
-      loc = Shenandoah::DefaultLocator.new(:main_path => 'bar')
+      loc = Shenandoah::DefaultLocator.new(:main_path => '/bar')
       tasks = Shenandoah::Tasks.new(:locator => loc, :main_path => 'foo')
-      tasks.locator.main_path.should == 'bar'
+      tasks.locator.main_path.should == '/bar'
     end
   end
 
@@ -36,13 +37,37 @@ describe Shenandoah::Tasks do
       Rake::Task::task_defined?('shen:serve').should be_true
     end
 
+    it "gives the shen:serve task a description" do
+      Rake::Task['shen:serve'].full_comment.should ==
+        "Start the in-browser JavaScript spec runner on http://localhost:4410/"
+    end
+
     it "adds a shen:shell task" do
       Rake::Task::task_defined?('shen:shell').should be_true
     end
 
+    it "gives the shen:shell task a description" do
+      Rake::Task['shen:shell'].full_comment.should ==
+        "Start the Shenandoah interactive JavaScript shell"
+    end
+
     it "adds a shen:spec task" do
       Rake::Task::task_defined?('shen:spec').should be_true
     end
+
+    it "gives the shen:spec task a description" do
+      Rake::Task['shen:spec'].full_comment.should ==
+        "Run the JavaScript specs"
+    end
+
+    it "adds a shen:generate task" do
+      Rake::Task::task_defined?('shen:generate').should be_true
+    end
+
+    it "gives the shen:generate task a description" do
+      Rake::Task['shen:generate'].full_comment.should ==
+        "Generate a skeleton spec.  Give the spec name as a task arg -- i.e. shen:generate[commands]."
+    end
   end
 
   describe "running" do
@@ -75,6 +100,13 @@ describe Shenandoah::Tasks do
       @tasks.run_specs
     end
 
+    it "only runs the specs matching the pattern argument" do
+      @locator.should_receive(:spec_files).and_return(%w(ab bc cd))
+      @runner.should_receive(:run_console).with(%w(bc cd)).and_return(%w(bc cd))
+
+      @tasks.run_specs 'c'
+    end
+
     it "throws an exception on failure" do
       @locator.should_receive(:spec_files).and_return(%w(a b c))
       @runner.should_receive(:run_console).with(%w(a b c)).and_return(%w(a b))
@@ -82,4 +114,187 @@ describe Shenandoah::Tasks do
       lambda { @tasks.run_specs }.should raise_error(/Shenandoah specs failed!/)
     end
   end
+
+  describe "running for real" do
+    include Shenandoah::Spec::Tmpfile
+
+    before do
+      tmpscript "Rakefile", <<-RUBY
+        require 'shenandoah/tasks'
+        Shenandoah::Tasks.new
+      RUBY
+    end
+
+    def run_specs(task='shen:spec')
+      FileUtils.cd @tmpdir do
+        Open3.popen3("rake _#{SHEN_RAKE_VERSION}_ #{task}") do |stdin, stdout, stderr|
+          stdin.close
+          return stdout.read, stderr.read
+        end
+      end
+    end
+
+    def create_passing_spec(name='good')
+      tmpfile "spec/#{name}_spec.js", <<-JS
+        Screw.Unit(function () {
+          describe("good", function () {
+            it("passes", function () {
+              expect("good").to(equal, "good");
+            });
+          });
+        });
+      JS
+      tmpfile "spec/#{name}.html", <<-HTML
+        <html>
+          <head></head>
+          <body></body>
+        </html>
+      HTML
+    end
+
+    def create_failing_spec(name='bad')
+      tmpfile "spec/#{name}_spec.js", <<-JS
+        Screw.Unit(function () {
+          describe("bad", function () {
+            it("fails", function () {
+              expect("bad").to(equal, "good");
+            });
+          });
+        });
+      JS
+      tmpfile "spec/#{name}.html", <<-HTML
+        <html>
+          <head></head>
+          <body></body>
+        </html>
+      HTML
+    end
+
+    it "passes for a good spec" do
+      create_passing_spec
+
+      out, err = run_specs
+
+      err.should == ""
+      out.should =~ %r{1 test\(s\), 0 failure\(s\)}
+    end
+
+    it "reports all results together" do
+      pending
+      create_passing_spec('a')
+      create_passing_spec('b')
+      create_passing_spec('c')
+
+      out, err = run_specs
+
+      err.should == ""
+      out.should =~ %r{3 test\(s\), 0 failure\(s\)}
+    end
+
+    it "fails for a bad spec" do
+      create_failing_spec
+
+      out, err = run_specs
+
+      err.should =~ /Shenandoah specs failed/
+      out.should =~ %r{1 test\(s\), 1 failure\(s\)}
+    end
+
+    it "reports all failures" do
+      pending
+      create_failing_spec('a')
+      create_passing_spec('b')
+      create_failing_spec('c')
+
+      out, err = run_specs
+
+      err.should =~ /Shenandoah specs failed/
+      out.should =~ %r{3 test\(s\), 2 failure\(s\)}
+    end
+
+    it "only runs the specs matching the arg" do
+      create_passing_spec('foo')
+      create_passing_spec('bar')
+      create_passing_spec('baz')
+
+      out, err = run_specs('shen:spec[ba]')
+
+      err.should == ""
+      out.should_not =~ %r{Running foo_spec}
+      out.should =~ %r{Running bar_spec}
+      out.should =~ %r{Running baz_spec}
+    end
+  end
+
+  describe "generation" do
+    include Shenandoah::Spec::Tmpfile
+
+    before do
+      @quiet = Rake.application.options.quiet
+      Rake.application.options.quiet = true
+    end
+
+    after do
+      Rake.application.options.quiet = @quiet
+    end
+
+    describe "when spec path is under the working directory" do
+      before do
+        @specdir = tmpdir('specs')
+        @tasks = Shenandoah::Tasks.new(:spec_path => @specdir)
+      end
+
+      it "fails without a name" do
+        lambda { @tasks.generate_spec(nil) }.
+          should raise_error(/Please specify a spec name.  E.g., shen:generate\[foo\]./)
+      end
+
+      it "generates the spec file" do
+        @tasks.generate_spec('arb')
+        File.exist?("#{@specdir}/arb_spec.js").should be_true
+      end
+
+      it "generates the HTML fixture" do
+        @tasks.generate_spec('zamm')
+        File.exist?("#{@specdir}/zamm.html").should be_true
+      end
+
+      describe "with nested paths" do
+        before do
+          @tasks.generate_spec("frob/zazz")
+        end
+
+        it "generates the spec file" do
+          File.exist?("#{@specdir}/frob/zazz_spec.js").should be_true
+        end
+
+        it "generates the HTML fixture" do
+          File.exist?("#{@specdir}/frob/zazz.html").should be_true
+        end
+      end
+    end
+
+    describe "when spec_path is not a child of working directory" do
+      before do
+        @original_wd = FileUtils.pwd
+        @specdir = tmpdir('specs')
+        @tasks = Shenandoah::Tasks.new(:spec_path => @specdir)
+        FileUtils.cd tmpdir('other')
+
+        @tasks.generate_spec("zip/zoom")
+      end
+
+      after do
+        FileUtils.cd @original_wd
+      end
+
+      it "generates the spec file" do
+        File.exist?("#{@specdir}/zip/zoom_spec.js").should be_true
+      end
+
+      it "generates the HTML fixture" do
+        File.exist?("#{@specdir}/zip/zoom.html").should be_true
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,9 @@
 require 'spec'
 require 'rubygems'
-
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+# Rake needs to be locked to the version that buildr expects before
+# anything else loads and gets the most recent installed version
+SHEN_RAKE_VERSION = '0.8.4'
+gem 'rake', "= #{SHEN_RAKE_VERSION}"
 
 Spec::Runner.configure do |config|
   
@@ -10,6 +11,13 @@ end
 
 module Shenandoah
   module Spec
+    def self.load_path_additions
+      [
+        File.dirname(__FILE__),
+        File.join(File.dirname(__FILE__), '..', 'lib')
+      ]
+    end
+    
     module Tmpfile
       attr_writer :tmpdir
       
@@ -20,6 +28,13 @@ module Shenandoah
         n
       end
       
+      def tmpscript(name, contents)
+        tmpfile name, 
+          Shenandoah::Spec.load_path_additions.
+            map { |a| "$LOAD_PATH.unshift(#{a.inspect})" }.
+            join("\n") + "\n" + contents
+      end
+      
       def tmpdir(name=nil)
         n = @tmpdir
         if (name)
@@ -58,4 +73,6 @@ module Shenandoah
       end
     end
   end
-end
+end
+
+Shenandoah::Spec.load_path_additions.each { |p| $LOAD_PATH.unshift(p) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rsutphin-shenandoah
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Rhett Sutphin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-16 00:00:00 -07:00
+date: 2009-07-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +72,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.3.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: hpricot
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.8.1
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec_hpricot_matchers
   type: :development
@@ -142,6 +152,76 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.12.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rubyzip
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.9.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: builder
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.1.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.0.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rjb
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.1.6
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: Antwrap
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.7.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: xml-simple
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.0.12
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: archive-tar-minitar
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.5.2
+    version: 
 description: 
 email: rhett@detailedbalance.net
 executables: []