sshkit-custom-dsl 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da6d68b754d89eaf7af860e18cbf278033b6f01d
-  data.tar.gz: b04e4e7dee373ef3e6263acce4a795481312ab14
+  metadata.gz: 3fd0fd9df160256d9c8ebc4c5f0e0bbf991ae454
+  data.tar.gz: d4852ffc4659a50ef06321fe8e41b24704475421
 SHA512:
-  metadata.gz: ee68181232e70d739c49de53e715828ba11d77f928487adb8b8166dcae6ddcbba92328826d76fb41c85e3007c6bd046d47dd39046608a59bf570106bc5c34380
-  data.tar.gz: 93e11979977e2b7b5ece94fa20f3fc4d088f02d4c67a15a7df5218a873e2d322f8cf3fc7eadc59cdebd451d9f98e9f6797576f4e480a1a3aa46a57382c774917
+  metadata.gz: a8939d7c079a9be99262d6132e98e14bc28cea0c5afc311af9bfecdb18ec96b834d9c66a15d6da3706bda552ebf032337b91840fcbfce6d95265efcba3fd4063
+  data.tar.gz: 3ff71a12cc83574c8be4d89c5975ac7d488f1123240db2e2d320ccec44da4f729a4bee348e434e7c4a6e38b9bda76c098c9175befa8e39c0ed53b4bfbfc593e1

data/.rubocop.yml

@@ -4,6 +4,9 @@ inherit_from: .rubocop_todo.yml
 LineLength:
   Max: 160
 
+Metrics/ModuleLength:
+  Max: 250
+
 Documentation:
   Enabled: false
 
@@ -14,7 +17,7 @@ MethodLength:
   Max: 50
 
 # @see http://www.rubytapas.com/episodes/24-Incidental-Change
-TrailingComma:
+TrailingCommaInLiteral:
   Enabled: false
 
 RegexpLiteral:

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 rvm:
-  - 2.1
-  - 2.0
+  - 2.1.5
+  - 2.2.1
 script: bundle exec rake spec rubocop
 cache: bundler
+before_install:
+  - gem install bundler # -v 1.7.14 if a specific version is needed

data/.versions.conf

@@ -1,4 +1,4 @@
-ruby=ruby-2.0.0
+ruby=ruby-2.1.5
 ruby-gemset=gem_sshkit-custom-dsl
-#ruby-gem-install=bundler rake
+ruby-gem-install=bundler rake
 #ruby-bundle-install=true

data/Gemfile

@@ -3,11 +3,9 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in sshkit-custom-dsl.gemspec
 gemspec
 
-gem 'simplecov', require:  false, group: :test
+gem 'simplecov', require: false, group: :test
 gem 'coveralls', require: false
 gem 'rubocop', require: false
 gem 'yard', require: false
 gem 'redcarpet', require: false
 gem 'github-markup', require: false
-
-

data/README.md

@@ -79,7 +79,9 @@ on %w{localhost 127.0.0.1}, in: :sequence, wait: 0 do
   end
 end
 
-on %w{localhost 127.0.0.1} do
+# thread_count is a new config option for parallel runner
+# is used for Rake::ThreadPool
+on %w{localhost 127.0.0.1}, thread_count: 10 do
   within "/tmp" do
     with rails_env: :production do
       execute "env", "|sort"

data/Rakefile

@@ -7,7 +7,7 @@ RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
 YARD::Rake::YardocTask.new do |t|
-  t.files   = ['lib/**/*.rb']   # optional
+  t.files = ['lib/**/*.rb'] # optional
 end
 
 task default: :spec

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

@@ -67,7 +67,7 @@ module SSHKit
         # Set the environment for the current backend.
         # @param env [Hash<String, String>] The new ENV-Vars to be used.
         def add_env(env)
-          old_env =  active_backend.env.clone
+          old_env = active_backend.env.clone
           _envs << old_env
           env = old_env.merge(env)
           active_backend.env = env
@@ -88,7 +88,7 @@ module SSHKit
         # @param user [String] The new username
         # @param group [String, nil] The new group
         def add_user_group(user, group)
-          _user_groups << { user: active_backend.user, group:  active_backend.group }
+          _user_groups << { user: active_backend.user, group: active_backend.group }
           active_backend.user = user
           active_backend.group = group
         end
@@ -105,6 +105,7 @@ module SSHKit
           SSHKit::Custom::Runner::Abstract.active_backend
         end
 
+        # Sets the default runner opts for instance change the default runner
         def default_runner_opts(opts)
           global_config_scope[:_default_runner_opts] = opts
         end

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

@@ -1,7 +1,7 @@
 module SSHKit
   module Custom
     module DSL
-      VERSION = '0.0.10'
+      VERSION = '0.0.11'.freeze
     end
   end
 end

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

@@ -8,6 +8,7 @@ module SSHKit
       # Base class for all runners
       # @abstract Subclass and override {#apply_block_to_bcks} to implement
       # @public
+      # rubocop:disable Performance/RedundantBlockCall
       class Abstract
         attr_accessor :backends
         attr_reader :options
@@ -25,7 +26,7 @@ module SSHKit
           when :groups
             Group
           else
-            fail "Don't know how to handle run style #{opts_with_defaults[:in].inspect}"
+            raise "Don't know how to handle run style #{opts_with_defaults[:in].inspect}"
           end.new(opts_with_defaults)
         end
 
@@ -41,7 +42,7 @@ module SSHKit
 
         # @api private
         def self.active_backend
-          scope[:active_backend] || fail(ArgumentError, 'Backend not set')
+          scope[:active_backend] || raise(ArgumentError, 'Backend not set')
         end
 
         # @api private
@@ -77,14 +78,14 @@ module SSHKit
 
         # @abstract
         def apply_block_to_bcks(&_block)
-          fail SSHKit::Backend::MethodUnavailableError
+          raise SSHKit::Backend::MethodUnavailableError
         end
 
         # @api private
         def apply_to_bck(backend, &block)
           self.active_backend = backend
           block.call(backend.host)
-         rescue => e
+        rescue => e
           e2 = ExecuteError.new e
           raise e2, "Exception while executing on host #{backend.host}: #{e.message}"
         ensure
@@ -102,6 +103,7 @@ module SSHKit
           @wait_interval || options[:wait] || 2
         end
       end
+      # rubocop:enable Performance/RedundantBlockCall
     end
   end
 end

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

@@ -10,11 +10,9 @@ module SSHKit
         # @yields the actual host
         def apply_block_to_bcks(&block)
           backends.each_slice(group_size).map do |group_backends|
-
             exec_parallel(group_backends, &block)
 
             do_wait
-
           end.flatten
         end
 

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

@@ -14,7 +14,7 @@ module SSHKit
         # @yields the actual host
         def apply_block_to_bcks(&block)
           futures = to_futures(&block)
-          futures.each { |f| f.value }
+          futures.each(&:value)
         end
 
         # @api private

data/spec/unit/sshkit/custom/config/store_spec.rb

@@ -4,7 +4,6 @@ module SSHKit
   module Custom
     module Config
       describe Store do
-
         let(:mock_bck) do
           SSHKit.config.backend.new(SSHKit::Host.new('localhost'))
         end
@@ -57,7 +56,6 @@ module SSHKit
         end
 
         describe '.add_env' do
-
           it 'adds an env to the stack' do
             expect(mock_bck.env).to eq({})
             Store.add_env(new_env)
@@ -120,6 +118,16 @@ module SSHKit
             expect(Runner::Abstract).to receive(:create_runner).with({ some: :things }.merge(opts))
             Store.create_runner opts
           end
+
+          it 'changes the options globally' do
+            Store.default_runner_opts(some: :things)
+
+            Thread.new { Store.default_runner_opts(some: :thing_else) }.join
+
+            opts = { in: :groups }
+            expect(Runner::Abstract).to receive(:create_runner).with({ some: :thing_else }.merge(opts))
+            Store.create_runner opts
+          end
         end
       end
     end

data/spec/unit/sshkit/custom/dsl/config_statements_spec.rb

@@ -67,7 +67,7 @@ module SSHKit
 
             expect do
               subject.within(dir) do
-                fail
+                raise
               end
             end.to raise_error
           end
@@ -94,7 +94,7 @@ module SSHKit
 
             expect do
               subject.with(env) do
-                fail
+                raise
               end
             end.to raise_error
           end
@@ -117,7 +117,7 @@ module SSHKit
 
             expect do
               subject.as(user: user, group: group) do
-                fail
+                raise
               end
             end.to raise_error
           end
@@ -149,7 +149,6 @@ module SSHKit
             subject.default_runner_opts(opts)
           end
         end
-
       end
     end
   end

data/spec/unit/sshkit/custom/dsl/exec_statements_spec.rb

@@ -15,7 +15,6 @@ module SSHKit
             end
 
             attr_accessor :runner
-
           end.new
         end
 
@@ -67,7 +66,6 @@ module SSHKit
             subject._guard_dir!('/tmp')
           end
         end
-
       end
     end
   end

data/spec/unit/sshkit/custom/dsl/helper_spec.rb

@@ -48,9 +48,7 @@ module SSHKit
             lch = SSHKit::Host.new('localhost')
             expect(subject.Host(lch)).to eq(lch)
           end
-
         end
-
       end
     end
   end

data/spec/unit/sshkit/custom/runner/abstract_spec.rb

@@ -4,7 +4,6 @@ module SSHKit
   module Custom
     module Runner
       describe Abstract do
-
         subject do
           Abstract.new(wait: 1)
         end
@@ -64,17 +63,15 @@ module SSHKit
               subject.send_cmd(:execute) do
                 args
               end
-
             end
 
             it 'reraises an exception' do
               expect do
                 subject.send_cmd(:execute) do
-                  fail
+                  raise
                 end
               end.to raise_error
             end
-
           end
 
           describe '.apply_to_bck' do
@@ -89,33 +86,28 @@ module SSHKit
             end
 
             it 'reraises an exception' do
-              block = ->(_host) { fail }
+              block = ->(_host) { raise }
 
               expect { subject.apply_to_bck(mock_bck, &block) }.to raise_error
             end
-
           end
 
           describe '.do_wait' do
             it 'sleeps [wait] seconds' do
-
               expect do
                 subject.send(:do_wait)
               end.to change { Time.now.utc }.by_at_least(1)
             end
-
           end
 
           describe '.apply_block_to_bcks' do
             it 'should be implemented by sub classes' do
               expect do
                 subject.apply_block_to_bcks do
-
                 end
               end.to raise_error
             end
           end
-
         end
       end
     end

data/spec/unit/sshkit/custom/runner/group_spec.rb

@@ -9,13 +9,12 @@ module SSHKit
         end
 
         describe '.apply_block_to_bcks' do
-
           let(:block) { ->(_) {} }
           let(:bck1) { SSHKit.config.backend.new(SSHKit::Host.new('localhost')) }
           let(:bck2) { SSHKit.config.backend.new(SSHKit::Host.new('127.0.0.1')) }
 
           before :each do
-            allow(subject).to receive(:use_runner).and_return(->(options) {Sequential.new(options) })
+            allow(subject).to receive(:use_runner).and_return(->(options) { Sequential.new(options) })
           end
 
           it 'calls apply_to_bck for every backend' do

data/spec/unit/sshkit/custom/runner/parallel_spec.rb

@@ -15,7 +15,7 @@ module SSHKit
       end
 
       describe Parallel do
-        let(:thread_pool)do
+        let(:thread_pool) do
           double(:thread_pool).tap do |t|
             allow(t).to receive(:future) do |host, &block|
               DummyFuture.new(host, &block)

data/sshkit-custom-dsl.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = SSHKit::Custom::DSL::VERSION
   spec.authors       = ['Dieter Späth']
   spec.email         = ['d.spaeth@faber.de']
-  spec.summary       = %q(Exchanges original sshkit dsl against a custom dsl)
-  spec.description   = %q(Exchanges original sshkit dsl against a custom dsl. This DSL does not change the scope of the blocks.)
+  spec.summary       = 'Exchanges original sshkit dsl against a custom dsl'
+  spec.description   = 'Exchanges original sshkit dsl against a custom dsl. This DSL does not change the scope of the blocks.'
   spec.homepage      = 'https://github.com/faber-lotto/sshkit-custom-dsl'
   spec.license       = 'MIT'
 
@@ -18,12 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'sshkit', '~> 1.5.1'
+  spec.add_dependency 'sshkit'
   spec.add_dependency 'scoped_storage'
   spec.add_dependency 'rake'
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rspec'
 
   spec.add_development_dependency 'rspec', '3.0.0'
   # show nicely how many specs have to be run

metadata

@@ -1,83 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: sshkit-custom-dsl
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Dieter Späth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '0'
 - !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: rake
   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
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -98,42 +84,42 @@ dependencies:
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-remote
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Exchanges original sshkit dsl against a custom dsl. This DSL does not
@@ -144,14 +130,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .consolerc
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .rubocop_todo.yml
-- .travis.yml
-- .versions.conf
-- .yardopts
+- ".consolerc"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
+- ".versions.conf"
+- ".yardopts"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -195,17 +181,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Exchanges original sshkit dsl against a custom dsl