ridley-connectors 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 664cd3f5806e0266a72564fcaff7dedb8678cfb1
-  data.tar.gz: 8d2e751c31d0778940a3ea617ca6c1e7b93a9266
+  metadata.gz: 6fd45d75b75804bf01b13a5126297aacfd5fc455
+  data.tar.gz: 63e286faecab868eed92362d49771c1c591aad96
 SHA512:
-  metadata.gz: a95132ce067326292a51f49e6b2fd48cc3600a81c1f27838d75bf55fd2defd38a48d8bf083779aefa89351fb4c85b79e892b2b45fb7a055d810bdac41e67793c
-  data.tar.gz: b8fd1f621e77b5c23a882055e1a1afa4bf936c185e289a217195024bc5d63383bc4abedf4275aa2110fa31f89e15ce62662971a5098b9c26b9352cf998bcedc0
+  metadata.gz: 49691e61efceb7a88fc5a4a5617b4f8364e9e074ef3d86079aedf2a7f3fa9f89d5ca59a4152f77a9be3ecc2f1d6e03512411f8d2f757d36a921843ae27fae55e
+  data.tar.gz: aabf718fdde84bdb5a210038ac319bcf53a56dc638ae39c642ab42ae7f6e65083f8d65b6a225f97fac4a4f1467b10870146e6bb4f3c389e953381c2b1d60d293

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v.1.6.0
+* [#14](https://github.com/RiotGames/ridley-connectors/pull/14) Create
+  a pool of WinRM / SSH actors, configurable with options(:connector\_pool\_size)
+
 ## v.1.5.0
 * [#11](https://github.com/RiotGames/ridley-connectors/pull/11) use -E on sudo to preserve the environment
 

data/lib/ridley-connectors/host_commander.rb

@@ -1,10 +1,16 @@
 module Ridley
   class ConnectorSupervisor < ::Celluloid::SupervisionGroup
     # @param [Celluloid::Registry] registry
-    def initialize(registry)
+    def initialize(registry, connector_pool_size)
       super(registry)
-      supervise_as :ssh, HostConnector::SSH
-      supervise_as :winrm, HostConnector::WinRM
+
+      if connector_pool_size > 1
+        pool(HostConnector::SSH, size: connector_pool_size, as: :ssh)
+        pool(HostConnector::WinRM, size: connector_pool_size, as: :winrm)
+      else
+        supervise_as :ssh, HostConnector::SSH
+        supervise_as :winrm, HostConnector::WinRM
+      end
     end
   end
 
@@ -16,9 +22,10 @@ module Ridley
 
     finalizer :finalize_callback
 
-    def initialize
+    def initialize(connector_pool_size=nil)
+      connector_pool_size ||= 1
       @connector_registry   = Celluloid::Registry.new
-      @connector_supervisor = ConnectorSupervisor.new_link(@connector_registry)
+      @connector_supervisor = ConnectorSupervisor.new_link(@connector_registry, connector_pool_size)
     end
 
     # Execute a shell command on a node

data/lib/ridley-connectors/host_connector/ssh.rb

@@ -113,7 +113,17 @@ module Ridley
       #
       # @return [HostConnector::Response]
       def chef_client(host, options = {})
-        run(host, "chef-client", options)
+        log_level = case log.level
+          when 0
+            "debug"
+          when 1
+            "info"
+          when 2
+            "warn"
+          else
+            "info"
+          end
+        run(host, "chef-client -l #{log_level}", options)
       end
 
       # Write your encrypted data bag secret on a node

data/lib/ridley-connectors/host_connector/winrm.rb

@@ -143,7 +143,17 @@ module Ridley
       #
       # @return [HostConnector::Response]
       def chef_client(host, options = {})
-        run(host, "chef-client", options)
+        log_level = case log.level
+          when 0
+            "debug"
+          when 1
+            "info"
+          when 2
+            "warn"
+          else
+            "info"
+          end
+        run(host, "chef-client -l #{log_level}", options)
       end
 
       # Write your encrypted data bag secret on a node

data/lib/ridley-connectors/resources/node_resource.rb

@@ -40,7 +40,7 @@ module Ridley
       @ssh                       = options[:ssh]
       @winrm                     = options[:winrm]
       @chef_version              = options[:chef_version]
-      @host_commander            = HostCommander.new_link
+      @host_commander            = HostCommander.new_link(options[:connector_pool_size])
     end
 
     # @param [String] host
@@ -193,6 +193,6 @@ module Ridley
 
       def finalize_callback
         @host_commander.terminate if @host_commander && @host_commander.alive?
-      end    
+      end
   end
 end

data/lib/ridley-connectors/version.rb

@@ -1,5 +1,5 @@
 module Ridley
   module Connectors
-    VERSION = '1.5.0'
+    VERSION = '1.6.0'
   end
 end

data/spec/unit/ridley-connectors/host_connector/ssh_spec.rb

@@ -32,7 +32,7 @@ describe Ridley::HostConnector::SSH do
 
   describe "#chef_client" do
     it "sends a #run message to self to execute chef-client" do
-      connector.should_receive(:run).with(host, "chef-client", options)
+      connector.should_receive(:run).with(host, "chef-client -l warn", options)
       connector.chef_client(host, options)
     end
   end

data/spec/unit/ridley-connectors/host_connector/winrm_spec.rb

@@ -129,7 +129,7 @@ describe Ridley::HostConnector::WinRM do
     subject(:chef_client) { connector.chef_client(host, options) }
 
     it "receives a command to run chef-client" do
-      connector.should_receive(:run).with(host, "chef-client", options)
+      connector.should_receive(:run).with(host, "chef-client -l warn", options)
 
       chef_client
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley-connectors
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid