ridley 0.3.2 → 0.4.0

data/lib/ridley/resources/data_bag.rb

@@ -1,7 +1,7 @@
 module Ridley
-  # @api private
   # @author Jamie Winsor <jamie@vialstudios.com>
-  class DBIContext
+  # @api private
+  class DBIChainLink
     attr_reader :data_bag
     attr_reader :connection
 
@@ -44,8 +44,8 @@ module Ridley
       # @return [Ridley::DataBag]
       def find!(connection, object)
         chef_id = object.respond_to?(:chef_id) ? object.chef_id : object
-        name, uri = connection.get("#{self.resource_path}/#{chef_id}").body.first
-        new(connection, name: name)
+        connection.get("#{self.resource_path}/#{chef_id}")
+        new(connection, name: chef_id)
       end
     end
 
@@ -56,7 +56,7 @@ module Ridley
     validates_presence_of :name
 
     def item
-      @dbi_context ||= DBIContext.new(self, connection)
+      @dbi_link ||= DBIChainLink.new(self, connection)
     end
   end
 
@@ -64,12 +64,12 @@ module Ridley
     # Coerces instance functions into class functions on Ridley::DataBag. This coercion
     # sends an instance of the including class along to the class function.
     #
-    # @see Ridley::Context
+    # @see Ridley::ChainLink
     #
-    # @return [Ridley::Context]
+    # @return [Ridley::ChainLink]
     #   a context object to delegate instance functions to class functions on Ridley::DataBag
     def data_bag
-      Context.new(Ridley::DataBag, self)
+      ChainLink.new(self, Ridley::DataBag)
     end
   end
 end

data/lib/ridley/resources/environment.rb

@@ -84,12 +84,12 @@ module Ridley
     # Coerces instance functions into class functions on Ridley::Environment. This coercion
     # sends an instance of the including class along to the class function.
     #
-    # @see Ridley::Context
+    # @see Ridley::ChainLink
     #
-    # @return [Ridley::Context]
+    # @return [Ridley::ChainLink]
     #   a context object to delegate instance functions to class functions on Ridley::Environment
     def environment
-      Context.new(Ridley::Environment, self)
+      ChainLink.new(self, Ridley::Environment)
     end
   end
 end

data/lib/ridley/resources/node.rb

@@ -1,6 +1,51 @@
 module Ridley 
   # @author Jamie Winsor <jamie@vialstudios.com>
   class Node
+    class << self
+      # @overload bootstrap(connection, nodes, options = {})
+      #   @param [Ridley::Connection] connection
+      #   @param [Array<String>, String] nodes
+      #   @option options [String] :ssh_user
+      #   @option options [String] :ssh_password
+      #   @option options [Array<String>, String] :ssh_keys
+      #   @option options [Float] :ssh_timeout
+      #     timeout value for SSH bootstrap (default: 1.5)
+      #   @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: {Ridley::CHEF_VERSION})
+      #   @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)
+      def bootstrap(connection, *args)
+        options = args.last.is_a?(Hash) ? args.pop : Hash.new
+
+        options[:server_url] ||= connection.server_url
+        options[:ssh_user] ||= connection.ssh[:user]
+        options[:ssh_password] ||= connection.ssh[:password]
+        options[:ssh_timeout] ||= connection.ssh[:timeout]
+        options[:validator_path] ||= connection.validator_path
+        options[:validator_client] ||= connection.validator_client
+        options[:encrypted_data_bag_secret_path] ||= connection.encrypted_data_bag_secret_path
+
+        Bootstrapper.new(args, options).run
+      end
+    end
+
     include Ridley::Resource
 
     set_chef_id "name"
@@ -132,18 +177,27 @@ module Ridley
     def rackspace?
       self.cloud_provider == "rackspace"
     end
+
+    # Run Chef-Client on the instantiated node
+    #
+    # @return [SSH::Response]
+    def chef_client
+      Ridley::SSH.start(self, connection.ssh) do |ssh|
+        ssh.run("sudo chef-client").first
+      end
+    end
   end
   
   module DSL
     # Coerces instance functions into class functions on Ridley::Node. This coercion
     # sends an instance of the including class along to the class function.
     #
-    # @see Ridley::Context
+    # @see Ridley::ChainLink
     #
-    # @return [Ridley::Context]
+    # @return [Ridley::ChainLink]
     #   a context object to delegate instance functions to class functions on Ridley::Node
     def node
-      Context.new(Ridley::Node, self)
+      ChainLink.new(self, Ridley::Node)
     end
   end
 end

data/lib/ridley/resources/role.rb

@@ -68,12 +68,12 @@ module Ridley
     # Coerces instance functions into class functions on Ridley::Role. This coercion
     # sends an instance of the including class along to the class function.
     #
-    # @see Ridley::Context
+    # @see Ridley::ChainLink
     #
-    # @return [Ridley::Context]
+    # @return [Ridley::ChainLink]
     #   a context object to delegate instance functions to class functions on Ridley::Role
     def role
-      Context.new(Ridley::Role, self)
+      ChainLink.new(self, Ridley::Role)
     end
   end
 end

data/lib/ridley/resources/sandbox.rb

@@ -111,12 +111,12 @@ module Ridley
     # Coerces instance functions into class functions on Ridley::Sandbox. This coercion
     # sends an instance of the including class along to the class function.
     #
-    # @see Ridley::Context
+    # @see Ridley::ChainLink
     #
-    # @return [Ridley::Context]
+    # @return [Ridley::ChainLink]
     #   a context object to delegate instance functions to class functions on Ridley::Sandbox
     def sandbox
-      Context.new(Ridley::Sandbox, self)
+      ChainLink.new(self, Ridley::Sandbox)
     end
   end
 end

data/lib/ridley/ssh/response.rb

@@ -0,0 +1,13 @@
+module Ridley
+  class SSH
+    # @author Jamie Winsor <jamie@vialstudios.com>
+    class Response < Struct.new(:stdout, :stderr, :exit_code, :exit_signal)
+      # Return true if the response was not successful
+      #
+      # @return [Boolean]
+      def error?
+        self.exit_code != 0
+      end
+    end
+  end
+end

data/lib/ridley/ssh/response_set.rb

@@ -0,0 +1,51 @@
+module Ridley
+  class SSH
+    # @author Jamie Winsor <jamie@vialstudios.com>
+    class ResponseSet
+      # @return [Array<SSH::Response>]
+      attr_reader :oks
+      # @return [Array<SSH::Response>]
+      attr_reader :errors
+
+      def initialize
+        @oks = Array.new
+        @errors = Array.new
+      end
+
+      # Add an "OK" response to the ResponseSet
+      #
+      # @param [SSH::Response] response
+      def add_ok(response)
+        self.oks << response
+      end
+
+      # Add an "Error" response to the ResponseSet
+      #
+      # @param [SSH::Response] response
+      def add_error(response)
+        self.errors << response
+      end
+
+      # Return true if the response set contains any errors
+      #
+      # @return [Boolean]
+      def has_errors?
+        self.errors.any?
+      end
+
+      # Return one of the responses
+      #
+      # @return [SSH::Response]
+      def first
+        (self.oks + self.errors).first
+      end
+
+      # Returns how many responses are in the set
+      #
+      # @return [Integer]
+      def length
+        self.oks.length + self.errors.length
+      end
+    end
+  end
+end

data/lib/ridley/ssh/worker.rb

@@ -0,0 +1,71 @@
+module Ridley
+  class SSH
+    # @author Jamie Winsor <jamie@vialstudios.com>
+    # @api private
+    class Worker
+      include Celluloid
+      include Celluloid::Logger
+      
+      # @param [Hash] options
+      def initialize(options = {})
+        @options = options
+        @user    = options.fetch(:user)
+      end
+
+      # @param [String] host
+      # @param [String] command
+      #
+      # @return [Array]
+      def run(host, command)
+        response = Response.new("", "")
+        debug "Running SSH command: '#{command}' on: '#{host}' as: '#{user}'"
+
+        Net::SSH.start(host, user, options) do |ssh|          
+          ssh.open_channel do |channel|
+            channel.exec(command) do |ch, success|
+              unless success
+                raise "FAILURE: could not execute command"
+              end
+
+              channel.on_data do |ch, data|
+                response.stdout += data
+              end
+
+              channel.on_extended_data do |ch, type, data|
+                response.stderr += data
+              end
+
+              channel.on_request("exit-status") do |ch, data|
+                response.exit_code = data.read_long
+              end
+
+              channel.on_request("exit-signal") do |ch, data|
+                response.exit_signal = data.read_string
+              end
+            end
+          end
+
+          ssh.loop
+        end
+
+        case response.exit_code
+        when 0
+          debug "Successfully ran SSH command: '#{command}' on: '#{host}' as: '#{user}' and it succeeded"
+          [ :ok, response ]
+        else
+          debug "Successfully ran SSH command: '#{command}' on: '#{host}' as: '#{user}' but it failed"
+          [ :error, response ]
+        end
+      rescue => e
+        debug "Failed to run SSH command: '#{command}' on: '#{host}' as: '#{user}'"
+        [ :error, e.message ]
+      end
+
+      private
+
+        attr_reader :runner
+        attr_reader :user
+        attr_reader :options
+    end
+  end
+end

data/lib/ridley/ssh.rb

@@ -0,0 +1,74 @@
+require 'net/ssh'
+
+module Ridley
+  # @author Jamie Winsor <jamie@vialstudios.com>
+  class SSH
+    autoload :Response, 'ridley/ssh/response'
+    autoload :ResponseSet, 'ridley/ssh/response_set'
+    autoload :Worker, 'ridley/ssh/worker'
+
+    class << self
+      # @param [Ridley::Node, Array<Ridley::Node>] nodes
+      # @param [Hash] options
+      def start(nodes, options = {}, &block)
+        runner = new(nodes, options)
+        result = yield runner
+        runner.terminate
+
+        result
+      end
+    end
+
+    include Celluloid
+    include Celluloid::Logger
+
+    attr_reader :nodes
+    attr_reader :options
+
+    # @param [Ridley::Node, Array<Ridley::Node>] nodes
+    # @param [Hash] options
+    #   @see Net::SSH
+    def initialize(nodes, options = {})
+      @nodes   = nodes
+      @options = options
+
+      self.options[:timeout] ||= 1.5
+    end
+
+    # @return [Array<SSH::Worker>]
+    def workers
+      @workers ||= Array(nodes).collect do |node|
+        Worker.new_link(current_actor, node.public_hostname, options)
+      end
+    end
+
+    # @param [String] command
+    #
+    # @return [Array]
+    def run(command)
+      workers.collect { |worker| worker.async.run(command) }
+
+      ResponseSet.new.tap do |responses|
+        until responses.length == workers.length
+          receive { |msg|
+            status, response = msg
+            
+            case status
+            when :ok
+              responses.add_ok(response)
+            when :error
+              responses.add_error(response)
+            else
+              error "SSH Failure: #{command}. terminating..."
+              terminate
+            end
+          }
+        end
+      end
+    end
+
+    def finalize
+      workers.collect(&:terminate)
+    end
+  end
+end

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/lib/ridley.rb

@@ -1,37 +1,48 @@
+require 'chozo'
+require 'active_support/core_ext'
+require 'celluloid'
 require 'faraday'
 require 'addressable/uri'
-require 'yajl'
 require 'multi_json'
 require 'active_model'
 require 'active_support/inflector'
-require 'active_support/core_ext'
 require 'forwardable'
-require 'set'
 require 'thread'
-require 'chozo/core_ext'
+
+if jruby?
+  require 'json/pure'
+else
+  require 'json/ext'
+end
 
 require 'ridley/version'
 require 'ridley/errors'
 
+JSON.create_id = nil
+
 # @author Jamie Winsor <jamie@vialstudios.com>
 module Ridley
-  CHEF_VERSION = '10.14.4'.freeze
+  CHEF_VERSION = '10.16.2'.freeze
 
-  autoload :Log, 'ridley/log'  
+  autoload :Bootstrapper, 'ridley/bootstrapper'
+  autoload :Client, 'ridley/resources/client'
   autoload :Connection, 'ridley/connection'
+  autoload :ChainLink, 'ridley/chain_link'
+  autoload :Cookbook, 'ridley/resources/cookbook'
+  autoload :DataBag, 'ridley/resources/data_bag'
+  autoload :DataBagItem, 'ridley/resources/data_bag_item'
   autoload :DSL, 'ridley/dsl'
-  autoload :Context, 'ridley/context'
-  autoload :Resource, 'ridley/resource'
   autoload :Environment, 'ridley/resources/environment'
-  autoload :Role, 'ridley/resources/role'
-  autoload :Client, 'ridley/resources/client'
+  autoload :Logging, 'ridley/logging'
   autoload :Node, 'ridley/resources/node'
-  autoload :DataBag, 'ridley/resources/data_bag'
-  autoload :DataBagItem, 'ridley/resources/data_bag_item'
-  autoload :Cookbook, 'ridley/resources/cookbook'
+  autoload :Resource, 'ridley/resource'
+  autoload :Role, 'ridley/resources/role'
   autoload :Search, 'ridley/resources/search'
+  autoload :SSH, 'ridley/ssh'
 
   class << self
+    attr_accessor :logger
+
     def connection(*args)
       Connection.new(*args)
     end
@@ -40,12 +51,26 @@ module Ridley
       Connection.sync(*args, &block)
     end
 
-    # @return [Ridley::Log]
-    def log
-      Ridley::Log
+    # @return [Logger]
+    def logger
+      Ridley::Logging.logger
+    end
+    alias_method :log, :logger
+
+    # @param [Logger, nil] obj
+    #
+    # @return [Logger]
+    def set_logger(obj)
+      Ridley::Logging.set_logger(obj)
+    end
+
+    # @return [Pathname]
+    def root
+      @root ||= Pathname.new(File.expand_path('../', File.dirname(__FILE__)))
     end
-    alias_method :logger, :log
   end
 end
 
+Celluloid.logger = Ridley.logger
+
 require 'ridley/middleware'

data/ridley.gemspec

@@ -16,27 +16,16 @@ Gem::Specification.new do |s|
   s.version       = Ridley::VERSION
   s.required_ruby_version = ">= 1.9.1"
 
-  s.add_runtime_dependency 'chozo', '>= 0.0.3'
-  s.add_runtime_dependency 'yajl-ruby'
+  s.add_runtime_dependency 'json', '>= 1.5.0'
+  s.add_runtime_dependency 'multi_json', '>= 1.0.4'
+  s.add_runtime_dependency 'chozo', '>= 0.2.2'
   s.add_runtime_dependency 'mixlib-log'
   s.add_runtime_dependency 'mixlib-authentication'
   s.add_runtime_dependency 'addressable'
   s.add_runtime_dependency 'faraday'
-  s.add_runtime_dependency 'multi_json', '>= 1.0.4'
   s.add_runtime_dependency 'activemodel', '>= 3.2.0'
   s.add_runtime_dependency 'activesupport', '>= 3.2.0'
-
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'fuubar'
-  s.add_development_dependency 'spork'
-  s.add_development_dependency 'yard'
-  s.add_development_dependency 'guard'
-  s.add_development_dependency 'guard-rspec'
-  s.add_development_dependency 'guard-spork'
-  s.add_development_dependency 'guard-yard'
-  s.add_development_dependency 'coolline'
-  s.add_development_dependency 'redcarpet'
-  s.add_development_dependency 'json_spec'
-  s.add_development_dependency 'webmock'
+  s.add_runtime_dependency 'celluloid'
+  s.add_runtime_dependency 'net-ssh'
+  s.add_runtime_dependency 'erubis'
 end

data/spec/acceptance/bootstrapping_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe "Bootstrapping a node", type: "acceptance" do
+  let(:server_url) { "https://api.opscode.com" }
+  let(:client_name) { "reset" }
+  let(:client_key) { "/Users/reset/.chef/reset.pem" }
+  let(:organization) { "vialstudios" }
+
+  let(:connection) do
+    Ridley.connection(
+      server_url: server_url,
+      client_name: client_name,
+      client_key: client_key,
+      organization: organization,
+      validator_client: "vialstudios-validator",
+      validator_path: "/Users/reset/.chef/vialstudios-validator.pem",
+      ssh: {
+        user: "vagrant",
+        password: "vagrant"
+      }
+    )
+  end
+
+  it "returns an array of response objects" do
+    pending
+    
+    connection.node.bootstrap("33.33.33.10").should_not have_errors
+  end
+end

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
 require 'rubygems'
 require 'bundler'
-require 'spork'
+require 'chozo'
 
-Spork.prefork do
+def setup_rspec
   require 'rspec'
   require 'json_spec'
   require 'webmock/rspec'
@@ -17,9 +17,25 @@ Spork.prefork do
     config.treat_symbols_as_metadata_keys_with_true_values = true
     config.filter_run focus: true
     config.run_all_when_everything_filtered = true
+
+    config.before(:all) do
+      Ridley.logger = nil
+      Celluloid.logger = nil
+    end
   end
 end
 
-Spork.each_run do
+if mri? && ENV['CI'] != 'true'
+  require 'spork'
+
+  Spork.prefork do
+    setup_rspec
+  end
+
+  Spork.each_run do
+    require 'ridley'
+  end
+else
   require 'ridley'
+  setup_rspec
 end