ridley 0.10.2 → 0.11.0.rc1

data/lib/ridley.rb

@@ -36,6 +36,7 @@ module Ridley
   autoload :Connection, 'ridley/connection'
   autoload :ChainLink, 'ridley/chain_link'
   autoload :Chef, 'ridley/chef'
+  autoload :ChefObject, 'ridley/chef_object'
   autoload :DSL, 'ridley/dsl'
   autoload :Logging, 'ridley/logging'
   autoload :Mixin, 'ridley/mixin'
@@ -71,4 +72,5 @@ Celluloid.logger = Ridley.logger
 
 require 'ridley/bootstrap_bindings'
 require 'ridley/middleware'
+require 'ridley/chef_objects'
 require 'ridley/resources'

data/lib/ridley/bootstrap_bindings/unix_template_binding.rb

@@ -1,15 +1,11 @@
-# 
-# Ridley::UnixTemplateBinding
-#   Represents a binding that will be evaluated as an ERB template. When bootstrapping
-#   nodes, an instance of this class represents the customizable and necessary configurations
-#   need by the Host in order to install and connect to Chef. By default, this class will be used
-#   when SSH is the best way to connect to the node.
-# 
-# @author Kyle Allan <kallan@riotgames.com>
-# 
 module Ridley
+  # Represents a binding that will be evaluated as an ERB template. When bootstrapping
+  # nodes, an instance of this class represents the customizable and necessary configurations
+  # needed by the Host in order to install and connect to Chef. By default, this class will be used
+  # when SSH is the best way to connect to the node.
+  #
+  # @author Kyle Allan <kallan@riotgames.com>
   class UnixTemplateBinding
-
     include Ridley::BootstrapBinding
 
     attr_reader :sudo
@@ -20,8 +16,8 @@ module Ridley
     #   filepath to the validator used to bootstrap the node (required)
     # @option options [String] :bootstrap_proxy (nil)
     #   URL to a proxy server to bootstrap through
-    # @option options [String] :encrypted_data_bag_secret_path (nil)
-    #   filepath on your host machine to your organizations encrypted data bag secret
+    # @option options [String] :encrypted_data_bag_secret
+    #   your organizations encrypted data bag secret
     # @option options [Hash] :hints (Hash.new)
     #   a hash of Ohai hints to place on the bootstrapped node
     # @option options [Hash] :attributes (Hash.new)
@@ -41,19 +37,19 @@ module Ridley
       options[:template] ||= default_template
       self.class.validate_options(options)
 
-      @template_file                  = options[:template]
-      @bootstrap_proxy                = options[:bootstrap_proxy]
-      @chef_version                   = options[:chef_version]
-      @sudo                           = options[:sudo]
-      @validator_path                 = options[:validator_path]
-      @encrypted_data_bag_secret_path = options[:encrypted_data_bag_secret_path]
-      @hints                          = options[:hints]
-      @server_url                     = options[:server_url]
-      @validator_client               = options[:validator_client]
-      @node_name                      = options[:node_name]
-      @attributes                     = options[:attributes]
-      @run_list                       = options[:run_list]
-      @environment                    = options[:environment]
+      @template_file             = options[:template]
+      @bootstrap_proxy           = options[:bootstrap_proxy]
+      @chef_version              = options[:chef_version]
+      @sudo                      = options[:sudo]
+      @validator_path            = options[:validator_path]
+      @encrypted_data_bag_secret = options[:encrypted_data_bag_secret]
+      @hints                     = options[:hints]
+      @server_url                = options[:server_url]
+      @validator_client          = options[:validator_client]
+      @node_name                 = options[:node_name]
+      @attributes                = options[:attributes]
+      @run_list                  = options[:run_list]
+      @environment               = options[:environment]
     end
 
     # @return [String]

data/lib/ridley/bootstrap_bindings/windows_template_binding.rb

@@ -1,20 +1,17 @@
-# 
-# Ridley::WindowsTemplateBinding
-#   Represents a binding that will be evaluated as an ERB template. When bootstrapping
-#   nodes, an instance of this class represents the customizable and necessary configurations
-#   need by the Host in order to install and connect to Chef. By default, this class will be used
-#   when WinRM is the best way to connect to the node.
-# 
-# @author Kyle Allan <kallan@riotgames.com>
-# 
-# Windows Specific code written by Seth Chisamore (<schisamo@opscode.com>) in knife-windows
-# https://github.com/opscode/knife-windows/blob/3b8886ddcfb928ca0958cd05b22f8c3d78bee86e/lib/chef/knife/bootstrap/windows-chef-client-msi.erb
-# https://github.com/opscode/knife-windows/blob/78d38bbed358ac20107fc2b5b427f4b5e52e5cb2/lib/chef/knife/core/windows_bootstrap_context.rb
 module Ridley
+  # Represents a binding that will be evaluated as an ERB template. When bootstrapping
+  # nodes, an instance of this class represents the customizable and necessary configurations
+  # needed by the Host in order to install and connect to Chef. By default, this class will be used
+  # when WinRM is the best way to connect to the node.
+  #
+  # @author Kyle Allan <kallan@riotgames.com>
+  #
+  # Windows Specific code written by Seth Chisamore (<schisamo@opscode.com>) in knife-windows
+  # https://github.com/opscode/knife-windows/blob/3b8886ddcfb928ca0958cd05b22f8c3d78bee86e/lib/chef/knife/bootstrap/windows-chef-client-msi.erb
+  # https://github.com/opscode/knife-windows/blob/78d38bbed358ac20107fc2b5b427f4b5e52e5cb2/lib/chef/knife/core/windows_bootstrap_context.rb
   class WindowsTemplateBinding
-
     include Ridley::BootstrapBinding
-    
+
     attr_reader :template_file
 
     # @option options [String] :validator_client
@@ -22,8 +19,8 @@ module Ridley
     #   filepath to the validator used to bootstrap the node (required)
     # @option options [String] :bootstrap_proxy (nil)
     #   URL to a proxy server to bootstrap through
-    # @option options [String] :encrypted_data_bag_secret_path (nil)
-    #   filepath on your host machine to your organizations encrypted data bag secret
+    # @option options [String] :encrypted_data_bag_secret
+    #   your organizations encrypted data bag secret
     # @option options [Hash] :hints (Hash.new)
     #   a hash of Ohai hints to place on the bootstrapped node
     # @option options [Hash] :attributes (Hash.new)
@@ -43,24 +40,24 @@ module Ridley
       options[:template] ||= default_template
       self.class.validate_options(options)
 
-      @template_file                  = options[:template]
-      @bootstrap_proxy                = options[:bootstrap_proxy]
-      @chef_version                   = options[:chef_version] ? options[:chef_version] : "latest"
-      @validator_path                 = options[:validator_path]
-      @encrypted_data_bag_secret_path = options[:encrypted_data_bag_secret_path]
-      @server_url                     = options[:server_url]
-      @validator_client               = options[:validator_client]
-      @node_name                      = options[:node_name]
-      @attributes                     = options[:attributes]
-      @run_list                       = options[:run_list]
-      @environment                    = options[:environment]
+      @template_file             = options[:template]
+      @bootstrap_proxy           = options[:bootstrap_proxy]
+      @chef_version              = options[:chef_version] ? options[:chef_version] : "latest"
+      @validator_path            = options[:validator_path]
+      @encrypted_data_bag_secret = options[:encrypted_data_bag_secret]
+      @server_url                = options[:server_url]
+      @validator_client          = options[:validator_client]
+      @node_name                 = options[:node_name]
+      @attributes                = options[:attributes]
+      @run_list                  = options[:run_list]
+      @environment               = options[:environment]
     end
 
     # @return [String]
     def boot_command
       template.evaluate(self)
     end
-    
+
     # @return [String]
     def chef_config
       body = <<-CONFIG
@@ -112,16 +109,14 @@ CONFIG
 
     # @return [String]
     def encrypted_data_bag_secret
-      return unless encrypted_data_bag_secret_path
+      return unless @encrypted_data_bag_secret
 
-      escape_and_echo(IO.read(encrypted_data_bag_secret_path).chomp)
-    rescue Errno::ENOENT
-      raise Errors::EncryptedDataBagSecretNotFound, "Error bootstrapping: Encrypted data bag secret provided but not found at '#{encrypted_data_bag_secret_path}'"      
+      escape_and_echo(@encrypted_data_bag_secret)
     end
 
     # Implements a Powershell script that attempts a simple
     # 'wget' to download the Chef msi
-    # 
+    #
     # @return [String]
     def windows_wget_powershell
       win_wget_ps = <<-WGET_PS
@@ -130,7 +125,7 @@ param(
  [String] $localPath
 )
 
-$webClient = new-object System.Net.WebClient; 
+$webClient = new-object System.Net.WebClient;
 
 $webClient.DownloadFile($remoteUrl, $localPath);
 WGET_PS

data/lib/ridley/bootstrapper.rb

@@ -27,8 +27,8 @@ module Ridley
     #   filepath to the validator used to bootstrap the node (required)
     # @option options [String] :bootstrap_proxy (nil)
     #   URL to a proxy server to bootstrap through
-    # @option options [String] :encrypted_data_bag_secret_path (nil)
-    #   filepath on your host machine to your organizations encrypted data bag secret
+    # @option options [String] :encrypted_data_bag_secret
+    #   your organizations encrypted data bag secret
     # @option options [Hash] :hints (Hash.new)
     #   a hash of Ohai hints to place on the bootstrapped node
     # @option options [Hash] :attributes (Hash.new)

data/lib/ridley/bootstrapper/context.rb

@@ -21,8 +21,8 @@ module Ridley
         #   filepath to the validator used to bootstrap the node (required)
         # @option options [String] :bootstrap_proxy (nil)
         #   URL to a proxy server to bootstrap through
-        # @option options [String] :encrypted_data_bag_secret_path (nil)
-        #   filepath on your host machine to your organizations encrypted data bag secret
+        # @option options [String] :encrypted_data_bag_secret
+        #   your organizations encrypted data bag secret
         # @option options [Hash] :hints (Hash.new)
         #   a hash of Ohai hints to place on the bootstrapped node
         # @option options [Hash] :attributes (Hash.new)
@@ -67,9 +67,9 @@ module Ridley
       # @param [Ridley::Binding] template_binding
       #   an instance of either the UnixTemplateBinding or WindowsTemplateBinding class
       def initialize(host, host_connector, template_binding)
-        @host                           = host
-        @host_connector                 = host_connector
-        @template_binding               = template_binding
+        @host             = host
+        @host_connector   = host_connector
+        @template_binding = template_binding
       end
 
       # @return [String]

data/lib/ridley/chef.rb

@@ -5,7 +5,6 @@ module Ridley
   # site, and Chef Cookbooks
   module Chef
     autoload :Cookbook, 'ridley/chef/cookbook'
-    autoload :Chefignore, 'ridley/chef/chefignore'
     autoload :Digester, 'ridley/chef/digester'
   end
 end

data/lib/ridley/chef/cookbook.rb

@@ -96,7 +96,6 @@ module Ridley::Chef
         root_files: Array.new
       )
       @frozen        = false
-      @chefignore    = Ridley::Chef::Chefignore.new(@path)
 
       load_files
     end
@@ -208,12 +207,7 @@ module Ridley::Chef
 
     private
 
-      # @return [Array]
       attr_reader :files
-      # @return [Ridley::Chef::Chefignore]
-      attr_reader :chefignore
-
-      def_delegator :chefignore, :ignored?
 
       def load_files
         load_shallow(:recipes, 'recipes', '*.rb')
@@ -231,7 +225,6 @@ module Ridley::Chef
         [].tap do |files|
           Dir.glob(path.join('*'), File::FNM_DOTMATCH).each do |file|
             next if File.directory?(file)
-            next if ignored?(file)
             @files << file
             @manifest[:root_files] << file_metadata(:root_files, file)
           end
@@ -243,7 +236,6 @@ module Ridley::Chef
           file_spec = path.join(category_dir, '**', glob)
           Dir.glob(file_spec, File::FNM_DOTMATCH).each do |file|
             next if File.directory?(file)
-            next if ignored?(file)
             @files << file
             @manifest[category] << file_metadata(category, file)
           end
@@ -253,7 +245,6 @@ module Ridley::Chef
       def load_shallow(category, *path_glob)
         [].tap do |files|
           Dir[path.join(*path_glob)].each do |file|
-            next if ignored?(file)
             @files << file
             @manifest[category] << file_metadata(category, file)
           end

data/lib/ridley/chef_object.rb

@@ -0,0 +1,128 @@
+module Ridley
+  # @author Jamie Winsor <reset@riotgames.com>
+  class ChefObject
+    class << self
+      # @return [String, nil]
+      def chef_id
+        @chef_id
+      end
+
+      # @param [String, Symbol] identifier
+      #
+      # @return [String]
+      def set_chef_id(identifier)
+        @chef_id = identifier.to_sym
+      end
+
+      # @return [String]
+      def chef_type
+        @chef_type ||= self.class.name.underscore
+      end
+
+      # @param [String, Symbol] type
+      #
+      # @return [String]
+      def set_chef_type(type)
+        @chef_type = type.to_s
+        attribute(:chef_type, default: type)
+      end
+
+      # @return [String, nil]
+      def chef_json_class
+        @chef_json_class
+      end
+
+      # @param [String, Symbol] klass
+      #
+      # @return [String]
+      def set_chef_json_class(klass)
+        @chef_json_class = klass
+        attribute(:json_class, default: klass)
+      end
+    end
+
+    include Chozo::VariaModel
+    include Comparable
+
+    # @param [Ridley::Resource] resource
+    # @param [Hash] new_attrs
+    def initialize(resource, new_attrs = {})
+      @resource = resource
+      mass_assign(new_attrs)
+    end
+
+    # Creates a resource on the target remote or updates one if the resource
+    # already exists.
+    #
+    # @raise [Errors::InvalidResource]
+    #   if the resource does not pass validations
+    #
+    # @return [Boolean]
+    def save
+      raise Errors::InvalidResource.new(self.errors) unless valid?
+
+      mass_assign(resource.create(self)._attributes_)
+      true
+    rescue Errors::HTTPConflict
+      self.update
+      true
+    end
+
+    # Updates the instantiated resource on the target remote with any changes made
+    # to self
+    #
+    # @raise [Errors::InvalidResource]
+    #   if the resource does not pass validations
+    #
+    # @return [Boolean]
+    def update
+      raise Errors::InvalidResource.new(self.errors) unless valid?
+
+      mass_assign(resource.update(self)._attributes_)
+      true
+    end
+
+    # Reload the attributes of the instantiated resource
+    #
+    # @return [Object]
+    def reload
+      mass_assign(resource.find(self)._attributes_)
+      self
+    end
+
+    # @return [String]
+    def chef_id
+      get_attribute(self.class.chef_id)
+    end
+
+    def inspect
+      "#<#{self.class} chef_id:#{self.chef_id}, attributes:#{self._attributes_}>"
+    end
+
+    # @param [Object] other
+    #
+    # @return [Boolean]
+    def <=>(other)
+      self.chef_id <=> other.chef_id
+    end
+
+    def ==(other)
+      self.chef_id == other.chef_id
+    end
+
+    # @param [Object] other
+    #
+    # @return [Boolean]
+    def eql?(other)
+      self.class == other.class && self == other
+    end
+
+    def hash
+      self.chef_id.hash
+    end
+
+    private
+
+      attr_reader :resource
+  end
+end

data/lib/ridley/chef_objects.rb

@@ -0,0 +1,3 @@
+Dir["#{File.dirname(__FILE__)}/chef_objects/*.rb"].sort.each do |path|
+  require "ridley/chef_objects/#{File.basename(path, '.rb')}"
+end

data/lib/ridley/chef_objects/client_object.rb

@@ -0,0 +1,55 @@
+module Ridley
+  # @author Jamie Winsor <reset@riotgames.com>
+  class ClientObject < Ridley::ChefObject
+    set_chef_id "name"
+    set_chef_type "client"
+    set_chef_json_class "Chef::ApiClient"
+
+    attribute :name,
+      type: String,
+      required: true
+
+    attribute :admin,
+      type: Boolean,
+      required: true,
+      default: false
+
+    attribute :validator,
+      type: Boolean,
+      required: true,
+      default: false
+
+    attribute :certificate,
+      type: String
+
+    attribute :public_key,
+      type: String
+
+    attribute :private_key,
+      type: [ String, Boolean ]
+
+    attribute :orgname,
+      type: String
+
+    # Regenerates the private key of the instantiated client object. The new
+    # private key will be set to the value of the 'private_key' accessor
+    # of the instantiated client object.
+    #
+    # @return [Boolean]
+    #   true for success and false for failure
+    def regenerate_key
+      self.private_key = true
+      self.save
+    end
+
+    # Override to_json to reflect to massage the returned attributes based on the type
+    # of connection. Only OHC/OPC requires the json_class attribute is not present.
+    def to_json
+      if resource.connection.hosted?
+        to_hash.except(:json_class).to_json
+      else
+        super
+      end
+    end
+  end
+end