ridley 0.5.1 → 0.5.2

data/lib/ridley/bootstrapper/context.rb

@@ -14,6 +14,22 @@ module Ridley
             raise Errors::ArgumentError, "A path to a validator is required for bootstrapping"
           end
         end
+
+        # A hash of default options to be used in the Context initializer
+        #
+        # @return [Hash]
+        def default_options
+          @default_options ||= {
+            validator_client: "chef-validator",
+            hints: Hash.new,
+            attributes: Hash.new,
+            run_list: Array.new,
+            chef_version: Ridley::CHEF_VERSION,
+            environment: "_default",
+            sudo: true,
+            template: Bootstrapper.default_template
+          }
+        end
       end
 
       # @return [String]
@@ -61,22 +77,23 @@ module Ridley
       # @option options [String] :template
       #   bootstrap template to use (default: omnibus)
       def initialize(host, options = {})
+        options = self.class.default_options.merge(options)
         self.class.validate_options(options)
 
         @host                           = host
         @server_url                     = options[:server_url]
         @validator_path                 = options[:validator_path]
         @node_name                      = options[:node_name]
-        @validator_client               = options[:validator_client] || "chef-validator"
+        @validator_client               = options[:validator_client]
         @bootstrap_proxy                = options[:bootstrap_proxy]
         @encrypted_data_bag_secret_path = options[:encrypted_data_bag_secret_path]
-        @hints                          = options[:hints] || Hash.new
-        @attributes                     = options[:attributes] || Hash.new
-        @run_list                       = options[:run_list] || Array.new
-        @chef_version                   = options[:chef_version] || Ridley::CHEF_VERSION
-        @environment                    = options[:environment] || "_default"
-        @sudo                           = options[:sudo] || true
-        @template_file                  = options[:template] || Bootstrapper.default_template
+        @hints                          = options[:hints]
+        @attributes                     = options[:attributes]
+        @run_list                       = options[:run_list]
+        @chef_version                   = options[:chef_version]
+        @environment                    = options[:environment]
+        @sudo                           = options[:sudo]
+        @template_file                  = options[:template]
       end
 
       # @return [String]

data/lib/ridley/connection.rb

@@ -17,6 +17,16 @@ module Ridley
           raise ArgumentError, "Missing required option(s): #{missing.join(', ')}"
         end
       end
+
+      # A hash of default options to be used in the Connection initializer
+      #
+      # @return [Hash]
+      def default_options
+        {
+          thread_count: DEFAULT_THREAD_COUNT,
+          ssh: Hash.new
+        }
+      end
     end
 
     extend Forwardable
@@ -88,13 +98,14 @@ module Ridley
     # @option options [URI, String, Hash] :proxy
     #   URI, String, or Hash of HTTP proxy options
     def initialize(options = {})
+      options = self.class.default_options.merge(options)
       self.class.validate_options(options)
 
       @client_name      = options[:client_name]
       @client_key       = File.expand_path(options[:client_key])
       @organization     = options[:organization]
-      @thread_count     = (options[:thread_count] || DEFAULT_THREAD_COUNT)
-      @ssh              = (options[:ssh] || Hash.new)
+      @thread_count     = options[:thread_count]
+      @ssh              = options[:ssh]
       @validator_client = options[:validator_client]
       @validator_path   = options[:validator_path]
       @encrypted_data_bag_secret_path = options[:encrypted_data_bag_secret_path]

data/lib/ridley/resources/node.rb

@@ -34,13 +34,17 @@ module Ridley
       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
+        default_options = {
+          server_url: connection.server_url,
+          ssh_user: connection.ssh[:user],
+          ssh_password: connection.ssh[:password],
+          ssh_timeout: connection.ssh[:timeout],
+          validator_path: connection.validator_path,
+          validator_client: connection.validator_client,
+          encrypted_data_bag_secret_path: connection.encrypted_data_bag_secret_path
+        }
+
+        options = default_options.merge(options)
 
         Bootstrapper.new(args, options).run
       end

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/unit/ridley/bootstrapper/context_spec.rb

@@ -16,6 +16,20 @@ describe Ridley::Bootstrapper::Context do
     subject { Ridley::Bootstrapper::Context }
 
     describe "::new" do
+      it "sets a default value of 'true' to 'sudo'" do
+        options.delete(:sudo)
+        obj = subject.new(host, options)
+
+        obj.send(:sudo).should be_true
+      end
+
+      it "sets the value of sudo to 'false' if provided" do
+        options.merge!(sudo: false)
+        obj = subject.new(host, options)
+
+        obj.send(:sudo).should be_false
+      end
+
       context "when validator_path is not specified" do
         let(:options) { Hash.new }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -305,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4545606646369102038
+      hash: -675121695435893823
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23