Shuffled some files around to be compliant with the way cucumber does…

… things currently.

lib/generators/cucumber.rb

@@ -13,17 +13,17 @@ def self.source_root
     option :orm, :desc => 'Object-Relation Mapper to use (one of: none, activerecord, datamapper, sequel)'
     option :session_type, :default => :simple, :desc => 'Session type to use (one of: simple, webrat)'
 
-    template(:env) { |t| t.source = t.destination = "features/env.rb" }
+    template(:env) { |t| t.source = t.destination = "features/support/env.rb" }
     template(:rake) { |t| t.source = t.destination = "lib/tasks/cucumber.rake" }
     template(:autotest) { |t| t.source = t.destination = "autotest/cucumber_merb_rspec.rb" }
-    template(:common_result_steps) { |t| t.source = t.destination = "features/steps/common_result_steps.rb" }
+    template(:result_steps) { |t| t.source = t.destination = "features/steps/result_steps.rb" }
 
     template(:example_feature, :session_type => :webrat) { |t|  t.source = t.destination = "features/login.feature" }
     template(:example_feature_steps, :session_type => :webrat) do |t| 
       t.source = t.destination = "features/steps/login_steps.rb"
     end
-    template(:common_webrat, :session_type => :webrat) do |t| 
-      t.source = t.destination = "features/steps/common_webrat.rb"
+    template(:webrat_steps, :session_type => :webrat) do |t| 
+      t.source = t.destination = "features/steps/webrat_steps.rb"
     end
 
     template(:cucumber, :after => :chmod) { |t| t.source = t.destination = "bin/cucumber" }
@@ -35,5 +35,4 @@ def chmod(action)
   end 
 
   add :cucumber, CucumberGenerator
-
-end
+end

merb_cucumber.gemspec

@@ -6,11 +6,11 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roman Gonzalez", "David Leal"]
-  s.date = %q{2008-11-29}
+  s.date = %q{2008-12-17}
   s.description = %q{Cucumber integration for Merb}
   s.email = ["romanandreg@gmail.com", "dgleal@gmail.com"]
   s.extra_rdoc_files = ["README.textile", "LICENSE", "TODO"]
-  s.files = ["LICENSE", "README.textile", "Rakefile", "TODO", "Generators", "lib/merb_cucumber.rb", "lib/generators", "lib/generators/cucumber", "lib/generators/cucumber/templates", "lib/generators/cucumber/templates/features", "lib/generators/cucumber/templates/features/steps", "lib/generators/cucumber/templates/features/steps/common_webrat.rb", "lib/generators/cucumber/templates/features/steps/common_result_steps.rb", "lib/generators/cucumber/templates/features/steps/login_steps.rb", "lib/generators/cucumber/templates/features/env.rb", "lib/generators/cucumber/templates/features/login.feature", "lib/generators/cucumber/templates/autotest", "lib/generators/cucumber/templates/autotest/cucumber_merb_rspec.rb", "lib/generators/cucumber/templates/bin", "lib/generators/cucumber/templates/bin/cucumber", "lib/generators/cucumber/templates/lib", "lib/generators/cucumber/templates/lib/tasks", "lib/generators/cucumber/templates/lib/tasks/cucumber.rake", "lib/generators/feature", "lib/generators/feature/templates", "lib/generators/feature/templates/feature_steps.rb", "lib/generators/feature/templates/feature.rbt", "lib/generators/cucumber.rb", "lib/generators/feature.rb", "lib/merb_cucumber", "lib/merb_cucumber/world", "lib/merb_cucumber/world/base.rb", "lib/merb_cucumber/world/simple.rb", "lib/merb_cucumber/world/webrat.rb", "lib/merb_cucumber/helpers", "lib/merb_cucumber/helpers/activerecord.rb", "lib/merb_cucumber/helpers/datamapper.rb", "spec/spec_helper.rb", "spec/cucumber_setup_generator_spec.rb", "spec/feature_generator_spec.rb"]
+  s.files = ["LICENSE", "README.textile", "Rakefile", "TODO", "Generators", "lib/merb_cucumber.rb", "lib/generators", "lib/generators/cucumber", "lib/generators/cucumber/templates", "lib/generators/cucumber/templates/features", "lib/generators/cucumber/templates/features/support", "lib/generators/cucumber/templates/features/support/env.rb", "lib/generators/cucumber/templates/features/steps", "lib/generators/cucumber/templates/features/steps/webrat_steps.rb", "lib/generators/cucumber/templates/features/steps/result_steps.rb", "lib/generators/cucumber/templates/features/steps/login_steps.rb", "lib/generators/cucumber/templates/features/login.feature", "lib/generators/cucumber/templates/autotest", "lib/generators/cucumber/templates/autotest/cucumber_merb_rspec.rb", "lib/generators/cucumber/templates/bin", "lib/generators/cucumber/templates/bin/cucumber", "lib/generators/cucumber/templates/lib", "lib/generators/cucumber/templates/lib/tasks", "lib/generators/cucumber/templates/lib/tasks/cucumber.rake", "lib/generators/feature", "lib/generators/feature/templates", "lib/generators/feature/templates/feature_steps.rb", "lib/generators/feature/templates/feature.rbt", "lib/generators/cucumber.rb", "lib/generators/feature.rb", "lib/merb_cucumber", "lib/merb_cucumber/world", "lib/merb_cucumber/world/base.rb", "lib/merb_cucumber/world/simple.rb", "lib/merb_cucumber/world/webrat.rb", "lib/merb_cucumber/helpers", "lib/merb_cucumber/helpers/activerecord.rb", "lib/merb_cucumber/helpers/datamapper.rb", "spec/spec_helper.rb", "spec/cucumber_setup_generator_spec.rb", "spec/feature_generator_spec.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/david/merb_cucumber}
   s.require_paths = ["lib"]

spec/cucumber_setup_generator_spec.rb

@@ -2,8 +2,8 @@
 
 describe "common files generator", :shared => true do
 
-  it "should generate the features/env.rb file" do
-    @generator.should create('/tmp/features/env.rb')
+  it "should generate the features/support/env.rb file" do
+    @generator.should create('/tmp/features/support/env.rb')
   end
 
   it "should generate the bin/cucumber file" do
@@ -14,16 +14,16 @@
     @generator.should create('/tmp/autotest/cucumber_merb_rspec.rb')
   end
 
-  it "should generate the features/steps/common_result_steps.rb file" do
-    @generator.should create('/tmp/features/steps/common_result_steps.rb')
+  it "should generate the features/steps/result_steps.rb file" do
+    @generator.should create('/tmp/features/steps/result_steps.rb')
   end
 
   it "should generate the lib/tasks/cucumber.rake" do
-    @generator.should create('/tmp/features/steps/common_result_steps.rb')
+    @generator.should create('/tmp/lib/tasks/cucumber.rake')
   end
 
   it "should render templates successfully" do
-    lambda { @generator.render! }.should_not raise_error
+    @generator.render!
   end
 
 
@@ -41,7 +41,6 @@
 
     it "should have a requirement to the datamapper helper" do
       @generator.render!
-      # IO.read(@generator.template(:env).destination).should =~ %r[merb_cucumber/helpers/datamapper]
     end
 
   end
@@ -56,7 +55,6 @@
 
     it "should have a requirement to the activerecord helper" do
       @generator.render!
-      # IO.read(@generator.template(:env).destination).should =~ %r[merb_cucumber/helpers/activerecord]
     end
 
   end
@@ -74,13 +72,10 @@
     end
 
     it "should not generate the features/steps/common_webrat.rb file" do
-      @generator.should_not create('/tmp/features/steps/common_webrat.rb')
+      @generator.should_not create('/tmp/features/steps/webrat_steps.rb')
     end
 
-    it "should have a requirement to the simple session type on the env.rb file" do
-      @generator.render!
-      # IO.read(@generator.template(:env).destination).should =~ %r[merb_cucumber/world/webrat]
-    end
+    it "should have a requirement to the simple session type on the env.rb file"
 
   end
 
@@ -97,14 +92,9 @@
     end
 
     it "should  generate the features/steps/common_webrat.rb file" do
-      @generator.should create('/tmp/features/steps/common_webrat.rb')
-    end
-
-    it "should have a requirement to the webrat session type on the env.rb file" do
-      @generator.render!
-      # IO.read(@generator.template(:env).destination).should =~ %r[merb_cucumber/world/webrat]
+      @generator.should create('/tmp/features/steps/webrat_steps.rb')
     end
 
+    it "should have a requirement to the webrat session type on the env.rb file"
   end
-
 end

spec/spec_helper.rb

@@ -1,5 +1,3 @@
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
-
 require 'rubygems'
 require 'spec'
 require 'merb-core'