minionizer 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab6c86800be7b1dcd9e3c4161b794321b16386b4
-  data.tar.gz: e96fdac6cac8c7b70eefa8f431291ce478b2e9a8
+  metadata.gz: 7690fcfb80c2f59841e1de580c8307eb1dcdbe13
+  data.tar.gz: 17c4557d0afebc778ff1dd75e188e208361b49bb
 SHA512:
-  metadata.gz: 2f26142169c727649b3b1780753cf4df4d3ff30d02061d3430c72d6fb9267c324b534091258c9de310d73b7565acd9e274d34488ff9074b3cba5b2eab20b5c23
-  data.tar.gz: ea619f4f6272c7c8652e170a06f0fac2b375cea1e43a10c8fc04c48250cfae673886661fa54740d4c4d81d4b5121aea7898b0075909cf13cc1f0ddd7eb684651
+  metadata.gz: 5286634c47d7b60f216ffce792c4955dd71a783cefbce1b3a3b8dc925630b3e88e58c99c1a65349dbb56fe5bf21f529f59d4d76d56269865958cff8e0fffa547
+  data.tar.gz: 6956bed9167c3a2d3806188c3c3ffeb1b1a7588411e541590822b1ba04d4278b915137a92c21dcd51b15b0bab6af5ea6fb231683e246a66b3db16ca231deb9e4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    minionizer (0.2.0)
+    minionizer (0.2.1)
       activesupport (~> 4.1)
       binding_of_caller (~> 0.7)
       net-scp (~> 1.2)
@@ -10,14 +10,14 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.2.6)
+    activesupport (4.2.8)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
+    concurrent-ruby (1.0.5)
     coveralls (0.7.1)
       multi_json (~> 1.3)
       rest-client
@@ -27,17 +27,17 @@ GEM
     debug_inspector (0.0.2)
     docile (1.1.5)
     fakefs (0.6.0)
-    i18n (0.7.0)
-    json (1.8.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     metaclass (0.0.4)
     mime-types (2.4.3)
-    minitest (5.9.0)
+    minitest (5.11.3)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.10.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.1)
+    net-ssh (2.9.4)
     netrc (0.8.0)
     rake (10.3.2)
     rest-client (1.7.2)
@@ -51,9 +51,9 @@ GEM
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     thor (0.19.1)
-    thread_safe (0.3.5)
+    thread_safe (0.3.6)
     tins (1.3.3)
-    tzinfo (1.2.2)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -63,9 +63,9 @@ DEPENDENCIES
   coveralls
   fakefs (~> 0.5)
   minionizer!
-  minitest (~> 5.4)
+  minitest (~> 5.11)
   mocha (~> 1.0)
   rake (~> 10.3)
 
 BUNDLED WITH
-   1.12.2
+   1.13.5

data/lib/minionizer.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/module/delegation'
 require 'active_support/inflector'
 require 'binding_of_caller'
 require 'erb'

data/lib/minionizer/minion.rb

@@ -4,31 +4,16 @@ module Minionizer
 
     def initialize(fqdn, config, session_constructor = Session)
       @fqdn = fqdn
-      @config = config
+      @config = config.minions[fqdn]
       @session_constructor = session_constructor
     end
 
     def session
-      @session ||= session_constructor.new(fqdn, ssh_credentials)
+      @session ||= session_constructor.new(self)
     end
 
     def roles
-      my_config['roles']
-    end
-
-    #######
-    private
-    #######
-
-    def ssh_credentials
-      {
-        'username' => my_config['ssh']['username'],
-        'password' => my_config['ssh']['password']
-      }
-    end
-
-    def my_config
-      config.minions[fqdn]
+      config['roles']
     end
   end
 end

data/lib/minionizer/session.rb

@@ -1,12 +1,15 @@
 require 'securerandom'
 module Minionizer
   class Session
-    attr_reader :fqdn, :username, :password, :ssh_connector, :scp_connector, :command_executor
+    attr_reader :minion, :ssh_connector, :scp_connector, :command_executor
 
-    def initialize(fqdn, credentials, ssh_connector=Net::SSH, scp_connector=Net::SCP, command_executor=CommandExecution)
-      @fqdn = fqdn
-      @username = credentials['username']
-      @password = credentials['password']
+    delegate :fqdn, :config, to: :minion
+
+    def initialize(minion,
+                   ssh_connector=Net::SSH,
+                   scp_connector=Net::SCP,
+                   command_executor=CommandExecution)
+      @minion = minion
       @ssh_connector = ssh_connector
       @scp_connector = scp_connector
       @command_executor = command_executor
@@ -60,12 +63,15 @@ module Minionizer
     end
 
     def ssh_connection
-      @ssh_connection ||= ssh_connector.start(fqdn, username, password: password)
+      @ssh_connection ||= ssh_connector.start(*connection_args)
     end
 
     def scp_connection
-      @scp_connection ||= scp_connector.start(fqdn, username, password: password)
+      @scp_connection ||= scp_connector.start(*connection_args)
     end
 
+    def connection_args
+      [fqdn, config['ssh']['username'], password: config['ssh']['password']]
+    end
   end
 end

data/lib/minionizer/version.rb

@@ -1,3 +1,3 @@
 module Minionizer
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/minionizer.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('fakefs', '~> 0.5')
   s.add_development_dependency('mocha', '~> 1.0')
-  s.add_development_dependency('minitest', '~> 5.4')
+  s.add_development_dependency('minitest', '~> 5.11')
   s.add_development_dependency('rake', '~> 10.3')
 
   s.files = `git ls-files`.split("\n")

data/test/test_helper.rb

@@ -190,4 +190,3 @@ module FakeFS
     end
   end
 end
-

data/test/unit/lib/minionizer/minion_test.rb

@@ -25,7 +25,7 @@ module Minionizer
         let(:session) { quacks_like_instance_of(Session) }
 
         it 'creates a session' do
-          session_constructor.expects(:new).with(fqdn, credentials).returns(session)
+          session_constructor.expects(:new).with(minion).returns(session)
           minion.session
         end
       end
@@ -40,5 +40,3 @@ module Minionizer
     end
   end
 end
-
-

data/test/unit/lib/minionizer/session_test.rb

@@ -7,16 +7,25 @@ module Minionizer
       let(:fqdn) { 'foo.bar.com' }
       let(:username) { 'foo' }
       let(:password) { 'bar' }
-      let(:credentials) {{ 'username' => username, 'password' => password }}
+      let(:config) do
+        { 'ssh' => { 'username' => username,
+                     'password' => password }}
+      end
+      let(:minion) { mock('minion') }
       let(:ssh_connector) { mock('ssh_connector') }
       let(:scp_connector) { mock('scp_connector') }
       let(:command_executor) { mock('CommandExecution') }
       let(:execution) { mock('execution') }
       let(:ssh_connection) { mock('ssh_connection') }
       let(:scp_connection) { mock('scp_connection') }
-      let(:session) { Session.new(fqdn, credentials, ssh_connector, scp_connector, command_executor) }
+      let(:session) { Session.new(minion, ssh_connector, scp_connector, command_executor) }
       let(:start_args) { [fqdn, username, { password: password }]}
 
+      before do
+        minion.stubs(:config).returns(config)
+        minion.stubs(:fqdn).returns(fqdn)
+      end
+
       it 'instantiates' do
         assert_kind_of(Session, session)
       end
@@ -65,7 +74,9 @@ module Minionizer
         let(:command) { 'foobar' }
 
         before do
-          ssh_connector.expects(:start).with(*start_args).returns(ssh_connection)
+          ssh_connector.expects(:start)
+                       .with(*start_args)
+                       .returns(ssh_connection)
         end
 
         describe '#sudo' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minionizer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Jonathan S. Garvin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-09 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '5.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement