merb_cucumber 0.5.1.2 → 0.6.1

data/README.textile

@@ -10,7 +10,7 @@ merb_cucumber 0.5.0 now requires a version greater than cucumber 0.1.13, which i
 
   Cucumber::CLI.execute ARGV
 
-* Add a cucumber.yml to your Merb.root with the following contents:
+* Add a config/cucumber.yml to your Merb.root with the following contents:
 
   default: --format pretty features
 

data/Rakefile

@@ -1,55 +1,17 @@
-require 'rubygems'
-require 'rake/gempackagetask'
+require 'rake'
 
-require 'merb-core'
-require 'merb-core/tasks/merb'
-
-GEM_NAME = "merb_cucumber"
-GEM_VERSION = "0.5.1.2"
-AUTHOR = ["Roman Gonzalez", "David Leal"]
-EMAIL = ["romanandreg@gmail.com", "dgleal@gmail.com"]
-HOMEPAGE = "http://github.com/david/merb_cucumber"
-SUMMARY = "Cucumber integration for Merb"
-
-spec = Gem::Specification.new do |s|
-  s.rubyforge_project = 'merb'
-  s.name = GEM_NAME
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README.textile", "LICENSE", 'TODO']
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.authors = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.add_dependency('merb-core', '~> 1.0')
-  s.add_dependency('cucumber', '>= 0.1.14')
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README.textile Rakefile TODO Generators) + Dir.glob("{lib,spec}/**/*")
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "install the plugin as a gem"
-task :install do
-  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
-end
-
-desc "Uninstall the gem"
-task :uninstall do
-  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-desc "Create a gemspec file"
-task :gemspec do
-  File.open("#{GEM_NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
-  end
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
-require 'spec/rake/spectask'
-require 'spec/rake/spectask'
-require 'merb-core/test/tasks/spectasks'
+desc 'Default: run spec examples'
+task :default => 'spec'

data/lib/generators/cucumber.rb

@@ -9,9 +9,9 @@ module Merb::Generators
     def self.source_root
       File.join(File.dirname(__FILE__), 'cucumber', 'templates')
     end
-    
+
     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)'
+    option :session_type, :default => :webrat, :desc => 'Session type to use (one of: simple, webrat)'
     
     template(:env) { |t| t.source = t.destination = "features/support/env.rb" }
     template(:rake) { |t| t.source = t.destination = "lib/tasks/cucumber.rake" }
@@ -25,7 +25,7 @@ module Merb::Generators
     template(:webrat_steps, :session_type => :webrat) do |t| 
       t.source = t.destination = "features/steps/webrat_steps.rb"
     end
-    template(:cucumber_yml) { |t| t.source = t.destination = "cucumber.yml" }
+    template(:cucumber_yml) { |t| t.source = t.destination = "config/cucumber.yml" }
     
     def chmod(action)
       File.chmod(0755, action.destination)

data/lib/generators/cucumber/templates/config/cucumber.yml

@@ -0,0 +1 @@
+default: -r features/support --format pretty features

data/lib/generators/cucumber/templates/features/support/env.rb

@@ -1,12 +1,6 @@
 # Sets up the Merb environment for Cucumber (thanks to krzys and roman)
 require "rubygems"
 
-# Add the local gems dir if found within the app root; any dependencies loaded
-# hereafter will try to load from the local gems before loading system gems.
-if (local_gem_dir = File.join(File.dirname(__FILE__), '..', 'gems')) && $BUNDLE.nil?
-  $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(local_gem_dir)
-end
-
 require "merb-core"
 require 'spec/expectations'
 require "merb_cucumber/world/<%= session_type %>"
@@ -16,6 +10,9 @@ require "merb_cucumber/helpers/datamapper"
 require "merb_cucumber/helpers/activerecord"
 <% end -%>
 
+# Recursively Load all steps defined within features/**/*_steps.rb
+Dir["#{Merb.root}" / "features" / "**" / "*_steps.rb"].each { |f| require f }
+
 # Uncomment if you want transactional fixtures
 # Merb::Test::World::Base.use_transactional_fixtures
 
@@ -24,4 +21,7 @@ require "merb_cucumber/helpers/activerecord"
 def Spec.run? ; true; end
 
 Merb.start_environment(:testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'test')
-  
+
+<% if orm == :datamapper -%>
+DataMapper.auto_migrate!
+<% end -%>

data/lib/generators/cucumber/templates/lib/tasks/cucumber.rake

@@ -1,33 +1,38 @@
-require 'cucumber/rake/task'
+begin
+  require 'cucumber/rake/task'
 
-cucumber_options = lambda do |t|
-  # if you want to pass some custom options to cucumber, pass them here
-  t.binary = Merb.root / 'bin' / 'cucumber' if File.exist?(Merb.root / 'bin' / 'cucumber')
-  # We need use fork cucumber since cucumber > 0.3.4
-  t.fork = true
+  # Use vendored cucumber binary if possible. If it's not vendored,
+  # Cucumber::Rake::Task will automatically use installed gem's cucumber binary
+  vendored_cucumber_binary = Merb.root / 'bin' / 'cucumber' if File.exist?(Merb.root / 'bin' / 'cucumber')
+  
+  namespace :cucumber do
+    Cucumber::Rake::Task.new(:ok, 'Run features that should pass') do |t|
+      t.binary = vendored_cucumber_binary if vendored_cucumber_binary
+      t.fork = true # You may get faster startup if you set this to false
+      t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
+    end
 
-  # Add all requirement like before cucumber<0.3.4
-  t.cucumber_opts = ''
-  require_list = Array(FileList[File.join(File.dirname(__FILE__),"../../features/**/*.rb")])
-  require_list.each do |step_file|
-    t.cucumber_opts << '--require'
-    t.cucumber_opts << step_file
-  end
-end
+    Cucumber::Rake::Task.new(:wip, 'Run features that are being worked on') do |t|
+      t.binary = vendored_cucumber_binary if vendored_cucumber_binary
+      t.fork = true # You may get faster startup if you set this to false
+      t.cucumber_opts = "--color --tags @wip:2 --wip --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
+    end
 
-Cucumber::Rake::Task.new(:features, &cucumber_options)
-Cucumber::Rake::FeatureTask.new(:feature, &cucumber_options)
-namespace :merb_cucumber do 
-  task :test_env do
-    Merb.start_environment(:environment => "test", :adapter => 'runner')
+    desc 'Run all features'
+    task :all => [:ok, :wip]
   end
-end
+  desc 'Alias for cucumber:ok'
+  task :cucumber => 'cucumber:ok'
+
+  task :default => :cucumber
 
-<% if orm == :datamapper %>
-dependencies = ['merb_cucumber:test_env', 'db:automigrate']
-task :features => dependencies
-task :feature  => dependencies
-<% else %>
-task :features => 'merb_cucumber:test_env'
-task :feature  => 'merb_cucumber:test_env'
-<% end %>
+  task :features => :cucumber do
+    STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
+  end
+  
+rescue LoadError
+  desc 'cucumber rake task not available (cucumber not installed)'
+  task :cucumber do
+    abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
+  end
+end

data/lib/merb_cucumber/version.rb

@@ -0,0 +1,5 @@
+module Merb
+  module Cucumber
+    VERSION = "0.6.1".freeze
+  end
+end

data/lib/merb_cucumber/world/webrat.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'base')
 require 'webrat'
-require 'webrat/adapters/merb'
+require 'cucumber/web/tableish'
 
 module Merb
   module Test

data/spec/cucumber_setup_generator_spec.rb

@@ -7,8 +7,8 @@ describe "common files generator", :shared => true do
     @generator.should create('/tmp/features/support/env.rb')
   end
 
-  it "should generate the cucumber.yml file" do
-    @generator.should create('/tmp/cucumber.yml')
+  it "should generate the config/cucumber.yml file" do
+    @generator.should create('/tmp/config/cucumber.yml')
   end
 
   it "should generate the autotest/cucumber_merb_rspec.rb file" do
@@ -63,7 +63,7 @@ describe Merb::Generators::CucumberGenerator do
   describe "on simple session" do
 
     before(:each) do
-      @generator = Merb::Generators::CucumberGenerator.new('/tmp', {:orm => :datamapper})
+      @generator = Merb::Generators::CucumberGenerator.new('/tmp', {:orm => :datamapper, :session_type => :simple})
     end
 
     it_should_behave_like "common files generator"
@@ -87,7 +87,7 @@ describe Merb::Generators::CucumberGenerator do
   describe "on webrat session" do
 
     before(:each) do
-      @generator = Merb::Generators::CucumberGenerator.new('/tmp', {:orm => :datamapper, :session_type => :webrat})
+      @generator = Merb::Generators::CucumberGenerator.new('/tmp', {:orm => :datamapper})
     end
 
     it_should_behave_like "common files generator"

data/spec/spec_helper.rb

@@ -1,5 +1,9 @@
 require 'rubygems'
-require 'spec'
+
+# Use current merb-core sources if running from a typical dev checkout.
+lib = File.expand_path('../../../merb/merb-core/lib', __FILE__)
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
+require 'merb-core'
 require 'merb-gen'
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -11,5 +15,3 @@ Merb.disable(:initfile)
 Spec::Runner.configure do |config|
   config.include Templater::Spec::Helpers
 end
-
-

metadata

@@ -1,42 +1,105 @@
 --- !ruby/object:Gem::Specification 
 name: merb_cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.5.1.2
+  hash: 5
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Roman Gonzalez
 - David Leal
+- Jacques Crocker
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-11-02 00:00:00 -08:00
+date: 2010-08-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: merb-gen
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.0"
-    version: 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: cucumber
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 7
+        - 2
+        version: 0.7.2
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: cucumber-rails
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.14
-    version: 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
+        version: 1.2.9
+  type: :development
+  version_requirements: *id005
 description: Cucumber integration for Merb
-email: 
-- romanandreg@gmail.com
-- dgleal@gmail.com
+email: merbjedi@gmail.com
 executables: []
 
 extensions: []
@@ -46,13 +109,9 @@ extra_rdoc_files:
 - LICENSE
 - TODO
 files: 
-- LICENSE
-- README.textile
 - Rakefile
-- TODO
-- Generators
 - lib/generators/cucumber/templates/autotest/cucumber_merb_rspec.rb
-- lib/generators/cucumber/templates/cucumber.yml
+- lib/generators/cucumber/templates/config/cucumber.yml
 - lib/generators/cucumber/templates/features/authentication/login.feature
 - lib/generators/cucumber/templates/features/authentication/steps/login_steps.rb
 - lib/generators/cucumber/templates/features/steps/result_steps.rb
@@ -65,6 +124,7 @@ files:
 - lib/generators/feature.rb
 - lib/merb_cucumber/helpers/activerecord.rb
 - lib/merb_cucumber/helpers/datamapper.rb
+- lib/merb_cucumber/version.rb
 - lib/merb_cucumber/world/base.rb
 - lib/merb_cucumber/world/simple.rb
 - lib/merb_cucumber/world/webrat.rb
@@ -72,8 +132,12 @@ files:
 - spec/cucumber_setup_generator_spec.rb
 - spec/feature_generator_spec.rb
 - spec/spec_helper.rb
+- README.textile
+- LICENSE
+- TODO
+- Generators
 has_rdoc: true
-homepage: http://github.com/david/merb_cucumber
+homepage: http://github.com/merb/merb_cucumber
 licenses: []
 
 post_install_message: 
@@ -82,21 +146,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: merb
-rubygems_version: 1.3.5
+rubyforge_project: 
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Cucumber integration for Merb

data/lib/generators/cucumber/templates/cucumber.yml

@@ -1 +0,0 @@
-default: -r features/steps -r features/support --format pretty features