sshkit-custom-dsl 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd78c52e9066b2a20a58ec0a15a582c18421d2bb
-  data.tar.gz: 676a5a5944f1eb99a1d6af444301602d83bae625
+  metadata.gz: df9d3b3f6a8a1e8f438527d2fa787c935d0aec37
+  data.tar.gz: 7d674c1c4ddfd58e581d78397bbac4c1058593fd
 SHA512:
-  metadata.gz: 6494485ae41a1c46ddeac63acd849df3992abb06c7a577c6cf173be699af18754498ca17efab7cab609eff7f2e6314c1f0741a02643de64138e6a9e17eb50aea
-  data.tar.gz: 23fdd8841b78db4226f7ebe7985b1c9005e9469c4ea8faf684a3aa5dcc9358eb1708b3887e1cf95936c478bf38afb7d8d3b5e2502665605b3310b69ec3aac020
+  metadata.gz: ba0cdea9ea03e9050e98048fe550d61411267077cbec690d84489e672e6ca212bcd8eadf6403eae4e46c25963aa8b4c0361e708b76b3f252ce378cfbb0bc2aca
+  data.tar.gz: cc05b1582649595794fa865511779466fd0661ecb1bd264d0a853a430d212a0424cc54f4028048996ea7d5e5b6d94600cd2e842608542d12ae489b09cc685ded

data/lib/core_ext/sshkit.rb

@@ -1,6 +1,2 @@
 require 'sshkit'
-require 'core_ext/sshkit/backend/abstract'
-require 'core_ext/sshkit/runner/abstract'
-require 'core_ext/sshkit/runner/sequential'
-require 'core_ext/sshkit/runner/parallel'
-require 'core_ext/sshkit/runner/group'
+require 'core_ext/sshkit/backend/abstract'

data/lib/sshkit/custom/config/runner/abstract.rb

@@ -0,0 +1,100 @@
+module SSHKit
+  module Custom
+    module Config
+      module Runner
+
+        ExecuteError = SSHKit::Runner::ExecuteError
+
+        class Abstract
+          attr_accessor :backends
+          attr_reader :options
+          attr_writer :wait_interval
+
+          def self.create_runner(opts)
+            opts_with_defaults = { in: :parallel }.merge(opts)
+
+            case opts_with_defaults[:in]
+              when :parallel then Parallel
+              when :sequence then Sequential
+              when :groups then Group
+              else
+                raise RuntimeError, "Don't know how to handle run style #{opts_with_defaults[:in].inspect}"
+            end.new(opts_with_defaults)
+
+          end
+
+          def self.scope_storage
+            ScopedStorage::ThreadLocalStorage
+          end
+
+          def self.scope
+            @scope ||= ScopedStorage::Scope.new('sshkit_runner', scope_storage)
+          end
+
+          def self.active_backend
+            scope[:active_backend]
+          end
+
+          def self.active_backend=(new_backend)
+            scope[:active_backend]=new_backend
+          end
+
+          def initialize(options = nil)
+            @options     = options || {}
+          end
+
+          def active_backend
+            self.class.active_backend
+          end
+
+          def active_backend=(new_backend)
+            self.class.active_backend=new_backend
+          end
+
+          def send_cmd(cmd, *args, &block)
+
+            begin
+
+              if block
+                args = Array(block.call(active_backend.host))
+              end
+
+              active_backend.send(cmd, *args)
+
+            rescue Exception => e
+              e2 = ExecuteError.new e
+              raise e2, "Exception while executing on host #{active_backend.host}: #{e.message}"
+            end
+
+          end
+
+
+          def apply_to_bck(backend, &block)
+            begin
+
+              self.active_backend = backend
+              block.call(backend.host)
+
+            rescue Exception => e
+              e2 = ExecuteError.new e
+              raise e2, "Exception while executing on host #{backend}: #{e.message}"
+            ensure
+              self.active_backend = nil
+            end
+          end
+
+          protected
+
+          def do_wait
+            sleep wait_interval
+          end
+
+          def wait_interval
+            @wait_interval || options[:wait] || 2
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/sshkit/custom/config/runner/group.rb

@@ -0,0 +1,31 @@
+module SSHKit
+  module Custom
+    module Config
+      module Runner
+
+        class Group < Abstract
+          attr_writer :group_size
+
+          def apply_block_to_bcks(&block)
+            backends.each_slice(group_size).collect do |group_backends|
+
+              Parallel.new(nil, nil).tap do |runner|
+                runner.backends = group_backends
+                runner.apply_block_to_bcks(&block)
+              end
+
+              do_wait
+
+            end.flatten
+          end
+
+
+          def group_size
+            @group_size || options[:limit] || 2
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/sshkit/custom/config/runner/parallel.rb

@@ -0,0 +1,26 @@
+module SSHKit
+  module Custom
+    module Config
+      module Runner
+
+        class Parallel < Abstract
+
+          def apply_block_to_bcks(&block)
+            threads = []
+
+            backends.each do |next_backend|
+
+              threads << Thread.new(next_backend) do |backend|
+                apply_to_bck backend, &block
+              end
+
+            end
+
+            threads.map(&:join)
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/sshkit/custom/config/runner/sequential.rb

@@ -0,0 +1,18 @@
+module SSHKit
+  module Custom
+    module Config
+      module Runner
+        class Sequential < Abstract
+
+          def apply_block_to_bcks(&block)
+            backends.each do |backend|
+              apply_to_bck backend, &block
+              do_wait
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/sshkit/custom/config/store.rb

@@ -14,15 +14,7 @@ module SSHKit
         end
 
         def create_runner(opts)
-          opts_with_defaults = { in: :parallel }.merge(opts)
-
-          @runner ||= case opts_with_defaults[:in]
-                        when :parallel then SSHKit::Runner::Parallel
-                        when :sequence then SSHKit::Runner::Sequential
-                        when :groups then SSHKit::Runner::Group
-                        else
-                          raise RuntimeError, "Don't know how to handle run style #{opts_with_defaults[:in].inspect}"
-                      end.new(nil, opts_with_defaults)
+          @runner ||= Runner::Abstract.create_runner opts
         end        
 
         def runner
@@ -78,7 +70,7 @@ module SSHKit
         end
 
         def active_backend
-          SSHKit::Runner::Abstract.active_backend
+          SSHKit::Custom::Config::Runner::Abstract.active_backend
         end
       end
     end

data/lib/sshkit/custom/dsl/helper.rb

@@ -4,7 +4,7 @@ module SSHKit
       module Helper
 
         def active_backend
-          SSHKit::Runner::Abstract.active_backend
+          SSHKit::Custom::Config::Store.active_backend
         end
 
         def host

data/lib/sshkit/custom/dsl/version.rb

@@ -1,7 +1,7 @@
 module SSHKit
   module Custom
     module DSL
-      VERSION = "0.0.2"
+      VERSION = "0.0.3"
     end
   end
 end

data/lib/sshkit/custom/dsl.rb

@@ -3,6 +3,11 @@ require 'core_ext/sshkit'
 require 'scoped_storage'
 
 require 'sshkit/custom/config/store'
+require 'sshkit/custom/config/runner/abstract'
+require 'sshkit/custom/config/runner/sequential'
+require 'sshkit/custom/config/runner/parallel'
+require 'sshkit/custom/config/runner/group'
+
 require 'sshkit/custom/dsl/config_statements'
 require 'sshkit/custom/dsl/exec_statements'
 require 'sshkit/custom/dsl/helper'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sshkit-custom-dsl
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Dieter Späth
@@ -157,10 +157,10 @@ files:
 - Rakefile
 - lib/core_ext/sshkit.rb
 - lib/core_ext/sshkit/backend/abstract.rb
-- lib/core_ext/sshkit/runner/abstract.rb
-- lib/core_ext/sshkit/runner/group.rb
-- lib/core_ext/sshkit/runner/parallel.rb
-- lib/core_ext/sshkit/runner/sequential.rb
+- lib/sshkit/custom/config/runner/abstract.rb
+- lib/sshkit/custom/config/runner/group.rb
+- lib/sshkit/custom/config/runner/parallel.rb
+- lib/sshkit/custom/config/runner/sequential.rb
 - lib/sshkit/custom/config/store.rb
 - lib/sshkit/custom/dsl.rb
 - lib/sshkit/custom/dsl/config_statements.rb

data/lib/core_ext/sshkit/runner/abstract.rb

@@ -1,49 +0,0 @@
-module SSHKit
-  module Runner
-    class Abstract
-      attr_accessor :backends
-
-      def active_backend
-        self.class.active_backend
-      end
-
-      def active_backend=(new_backend)
-        self.class.active_backend=new_backend
-      end
-
-      def self.scope_storage
-        ScopedStorage::ThreadLocalStorage
-      end
-
-      def self.scope
-        @scope ||= ScopedStorage::Scope.new('sshkit_runner', scope_storage)
-      end
-
-      def self.active_backend
-        scope[:active_backend]
-      end
-
-      def self.active_backend=(new_backend)
-        scope[:active_backend]=new_backend
-      end
-
-      def send_cmd(cmd, *args, &block)
-
-        begin
-
-          if block
-            args = Array(block.call(active_backend.host))
-          end
-
-          active_backend.send(cmd, *args)
-
-        rescue Exception => e
-          e2 = ExecuteError.new e
-          raise e2, "Exception while executing on host #{active_backend.host}: #{e.message}"
-        end
-
-      end
-
-    end
-  end
-end

data/lib/core_ext/sshkit/runner/group.rb

@@ -1,20 +0,0 @@
-module SSHKit
-  module Runner
-
-    class Group < Sequential
-      attr_writer :group_size
-
-      def apply_block_to_bcks( &block)
-        backends.each_slice(group_size).collect do |group_backends|
-
-          Parallel.new(nil, nil).tap do |runner|
-            runner.backends = group_backends
-            runner.apply_block_to_bcks(&block)
-          end
-
-          sleep wait_interval
-        end.flatten
-      end
-    end
-  end
-end

data/lib/core_ext/sshkit/runner/parallel.rb

@@ -1,27 +0,0 @@
-module SSHKit
-  module Runner
-
-    class Parallel < Abstract
-
-      def apply_block_to_bcks( &block)
-        threads = []
-        backends.each do |host|
-          threads << Thread.new(host) do |h|
-            begin
-
-              self.active_backend = h
-              block.call(h.host)
-
-            rescue Exception => e
-              e2 = ExecuteError.new e
-              raise e2, "Exception while executing on host #{h}: #{e.message}"
-            ensure
-              self.active_backend = nil
-            end
-          end
-        end
-        threads.map(&:join)
-      end
-    end
-  end
-end

data/lib/core_ext/sshkit/runner/sequential.rb

@@ -1,22 +0,0 @@
-module SSHKit
-  module Runner
-    class Sequential < Abstract
-      def apply_block_to_bcks( &block)
-        backends.each do |backend|
-          begin
-
-            self.active_backend = backend
-            block.call(backend.host)
-
-          rescue Exception => e
-            e2 = ExecuteError.new e
-            raise e2, "Exception while executing on host #{backend}: #{e.message}"
-          ensure
-            self.active_backend = nil
-          end
-          sleep wait_interval
-        end
-      end
-    end
-  end
-end