spinach 0.4.1 → 0.4.2

data/README.markdown

@@ -190,6 +190,7 @@ Check out our [spinach-sinatra demo](https://github.com/codegram/spinach-sinatra
 
 * [spinach rails demo](https://github.com/codegram/spinach-rails-demo)
 * [spinach sinatra demo](https://github.com/codegram/spinach-sinatra-demo)
+* [simple todo Rails app](https://github.com/codegram/tasca-spinach-demo)
 
 ## Contributing
 

data/features/support/filesystem.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'open4'
 
 # The Filesystem module runs commands, captures their output and exit status
 # and lets the host know about it.
@@ -46,11 +45,25 @@ module Filesystem
   # @api public
   def run(command)
     in_current_dir do
-      pid = Open4.popen4(command) do |pid, stdin, stdout, stderr|
-        @stdout = stdout.readlines.join("\n")
-        @stderr = stderr.readlines.join("\n")
-      end
-      @last_exit_status = pid.exitstatus
+      # stdout, stderr pipes
+      rout, wout = IO.pipe
+      rerr, werr = IO.pipe
+
+      pid = Process.spawn(command, :out => wout, :err => werr)
+      _, status = Process.wait2(pid)
+
+      # close write ends so we could read them
+      wout.close
+      werr.close
+
+      @stdout = rout.readlines.join("\n")
+      @stderr = rerr.readlines.join("\n")
+
+      # dispose the read ends of the pipes
+      rout.close
+      rerr.close
+
+      @last_exit_status = status.exitstatus
     end
   end
 
@@ -60,6 +73,10 @@ module Filesystem
     FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
   end
 
+  def rmdir(dirname)
+    FileUtils.rm_rf(dirname) unless File.directory?(dirname)
+  end
+
   def current_dir
     File.join(*dirs)
   end

data/features/support/spinach_runner.rb

@@ -1,3 +1,4 @@
+require "rbconfig"
 require_relative 'filesystem'
 
 module Integration
@@ -8,7 +9,7 @@ module Integration
       Spinach.hooks.before_scenario do
         if respond_to?(:in_current_dir)
           in_current_dir do
-            run "rm -fR rails_app"
+            rmdir "rails_app"
           end
         end
       end
@@ -18,7 +19,15 @@ module Integration
       options[:framework] ||= :minitest
       use_minitest if options[:framework] == :minitest
       use_rspec if options[:framework] == :rspec
-      run "../../bin/spinach #{command} #{options[:append]}"
+      run "#{ruby} ../../bin/spinach #{command} #{options[:append]}"
+    end
+
+    def ruby
+      return @ruby if defined?(@ruby)
+
+      config = RbConfig::CONFIG
+      @ruby = File.join(config["bindir"],
+                  "#{config["ruby_install_name"]}#{config["EXEEXT"]}")
     end
 
     def use_minitest

data/lib/spinach/capybara.rb

@@ -1,5 +1,6 @@
 require 'capybara'
 require 'capybara/dsl'
+require 'rbconfig'
 require_relative 'feature_steps'
 
 module Spinach
@@ -33,12 +34,24 @@ module Spinach
           def visit(*args)
             stream = STDOUT
             old_stream = stream.dup
-            stream.reopen('/dev/null')
+            stream.reopen(null_device)
             stream.sync = true
             super
           ensure
             stream.reopen(old_stream)
           end
+
+          def null_device
+            return @null_device if defined?(@null_device)
+
+            if RbConfig::CONFIG["host_os"] =~ /mingw|mswin/
+              @null_device = "NUL"
+            else
+              @null_device = "/dev/null"
+            end
+
+            @null_device
+          end
         end
       end
     end

data/lib/spinach/cli.rb

@@ -20,21 +20,14 @@ module Spinach
     #
     # @api public
     def run
-      parse_options
-      features = if @args.any?
-        @args
-      else
-        Dir.glob(File.join Spinach.config[:features_path], '**', '*.feature')
-      end
-      Spinach::Runner.new(features).run
+      Spinach::Runner.new(feature_files).run
     end
 
     # Inits the reporter with a default one.
     #
     # @api public
     def init_reporter
-      reporter =
-        Spinach::Reporter::Stdout.new(options[:reporter])
+      reporter = Spinach::Reporter::Stdout.new(options[:reporter])
       reporter.bind
     end
 
@@ -118,5 +111,25 @@ module Spinach
 
       {reporter: reporter_options}
     end
+
+    # Uses given args to list the feature files to run. It will find a single
+    # feature, features in a folder and subfolders or every feature file in the
+    # feature path.
+    #
+    # @return [Array]
+    #   An array with the feature file names.
+    #
+    # @api private
+    def feature_files
+      path = @args.first.to_s
+
+      if File.file?(path)
+        @args
+      elsif File.directory?(path)
+        Dir.glob(File.join(path, '**', '*.feature'))
+      else
+        Dir.glob(File.join(Spinach.config[:features_path], '**', '*.feature'))
+      end
+    end
   end
 end

data/lib/spinach/dsl.rb

@@ -28,21 +28,36 @@ module Spinach
       #   Action to perform in that step.
       #
       # @example
+      #   These 3 examples are equivalent:
+      #
       #   class MyFeature < Spinach::FeatureSteps
       #     When "I go to the toilet" do
       #       @sittin_on_the_toilet.must_equal true
       #     end
       #   end
       #
+      #   class MyFeature < Spinach::FeatureSteps
+      #     step "I go to the toilet" do
+      #       @sittin_on_the_toilet.must_equal true
+      #     end
+      #   end
+      #
+      #   class MyFeature < Spinach::FeatureSteps
+      #     def i_go_to_the_toilet
+      #       @sittin_on_the_toilet.must_equal true
+      #     end
+      #   end
+      #
       # @api public
-      def Given(step, &block)
+      def step(step, &block)
         define_method(Spinach::Support.underscore(step), &block)
       end
 
-      alias_method :When, :Given
-      alias_method :Then, :Given
-      alias_method :And, :Given
-      alias_method :But, :Given
+      alias_method :Given, :step
+      alias_method :When, :step
+      alias_method :Then, :step
+      alias_method :And, :step
+      alias_method :But, :step
 
       # Sets the feature name.
       #

data/lib/spinach/version.rb

@@ -1,4 +1,4 @@
 module Spinach
   # Spinach version.
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spinach.gemspec

@@ -15,11 +15,9 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'mocha'
   gem.add_development_dependency 'sinatra'
   gem.add_development_dependency 'capybara'
-  gem.add_development_dependency 'open4'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'fakefs'
   gem.add_development_dependency 'minitest', '~> 2.0'
   gem.add_development_dependency 'turn'
 

data/test/spinach/cli_test.rb

@@ -137,6 +137,8 @@ describe Spinach::Cli do
     describe 'when a particular feature list is passed' do
       it 'runs the feature' do
         cli = Spinach::Cli.new(['features/some_feature.feature'])
+        File.expects(:file?).with('features/some_feature.feature').returns(true)
+
         Spinach::Runner.expects(:new).with(['features/some_feature.feature']).
           returns(stub(:run))
         cli.run
@@ -153,5 +155,27 @@ describe Spinach::Cli do
         cli.run
       end
     end
+
+    describe 'when a folder is given' do
+      it 'runs all feature files in the folder and subfolders' do
+        cli = Spinach::Cli.new(['path/to/features'])
+
+        File.expects(:directory?).with('path/to/features').returns(true)
+        Dir.expects(:glob).with('path/to/features/**/*.feature').
+          returns(['path/to/features/feature1.feature', 
+                  'path/to/features/feature2.feature',
+                  'path/to/features/feature3.feature',
+                  'path/to/features/domain/feature4.feature'])
+
+        Spinach::Runner.expects(:new).with([
+                   'path/to/features/feature1.feature', 
+                   'path/to/features/feature2.feature',
+                   'path/to/features/feature3.feature',
+                   'path/to/features/domain/feature4.feature']).
+          returns(stub(:run))
+
+        cli.run
+      end
+    end
   end
 end

data/test/spinach/dsl_test.rb

@@ -8,10 +8,10 @@ describe Spinach::DSL do
   end
 
   describe 'class methods' do
-    describe '#When' do
+    describe '#step' do
       it 'defines a method with the step name' do
         step_executed = false
-        @feature.When('I say goodbye') do
+        @feature.step('I say goodbye') do
           step_executed = true
         end
 
@@ -20,9 +20,9 @@ describe Spinach::DSL do
       end
     end
 
-    describe '#When, #Then, #And, #But' do
-      it 'are #Given aliases' do
-        %w{When Then And But}.each do |method|
+    describe '#Give, #When, #Then, #And, #But' do
+      it 'are #step aliases' do
+        %w{Given When Then And But}.each do |method|
           @feature.must_respond_to method
         end
       end

data/test/spinach/generators/feature_generator_test.rb

@@ -63,28 +63,28 @@ Feature: Cheezburger can I has
 
     describe "#store" do
       it "stores the generated feature into a file" do
-        FakeFS.activate!
-        subject.store
-        File.directory?("features/steps/").must_equal true
-        File.exists?("features/steps/cheezburger_can_i_has.rb").must_equal true
-        File.read("features/steps/cheezburger_can_i_has.rb").strip.must_equal(
-          subject.generate.strip
-        )
-        FileUtils.rm_rf("features/steps")
-        FakeFS.deactivate!
+        in_current_dir do
+          subject.store
+          File.directory?("features/steps/").must_equal true
+          File.exists?("features/steps/cheezburger_can_i_has.rb").must_equal true
+          File.read("features/steps/cheezburger_can_i_has.rb").strip.must_equal(
+            subject.generate.strip
+          )
+          FileUtils.rm_rf("features/steps")
+        end
       end
 
       it "raises an error if the file already exists and does nothing" do
         file = "features/steps/cheezburger_can_i_has.rb"
-        FakeFS.activate!
-        FileUtils.mkdir_p "features/steps"
-        File.open(file, 'w') do |f|
-          f.write("Fake content")
+        in_current_dir do
+          FileUtils.mkdir_p "features/steps"
+          File.open(file, 'w') do |f|
+            f.write("Fake content")
+          end
+          Proc.new{subject.store}.must_raise(
+            Spinach::Generators::FeatureGeneratorException)
+          FileUtils.rm_rf("features/steps")
         end
-        Proc.new{subject.store}.must_raise(
-          Spinach::Generators::FeatureGeneratorException)
-        FileUtils.rm_rf("features/steps")
-        FakeFS.deactivate!
       end
     end
   end

data/test/spinach/generators_test.rb

@@ -32,19 +32,22 @@ Feature: Cheezburger can I has
   describe "#generate_feature" do
     it "generates a file" do
       feature_data = data
-      FakeFS.activate!
-      subject.generate_feature(feature_data)
-      File.exists?("features/steps/cheezburger_can_i_has.rb").must_equal true
-      FileUtils.rm_rf("features/steps")
-      FakeFS.deactivate!
+      in_current_dir do
+        subject.generate_feature(feature_data)
+        File.exists?("features/steps/cheezburger_can_i_has.rb").must_equal true
+        FileUtils.rm_rf("features/steps")
+      end
     end
+
     it "outputs a message if feature cannot be generated" do
-      subject::FeatureGenerator.expects(:new).raises(
-        Spinach::Generators::FeatureGeneratorException.new("File already exists"))
-      capture_stdout do
-        subject.generate_feature(data)
-      end.must_include "File already exists"
-      File.exists?("features/steps/cheezburger_can_i_has.rb").must_equal false
+      in_current_dir do
+        subject::FeatureGenerator.expects(:new).raises(
+          Spinach::Generators::FeatureGeneratorException.new("File already exists"))
+        capture_stdout do
+          subject.generate_feature(data)
+        end.must_include "File already exists"
+        File.exists?("features/steps/cheezburger_can_i_has.rb").must_equal false
+      end
     end
   end
 end

data/test/support/filesystem.rb

@@ -0,0 +1,13 @@
+require "fileutils"
+
+module Filesystem
+  def in_current_dir(&block)
+    dir = "tmp/fs"
+    FileUtils.mkdir(dir)
+    Dir.chdir(dir, &block)
+  ensure
+    FileUtils.rm_rf(dir)
+  end
+end
+
+MiniTest::Spec.send(:include, Filesystem)

data/test/test_helper.rb

@@ -15,11 +15,12 @@ require 'mocha'
 require 'ostruct'
 require 'stringio'
 require 'pry'
-require 'fakefs/safe'
 require 'turn'
 
 require 'spinach'
 
+require_relative "support/filesystem"
+
 module Kernel
   def capture_stdout
     out = StringIO.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spinach
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-04 00:00:00.000000000 Z
+date: 2012-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin-ruby
-  requirement: &70243741509420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +24,15 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70243741509420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70243741509000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +40,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70243741509000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70243741508540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +56,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243741508540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70243741508120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +72,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243741508120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70243741507700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +88,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243741507700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70243741523640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,21 +104,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243741523640
-- !ruby/object:Gem::Dependency
-  name: open4
-  requirement: &70243741523220 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70243741523220
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70243741522800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +120,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243741522800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70243741522380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +136,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243741522380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70243741521960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,21 +152,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243741521960
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: &70243741521540 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70243741521540
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70243741521040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -145,10 +168,15 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70243741521040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70243741520620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -156,7 +184,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243741520620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Spinach is a BDD framework on top of gherkin
 email:
 - info@codegram.com
@@ -257,6 +290,7 @@ files:
 - test/spinach/support_test.rb
 - test/spinach/tags_matcher_test.rb
 - test/spinach_test.rb
+- test/support/filesystem.rb
 - test/test_helper.rb
 homepage: http://github.com/codegram/spinach
 licenses: []
@@ -278,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Spinach is a BDD framework on top of gherkin
@@ -331,5 +365,6 @@ test_files:
 - test/spinach/support_test.rb
 - test/spinach/tags_matcher_test.rb
 - test/spinach_test.rb
+- test/support/filesystem.rb
 - test/test_helper.rb
 has_rdoc: