sshkit-custom-dsl 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab9dd14dc306c8e3f18d81ca8385ed115842edbe
-  data.tar.gz: 6526ba1775b63d8b6d87243033bd3b5895e8aee9
+  metadata.gz: bd78c52e9066b2a20a58ec0a15a582c18421d2bb
+  data.tar.gz: 676a5a5944f1eb99a1d6af444301602d83bae625
 SHA512:
-  metadata.gz: dcb0c1732f808742b14f7d4ae62e2ac22ed47a0d27dca66e3e6e937530261f110529867796bc954abf51631ecb0892a33bce960ce8979753fcd42dd61670e765
-  data.tar.gz: ef35b8bd4836fa29ead1faec46b58245b756cdc979ad61754b1c07726ef6df0f63bcf412fe0fcf98ddd49bc046c00f985a49dadd483fdf21efda27227bbe133c
+  metadata.gz: 6494485ae41a1c46ddeac63acd849df3992abb06c7a577c6cf173be699af18754498ca17efab7cab609eff7f2e6314c1f0741a02643de64138e6a9e17eb50aea
+  data.tar.gz: 23fdd8841b78db4226f7ebe7985b1c9005e9469c4ea8faf684a3aa5dcc9358eb1708b3887e1cf95936c478bf38afb7d8d3b5e2502665605b3310b69ec3aac020

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

@@ -11,12 +11,20 @@ module SSHKit
         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
-        Thread.current[:active_backend]
+        scope[:active_backend]
       end
 
       def self.active_backend=(new_backend)
-        Thread.current[:active_backend]=new_backend
+        scope[:active_backend]=new_backend
       end
 
       def send_cmd(cmd, *args, &block)

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

@@ -4,12 +4,12 @@ module SSHKit
     class Group < Sequential
       attr_writer :group_size
 
-      def do_it( &block)
+      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.do_it(&block)
+            runner.apply_block_to_bcks(&block)
           end
 
           sleep wait_interval

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

@@ -3,7 +3,7 @@ module SSHKit
 
     class Parallel < Abstract
 
-      def do_it( &block)
+      def apply_block_to_bcks( &block)
         threads = []
         backends.each do |host|
           threads << Thread.new(host) do |h|

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

@@ -1,7 +1,7 @@
 module SSHKit
   module Runner
     class Sequential < Abstract
-      def do_it( &block)
+      def apply_block_to_bcks( &block)
         backends.each do |backend|
           begin
 

data/lib/sshkit/custom/{dsl/config_store.rb → config/store.rb}

@@ -1,24 +1,31 @@
 module SSHKit
   module Custom
-    module DSL
-      module ConfigStore
+    module Config
+      module Store
 
         module_function
-        
-        def runner_opts=(opts)
-          @runner = nil
-          @runner_opts = { in: :parallel }.merge(opts)
-        end        
 
-        def runner
-          @runner ||= case @runner_opts[:in]
+        def scope_storage
+          ScopedStorage::ThreadLocalStorage
+        end
+
+        def config_scope
+          @config_scope ||= ScopedStorage::Scope.new('sshkit_dsl_config', scope_storage)
+        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 #{@runner_opts[:in].inspect}"
-                      end.new(nil, @runner_opts)
+                          raise RuntimeError, "Don't know how to handle run style #{opts_with_defaults[:in].inspect}"
+                      end.new(nil, opts_with_defaults)
+        end        
 
+        def runner
           @runner.tap{|r| r.backends = backends}
         end
 
@@ -31,22 +38,22 @@ module SSHKit
         end
 
         def add_pwd(directory)
-          backend.pwd ||= [];  backend.pwd << directory
+          active_backend.pwd ||= [];  active_backend.pwd << directory
         end
 
         def pop_pwd
-          backend.pwd ||= [];  backend.pwd.pop
+          active_backend.pwd ||= [];  active_backend.pwd.pop
         end
 
         def _envs
-          Thread.current[:_envs] ||= []
+          config_scope[:_envs] ||= []
         end
 
         def add_env(env)
           old_env =  backends.first.env.clone
           _envs << old_env
           env = old_env.merge(env)
-          backend.env = env
+          active_backend.env = env
         end
 
         def pop_env
@@ -55,20 +62,22 @@ module SSHKit
         end
 
         def _user_groups
-          Thread.current[:_user_groups] ||= []
+          config_scope[:_user_groups] ||= []
         end
 
         def add_user_group(user, group)
-          _user_groups << {user: backend.user, group:  backend.group }
-          backend.user = user; backend.group = group
+          _user_groups << {user: active_backend.user, group:  active_backend.group }
+          active_backend.user = user
+          active_backend.group = group
         end
 
         def pop_user_group
           old_user_group = _user_groups.pop || {}
-          backend.user = old_user_group[:user]; backend.group = old_user_group[:group]
+          active_backend.user = old_user_group[:user]
+          active_backend.group = old_user_group[:group]
         end
 
-        def backend
+        def active_backend
           SSHKit::Runner::Abstract.active_backend
         end
       end

data/lib/sshkit/custom/dsl.rb

@@ -1,16 +1,17 @@
 require 'sshkit/custom/dsl/version'
 require 'core_ext/sshkit'
+require 'scoped_storage'
 
-require 'sshkit/custom/dsl/config_store'
-require 'sshkit/custom/dsl/configuration'
-require 'sshkit/custom/dsl/execution'
+require 'sshkit/custom/config/store'
+require 'sshkit/custom/dsl/config_statements'
+require 'sshkit/custom/dsl/exec_statements'
 require 'sshkit/custom/dsl/helper'
 
 module SSHKit
   module Custom
     module DSL
-      include Configuration
-      include Execution
+      include ConfigStatements
+      include ExecStatements
       include Helper
     end
   end

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

@@ -0,0 +1,55 @@
+module SSHKit
+  module Custom
+    module DSL
+      module ConfigStatements
+
+        def on(hosts, options={}, &block)
+          hosts = Array(hosts).map { |rh| Host(rh) }.uniq
+
+          _config_store.backends = hosts
+          _config_store.create_runner options
+
+          _config_store.runner.apply_block_to_bcks(&block) if block_given?
+        end
+
+        def within(directory)
+          _guard_dir!(File.join(_config_store.active_backend.pwd + [directory]))
+
+          _config_store.add_pwd directory
+
+          yield if block_given?
+        ensure
+          _config_store.pop_pwd
+        end
+
+        def with(environment)
+          _config_store.add_env environment
+          yield if block_given?
+        ensure
+          _config_store.pop_env
+        end
+
+        def as(who)
+
+          if who.respond_to? :fetch
+            user = who.fetch(:user,  who.fetch("user"))
+            group = who.fetch(:group, who.fetch("group", nil))
+          else
+            user = who
+            group = nil
+          end
+
+          _guard_sudo_user!(user)
+          _guard_sudo_group!(user, group)
+
+          _config_store.add_user_group user, group
+
+          yield if block_given?
+        ensure
+          _config_store.pop_user_group
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+module SSHKit
+  module Custom
+    module DSL
+      module ExecStatements
+
+
+        [:execute, :make, :rake, :test, :capture, :upload!, :download!].each do |method|
+          define_method method do |*args, &block|
+            _config_store.runner.send_cmd method, *args, &block
+          end
+        end
+
+        def _guard_sudo_user!(user)
+          execute <<-EOTEST, verbosity: Logger::DEBUG
+            if ! sudo -u #{user} whoami > /dev/null
+            then echo "You cannot switch to user '#{user}' using sudo, please check the sudoers file" 1>&2
+               false
+            fi
+          EOTEST
+        end
+
+        def _guard_sudo_group!(user, group)
+          execute <<-EOTEST, verbosity: Logger::DEBUG if group
+            if ! sudo -u #{user} -g #{group} whoami > /dev/null
+            then echo "You cannot switch to group '#{group}' using sudo, please check the sudoers file" 1>&2
+               false
+            fi
+          EOTEST
+        end
+
+        def _guard_dir!(dir_to_check)
+          execute <<-EOTEST, verbosity: Logger::DEBUG
+           if test ! -d #{dir_to_check}
+              then echo "Directory does not exist '#{dir_to_check}'" 1>&2
+              false
+           fi
+          EOTEST
+        end
+
+      end
+    end
+  end
+end

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

@@ -17,6 +17,18 @@ module SSHKit
           end
         end
 
+        def Host(rh)
+          if rh.is_a?(SSHKit::Host)
+            rh
+          else
+            SSHKit::Host.new(rh)
+          end
+        end
+
+        def _config_store
+          @_config_store ||= SSHKit::Custom::Config::Store
+        end
+
       end
     end
   end

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

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

data/sshkit-custom-dsl.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'sshkit', '~> 1.5.1'
+  spec.add_dependency 'scoped_storage'
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sshkit-custom-dsl
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Dieter Späth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.1
+- !ruby/object:Gem::Dependency
+  name: scoped_storage
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -147,10 +161,10 @@ files:
 - 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/store.rb
 - lib/sshkit/custom/dsl.rb
-- lib/sshkit/custom/dsl/config_store.rb
-- lib/sshkit/custom/dsl/configuration.rb
-- lib/sshkit/custom/dsl/execution.rb
+- lib/sshkit/custom/dsl/config_statements.rb
+- lib/sshkit/custom/dsl/exec_statements.rb
 - lib/sshkit/custom/dsl/helper.rb
 - lib/sshkit/custom/dsl/version.rb
 - spec/acceptance/.gitkeep

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

@@ -1,75 +0,0 @@
-module SSHKit
-  module Custom
-    module DSL
-      module Configuration
-
-        def config_store
-          @config_store ||= SSHKit::Custom::DSL::ConfigStore
-        end
-
-        def on(hosts, options={}, &block)
-          hosts = Array(hosts).map { |rh| rh.is_a?(SSHKit::Host) ? rh : SSHKit::Host.new(rh) }.uniq
-          config_store.backends = hosts
-          config_store.runner_opts = options
-          config_store.runner.do_it(&block) if block_given?
-        end
-
-        def within(directory)
-
-          dir_to_check = File.join(config_store.backend.pwd + [directory])
-
-          execute <<-EOTEST, verbosity: Logger::DEBUG
-           if test ! -d #{dir_to_check}
-              then echo "Directory does not exist '#{dir_to_check}'" 1>&2
-              false
-           fi
-          EOTEST
-
-          config_store.add_pwd directory
-
-          yield if block_given?
-        ensure
-          config_store.pop_pwd
-        end
-
-        def with(environment)
-          config_store.add_env environment
-          yield if block_given?
-        ensure
-          config_store.pop_env
-        end
-
-        def as(who)
-          if who.is_a? Hash
-            user = who[:user] || who["user"]
-            group = who[:group] || who["group"]
-          else
-            user = who
-            group = nil
-          end
-
-          execute <<-EOTEST, verbosity: Logger::DEBUG
-            if ! sudo -u #{user} whoami > /dev/null
-            then echo "You cannot switch to user '#{user}' using sudo, please check the sudoers file" 1>&2
-               false
-            fi
-          EOTEST
-
-          execute <<-EOTEST, verbosity: Logger::DEBUG if group
-            if ! sudo -u #{user} -g #{group} whoami > /dev/null
-            then echo "You cannot switch to group '#{group}' using sudo, please check the sudoers file" 1>&2
-               false
-            fi
-          EOTEST
-
-          config_store.add_user_group user, group
-
-          yield if block_given?
-        ensure
-          config_store.pop_user_group
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,16 +0,0 @@
-module SSHKit
-  module Custom
-    module DSL
-      module Execution
-
-
-        [:execute, :make, :rake, :test, :capture, :upload!, :download!].each do |method|
-          define_method method do |*args, &block|
-            config_store.runner.send_cmd method, *args, &block
-          end
-        end
-
-      end
-    end
-  end
-end