pd-blender 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d2a8ce92f7b3b1e822aef383d7b8877be17b289
-  data.tar.gz: d6e102dfd4f9d92ef2c2a6e619f490597846bc05
+  metadata.gz: 66bca7b99c5bdc6aafb60b4cb78c73896624805d
+  data.tar.gz: 6b68caf3373bf8b783e1dba94a8d763928a5c637
 SHA512:
-  metadata.gz: 540d5d79754dc7edaca79ad4882a73e2f16badd2dd2dcc3a2cdff5da055d722993b783536c4a9bb9b0f8b5b0098ef56adf351e5437e39234915353f98dd0b83b
-  data.tar.gz: 0a8af7f7576af424751136e9f4aee4709e3c9376e58f43ef4eb649d5d2ddd332f3b6526e513a60367ad69e388365f1e8bce2a75c35ce98e7969bc80f0d8392f6
+  metadata.gz: a8531cd51967ca49ba82cff42c50c25adff603d5bc829c5ec47e490ea8665918366a7c5570aa2f9909f3b211d5159cdf28c8aa8e1f4b5c0a8c008fa3847a0ced
+  data.tar.gz: d81fafc0386a9829a03fd200ec2269e4a0c17cfa52050aabd57d7380361ca2a6af9d736cc5f34152ffc79cc09a0f581676d83056aee8f9a28bae153023c4b609

data/blender.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mixlib-shellout'
   spec.add_dependency 'mixlib-log'
   spec.add_dependency 'net-ssh'
+  spec.add_dependency 'net-ssh-multi'
   spec.add_dependency 'net-scp'
   spec.add_dependency 'rufus-scheduler'
 

data/lib/blender/drivers/ssh_multi.rb

@@ -19,6 +19,7 @@ require 'net/ssh'
 require 'blender/exceptions'
 require 'blender/drivers/ssh'
 require 'blender/drivers/ssh_exec'
+require 'net/ssh/multi'
 
 module Blender
   module Driver
@@ -27,25 +28,19 @@ module Blender
       def execute(tasks, hosts)
         Log.debug("SSH execution tasks [#{tasks.size}]")
         Log.debug("SSH on hosts [#{hosts.join("\n")}]")
-        session = create_session(hosts)
         Array(tasks).each do |task|
+          session = create_session(hosts, task.metadata[:concurrency])
           cmd = run_command(task.command, session)
           if cmd.exitstatus != 0 and !task.metadata[:ignore_failure]
             raise ExecutionFailed, cmd.stderr
           end
+          session.loop
         end
-        session.loop
-      end
-
-      def concurrency
-        @config[:concurrency]
       end
 
       private
 
-      def create_session(hosts)
-        user = @config[:user] || ENV['USER']
-        ssh_config = { password: @config[:password]}
+      def create_session(hosts, concurrency)
         error_handler = lambda do |server|
           if config[:ignore_on_failure]
             $!.backtrace.each { |l| Blender::Log.debug(l) }
@@ -58,7 +53,7 @@ module Blender
           on_error: error_handler
         )
         hosts.each do |h|
-          s.use(user + '@' + h)
+          s.use(user + '@' + h, config)
         end
         s
       end

data/lib/blender/scheduler/dsl.rb

@@ -116,7 +116,11 @@ module Blender
     def ssh_task(name, &block)
       task = build_task(name, :ssh)
       task.instance_eval(&block) if block_given?
-      append_task(:ssh, task)
+      if task.metadata[:concurrency] == 1
+        append_task(:ssh, task)
+      else
+        append_task(:ssh_multi, task)
+      end
     end
 
     def scp_upload(name, &block)

data/lib/blender/tasks/ssh.rb

@@ -20,6 +20,16 @@ require 'blender/tasks/ssh'
 module Blender
   module Task
     class Ssh < Blender::Task::Base
+      def concurrency(n)
+        @metadata[:concurrency] = n
+      end
+
+      def default_metadata
+        { 
+          ignore_failure: false,
+          concurrency: 1
+        }
+      end
     end
   end
 end

data/lib/blender/version.rb

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

data/spec/blender/drivers/ssh_multi_spec.rb

@@ -1,16 +1,22 @@
 require 'spec_helper'
 
 describe Blender::Driver::SshMulti do
-  let(:driver) {described_class.new(events: Object.new, concurrency: 10)}
-  let(:job) do
-    Blender::Job.new(
-      101,
-      nil,
-      %w{h1 h2 h3 h4 h5},
-      Array.new(1){|n| create_task("t#{n}")}
-    )
-  end
-  it '#concurrency' do
-    expect(driver.concurrency).to eq(10)
+  it '#DSL' do
+    hosts = %w(a b c d)
+    channel = double('channel').as_null_object
+    session = double('session', open_channel: channel, loop: true)
+    hosts.each do |h|
+      expect(session).to receive(:use).with('foo@'+h, password: 'bar')
+    end
+    expect(Net::SSH::Multi).to receive(:start).and_return(session)
+    sched = Blender::Scheduler.new('test')
+    sched.config(:ssh_multi, user: 'foo', password: 'bar')
+    sched.strategy :per_task
+    sched.ssh_task 'run' do
+      execute 'sudo /usr/local/sbin/chef-client-cron'
+      members(hosts)
+      concurrency 2
+    end
+    sched.run
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pd-blender
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Ranjib Dey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-ssh-multi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement