speedflow 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dbf2b0268766ac602d031b032f4a050893a0c70
-  data.tar.gz: b80f540563d169c40148ec7ec5345566e8c230fc
+  metadata.gz: 1fa0904a1217e443c1c991f6a65247eedb1b74bf
+  data.tar.gz: 230efa0af2539563d2b8f23465b4d1cd2723ba2e
 SHA512:
-  metadata.gz: de2a65663c9b74ed32dd28e5f5273aa472fd3137fbb25a799cb8ebd97525b99c17e72b0db16669a73d774bdfa93c84857bd63233fc54d16ae0b6e816c14615fa
-  data.tar.gz: 221cd775cb9bbfc581a39a0b6a0b3717f12c8cd769c8698fa103b91080fdf5e5e4db4007fbe869cbd196d705fab3de7ba21ea2891d82567ed573448295f753af
+  metadata.gz: 3a72c8b294fbc30f78ce1f72249ab43be9b3f04408c8f6bba93798035e7a6225a23a590d2be597415cf2bd5456af973f10e63832fae8011e72598d6ff1dc04c2
+  data.tar.gz: 9cf30224680531bca375aa8ba1616ef118e6bdb9823abbb96325470339ca79fcb37eb0ee01e7209e1683e17eaf018b231b10f98b583ccd9f1374fe30b6aa1fa8

data/bin/speedflow

@@ -7,7 +7,7 @@ require 'speedflow'
 # Speedflow program
 Mercenary.program(:speedflow) do |program|
   program.version Speedflow::VERSION
-  program.description 'Speedflow is a CLI tool to help you to keep your time.'
+  program.description 'Speedflow is a CLI to help you to keep your time.'
   program.syntax "speedflow [OPTIONS] COMMAND [arg...]\n" \
                  '  speedflow [ --help | -v | --version | --trace ]'
   program.option(

data/lib/speedflow/flow.rb

@@ -29,12 +29,28 @@ module Speedflow
       output = {}
       @config['flow'][trigger.to_s].each do |step|
         arguments = step['arguments'] || {}
+
         step['arguments'] = transform_arguments(arguments, output, inputs)
-        step['arguments']['_config'] = @config
+        step['arguments'] = add_config_argument(arguments)
+
         output = plugin_manager.call_action_from_step(step)
       end
     end
 
+    # Public: Add config arguement
+    #
+    # arguments   - Hash of arguments.
+    #
+    # Returns Hash of arguments.
+    def add_config_argument(arguments)
+      arguments['_config'] = @config.clone
+      arguments['_config'].delete_if { |k, _| arguments.key?(k) }
+      arguments['_config'].delete_if do |k, _|
+        @config.class.const_get('DEFAULTS').stringify_keys.key?(k)
+      end
+      arguments
+    end
+
     # Public: Transform arguments (to add value)
     #
     # arguments   - Hash of arguments.
@@ -45,14 +61,14 @@ module Speedflow
     def transform_arguments(arguments, prev_values, inputs)
       arguments = arguments.replace_values_from_previous(prev_values)
       arguments.each do |arg_name, arg_values|
-        arguments[arg_name][:value] = ''
+        arguments[arg_name] = {} unless arguments[arg_name].is_a?(Hash)
+        arguments[arg_name]['value'] = ''
         if inputs.key?(arg_name)
-          arguments[arg_name][:value] = inputs[arg_name]
-        elsif arg_values.key?('default')
-          arguments[arg_name][:value] = arg_values[:default]
+          arguments[arg_name]['value'] = inputs[arg_name]
+        elsif !arg_values.nil? && arg_values.key?('default')
+          arguments[arg_name]['value'] = arg_values['default']
         end
       end
-      arguments
     end
 
     # Public: Get flat arguments from flow.

data/lib/speedflow/version.rb

@@ -1,3 +1,3 @@
 module Speedflow
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speedflow
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Julien Breux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all