pd-blender 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66bca7b99c5bdc6aafb60b4cb78c73896624805d
-  data.tar.gz: 6b68caf3373bf8b783e1dba94a8d763928a5c637
+  metadata.gz: 1a647ec91e708fdc7ffa2d7275fa03d7ce99a236
+  data.tar.gz: aecd89dd6ce1a6a2473da673717521217fb8a0d6
 SHA512:
-  metadata.gz: a8531cd51967ca49ba82cff42c50c25adff603d5bc829c5ec47e490ea8665918366a7c5570aa2f9909f3b211d5159cdf28c8aa8e1f4b5c0a8c008fa3847a0ced
-  data.tar.gz: d81fafc0386a9829a03fd200ec2269e4a0c17cfa52050aabd57d7380361ca2a6af9d736cc5f34152ffc79cc09a0f581676d83056aee8f9a28bae153023c4b609
+  metadata.gz: 4886449ccf296a01d265b24352d22bbfacbf1e096c058cdb2969c38221e18b96264e4190902daa5fd158d622b5e54b106cd8285de73edd2a16c5d8dfab4752e0
+  data.tar.gz: 99949f26259eb2bbeacadf3747d443b6a855f6e4f7792fbe53f3943c8db953670f63b296001ee21c81ce0fd0bb5c1edc63b22f2ad48c04ca0d9ef3c0da06fa97

data/lib/blender/scheduler/dsl.rb

@@ -40,7 +40,7 @@ module Blender
     include Blender::Discovery
 
     def config(type, opts = {})
-      Blender::Configuration[type].merge!(opts)
+      blender_config(type).merge!(opts)
     end
 
     alias :init :config
@@ -82,18 +82,17 @@ module Blender
 
     def build_task(name, type)
       task_klass = Blender::Task.const_get(camelcase(type.to_s).to_sym)
-      driver_klass = Blender::Driver.const_get(camelcase(type.to_s).to_sym)
       task = task_klass.new(name)
       task.members(metadata[:members]) unless metadata[:members].empty?
       task
     end
 
-    def append_task(type, task)
+    def append_task(type, task, driver_config = {})
       Log.debug("Appended task:#{task.name}")
       klass = Blender::Driver.const_get(camelcase(type.to_s).to_sym)
       if task.driver.nil?
-        opts = {}
-        opts.merge!(Blender::Configuration[type]) unless Blender::Configuration[type].empty?
+        opts = driver_config.dup
+        opts.merge!(blender_config(type)) unless blender_config(type).empty?
         opts.merge!(task.driver_opts)
         task.use_driver(driver(type, opts))
       end
@@ -119,7 +118,7 @@ module Blender
       if task.metadata[:concurrency] == 1
         append_task(:ssh, task)
       else
-        append_task(:ssh_multi, task)
+        append_task(:ssh_multi, task, blender_config(:ssh))
       end
     end
 
@@ -127,14 +126,14 @@ module Blender
       task = build_task(name, :scp)
       task.instance_eval(&block) if block_given?
       task.direction = :upload
-      append_task(:scp, task)
+      append_task(:scp, task, blender_config(:ssh))
     end
 
     def scp_download(name, &block)
       task = build_task(name, :scp)
       task.instance_eval(&block) if block_given?
       task.direction = :download
-      append_task(:scp, task)
+      append_task(:scp, task, blender_config(:ssh))
     end
 
     def strategy(strategy)
@@ -177,5 +176,11 @@ module Blender
     end
 
     alias_method :task, :shell_task
+
+    private
+
+    def blender_config(key)
+      Blender::Configuration[key]
+    end
   end
 end

data/lib/blender/version.rb

@@ -16,5 +16,5 @@
 # limitations under the License.
 
 module Blender
-  VERSION = '0.3'
+  VERSION = '0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pd-blender
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Ranjib Dey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-21 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline