bumps 0.0.2 → 0.0.3

data/History.txt

@@ -1,3 +1,8 @@
+== 0.0.3 2009-09-28
+
+* Compatibility with Cucumber 0.3.104 and above
+  * Uses new formatter api
+
 == 0.0.2 2009-09-03
 
 * Compatibility with Cucumber 0.3.99 and above

data/Manifest.txt

@@ -3,6 +3,7 @@ Manifest.txt
 README.rdoc
 Rakefile
 TODO
+environment.rb
 examples/feature_server
 features/pull_remote_features.feature
 features/push_feature_results.feature
@@ -31,5 +32,6 @@ spec/bumps_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
 tasks/rspec.rake
+tasks/setup.rake
 test_features/remote_content/destroy_dr_thaddeus_venture.feature
 test_features/requires/support/env.rb

data/README.rdoc

@@ -4,6 +4,10 @@
 * http://groups.google.com/group/bumps-for-cucumber
 * http://fuglylogic.com/2009/07/20/bumps-remote-features-for-cucumber/
 
+== Description
+
+Remote feature management for Cucumber.
+
 Bumps extends {Cucumber}[http://cukes.info] by allowing you to pull feature content and push run results to and from a remote server. This means that your feature files no longer need to live with your steps and other code. This also means that you can publish the results of a Cucumber run to another system.
 
 See the {wiki}[http://wiki.github.com/brentsnook/bumps] for more details.
@@ -12,15 +16,13 @@ See the {wiki}[http://wiki.github.com/brentsnook/bumps] for more details.
 
   sudo gem install bumps
 
-=== Building the Gem yourself
-
-Grab the code from github:
+Or grab the code from Github and build yourself:
 
   git clone git://github.com/brentsnook/bumps.git
   cd bumps
   rake install_gem
 
-== How do I use it?
+== Synopsis
 
 First, start up a server that meets the {push/pull contract}[http://wiki.github.com/brentsnook/bumps/push-pull-contract].
 
@@ -33,7 +35,7 @@ Lastly, just run Cukes as normal.
 
   cucumber my_feature_directory
 
-Bumps will pull feature files into the specified feature directory, run cukes and then push the results back to the server.
+Bumps will pull feature files into the specified feature directory, run Cukes and then push the results back to the server.
 
 == License
 

data/Rakefile

@@ -1,27 +1,32 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
-require File.expand_path(File.dirname(__FILE__) + '/lib/bumps_core')
+%w[rubygems rake rake/clean hoe fileutils newgem rubigen].each { |f| require f }
+['/lib/bumps_core', 'environment'].each do |f|
+  require File.expand_path(File.join(File.dirname(__FILE__) , f))
+end
 
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('bumps', Bumps::VERSION) do |p|
-  p.developer 'Brent Snook', 'brent@fuglylogic.com'
-  p.summary = %q{Remote feature management for Cucumber.}
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.rubyforge_name = p.name
-  p.extra_deps = [
-    ['cucumber', ">= 0.3.99"],
-    ['nokogiri','>= 1.1.1'],
+Hoe.spec 'bumps' do
+  self.version = Bumps::VERSION
+  developer 'Brent Snook', 'brent@fuglylogic.com'
+  self.readme_file = 'README.rdoc'
+  self.clean_globs |= %w[**/.DS_Store tmp *.log]
+  self.rsync_args = '-av --delete --ignore-errors' # is this needed?
+  
+  self.extra_deps = [
+    ['cucumber', ">= 0.3.104"],
+    ['nokogiri','>= 1.3.3'],
   ]
-  p.extra_dev_deps = [
+  
+  self.extra_dev_deps = [
+    ['rspec', '>= 1.2.8'],
     ['newgem', ">= #{::Newgem::VERSION}"],
-    ['rspec', '>= 1.2.7'],
+    ['sinatra', '>=0.9.4'],
   ]
+end
 
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
-  p.rsync_args = '-av --delete --ignore-errors'
+require 'cucumber/rake/task'
+Cucumber::Rake::Task.new(:features) do |t|
+  t.cucumber_opts = "features --format pretty"
 end
+task :features => :create_tmp
 
 require 'newgem/tasks' # load /tasks/*.rake
 Dir['tasks/**/*.rake'].each { |t| load t }

data/TODO

@@ -1,19 +1,11 @@
-
---- 0.3.96 fix
-
-  - test with different ruby versions
-
-  - publish gem
-  - add to tools page on Cukes wiki
-  - announce on twitter, Bumps mailing list, Cukes mailing list, Wave list
-
-  - delete fork
-   
+- release
+  - tag
+  - release to rubyforge
+  - announce on bumps group + twitter
 
 --- LATER ---
 
 - add validation for config and some nicer messages?
-- get rid of treetop gibberish
 - can it be more of a synch than a straight clobber??? for speed mainly
 - extract process control logic out into a new gem
 - support obtaining details for a single feature ???

data/environment.rb

@@ -0,0 +1 @@
+ENV['BUMPS_TEMP'] = File.expand_path(File.join(File.dirname(__FILE__), 'tmp'))

data/examples/feature_server

@@ -1,61 +1,39 @@
-require 'webrick'
-require 'stringio'
+require 'rubygems'
+require 'sinatra'
 
-include WEBrick
+FEATURE_DIR, RESULTS_FILE = ARGV[0..1]
 
-class PullServlet < HTTPServlet::AbstractServlet
+set :port, 1981
 
-  def do_GET(request, response)
-    response.body = feature_content
-    response['Content-Type'] = 'text/xml'
-  end
-
-  private
-
-  def feature_content
-    content = StringIO.new 
-    content.puts '<?xml version="1.0"?>'
-    content.puts '<features>'
-
-    Dir.glob(features_pattern).each do |file|
-      content << feature_within(file) if File.file?(file)
-    end
+def feature_content
+  content = StringIO.new 
+  content.puts '<?xml version="1.0"?>'
+  content.puts '<features>'
 
-    content.puts '</features>'
-
-    content.string
-  end
-
-  def feature_within file
-    relative_path = file[(@options[0].length)..-1]
-    "<feature name=\"#{relative_path}\"><![CDATA[#{IO.read(file)}\n]]></feature>"
+  Dir.glob(features_pattern).each do |file|
+    content << feature_within(file) if File.file?(file)
   end
 
-  def features_pattern
-    File.join @options[0], '**', '*'
-  end
+  content.puts '</features>'
 
+  content.string
 end
 
-class PushServlet < HTTPServlet::AbstractServlet
-
-  def do_POST(request, response)
-    File.open(@options[0], 'w'){ |f| f.write(request.query['results']) }
-    response['Content-Type'] = 'text/html'
-  end
-
+def feature_within file
+  relative_path = file[(FEATURE_DIR.length)..-1]
+  "<feature name=\"#{relative_path}\"><![CDATA[#{IO.read(file)}\n]]></feature>"
 end
 
-server = WEBrick::HTTPServer.new :Port => 1981
-
-server.mount "/features/content", PullServlet, ARGV[0]
-server.mount "/features/results", PushServlet, ARGV[1]
+def features_pattern
+  File.join FEATURE_DIR, '**', '*'
+end
 
-%w(INT TERM).each do |signal|
-  trap signal do
-    server.shutdown
-    exit!
-  end
+get '/features/content' do
+  content_type 'text/xml'
+  feature_content
 end
 
-server.start
+post '/features/results' do
+  content_type 'text/html'
+  File.open(RESULTS_FILE, 'w'){ |f| f.write(params[:results]) }
+end

data/features/steps/helpers/scenario_process.rb

@@ -46,7 +46,7 @@ class ScenarioProcess
   private
   
   def log
-    File.expand_path(File.dirname(__FILE__) + "/../../../tmp/#{@name}.log")
+    File.expand_path(File.join(ENV['BUMPS_TEMP'], "#{@name}.log"))
   end 
   
   def remove file

data/features/support/env.rb

@@ -1,7 +1,9 @@
+require File.expand_path(File.dirname(__FILE__) + '../../../environment.rb')
+
 module CucumberWorld
 
   def feature_report_file
-    File.expand_path File.join(root, 'tmp', 'cucumber.out')
+    File.expand_path File.join(ENV['BUMPS_TEMP'], 'cucumber.out')
   end
   
   def feature_report
@@ -17,7 +19,7 @@ module CucumberWorld
   end
 
   def push_request_file
-    File.expand_path File.join(root, 'tmp', 'results.xml')
+    File.expand_path File.join(ENV['BUMPS_TEMP'], 'results.xml')
   end
   
   def push_request
@@ -29,7 +31,7 @@ module CucumberWorld
   end
   
   def test_features_directory
-    File.expand_path File.join(root, 'tmp')
+    ENV['BUMPS_TEMP']
   end
   
   def feature_server_command
@@ -61,7 +63,7 @@ module CucumberWorld
   end
   
   def command_output_file
-    File.expand_path File.join(root, 'tmp', 'cucumber.log')
+    File.expand_path File.join(ENV['BUMPS_TEMP'], 'cucumber.log')
   end
   
   def remote_features_directory

data/lib/bumps/remote_feature.rb

@@ -1,5 +1,4 @@
 require 'nokogiri'
-
 require 'open-uri'
 
 module Bumps

data/lib/bumps/results_push_formatter.rb

@@ -2,17 +2,26 @@ require 'cucumber/formatter/html'
 require 'net/http'
 
 module Bumps
-  class ResultsPushFormatter < Cucumber::Ast::Visitor
+  class ResultsPushFormatter
+    
+    attr_reader :formatter, :results
     
     def initialize(step_mother, io, options)
-      super step_mother
       @step_mother = step_mother
       @io = io
       @options = options
     end
-
-    def visit_features features
-      push results_of_running(features)
+    
+    def before_features features
+      @results = StringIO.open
+      @formatter = Bumps::Configuration.results_formatter.new @step_mother, results, @options
+      formatter.before_features features
+    end
+    
+    def after_features features
+      formatter.after_features features
+      results.close
+      push results.string
     end
     
     def push results
@@ -25,13 +34,13 @@ module Bumps
       end
     end
     
-    def results_of_running features
-      StringIO.open do |io|
-        formatter = Bumps::Configuration.results_formatter.new step_mother, io, options
-        formatter.visit_features features
-        
-        io.string
-      end
+    def method_missing(method, *args, &block)
+      formatter.send(method, *args, &block)
+    end
+
+    def respond_to?(message, include_private = false)
+      super(message, include_private) || formatter.respond_to?(message, include_private)
     end
+    
   end
 end

data/lib/bumps_core.rb

@@ -14,7 +14,7 @@ require 'cucumber'
 
 module Bumps
   
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
   
   def self.configure &block
     Configuration.configure(&block)

data/spec/bumps/results_push_formatter_spec.rb

@@ -18,65 +18,139 @@ describe Bumps::ResultsPushFormatter do
     )
   end
   
-  it 'should capture results before pushing them' do
-    results = mock 'results'
-    
-    subject.should_receive(:results_of_running).with(@features).and_return results
-    subject.should_receive(:push).with results
-    
-    subject.visit_features @features
-  end
-  
   describe 'when capturing results' do
-    
+ 
     before do
       @formatter_class = mock 'formatter class'
+      @formatter = mock('formatter').as_null_object
       Bumps::Configuration.stub!(:results_formatter).and_return @formatter_class
     end
     
-    it 'should obtain the results formatter from the configuration' do
-      @formatter_class.stub!(:new).and_return mock('formatter').as_null_object 
+    describe 'responding to events' do
       
-      Bumps::Configuration.should_receive(:results_formatter).and_return @formatter_class
+      before do
+        @formatter_class.stub!(:new).and_return @formatter
+        Bumps::Configuration.stub!(:results_formatter).and_return @formatter_class
+      end
+      
+      it 'should recognise events that the wrapped formatter handles' do
+        @formatter.stub!(:respond_to?).with('event', anything).and_return true
+       
+        subject.before_features @features
+        subject.respond_to?('event').should == true
+      end
       
-      subject.results_of_running @features
+      it 'should recognise events that it handles on its own' do
+        @formatter.stub!(:respond_to?).with('after_features', anything).and_return false
+    
+        subject.before_features @features
+        subject.respond_to?('after_features').should == true
+      end
     end
- 
-    it 'should construct the wrapped formatter using the step mother' do
-      @formatter_class.should_receive(:new).with(
-        @step_mother, anything, anything
-      ).and_return mock('formatter').as_null_object
- 
-      subject.results_of_running @features
+       
+    describe 'before the running of features' do
+      
+      it 'should construct the wrapped formatter using the step mother' do
+        @formatter_class.should_receive(:new).with(
+          @step_mother, anything, anything
+        ).and_return @formatter
+
+        subject.before_features @features
+      end   
+      
+      it 'should construct the wrapped formatter using the options' do
+        @formatter_class.should_receive(:new).with(
+          anything, anything, @options
+        ).and_return @formatter
+
+        subject.before_features @features
+      end
+      
+      it 'should obtain the results formatter from the configuration' do
+        @formatter_class.stub!(:new).and_return @formatter
+
+        Bumps::Configuration.should_receive(:results_formatter).and_return @formatter_class
+
+        subject.before_features @features
+      end
+      
+      it 'should notify the wrapped formatter of the before_features event' do
+        Bumps::Configuration.stub!(:results_formatter).and_return @formatter_class
+        @formatter_class.stub!(:new).and_return @formatter
+
+        @formatter.should_receive(:before_features).with @features
+
+        subject.before_features @features
+      end
+         
     end
     
-    it 'should construct the wrapped formatter using the options' do
-      @formatter_class.should_receive(:new).with(
-        anything, anything, @options
-      ).and_return mock('formatter').as_null_object
- 
-      subject.results_of_running @features
+    describe 'during the running of features' do
+
+      it 'should notify the wrapped formatter of all events' do
+        @formatter_class.stub!(:new).and_return @formatter
+        Bumps::Configuration.stub!(:results_formatter).and_return @formatter_class
+        events = [
+          :before_feature, :after_feature, :before_comment, :after_comment,
+          :comment_line, :after_tags, :before_background, :after_background,
+          # there are more, add as needed
+        ]
+        
+        events.each { |event| @formatter.should_receive(event).with('arguments')}
+     
+        subject.before_features @features
+        events.each { |event| subject.send(event, 'arguments')}
+      end
+      
     end
     
-    it 'should return results of visiting features with wrapped formatter' do
-      
-      class FormatterTestDouble  
-        def initialize io
-          @io = io
-        end
-        
-        def visit_features features
-          @io << 'results'
-        end
+    describe 'after the running of features' do
+      before do
+        @results = mock('results').as_null_object
+        subject.stub!(:results).and_return @results
+        subject.stub!(:formatter).and_return @formatter
+        subject.stub!(:push)
       end
+    
+      it 'should notify the wrapped formatter after all features have been run' do
+        @formatter.should_receive(:after_features).with @features
       
-      @formatter_class.stub!(:new) do |step_mother, io, options|
-        FormatterTestDouble.new(io)
+        subject.after_features @features
       end
+    
+      it 'should ready the captured results for pushing' do     
+        @results.should_receive :close
       
-      subject.results_of_running(@features).should =='results'
+        subject.after_features @features  
+      end
     end
+    
+    describe 'over the entire run' do
+      it 'should capture then push results' do
+        class FormatterTestDouble
+          def initialize(step_mother, io, options)
+            @io = io
+          end
+          
+          def before_features features
+          end
+          
+          def after_features features
+          end
 
+          def after_feature feature
+            @io << "After feature: #{feature}"
+          end
+        end
+        Bumps::Configuration.stub(:results_formatter).and_return FormatterTestDouble
+
+        subject.should_receive(:push).with 'After feature: walk the dog' 
+
+        subject.before_features @features
+        subject.after_feature 'walk the dog'
+        subject.after_features @features
+      end
+    end
   end
   
   describe 'when pushing results' do

data/tasks/setup.rake

@@ -0,0 +1,4 @@
+desc "Create temp directory"
+task :create_tmp do
+  mkdir_p ENV['BUMPS_TEMP'], :verbose => false
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bumps
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Brent Snook
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-03 00:00:00 +01:00
+date: 2009-09-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.99
+        version: 0.3.104
     version: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -30,7 +30,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.1
+        version: 1.3.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: newgem
@@ -40,17 +50,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: 1.5.2
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: sinatra
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.7
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -60,9 +70,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 2.3.3
     version: 
-description: ""
+description: |-
+  Remote feature management for Cucumber.
+  
+  Bumps extends {Cucumber}[http://cukes.info] by allowing you to pull feature content and push run results to and from a remote server. This means that your feature files no longer need to live with your steps and other code. This also means that you can publish the results of a Cucumber run to another system.
+  
+  See the {wiki}[http://wiki.github.com/brentsnook/bumps] for more details.
 email: 
 - brent@fuglylogic.com
 executables: []
@@ -72,13 +87,13 @@ extensions: []
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
-- README.rdoc
 files: 
 - History.txt
 - Manifest.txt
 - README.rdoc
 - Rakefile
 - TODO
+- environment.rb
 - examples/feature_server
 - features/pull_remote_features.feature
 - features/push_feature_results.feature
@@ -107,6 +122,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - tasks/rspec.rake
+- tasks/setup.rake
 - test_features/remote_content/destroy_dr_thaddeus_venture.feature
 - test_features/requires/support/env.rb
 has_rdoc: true
@@ -137,6 +153,6 @@ rubyforge_project: bumps
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Remote feature management for Cucumber.
+summary: Remote feature management for Cucumber
 test_files: []