sshkit 1.8.1 → 1.9.0.rc1

data/test/unit/backends/test_printer.rb

@@ -22,16 +22,16 @@ module SSHKit
       def test_execute
         printer.execute 'uname -a'
         assert_output_lines(
-          '  INFO [aaaaaa] Running /usr/bin/env uname -a on example.com',
+          '  INFO [aaaaaa] Running uname -a on example.com',
           ' DEBUG [aaaaaa] Command: uname -a'
         )
       end
 
       def test_test_method
-        printer.test '[ -d /some/file ]'
+        assert printer.test('[ -d /some/file ]'), 'test should return true'
 
         assert_output_lines(
-          ' DEBUG [aaaaaa] Running /usr/bin/env [ -d /some/file ] on example.com',
+          ' DEBUG [aaaaaa] Running [ -d /some/file ] on example.com',
           ' DEBUG [aaaaaa] Command: [ -d /some/file ]'
         )
       end
@@ -42,7 +42,7 @@ module SSHKit
         assert_equal '', result
 
         assert_output_lines(
-          ' DEBUG [aaaaaa] Running /usr/bin/env ls -l on example.com',
+          ' DEBUG [aaaaaa] Running ls -l on example.com',
           ' DEBUG [aaaaaa] Command: ls -l'
         )
       end
@@ -70,4 +70,4 @@ module SSHKit
       end
     end
   end
-end
+end

data/test/unit/formatters/test_custom.rb

@@ -43,6 +43,11 @@ module SSHKit
       assert_log_output 'C 1 /usr/bin/env ls'
     end
 
+    def test_accepts_options_hash
+      custom = CustomFormatter.new(output, :foo => 'value')
+      assert_equal('value', custom.options[:foo])
+    end
+
     private
 
     def assert_log_output(expected_output)
@@ -53,10 +58,11 @@ module SSHKit
 
   class CustomFormatter < SSHKit::Formatter::Abstract
     def write(obj)
-      original_output << case obj
+      original_output << \
+        case obj
         when SSHKit::Command    then "C #{obj.verbosity} #{obj}"
         when SSHKit::LogMessage then "LM #{obj.verbosity} #{obj}"
-      end
+        end
     end
     alias :<< :write
 

data/test/unit/test_command_map.rb

@@ -56,5 +56,14 @@ module SSHKit
       assert_equal map[:rake], "/home/vagrant/.rbenv/bin/rbenv exec bundle exec rake"
     end
 
+    def test_prefix_initialization_is_thread_safe
+      map = CommandMap.new
+      threads = Array.new(3) do
+        Thread.new do
+          (1..1_000).each { |i| assert_equal([], map.prefix[i.to_s]) }
+        end
+      end
+      threads.each(&:join)
+    end
   end
 end

data/test/unit/test_configuration.rb

@@ -51,6 +51,12 @@ module SSHKit
       assert SSHKit.config.default_env
     end
 
+    def test_default_runner
+      assert_equal :parallel, SSHKit.config.default_runner
+      SSHKit.config.default_runner = :sequence
+      assert_equal :sequence, SSHKit.config.default_runner
+    end
+
     def test_backend
       assert_equal SSHKit::Backend::Netssh, SSHKit.config.backend
       assert SSHKit.config.backend = SSHKit::Backend::Printer

data/test/unit/test_coordinator.rb

@@ -4,7 +4,6 @@ require 'helper'
 module SSHKit
 
   class TestCoordinator < UnitTest
-
     def setup
       super
       @output = String.new
@@ -56,6 +55,33 @@ module SSHKit
       assert_at_least_1_sec_apart(actual_execution_times.first, actual_execution_times.last)
     end
 
+    class MyRunner < SSHKit::Runner::Parallel
+      def execute
+        threads = hosts.map do |host|
+          Thread.new(host) do |h|
+            b = backend(h, &block)
+            b.run
+            b.warn "custom runner out"
+          end
+        end
+        threads.each(&:join)
+      end
+    end
+
+    def test_the_connection_manager_can_run_things_in_custom_runner
+      begin
+        $original_runner = SSHKit.config.default_runner
+        SSHKit.config.default_runner = MyRunner
+
+        Coordinator.new(%w{1.example.com 2.example.com}).each(&echo_time)
+        assert_equal 2, actual_execution_times.length
+        assert_within_10_ms(actual_execution_times)
+        assert_match(/custom runner out/, @output)
+      ensure
+        SSHKit.config.default_runner = $original_runner
+      end
+    end
+
     def test_the_connection_manager_can_run_things_in_sequence_with_wait
       start = Time.now
       Coordinator.new(%w{1.example.com 2.example.com}).each in: :sequence, wait: 10, &echo_time

data/test/unit/test_dsl.rb

@@ -0,0 +1,26 @@
+require 'helper'
+
+module SSHKit
+
+  class TestDSL < UnitTest
+    include SSHKit::DSL
+
+    def test_dsl_on
+      coordinator = mock
+      Coordinator.stubs(:new).returns coordinator
+      coordinator.expects(:each).at_least_once
+
+      on('1.2.3.4')
+    end
+
+    def test_dsl_run_locally
+      local_backend = mock
+      Backend::Local.stubs(:new).returns local_backend
+      local_backend.expects(:run).at_least_once
+
+      run_locally
+    end
+
+  end
+
+end

data/test/unit/test_host.rb

@@ -65,8 +65,12 @@ module SSHKit
     end
 
     def test_assert_hosts_compare_equal
-      assert Host.new('example.com').eql? Host.new('example.com')
-      assert Host.new('example.com').equal? Host.new('example.com')
+      h1 = Host.new('example.com')
+      h2 = Host.new('example.com')
+
+      assert h1 == h2
+      assert h1.eql? h2
+      assert h1.equal? h2
     end
 
     def test_arbitrary_host_properties

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sshkit
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.9.0.rc1
 platform: ruby
 authors:
 - Lee Hambley
@@ -9,110 +9,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.3
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.3
-    - - <
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   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: turn
+  name: rubocop
   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: unindent
   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: mocha
   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: A comprehensive toolkit for remotely running commands in a structured
@@ -124,9 +132,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - BREAKING_API_WISHLIST.md
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -146,6 +154,8 @@ files:
 - lib/sshkit/all.rb
 - lib/sshkit/backends/abstract.rb
 - lib/sshkit/backends/connection_pool.rb
+- lib/sshkit/backends/connection_pool/cache.rb
+- lib/sshkit/backends/connection_pool/nil_cache.rb
 - lib/sshkit/backends/local.rb
 - lib/sshkit/backends/netssh.rb
 - lib/sshkit/backends/printer.rb
@@ -196,6 +206,7 @@ files:
 - test/unit/test_configuration.rb
 - test/unit/test_coordinator.rb
 - test/unit/test_deprecation_logger.rb
+- test/unit/test_dsl.rb
 - test/unit/test_host.rb
 - test/unit/test_logger.rb
 - test/unit/test_mapping_interaction_handler.rb
@@ -209,17 +220,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'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: SSHKit makes it easy to write structured, testable SSH commands in Ruby
@@ -246,6 +257,7 @@ test_files:
 - test/unit/test_configuration.rb
 - test/unit/test_coordinator.rb
 - test/unit/test_deprecation_logger.rb
+- test/unit/test_dsl.rb
 - test/unit/test_host.rb
 - test/unit/test_logger.rb
 - test/unit/test_mapping_interaction_handler.rb