spinach 0.1.5.4 → 0.2.0.1

data/features/steps/reporting/undefined_feature_reporting.rb

@@ -5,13 +5,13 @@ class UndefinedFeatureReporting < Spinach::FeatureSteps
   include Integration::SpinachRunner
 
   Given "I've written a feature but not its steps" do
-    write_file('features/feature_without_steps.feature',
-               'Feature: Feature without steps
+    write_file('features/feature_without_steps.feature', """
+Feature: Feature without steps
 
-                Scenario: A scenario without steps
-                  Given I have no steps
-                  Then I should do nothing
-               ')
+  Scenario: A scenario without steps
+    Given I have no steps
+    Then I should do nothing
+""")
   end
 
   When "I run spinach" do
@@ -19,6 +19,6 @@ class UndefinedFeatureReporting < Spinach::FeatureSteps
   end
 
   Then "I should see a message telling me that there's an undefined feature" do
-    all_stderr.must_match /Undefined features.*1/
+    @stderr.must_match /Undefined features.*1/
   end
 end

data/features/steps/rspec_compatibility.rb

@@ -6,13 +6,13 @@ class RSpecCompatibility < Spinach::FeatureSteps
   include Integration::ErrorReporting
 
   Given "I have a feature with some failed expectations" do
-    write_file('features/feature_with_failures.feature',
-               'Feature: Feature with failures
+    write_file('features/feature_with_failures.feature', """
+Feature: Feature with failures
 
-                Scenario: This scenario will fail
-                  Given true is false
-                  Then remove all the files in my hard drive
-               ')
+  Scenario: This scenario will fail
+    Given true is false
+    Then remove all the files in my hard drive
+""")
 
     write_file('features/steps/failure_feature.rb',
                'class FeatureWithFailures < Spinach::FeatureSteps
@@ -30,7 +30,7 @@ class RSpecCompatibility < Spinach::FeatureSteps
 
   When "I run \"spinach\" with rspec" do
     @feature =
-    run_feature "features/#{@feature}.feature", suite: :rspec
+      run_feature "features/#{@feature}.feature", framework: :rspec
   end
 
   Then "I should see the failure count along with their messages" do
@@ -49,13 +49,13 @@ class RSpecCompatibility < Spinach::FeatureSteps
       Capybara.app = app
     ')
 
-    write_file('features/greeting.feature',
-               'Feature: Greeting
+    write_file('features/greeting.feature', """
+Feature: Greeting
 
-                Scenario: Greeting
-                  Given I am on the front page
-                  Then I should see hello world
-               ')
+  Scenario: Greeting
+    Given I am on the front page
+    Then I should see hello world
+""")
 
     write_file('features/steps/greeting.rb',
                'require "spinach/capybara"
@@ -74,7 +74,7 @@ class RSpecCompatibility < Spinach::FeatureSteps
   end
 
   Given  'There should be no error' do
-    last_exit_status.must_equal 0
+    @last_exit_status.must_equal 0
   end
 
 end

data/features/support/error_reporting.rb

@@ -1,16 +1,16 @@
-require 'aruba/api'
+require_relative 'spinach_runner'
 
 module Integration
   module ErrorReporting
-    include Aruba::Api
+    include Filesystem
 
     def check_error_messages(n = 1)
-      all_stderr.must_match /Failures \(1\)/
+      @stderr.must_match /Failures \(1\)/
     end
 
     def check_backtrace(n = 1)
-      all_stderr.must_match /Failures \(1\)/
-      all_stderr.must_match /gems.*(minitest|rspec).*assert_equal/
+      @stderr.must_match /Failures \(1\)/
+      @stderr.must_match /gems.*(minitest|rspec).*assert_equal/
     end
   end
 end

data/features/support/filesystem.rb

@@ -0,0 +1,71 @@
+require 'fileutils'
+require 'open4'
+
+# The Filesystem module runs commands, captures their output and exit status
+# and lets the host know about it.
+#
+module Filesystem
+  # Writes a file with some contents.
+  #
+  # @param [String] filename
+  #   The file name to write.
+  #
+  # @param [String] contents
+  #   The contents to include in the file.
+  #
+  # @api public
+  def write_file(filename, contents)
+    in_current_dir do
+      mkdir(File.dirname(filename))
+      File.open(filename, 'w') { |f| f << contents }
+    end
+  end
+
+  # Executes a code block within a particular directory.
+  #
+  # @param [Proc] block
+  #   The block to execute
+  #
+  # @api public
+  def in_current_dir(&block)
+    mkdir(current_dir)
+    Dir.chdir(current_dir, &block)
+  end
+
+  # Runs a command in the current directory.
+  #
+  # It populates the following instance variables:
+  #
+  #   * @stdout - The standard output captured from the process.
+  #   * @stderr - The standard error captured from the process.
+  #   * @last_exit_status - The process exit status.
+  #
+  # @param [String] command
+  #   The command to run.
+  #
+  # @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
+    end
+  end
+
+  private
+
+  def mkdir(dirname)
+    FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
+  end
+
+  def current_dir
+    File.join(*dirs)
+  end
+
+  def dirs
+    ['tmp/fs']
+  end
+
+end

data/features/support/spinach_runner.rb

@@ -1,12 +1,11 @@
-require 'aruba/api'
+require_relative 'filesystem'
 
 module Integration
   module SpinachRunner
-    include Aruba::Api
+    include Filesystem
 
     def self.included(base)
       Spinach.hooks.before_scenario do
-        @aruba_timeout_seconds = 6
         if respond_to?(:in_current_dir)
           in_current_dir do
             run "rm -fR rails_app"
@@ -16,9 +15,9 @@ module Integration
     end
 
     def run_feature(command, options={})
-      options[:suite] ||= :minitest
-      use_minitest if options[:suite] == :minitest
-      use_rspec if options[:suite] == :rspec
+      options[:framework] ||= :minitest
+      use_minitest if options[:framework] == :minitest
+      use_rspec if options[:framework] == :rspec
       run "../../bin/spinach #{command} #{options[:append]}"
     end
 

data/lib/spinach.rb

@@ -12,6 +12,11 @@ require_relative 'spinach/reporter'
 require_relative 'spinach/cli'
 require_relative 'spinach/generators'
 
+require_relative 'spinach/background'
+require_relative 'spinach/feature'
+require_relative 'spinach/scenario'
+require_relative 'spinach/step'
+
 # Spinach is a BDD framework leveraging the great Gherkin language. This
 # language is the one used defining features in Cucumber, the BDD framework
 # Spinach is inspired upon.
@@ -50,20 +55,20 @@ module Spinach
     @@hooks ||= Hooks.new
   end
 
-  # Finds a feature given a feature name.
+  # Finds step definitions given a feature name.
   #
   # @param [String] name
-  #   The feature name.
+  #   The feature name to get the definitions for.
   #
-  # @return [FeatureSteps]
-  #   the {FeatureSteps} class for the given feature name
+  # @return [StepDefinitions]
+  #   the {StepDefinitions} class for the given feature name
   #
   # @api public
-  def self.find_feature_steps(name)
+  def self.find_step_definitions(name)
     klass = Spinach::Support.camelize(name)
     feature_steps.detect do |feature|
       feature.feature_name.to_s == name.to_s ||
-      feature.name == klass
+        feature.name == klass
     end
   end
 end

data/lib/spinach/background.rb

@@ -0,0 +1,11 @@
+module Spinach
+  class Background
+    attr_accessor :line
+    attr_accessor :steps, :feature
+
+    def initialize(feature)
+      @feature = feature
+      @steps   = []
+    end
+  end
+end

data/lib/spinach/capybara.rb

@@ -30,8 +30,14 @@ module Spinach
             include ::Capybara::RSpecMatchers
           end
         end
-        Spinach.hooks.before_scenario do
+
+        Spinach.hooks.after_scenario do
           ::Capybara.current_session.reset! if ::Capybara.app
+          ::Capybara.use_default_driver
+        end
+
+        Spinach.hooks.on_tag('javascript') do
+          ::Capybara.current_driver = ::Capybara.javascript_driver
         end
       end
     end

data/lib/spinach/cli.rb

@@ -24,7 +24,7 @@ module Spinach
       features = if @args.any?
         @args
       else
-        Dir.glob(File.join 'features', '**', '*.feature')
+        Dir.glob(File.join Spinach.config[:features_path], '**', '*.feature')
       end
       Spinach::Runner.new(features).run
     end
@@ -61,19 +61,42 @@ module Spinach
     def parse_options
       reporter_options = {}
       reporter_options[:backtrace] = false
+      config = {}
 
-      OptionParser.new do |opts|
-        opts.on('-b', '--backtrace', 'Show backtrace of errors') do |v|
-          reporter_options[:backtrace] = v
-        end
-        opts.on('-g', '--generate', 'Auto-generate the feeature steps files') do |v|
-          Spinach::Generators.bind
-        end
-        opts.on_tail('--version', 'Show version') do
-          puts Spinach::VERSION
-          exit
-        end
-      end.parse!(@args)
+      begin
+        OptionParser.new do |opts|
+          opts.on('-c', '--config_path PATH',
+                  'Parse options from file (will get overriden by flags)') do |file|
+            Spinach.config[:config_path] = file
+          end
+
+          opts.on('-b', '--backtrace',
+                  'Show backtrace of errors') do |show_backtrace|
+            reporter_options[:backtrace] = show_backtrace
+          end
+
+          opts.on('-g', '--generate',
+                  'Auto-generate the feeature steps files') do
+            Spinach::Generators.bind
+          end
+
+          opts.on_tail('--version', 'Show version') do
+            puts Spinach::VERSION
+            exit
+          end
+
+          opts.on('-f', '--features_path PATH',
+                  'Path where your features will be searched for') do |path|
+            config[:features_path] = path
+          end
+        end.parse!(@args)
+
+        Spinach.config.parse_from_file
+        config.each{|k,v| Spinach.config[k] = v}
+      rescue OptionParser::ParseError => exception
+        puts exception.message.capitalize
+        exit 1
+      end
 
       {reporter: reporter_options}
     end

data/lib/spinach/config.rb

@@ -20,29 +20,40 @@ module Spinach
   # to run.
   #
   class Config
-    attr_writer :step_definitions_path, :default_reporter, :support_path,
-      :failure_exceptions
+    attr_writer :features_path, :step_definitions_path, :default_reporter, :support_path,
+      :failure_exceptions, :config_path
+
+    # The "features path" holds the place where your features will be
+    # searched for. Defaults to 'features'
+    #
+    # @return [String]
+    #    The features path.
+    #
+    # @api public
+    def features_path
+      @features_path || 'features'
+    end
 
     # The "step definitions path" holds the place where your feature step
-    # classes will be searched for. Defaults to 'features/steps'
+    # classes will be searched for. Defaults to '#{features_path}/steps'
     #
     # @return [String]
     #   The step definitions path.
     #
     # @api public
     def step_definitions_path
-      @step_definitions_path || 'features/steps'
+      @step_definitions_path || "#{self.features_path}/steps"
     end
 
     # The "support path" helds the place where you can put your configuration
-    # files.
+    # files. Defaults to '#{features_path}/support'
     #
     # @return [String]
     #   The support file path.
     #
     # @api public
     def support_path
-      @support_path || 'features/support'
+      @support_path || "#{self.features_path}/support"
     end
 
     # Allows you to read the config object using a hash-like syntax.
@@ -85,5 +96,28 @@ module Spinach
     def failure_exceptions
       @failure_exceptions ||= []
     end
+
+    # It allows you to set a config file to parse for all the other options to be set
+    #
+    # @return [String]
+    #   The config file name
+    #
+    def config_path
+      @config_path ||= 'config/spinach.yml'
+    end
+
+    # Parse options from the config file
+    #
+    # @return [Boolean]
+    #   If the config was parsed from the file
+    #
+    def parse_from_file
+      parsed_opts = YAML.load_file(config_path)
+      parsed_opts.delete_if{|k| k.to_s == 'config_path'}
+      parsed_opts.each_pair{|k,v| self[k] = v}
+      true
+    rescue Errno::ENOENT
+      false
+    end
   end
 end

data/lib/spinach/dsl.rb

@@ -65,23 +65,26 @@ module Spinach
     module InstanceMethods
       # Executes a given step.
       #
-      # @param [String] step
-      #   The step name to execute.
-      #
-      # @return [String]
-      #   The file and line where the step was defined.
-      #
       # @api public
-      def execute_step(step)
-        underscored_step = Spinach::Support.underscore(step)
-        location = nil
+      def execute(step)
+        underscored_step = Spinach::Support.underscore(step.name)
         if self.respond_to?(underscored_step)
-          location = method(underscored_step).source_location
           self.send(underscored_step)
         else
           raise Spinach::StepNotDefinedException.new(step)
         end
-        location
+      end
+
+      # Gets current step source location.
+      #
+      # @param [String] step
+      #   The step name to execute.
+      #
+      # @return [String]
+      #   The file and line where the step was defined.
+      def step_location_for(step)
+        underscored_step = Spinach::Support.underscore(step)
+        location = method(underscored_step).source_location if self.respond_to?(underscored_step)
       end
 
       # @return [String]