kosmas58-cucumber 0.2.0 → 0.2.0.1

data/History.txt

@@ -1,3 +1,8 @@
+== 0.2.1 (In Git)
+
+== Bugfixes
+* Snippets are showing 'Ands' (#249 Aslak Hellesøy)
+
 == 0.2.0 2009-03-18
 
 This release sports a bunch of new and exciting features, as well a major rewrite of Cucumber's internals. 

data/Manifest.txt

@@ -177,9 +177,11 @@ examples/tickets/features/177/3.feature
 examples/tickets/features/180.feature
 examples/tickets/features/236.feature
 examples/tickets/features/241.feature
+examples/tickets/features/248.feature
 examples/tickets/features/lib/eatting_machine.rb
 examples/tickets/features/lib/pantry.rb
 examples/tickets/features/scenario_outline.feature
+examples/tickets/features/step_definitons/248_steps.rb
 examples/tickets/features/step_definitons/scenario_outline_steps.rb
 examples/tickets/features/step_definitons/tickets_steps.rb
 examples/tickets/features/tickets.feature

data/gem_tasks/rspec.rake

@@ -31,8 +31,6 @@ if require_spec
   Spec::Rake::SpecTask.new do |t|
     t.spec_opts = ['--options', "spec/spec.opts"]
     t.spec_files = FileList['spec/**/*_spec.rb']
-    t.fail_on_error = false
-    #t.rcov = true
     t.rcov = ENV['RCOV']
     t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}
   end

data/lib/cucumber/ast/step.rb

@@ -78,21 +78,6 @@ module Cucumber
         @file_colon_line ||= @feature_element.file_colon_line(@line) unless @feature_element.nil?
       end
 
-      def actual_keyword
-        if [Cucumber.keyword_hash['and'], Cucumber.keyword_hash['but']].index(@keyword) && previous_step
-          previous_step.actual_keyword
-        else
-          @keyword
-        end
-      end
-
-      protected
-
-      # TODO: Remove when we use StepCollection everywhere
-      def previous_step
-        @feature_element.previous_step(self)
-      end
-
       private
 
       def matched_cells(cells)

data/lib/cucumber/ast/step_invocation.rb

@@ -79,7 +79,7 @@ module Cucumber
       end
 
       def actual_keyword
-        if [Cucumber.keyword_hash['and'], Cucumber.keyword_hash['but']].index(@keyword) && previous
+        if [Cucumber.keyword_hash['and'], Cucumber.keyword_hash['but']].index(@step.keyword) && previous
           previous.actual_keyword
         else
           @step.keyword

data/lib/cucumber/step_definition.rb

@@ -64,7 +64,7 @@ module Cucumber
     # Formats the matched arguments of the associated Step. This method
     # is usually called from visitors, which render output.
     #
-    # The +format+ either be a String or a Proc.
+    # The +format+ can either be a String or a Proc.
     #
     # If it is a String it should be a format string according to
     # <tt>Kernel#sprinf</tt>, for example:

data/lib/cucumber/version.rb

@@ -3,7 +3,7 @@ module Cucumber #:nodoc:
     MAJOR = 0
     MINOR = 2
     TINY  = 0
-    PATCH = nil # Set to nil for official release
+    PATCH = 1 # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

data/rails_generators/cucumber/cucumber_generator.rb

@@ -5,8 +5,7 @@ class CucumberGenerator < Rails::Generator::Base
   DEFAULT_SHEBANG = File.join(Config::CONFIG["bindir"],
                               Config::CONFIG["ruby_install_name"])
   
-  attr_reader :language
-  attr_accessor :framework
+  attr_accessor :framework, :language
   
   def initialize(runtime_args, runtime_options = {})
     super
@@ -19,16 +18,16 @@ class CucumberGenerator < Rails::Generator::Base
       set_language(@language)
     end
     record do |m|
-      m.directory  File.join(@features_path, "step_definitions")
+      m.directory "features/support"
+      m.file "env.rb", "features/support/env.rb"       
+      m.directory  File.join(@features_path, "step_definitions") 
       if @language
         m.file File.join(@language, "webrat_steps.rb"), File.join(@features_path, "step_definitions", "paths.rb")
         m.file File.join(@language, "webrat_steps.rb"), File.join(@features_path, "step_definitions", "webrat_steps.rb")       
       else
         m.file "webrat_steps.rb", File.join(@features_path, "step_definitions", "webrat_steps.rb")    
         m.file "paths.rb", "features/support/paths.rb"      
-      end
-      m.directory "features/support"
-      m.file "env.rb", "features/support/env.rb"   
+      end  
  
       m.directory "lib/tasks"
       m.template "cucumber.rake", "lib/tasks/cucumber.rake"
@@ -48,13 +47,7 @@ protected
   def banner
     "Usage: #{$0} cucumber"
   end
-    
-  def add_options!(opt)
-    opt.separator ""
-    opt.separator "Options:"
-    opt.on("-l", "--language=lang", String, "Use a [language] subdirectoy in /features.") { |v| options[:language] = v }
-   end
-   
+      
   # Load up the transations for the passed language, and modify the features_path accordingly
   def set_language(language)
     @features_path = File.join(@features_path, language)
@@ -70,6 +63,11 @@ protected
     opt.on('--testunit', 'Setup cucumber for use with test/unit') do |value|
       options[:framework] = :testunit
     end
+    
+    opt.on("-l", "--language=lang", String, "Use a [language] subdirectoy in /features.") do |value| 
+      options[:language] = value
+    end
+
   end
 
 end

data/spec/cucumber/ast/step_collection_spec.rb

@@ -3,6 +3,14 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 module Cucumber
   module Ast
     describe StepCollection do
+      it "should convert And to Given in snippets" do
+        c = StepCollection.new([
+          Step.new(1, 'Given', 'cukes'),
+          Step.new(2, 'And', 'turnips')
+        ])
+        actual_keywords = c.step_invocations.map{|i| i.actual_keyword}
+        actual_keywords.should == %w{Given Given}
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kosmas58-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.0.1
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-18 00:00:00 -07:00
+date: 2009-03-20 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency