node_resource.rb in ridley-1.0.0.rc1

- old
+ new

@@ -12,10 +12,12 @@
     attr_reader :encrypted_data_bag_secret
     attr_reader :ssh
     attr_reader :winrm
     attr_reader :chef_version
 
+    finalizer :finalize_callback
+
     # @param [Celluloid::Registry] connection_registry
     #
     # @option options [String] :server_url
     #   URL to the Chef API
     # @option options [Hash] ssh
@@ -41,116 +43,101 @@
       @validator_client          = options[:validator_client]
       @encrypted_data_bag_secret = options[:encrypted_data_bag_secret]
       @ssh                       = options[:ssh]
       @winrm                     = options[:winrm]
       @chef_version              = options[:chef_version]
+      @host_commander            = HostCommander.new_link
     end
 
-    # @overload bootstrap(nodes, options = {})
-    #   @param [Array<String>, String] nodes
+    # @param [String] host
     #
-    #   @option options [Hash] ssh
-    #     * :user (String) a shell user that will login to each node and perform the bootstrap command on (required)
-    #     * :password (String) the password for the shell user that will perform the bootstrap
-    #     * :keys (Array, String) an array of keys (or a single key) to authenticate the ssh user with instead of a password
-    #     * :timeout (Float) [5.0] timeout value for SSH bootstrap
-    #   @option options [Hash] :winrm
-    #     * :user (String) a user that will login to each node and perform the bootstrap command on (required)
-    #     * :password (String) the password for the user that will perform the bootstrap
-    #     * :port (Fixnum) the winrm port to connect on the node the bootstrap will be performed on (5985)
-    #   @option options [String] :validator_client
-    #   @option options [String] :validator_path
-    #     filepath to the validator used to bootstrap the node (required)
-    #   @option options [String] :bootstrap_proxy
-    #     URL to a proxy server to bootstrap through (default: nil)
-    #   @option options [String] :encrypted_data_bag_secret_path
-    #     filepath on your host machine to your organizations encrypted data bag secret (default: nil)
-    #   @option options [Hash] :hints
-    #     a hash of Ohai hints to place on the bootstrapped node (default: Hash.new)
-    #   @option options [Hash] :attributes
-    #     a hash of attributes to use in the first Chef run (default: Hash.new)
-    #   @option options [Array] :run_list
-    #     an initial run list to bootstrap with (default: Array.new)
-    #   @option options [String] :chef_version
-    #     version of Chef to install on the node (default: nil)
-    #   @option options [String] :environment
-    #     environment to join the node to (default: '_default')
-    #   @option options [Boolean] :sudo
-    #     bootstrap with sudo (default: true)
-    #   @option options [String] :template
-    #     bootstrap template to use (default: omnibus)
+    # @option options [Hash] ssh
+    #   * :user (String) a shell user that will login to each node and perform the bootstrap command on (required)
+    #   * :password (String) the password for the shell user that will perform the bootstrap
+    #   * :keys (Array, String) an array of keys (or a single key) to authenticate the ssh user with instead of a password
+    #   * :timeout (Float) [5.0] timeout value for SSH bootstrap
+    # @option options [Hash] :winrm
+    #   * :user (String) a user that will login to each node and perform the bootstrap command on (required)
+    #   * :password (String) the password for the user that will perform the bootstrap
+    #   * :port (Fixnum) the winrm port to connect on the node the bootstrap will be performed on (5985)
+    # @option options [String] :validator_client
+    # @option options [String] :validator_path
+    #   filepath to the validator used to bootstrap the node (required)
+    # @option options [String] :bootstrap_proxy
+    #   URL to a proxy server to bootstrap through (default: nil)
+    # @option options [String] :encrypted_data_bag_secret_path
+    #   filepath on your host machine to your organizations encrypted data bag secret (default: nil)
+    # @option options [Hash] :hints
+    #   a hash of Ohai hints to place on the bootstrapped node (default: Hash.new)
+    # @option options [Hash] :attributes
+    #   a hash of attributes to use in the first Chef run (default: Hash.new)
+    # @option options [Array] :run_list
+    #   an initial run list to bootstrap with (default: Array.new)
+    # @option options [String] :chef_version
+    #   version of Chef to install on the node (default: nil)
+    # @option options [String] :environment
+    #   environment to join the node to (default: '_default')
+    # @option options [Boolean] :sudo
+    #   bootstrap with sudo (default: true)
+    # @option options [String] :template
+    #   bootstrap template to use (default: omnibus)
     #
-    # @return [SSH::ResponseSet]
-    def bootstrap(*args)
-      args = args.dup
-      opts = args.extract_options!
-
-      options = opts.reverse_merge(
+    # @return [HostConnector::Response]
+    def bootstrap(host, options = {})
+      options = options.reverse_merge(
         server_url: server_url,
         validator_path: validator_path,
         validator_client: validator_client,
         encrypted_data_bag_secret: encrypted_data_bag_secret,
         ssh: ssh,
         winrm: winrm,
         chef_version: chef_version
       )
 
-      Bootstrapper.new(args, options).run
+      host_commander.bootstrap(host, options)
     end
 
     # Executes a Chef run using the best worker available for the given
     # host.
     #
     # @param [String] host
     #
     # @return [HostConnector::Response]
     def chef_run(host)
-      worker = HostConnector.new(host, ssh: ssh, winrm: winrm)
-      worker.chef_client
-    ensure
-      worker.terminate if worker && worker.alive?
+      host_commander.chef_client(host, ssh: ssh, winrm: winrm)
     end
 
     # Puts a secret on the host using the best worker available for
     # the given host.
     #
     # @param [String] host
     #
     # @return [HostConnector::Response]
     def put_secret(host)
-      worker = HostConnector.new(host, ssh: ssh, winrm: winrm)
-      worker.put_secret(encrypted_data_bag_secret)
-    ensure
-      worker.terminate if worker && worker.alive?
+      host_commander.put_secret(host, encrypted_data_bag_secret, ssh: ssh, winrm: winrm)
     end
 
     # Executes an arbitrary ruby script using the best worker available
     # for the given host.
     #
     # @param [String] host
     # @param [Array<String>] command_lines
     #
     # @return [HostConnector::Response]
     def ruby_script(host, command_lines)
-      worker = HostConnector.new(host, ssh: ssh, winrm: winrm)
-      worker.ruby_script(command_lines)
-    ensure
-      worker.terminate if worker && worker.alive?
+      host_commander.ruby_script(host, command_lines, ssh: ssh, winrm: winrm)
     end
 
     # Executes the given command on a node using the best worker
     # available for the given host.
     #
     # @param [String] host
     # @param [String] command
     #
     # @return [Array<Symbol, HostConnector::Response>]
     def execute_command(host, command)
-      worker = HostConnector.new(host, ssh: ssh, winrm: winrm)
-      worker.run(command)
-    ensure
-      worker.terminate if worker && worker.alive?
+      host_commander.run(host, command, ssh: ssh, winrm: winrm)
     end
 
     # Merges the given data with the the data of the target node on the remote
     #
     # @param [Ridley::NodeResource, String] target
@@ -162,15 +149,24 @@
     #   attributes of normal precedence to merge
     #
     # @raise [Errors::ResourceNotFound]
     #   if the target node is not found
     #
-    # @return [Ridley::NodeResource]
+    # @return [Ridley::NodeObject]
     def merge_data(target, options = {})
       unless node = find(target)
         abort Errors::ResourceNotFound.new
       end
 
       update(node.merge_data(options))
     end
+
+    private
+
+      # @return [Ridley::HostCommander]
+      attr_reader :host_commander
+
+      def finalize_callback
+        @host_commander.terminate if @host_commander && @host_commander.alive?
+      end
   end
 end