ridley 0.3.2 → 0.4.0

data/.rbenv-version

@@ -0,0 +1 @@
+1.9.3-p286

data/.travis.yml

@@ -3,3 +3,4 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+  - jruby-19mode

data/Gemfile

@@ -1,3 +1,48 @@
-source 'https://rubygems.org'
+source :rubygems
 
 gemspec
+
+platforms :jruby do
+  gem 'jruby-openssl'
+end
+
+group :development do
+  gem 'yard'
+  gem 'spork'
+  gem 'guard', '>= 1.5.0'
+  gem 'guard-yard'
+  gem 'guard-rspec'
+  gem 'guard-spork', platforms: :ruby
+  gem 'coolline'
+  gem 'redcarpet', platforms: :ruby
+  gem 'kramdown', platforms: :jruby
+
+  require 'rbconfig'
+
+  if RbConfig::CONFIG['target_os'] =~ /darwin/i
+    gem 'growl', require: false
+    gem 'rb-fsevent', require: false
+
+    if `uname`.strip == 'Darwin' && `sw_vers -productVersion`.strip >= '10.8'
+      gem 'terminal-notifier-guard', '~> 1.5.3', require: false
+    end rescue Errno::ENOENT
+
+  elsif RbConfig::CONFIG['target_os'] =~ /linux/i
+    gem 'libnotify',  '~> 0.8.0', require: false
+    gem 'rb-inotify', require: false
+
+  elsif RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
+    gem 'win32console', require: false
+    gem 'rb-notifu', '>= 0.0.4', require: false
+    gem 'wdm', require: false
+  end
+end
+
+group :test do
+  gem 'thor'
+  gem 'rake', '>= 0.9.2.2'
+  gem 'rspec'
+  gem 'fuubar'
+  gem 'json_spec'
+  gem 'webmock'
+end

data/Guardfile

@@ -1,5 +1,4 @@
 notification :off
-interactor :coolline
 
 guard 'spork' do
   watch('Gemfile')

data/README.md

@@ -345,6 +345,21 @@ And the same goes for setting an environment level override attribute
       obj.save
     end
 
+## Bootstrapping nodes
+
+    conn = Ridley.connection(
+      server_url: "https://api.opscode.com",
+      organization: "vialstudios",
+      validator_client: "vialstudios-validator",
+      validator_path: "/Users/reset/.chef/vialstudios-validator.pem",
+      ssh: {
+        user: "vagrant",
+        password: "vagrant"
+      }
+    )
+
+    conn.node.bootstrap("33.33.33.10", "33.33.33.11")
+
 # Authors and Contributors
 
 * Jamie Winsor (<jamie@vialstudios.com>)

data/Thorfile

@@ -5,25 +5,28 @@ require 'bundler'
 require 'bundler/setup'
 
 require 'ridley'
-require 'thor/rake_compat'
 
 class Default < Thor
-  include Thor::RakeCompat
-  Bundler::GemHelper.install_tasks
-
-  desc "build", "Build ridley-#{Ridley::VERSION}.gem into the pkg directory"
-  def build
-    Rake::Task["build"].execute
-  end
+  unless jruby?
+    require 'thor/rake_compat'
+    
+    include Thor::RakeCompat
+    Bundler::GemHelper.install_tasks
+
+    desc "build", "Build ridley-#{Ridley::VERSION}.gem into the pkg directory"
+    def build
+      Rake::Task["build"].execute
+    end
 
-  desc "install", "Build and install ridley-#{Ridley::VERSION}.gem into system gems"
-  def install
-    Rake::Task["install"].execute
-  end
+    desc "install", "Build and install ridley-#{Ridley::VERSION}.gem into system gems"
+    def install
+      Rake::Task["install"].execute
+    end
 
-  desc "release", "Create tag v#{Ridley::VERSION} and build and push ridley-#{Ridley::VERSION}.gem to Rubygems"
-  def release
-    Rake::Task["release"].execute
+    desc "release", "Create tag v#{Ridley::VERSION} and build and push ridley-#{Ridley::VERSION}.gem to Rubygems"
+    def release
+      Rake::Task["release"].execute
+    end
   end
 
   class Spec < Thor

data/bootstrappers/omnibus.erb

@@ -0,0 +1,73 @@
+bash -c '
+<%= "export http_proxy=\"#{bootstrap_proxy}\"" if bootstrap_proxy -%>
+
+exists() {
+  if command -v $1 &>/dev/null
+  then
+    return 0
+  else
+    return 1
+  fi
+}
+
+install_sh="http://opscode.com/chef/install.sh"
+version_string="-v <%= chef_version %>"
+
+if ! exists /usr/bin/chef-client; then
+  if exists wget; then
+    bash <(wget <%= "--proxy=on " if bootstrap_proxy %> ${install_sh} -O -) ${version_string}
+  else
+    if exists curl; then
+      bash <(curl -L <%= "--proxy=on " if bootstrap_proxy %> ${install_sh}) ${version_string}
+    fi
+  fi
+fi
+
+mkdir -p /etc/chef
+
+(
+cat <<'EOP'
+<%= validation_key %>
+EOP
+) > /tmp/validation.pem
+awk NF /tmp/validation.pem > /etc/chef/validation.pem
+rm /tmp/validation.pem
+chmod 0600 /etc/chef/validation.pem
+
+<% if encrypted_data_bag_secret -%>
+(
+cat <<'EOP'
+<%= encrypted_data_bag_secret %>
+EOP
+) > /tmp/encrypted_data_bag_secret
+awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
+rm /tmp/encrypted_data_bag_secret
+chmod 0600 /etc/chef/encrypted_data_bag_secret
+<% end -%>
+
+<%# Generate Ohai Hints -%>
+<% unless hints.empty? -%>
+mkdir -p /etc/chef/ohai/hints
+
+<% hints.each do |name, hash| -%>
+(
+cat <<'EOP'
+<%= hash.to_json %>
+EOP
+) > /etc/chef/ohai/hints/<%= name %>.json
+<% end -%>
+<% end -%>
+
+(
+cat <<'EOP'
+<%= chef_config %>
+EOP
+) > /etc/chef/client.rb
+
+(
+cat <<'EOP'
+<%= first_boot %>
+EOP
+) > /etc/chef/first-boot.json
+
+<%= chef_run %>'

data/lib/ridley/bootstrapper/context.rb

@@ -0,0 +1,172 @@
+require 'erubis'
+
+module Ridley
+  class Bootstrapper
+    # @author Jamie Winsor <jamie@vialstudios.com>
+    class Context
+      class << self
+        def validate_options(options = {})
+          if options[:server_url].nil?
+            raise Errors::ArgumentError, "A server_url is required for bootstrapping"
+          end
+
+          if options[:validator_path].nil?
+            raise Errors::ArgumentError, "A path to a validator is required for bootstrapping"
+          end
+        end
+      end
+
+      # @return [String]
+      attr_reader :host
+      # @return [String]
+      attr_reader :node_name
+      # @return [String]
+      attr_reader :server_url
+      # @return [String]
+      attr_reader :validator_client
+      # @return [String]
+      attr_reader :validator_path
+      # @return [String]
+      attr_reader :bootstrap_proxy
+      # @return [Hash]
+      attr_reader :hints
+      # @return [String]
+      attr_reader :chef_version
+      # @return [String]
+      attr_reader :environment
+
+      # @param [String] host
+      #   name of the node as identified in Chef
+      # @option options [String] :validator_path
+      #   filepath to the validator used to bootstrap the node (required)
+      # @option options [String] :node_name
+      # @option options [String] :server_url
+      # @option options [String] :validator_client
+      # @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 initialize(host, 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"
+        @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
+      end
+
+      # @return [String]
+      def boot_command
+        cmd = template.evaluate(self)
+
+        if sudo
+          cmd = "sudo #{cmd}"
+        end
+
+        cmd
+      end
+
+      # @return [String]
+      def clean_command
+        "rm /etc/chef/first-boot.json; rm /etc/chef/validation.pem"
+      end
+
+      # @return [String]
+      def chef_run
+        "chef-client -j /etc/chef/first-boot.json -E #{environment}"
+      end
+
+      # @return [String]
+      def chef_config
+        body = <<-CONFIG
+log_level        :info
+log_location     STDOUT
+chef_server_url  "#{server_url}"
+validation_client_name "#{validator_client}"
+CONFIG
+
+        if node_name.present?
+          body << %Q{node_name "#{node_name}"\n}
+        else
+          body << "# Using default node name (fqdn)\n"
+        end
+
+        if bootstrap_proxy.present?
+          body << %Q{http_proxy        "#{bootstrap_proxy}"\n}
+          body << %Q{https_proxy       "#{bootstrap_proxy}"\n}
+        end
+
+        if encrypted_data_bag_secret.present?
+          body << %Q{encrypted_data_bag_secret "/etc/chef/encrypted_data_bag_secret"\n}
+        end
+
+        body
+      end
+
+      # @return [String]
+      def first_boot
+        attributes.merge(run_list: run_list).to_json
+      end
+
+      # The validation key to create a new client for the node
+      #
+      # @raise [Ridley::Errors::ValidatorNotFound]
+      #
+      # @return [String]
+      def validation_key
+        IO.read(validator_path).chomp
+      rescue Errno::ENOENT
+        raise Errors::ValidatorNotFound, "Error bootstrapping: Validator not found at '#{validator_path}'"
+      end
+
+      # @raise [Ridley::Errors::EncryptedDataBagSecretNotFound]
+      #
+      # @return [String, nil]
+      def encrypted_data_bag_secret
+        return nil if encrypted_data_bag_secret_path.nil?
+
+        IO.read(encrypted_data_bag_secret_path).chomp
+      rescue Errno::ENOENT => encrypted_data_bag_secret
+        raise Errors::EncryptedDataBagSecretNotFound, "Error bootstrapping: Encrypted data bag secret provided but not found at '#{encrypted_data_bag_secret_path}"
+      end
+
+      private
+
+        attr_reader :sudo
+        attr_reader :template_file
+        attr_reader :encrypted_data_bag_secret_path
+        attr_reader :validator_path
+        attr_reader :run_list
+        attr_reader :attributes
+
+        # @return [Erubis::Eruby]
+        def template
+          Erubis::Eruby.new(IO.read(template_file).chomp)
+        end
+    end
+  end
+end

data/lib/ridley/bootstrapper.rb

@@ -0,0 +1,99 @@
+module Ridley
+  # @author Jamie Winsor <jamie@vialstudios.com>
+  class Bootstrapper
+    autoload :Context, 'ridley/bootstrapper/context'
+
+    class << self
+      # @return [Pathname]
+      def templates_path
+        Ridley.root.join('bootstrappers')
+      end
+
+      # @return [String]
+      def default_template
+        templates_path.join('omnibus.erb').to_s
+      end
+    end
+
+    include Celluloid
+    include Celluloid::Logger
+
+    # @return [Array<String>]
+    attr_reader :hosts
+
+    # @return [Array<Bootstrapper::Context>]
+    attr_reader :contexts
+
+    # @return [Hash]
+    attr_reader :ssh_config
+
+    # @param [Array<#to_s>] hosts
+    # @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 initialize(hosts, options = {})
+      @hosts      = Array(hosts).collect(&:to_s).uniq
+      @ssh_config = {
+        user: options.fetch(:ssh_user),
+        password: options[:ssh_password],
+        keys: options[:ssh_keys],
+        timeout: (options[:ssh_timeout] || 1.5)
+      }
+
+      @contexts = @hosts.collect do |host|
+        Context.new(host, options)
+      end
+    end
+
+    # @return [SSH::ResponseSet]
+    def run
+      if contexts.length >= 2
+        pool = SSH::Worker.pool(size: contexts.length, args: [self.ssh_config])
+      else
+        pool = SSH::Worker.new(self.ssh_config)
+      end
+
+      responses = contexts.collect do |context|
+        pool.future.run(context.host, context.boot_command)
+      end.collect(&:value)
+
+      SSH::ResponseSet.new.tap do |response_set|
+        responses.each do |message|
+          status, response = message
+
+          case status
+          when :ok
+            response_set.add_ok(response)
+          when :error
+            response_set.add_error(response)
+          end
+        end
+      end
+    ensure
+      pool.terminate if pool
+    end
+  end
+end

data/lib/ridley/chain_link.rb

@@ -0,0 +1,25 @@
+module Ridley
+  # @author Jamie Winsor <jamie@vialstudios.com>
+  # @api private
+  class ChainLink
+    attr_reader :parent
+    attr_reader :child
+
+    # @param [Class, Object] parent
+    #   the parent class or object to send to the child
+    # @param [Class, Object] child
+    #   the child class or instance to delegate functions to
+    def initialize(parent, child)
+      @parent = parent
+      @child  = child
+    end
+
+    def new(*args)
+      child.send(:new, parent, *args)
+    end
+
+    def method_missing(fun, *args, &block)
+      child.send(fun, parent, *args, &block)
+    end
+  end
+end

data/lib/ridley/connection.rb

@@ -25,6 +25,11 @@ module Ridley
     attr_reader :client_name
     attr_reader :client_key
     attr_reader :organization
+    attr_reader :ssh
+
+    attr_reader :validator_client
+    attr_reader :validator_path
+    attr_reader :encrypted_data_bag_secret_path
 
     attr_accessor :thread_count
 
@@ -35,6 +40,7 @@ module Ridley
     def_delegator :conn, :path_prefix
 
     def_delegator :conn, :url_prefix=
+    def_delegator :conn, :url_prefix
 
     def_delegator :conn, :get
     def_delegator :conn, :put
@@ -48,7 +54,7 @@ module Ridley
       :server_url,
       :client_name,
       :client_key
-    ]
+    ].freeze
 
     DEFAULT_THREAD_COUNT = 8
 
@@ -62,7 +68,15 @@ module Ridley
     # @option options [String] :organization
     #   the Organization to connect to. This is only used if you are connecting to
     #   private Chef or hosted Chef
+    # @option options [String] :validator_client
+    #   (default: nil)
+    # @option options [String] :validator_path
+    #   (default: nil)
+    # @option options [String] :encrypted_data_bag_secret_path
+    #   (default: nil)
     # @option options [Integer] :thread_count
+    # @option options [Hash] :ssh
+    #   authentication credentials for bootstrapping or connecting to nodes (default: Hash.new)
     # @option options [Hash] :params
     #   URI query unencoded key/value pairs
     # @option options [Hash] :headers
@@ -76,10 +90,14 @@ module Ridley
     def initialize(options = {})
       self.class.validate_options(options)
 
-      @client_name  = options.fetch(:client_name)
-      @client_key   = options.fetch(:client_key)
-      @organization = options.fetch(:organization, nil)
-      @thread_count = options.fetch(:thread_count, DEFAULT_THREAD_COUNT)
+      @client_name      = options.fetch(:client_name)
+      @client_key       = options.fetch(:client_key)
+      @organization     = options[:organization]
+      @thread_count     = (options[:thread_count] || DEFAULT_THREAD_COUNT)
+      @ssh              = (options[:ssh] || Hash.new)
+      @validator_client = options[:validator_client]
+      @validator_path   = options[:validator_path]
+      @encrypted_data_bag_secret_path = options[:encrypted_data_bag_secret_path]
 
       unless @client_key.present? && File.exist?(@client_key)
         raise Errors::ClientKeyFileNotFound, "client key not found at: '#{@client_key}'"
@@ -134,6 +152,10 @@ module Ridley
       api_type == :foss
     end
 
+    def server_url
+      self.url_prefix.to_s
+    end
+
     private
 
       attr_reader :conn

data/lib/ridley/errors.rb

@@ -3,6 +3,9 @@ module Ridley
   module Errors
     class RidleyError < StandardError; end
     class InternalError < RidleyError; end
+    class ArgumentError < InternalError; end
+
+    class ValidatorNotFound < RidleyError; end
 
     class InvalidResource < RidleyError
       attr_reader :errors
@@ -17,7 +20,9 @@ module Ridley
       alias_method :to_s, :message
     end
 
-    class ClientKeyFileNotFound < RidleyError; end
+    class BootstrapError < RidleyError; end
+    class ClientKeyFileNotFound < BootstrapError; end
+    class EncryptedDataBagSecretNotFound < BootstrapError; end
 
     class HTTPError < RidleyError
       class << self

data/lib/ridley/logging.rb

@@ -0,0 +1,30 @@
+require 'logger'
+
+module Ridley
+  # @author Jamie Winsor <jamie@vialstudios.com>
+  module Logging
+    class << self
+      # @return [Logger]
+      def logger
+        @logger ||= begin
+          log = Logger.new(STDOUT)
+          log.level = Logger::INFO
+          log
+        end
+      end
+
+      # @param [Logger, nil] obj
+      #
+      # @return [Logger]
+      def set_logger(obj)
+        @logger = (obj.nil? ? Logger.new('/dev/null') : obj)
+      end
+    end
+
+    # @return [Logger]
+    def logger
+      Ridley::Logging.logger
+    end
+    alias_method :log, :logger
+  end
+end

data/lib/ridley/resources/client.rb

@@ -64,12 +64,12 @@ module Ridley
     # Coerces instance functions into class functions on Ridley::Client. 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::Client
     def client
-      Context.new(Ridley::Client, self)
+      ChainLink.new(self, Ridley::Client)
     end
   end
 end

data/lib/ridley/resources/cookbook.rb

@@ -42,12 +42,12 @@ module Ridley
     # Coerces instance functions into class functions on Ridley::Cookbook. 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::Cookbook
     def cookbook
-      Context.new(Ridley::Cookbook, self)
+      ChainLink.new(self, Ridley::Cookbook)
     end
   end
 end