producer-core 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7369766247b31d978939ca38cea6e1ffda8e7e72
-  data.tar.gz: f0440319fe4a6c3e3dcf0352ac01a1dd39ed6a9f
+  metadata.gz: e8ed5fbac8a4bcce8a96df535139a7661fb6743d
+  data.tar.gz: 68fd481da50a32dd5eb6da6132c323588ad678e0
 SHA512:
-  metadata.gz: 3cf37a2d16b4e6bb4d42d0204ffc3f3a52016fc52358a625bc0eb86b13209241f75a6f171d29044414ff48dba4f339f6fff454d52b5d9ace33a4027f29d55117
-  data.tar.gz: 267659f33b453c84df3c0f9188ecb7f82ec08162bcc119afdf1b8da3776cc57d1b8014c846524b41202cb3ecbf3785ed66493e03f86987dc0cc46fd4845dd745
+  metadata.gz: ccb2d2a8bd77165bdeb7f37bb8b2f2c0fe2f4f228ac9ae6a703d4bcd9567aa5e71de7f707c545bd77571a712cf969adda2510aedf436b997a0ebdf359cf99814
+  data.tar.gz: dcec3e65090d29eb2ba278785bac8004c8826d7bac22d85f984e4bcff4bb49d9f7b7593643973b6cb92c73757d1e89e7c4459b2063adfbd5bd51331d1ee80298

data/README.md

@@ -378,9 +378,9 @@ Similar or related code and tools
 
 
 
-[badge-version-img]:  https://img.shields.io/gem/v/producer-core.svg
+[badge-version-img]:  https://img.shields.io/gem/v/producer-core.svg?style=flat-square
 [badge-version-uri]:  https://rubygems.org/gems/producer-core
-[badge-build-img]:    https://img.shields.io/travis/tjouan/producer-core/master.svg
+[badge-build-img]:    https://img.shields.io/travis/tjouan/producer-core/master.svg?style=flat-square
 [badge-build-uri]:    https://travis-ci.org/tjouan/producer-core
-[badge-cclimate-img]: https://img.shields.io/codeclimate/github/tjouan/producer-core.svg
+[badge-cclimate-img]: https://img.shields.io/codeclimate/github/tjouan/producer-core.svg?style=flat-square
 [badge-cclimate-uri]: https://codeclimate.com/github/tjouan/producer-core

data/features/steps/recipe_steps.rb

@@ -1,9 +1,25 @@
+def run_recipe(remote: false, options: nil, check: false, rargv: nil)
+  command = %w[producer recipe.rb]
+  case remote
+  when :unknown then command += %w[-t unknown_host.test]
+  when true     then command += %w[-t some_host.test]
+  end
+  command << options if options
+  command << ['--', *rargv] if rargv
+
+  p command.join(' ')
+  run_simple command.join(' '), false
+
+  assert_exit_status 0 if check
+  assert_matching_output '\ASocketError', all_output if remote == :unknown
+end
+
 Given /^a recipe with:$/ do |recipe_body|
   write_file 'recipe.rb', recipe_body
 end
 
 Given /^a recipe with an error$/ do
-  write_file 'recipe.rb', "task(:trigger_error) { fail 'some error' }\n"
+  write_file 'recipe.rb', "fail 'some error'\n"
 end
 
 Given /^a recipe using a remote$/ do
@@ -15,40 +31,39 @@ Given /^a recipe named "([^"]+)" with:$/ do |recipe_path, recipe_body|
 end
 
 When /^I execute the recipe$/ do
-  run_simple 'producer recipe.rb', false
+  run_recipe
 end
 
 When /^I execute the recipe on remote target$/ do
-  run_simple 'producer recipe.rb -t some_host.test', false
+  run_recipe remote: true
 end
 
 When /^I execute the recipe on unknown remote target$/ do
-  run_simple 'producer recipe.rb -t #unknown_host.test', false
-  assert_matching_output '\ASocketError', all_output
+  run_recipe remote: :unknown
+end
+
+When /^I execute the recipe with options? (-.+)$/ do |options|
+  run_recipe options: options
 end
 
-When /^I execute the recipe on unknown remote target with option (-.+)$/ do |option|
-  run_simple "producer recipe.rb #{option} -t #unknown_host.test", false
-  assert_matching_output '\ASocketError', all_output
+When /^I execute the recipe on unknown remote target with options? (-.+)$/ do |options|
+  run_recipe remote: :unknown, options: options
 end
 
 When /^I successfully execute the recipe$/ do
-  step 'I execute the recipe'
-  assert_exit_status 0
+  run_recipe check: true
 end
 
 When /^I successfully execute the recipe on remote target$/ do
-  step 'I execute the recipe on remote target'
-  assert_exit_status 0
+  run_recipe remote: true, check: true
 end
 
-When /^I execute the recipe with option (-.+)$/ do |option|
-  run_simple "producer #{option} recipe.rb", false
+When /^I successfully execute the recipe with option? (-.+)$/ do |options|
+  run_recipe options: options, check: true
 end
 
-When /^I successfully execute the recipe with option (-.+)$/ do |option|
-  run_simple "producer #{option} recipe.rb", false
-  assert_exit_status 0
+When /^I successfully execute the recipe with arguments "([^"]+)"$/ do |rargv|
+  run_recipe rargv: rargv, check: true
 end
 
 When /^I execute the recipe interactively$/ do

data/features/steps/remote_steps.rb

@@ -1,3 +1,9 @@
+def stat_mode(path)
+  in_current_dir do
+    ('%o' % [File::Stat.new(path).mode])[-4, 4]
+  end
+end
+
 Given /^a remote directory named "([^"]+)"$/ do |path|
   create_dir path
 end
@@ -26,12 +32,6 @@ Then /^the remote file "([^"]+)" must match \/([^\/]+)\/$/ do |path, pattern|
   check_file_content path, /#{pattern}/, true
 end
 
-def stat_mode(path)
-  in_current_dir do
-    ('%o' % [File::Stat.new(path).mode])[-4, 4]
-  end
-end
-
 Then /^the remote file "([^"]+)" must have (\d+) mode$/ do |path, mode|
   expect(stat_mode path).to eq mode
 end

data/features/task/recipe_argv.feature

@@ -0,0 +1,13 @@
+Feature: `recipe_argv' task keyword
+
+  Background:
+    Given a recipe with:
+      """
+      task :echo_arguments do
+        echo recipe_argv
+      end
+      """
+
+  Scenario: returns recipe arguments
+    When I successfully execute the recipe with arguments "foo bar"
+    Then the output must contain exactly "foo\nbar\n"

data/lib/producer/core/cli.rb

@@ -8,6 +8,8 @@ module Producer
       EX_USAGE    = 64
       EX_SOFTWARE = 70
 
+      ARGUMENTS_SEPARATOR = '--'.freeze
+
       class << self
         def run!(arguments, stdin: $stdin, stdout: $stdout, stderr: $stderr)
           cli = new(arguments, stdin: stdin, stdout: stdout, stderr: stderr)
@@ -39,6 +41,9 @@ module Producer
       end
 
       def parse_arguments!
+        if @arguments.include? ARGUMENTS_SEPARATOR
+          @arguments, @env.recipe_argv = split_arguments_lists @arguments
+        end
         option_parser.parse!(@arguments)
         fail ArgumentError, option_parser if @arguments.empty?
       end
@@ -60,6 +65,13 @@ module Producer
         Env.new(input: @stdin, output: @stdout, error_output: @stderr)
       end
 
+      def split_arguments_lists(arguments)
+        arguments
+          .chunk  { |e| e == ARGUMENTS_SEPARATOR }
+          .reject { |b, a| b }
+          .map    &:last
+      end
+
       def option_parser
         OptionParser.new do |opts|
           opts.banner = USAGE

data/lib/producer/core/env.rb

@@ -5,7 +5,7 @@ module Producer
       def_delegators :@registry, :[]=, :key?
 
       attr_reader   :input, :output, :error_output, :registry, :logger
-      attr_accessor :target, :verbose, :debug, :dry_run
+      attr_accessor :target, :verbose, :debug, :dry_run, :recipe_argv
 
       def initialize(input: $stdin, output: $stdout, error_output: $stderr, remote: nil, registry: {})
         @verbose = @debug = @dry_run = false

data/lib/producer/core/task.rb

@@ -18,6 +18,7 @@ module Producer
       def_delegators  :@env,  :target
       def_delegator   :@env,  :[], :get
       def_delegator   :@env,  :key?, :set?
+      def_delegator   :@env,  :recipe_argv
 
       define_action :echo,                  Actions::Echo
       define_action :sh,                    Actions::ShellCommand

data/lib/producer/core/version.rb

@@ -1,5 +1,5 @@
 module Producer
   module Core
-    VERSION = '0.4.5'.freeze
+    VERSION = '0.5.0'.freeze
   end
 end

data/spec/producer/core/cli_spec.rb

@@ -130,6 +130,20 @@ module Producer::Core
         end
       end
 
+      context 'with recipe arguments' do
+        let(:arguments) { %w[recipe.rb -- foo] }
+
+        it 'removes recipe arguments' do
+          cli.parse_arguments!
+          expect(cli.arguments).to eq %w[recipe.rb]
+        end
+
+        it 'assigns env recipe arguments' do
+          cli.parse_arguments!
+          expect(cli.env.recipe_argv).to eq %w[foo]
+        end
+      end
+
       context 'when no arguments remains after parsing' do
         let(:arguments) { [] }
 

data/spec/producer/core/task_spec.rb

@@ -179,5 +179,13 @@ module Producer::Core
         expect(task.target).to eq :some_target
       end
     end
+
+    describe '#recipe_argv' do
+      before { env.recipe_argv = %w[foo bar] }
+
+      it 'returns recipe arguments' do
+        expect(task.recipe_argv).to eq %w[foo bar]
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: producer-core
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -157,6 +157,7 @@ files:
 - features/task/ask.feature
 - features/task/condition.feature
 - features/task/nested_tasks.feature
+- features/task/recipe_argv.feature
 - features/task/target.feature
 - features/task/template.feature
 - features/tests/dir.feature
@@ -311,6 +312,7 @@ test_files:
 - features/task/ask.feature
 - features/task/condition.feature
 - features/task/nested_tasks.feature
+- features/task/recipe_argv.feature
 - features/task/target.feature
 - features/task/template.feature
 - features/tests/dir.feature