Merge pull request #167 from sgarciac/master

Parse all options before calling the step files generation

lib/spinach/cli.rb

@@ -22,9 +22,11 @@ def initialize(args = ARGV)
     def run
       options
 
-      return true if Spinach.config.generate
-
-      Spinach::Runner.new(feature_files).run
+      if Spinach.config.generate
+        Spinach::Generators.run(feature_files)
+      else
+        Spinach::Runner.new(feature_files).run
+      end
     end
 
     # @return [Hash]
@@ -109,7 +111,6 @@ def parse_options
           opts.on('-g', '--generate',
                   'Auto-generate the feature steps files') do
             config[:generate] = true
-            Spinach::Generators.run(feature_files)
           end
 
           opts.on_tail('--version', 'Show version') do

lib/spinach/generators.rb

@@ -7,15 +7,18 @@ module Generators
     # @files [Array]
     #   filenames to evaluate for step generation
     def self.run(files)
+      successful = true
       files.each do |file|
         feature = Parser.open_file(file).parse
 
         begin
           FeatureGenerator.new(feature).store
         rescue FeatureGeneratorException => e
+          successful = false
           $stderr.puts e
         end
       end
+      successful
     end
   end
 end

test/spinach/cli_test.rb

@@ -148,17 +148,28 @@
     end
 
     describe 'generate' do
-      %w{-g --generate}.each do |opt|
-        it 'inits the generator if #{opt}' do
+      %w{-g --generate}.each do |generate_opt|
+        it 'inits the generator if #{generate_opt}' do
           config = Spinach::Config.new
           Spinach.stubs(:config).returns(config)
 
           Spinach::Generators.expects(:run)
 
-          Spinach::Cli.new([opt]).run
+          Spinach::Cli.new([generate_opt]).run
 
           config.generate.must_equal true
         end
+
+        %w{-f --features_path}.each do |feature_path_opt|
+          it "honors the #{feature_path_opt} option" do
+            config = Spinach::Config.new
+            Spinach.stubs(:config).returns(config)
+            cli = Spinach::Cli.new([feature_path_opt,"custom_path", generate_opt])
+            cli.options
+            config.features_path.must_equal 'custom_path'
+          end
+        end
+
       end
     end