ridley 0.9.1 → 0.10.0.rc1

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 *.sw[op]
+.DS_Store

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3-p392

data/Guardfile

@@ -12,7 +12,7 @@ guard 'yard', stdout: '/dev/null', stderr: '/dev/null' do
   watch(%r{ext/.+\.c})
 end
 
-guard 'rspec', cli: "--color --drb --format Fuubar", all_on_start: false, all_after_pass: false do
+guard 'rspec', cli: "--color --drb --format Fuubar --tag ~type:acceptance", all_on_start: false, all_after_pass: false do
   watch(%r{^spec/unit/.+_spec\.rb$})
   watch(%r{^spec/acceptance/.+_spec\.rb$})
   

data/README.md

@@ -2,7 +2,7 @@
 [![Gem Version](https://badge.fury.io/rb/ridley.png)](http://badge.fury.io/rb/ridley)
 [![Build Status](https://secure.travis-ci.org/RiotGames/ridley.png?branch=master)](http://travis-ci.org/RiotGames/ridley)
 [![Dependency Status](https://gemnasium.com/RiotGames/ridley.png?travis)](https://gemnasium.com/RiotGames/ridley)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/RiotGames/ridley)
+[![Code Climate](https://codeclimate.com/github/RiotGames/ridley.png)](https://codeclimate.com/github/RiotGames/ridley)
 
 A reliable Chef API client with a clean syntax
 

data/bootstrappers/{omnibus.erb → unix_omnibus.erb}

@@ -10,17 +10,32 @@ exists() {
   fi
 }
 
-install_sh="http://opscode.com/chef/install.sh"
-version_string="-v <%= chef_version %>"
+install_chef() {
+  install_sh="http://opscode.com/chef/install.sh"
+  proxy_string="<%= "--proxy=on " if bootstrap_proxy %>"
+
+  if [[ $requested_chef_version != "" ]]; then
+    version_string="-v $requested_chef_version"
+  else
+    version_string=""
+  fi
 
-if ! exists /usr/bin/chef-client; then
   if exists wget; then
-    bash <(wget <%= "--proxy=on " if bootstrap_proxy %> ${install_sh} -O -) ${version_string}
+    bash <(wget ${proxy_string} ${install_sh} -O -) ${version_string}
   else
     if exists curl; then
-      bash <(curl -L <%= "--proxy=on " if bootstrap_proxy %> ${install_sh}) ${version_string}
+      bash <(curl -L ${proxy_string} ${install_sh}) ${version_string}
     fi
   fi
+}
+
+requested_chef_version="<%= chef_version %>"
+installed_chef_version="$(which chef-client &>/dev/null && chef-client -v | cut -f 2 -d " ")"
+
+if [[ ! $installed_chef_version ]]; then
+  install_chef
+elif [[ ($requested_chef_version != "") && ($installed_chef_version != $requested_chef_version) ]]; then
+  install_chef
 fi
 
 mkdir -p /etc/chef

data/bootstrappers/windows_omnibus.erb

@@ -0,0 +1,133 @@
+@echo off
+
+rem Author:: Kyle Allan (<kallan@riotgames.com>)
+rem Original Author:
+rem
+rem Author:: Seth Chisamore (<schisam@oopscode.com>)
+rem Copyright:: Copyright (c) 2011 Opscode, Inc.
+rem License:: Apache License, Version 2.0
+rem
+rem Licensed under the Apache License, Version 2.0 (the "License");
+rem you may not use this file except in compliance with the License.
+rem You may obtain a copy of the License at
+rem
+rem     http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+rem
+
+setlocal
+
+<%= "SETX HTTP_PROXY \"#{bootstrap_proxy}\"" if bootstrap_proxy %>
+mkdir <%= bootstrap_directory %>
+
+> <%= bootstrap_directory %>\wget.vbs (
+ <%= windows_wget_vb %>
+)
+
+> <%= bootstrap_directory %>\wget.ps1 (
+ <%= windows_wget_powershell %>
+)
+
+rem Determine the version and the architecture
+
+FOR /F "tokens=1-8 delims=.[] " %%A IN ('ver') DO (
+set WinMajor=%%D
+set WinMinor=%%E
+set WinBuild=%%F
+)
+
+goto Version%WinMajor%.%WinMinor%
+
+rem If this is an unknown version of windows set the default
+set MACHINE_OS=2008r2
+goto architecture
+
+:Version6.0
+set MACHINE_OS=2008
+goto architecture
+
+:Version5.2
+set MACHINE_OS=2003r2
+goto architecture
+
+:Version6.1
+set MACHINE_OS=2008r2
+goto architecture
+
+:Version6.2
+set MACHINE_OS=2012
+goto architecture
+
+:architecture
+
+goto Architecture%PROCESSOR_ARCHITECTURE%
+
+rem If this is an unknown architecture set the default
+set MACHINE_ARCH=i686
+goto install
+
+:Architecturex86
+set MACHINE_ARCH=i686
+goto install
+
+:Architectureamd64
+set MACHINE_ARCH=x86_64
+goto install
+
+:install
+rem Install Chef using chef-client MSI installer
+
+set "VERSION_STRING=<%= chef_version %>"
+set "REMOTE_SOURCE_MSI_URL=https://www.opscode.com/chef/download?p=windows&pv=%MACHINE_OS%&m=%MACHINE_ARCH%&v=%VERSION_STRING%"
+set "LOCAL_DESTINATION_MSI_PATH=<%= local_download_path %>"
+set "FALLBACK_QUERY_STRING=&DownloadContext=PowerShell"
+
+cscript /nologo <%= bootstrap_directory %>\wget.vbs /url:"%REMOTE_SOURCE_MSI_URL%" /path:"%LOCAL_DESTINATION_MSI_PATH%"
+
+rem Work around issues found in Windows Server 2012 around job objects not respecting WSMAN memory quotas
+rem that cause the MSI download process to exceed the quota even when it is increased by administrators.
+rem Retry the download using a more memory-efficient mechanism that only works if PowerShell is available.
+if ERRORLEVEL 1 (      
+    echo Warning: Failed to download "%REMOTE_SOURCE_MSI_URL%" to "%LOCAL_DESTINATION_MSI_PATH%"
+    echo Warning: Retrying download with PowerShell if available
+    if EXIST "%LOCAL_DESTINATION_MSI_PATH%" del /f /q "%LOCAL_DESTINATION_MSI_PATH%"
+    powershell -ExecutionPolicy Unrestricted -NoProfile -NonInteractive "& '<%= bootstrap_directory %>\wget.ps1' '%REMOTE_SOURCE_MSI_URL%%FALLBACK_QUERY_STRING%' '%LOCAL_DESTINATION_MSI_PATH%'"
+
+    if NOT ERRORLEVEL 1 (
+        echo Download succeeded
+    ) else (
+        echo Failed to download "%REMOTE_SOURCE_MSI_URL%"
+        echo Subsequent attempt to install the downloaded MSI is likely to fail
+    )
+)
+
+<%= install_chef %>
+
+endlocal
+
+> <%= bootstrap_directory %>\validation.pem (
+ <%= validation_key %>
+)
+
+<% if encrypted_data_bag_secret -%>
+> <%= bootstrap_directory %>\encrypted_data_bag_secret (
+ <%= encrypted_data_bag_secret %>
+)
+<% end -%>
+
+> <%= bootstrap_directory %>\client.rb (
+ <%= chef_config %>
+)
+
+> <%= bootstrap_directory %>\first-boot.json (
+ <%= first_boot %>
+)
+
+<%= set_path %>
+
+<%= chef_run %>

data/lib/ridley.rb

@@ -1,3 +1,5 @@
+# Requiring winrm here because of https://github.com/WinRb/WinRM/issues/39
+require 'winrm'
 require 'chozo'
 require 'celluloid'
 require 'faraday'
@@ -34,7 +36,7 @@ module Ridley
   autoload :Mixin, 'ridley/mixin'
   autoload :Resource, 'ridley/resource'
   autoload :SandboxUploader, 'ridley/sandbox_uploader'
-  autoload :SSH, 'ridley/ssh'
+  autoload :HostConnector, 'ridley/host_connector'
 
   class << self
     extend Forwardable
@@ -62,5 +64,6 @@ end
 
 Celluloid.logger = Ridley.logger
 
+require 'ridley/bootstrap_bindings'
 require 'ridley/middleware'
 require 'ridley/resources'

data/lib/ridley/bootstrap_bindings.rb

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

data/lib/ridley/bootstrap_bindings/unix_template_binding.rb

@@ -0,0 +1,112 @@
+# 
+# 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
+  class UnixTemplateBinding
+
+    include Ridley::BootstrapBinding
+
+    attr_reader :sudo
+    attr_reader :hints
+
+    # @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 (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 [Hash] :hints (Hash.new)
+    #   a hash of Ohai hints to place on the bootstrapped node
+    # @option options [Hash] :attributes (Hash.new)
+    #   a hash of attributes to use in the first Chef run
+    # @option options [Array] :run_list (Array.new)
+    #   an initial run list to bootstrap with
+    # @option options [String] :chef_version (nil)
+    #   version of Chef to install on the node
+    # @option options [String] :environment ('_default')
+    #   environment to join the node to
+    # @option options [Boolean] :sudo (true)
+    #   bootstrap with sudo (default: true)
+    # @option options [String] :template ('unix_omnibus')
+    #   bootstrap template to use
+    def initialize(options = {})
+      options = self.class.default_options.merge(options)
+      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]
+    end
+
+    # @return [String]
+    def boot_command
+      cmd = template.evaluate(self)
+
+      if sudo
+        cmd = "sudo #{cmd}"
+      end
+
+      cmd
+    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 "#{bootstrap_directory}/encrypted_data_bag_secret"\n}
+      end
+
+      body
+    end
+
+    # @return [String]
+    def bootstrap_directory
+      "/etc/chef"
+    end
+
+    # @return [String]
+    def chef_run
+      "chef-client -j #{bootstrap_directory}/first-boot.json -E #{environment}"
+    end
+
+    # @return [String]
+    def default_template
+      templates_path.join('unix_omnibus.erb').to_s
+    end
+  end
+end

data/lib/ridley/bootstrap_bindings/windows_template_binding.rb

@@ -0,0 +1,221 @@
+# 
+# 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
+  class WindowsTemplateBinding
+
+    include Ridley::BootstrapBinding
+    
+    attr_reader :template_file
+
+    # @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 (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 [Hash] :hints (Hash.new)
+    #   a hash of Ohai hints to place on the bootstrapped node
+    # @option options [Hash] :attributes (Hash.new)
+    #   a hash of attributes to use in the first Chef run
+    # @option options [Array] :run_list (Array.new)
+    #   an initial run list to bootstrap with
+    # @option options [String] :chef_version (nil)
+    #   version of Chef to install on the node
+    # @option options [String] :environment ('_default')
+    #   environment to join the node to
+    # @option options [Boolean] :sudo (true)
+    #   bootstrap with sudo (default: true)
+    # @option options [String] :template ('windows_omnibus')
+    #   bootstrap template to use
+    def initialize(options)
+      options = self.class.default_options.merge(options)
+      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]
+    end
+
+    # @return [String]
+    def boot_command
+      template.evaluate(self)
+    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 "#{bootstrap_directory}\\encrypted_data_bag_secret"\n}
+      end
+
+      escape_and_echo(body)
+    end
+
+    # @return [String]
+    def bootstrap_directory
+      "C:\\chef"
+    end
+
+    # @return [String]
+    def validation_key
+      escape_and_echo(IO.read(File.expand_path(validator_path)).chomp)
+    rescue Errno::ENOENT
+      raise Errors::ValidatorNotFound, "Error bootstrapping: Validator not found at '#{validator_path}'"
+    end
+
+    # @return [String]
+    def chef_run
+      "chef-client -j #{bootstrap_directory}\\first-boot.json -E #{environment}"
+    end
+
+    # @return [String]
+    def default_template
+      templates_path.join('windows_omnibus.erb').to_s
+    end
+
+    # @return [String]
+    def encrypted_data_bag_secret
+      return unless encrypted_data_bag_secret_path
+
+      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}'"      
+    end
+
+    # Implements a Visual Basic script that attempts a simple
+    # 'wget' to download the Chef msi
+    # 
+    # @return [String]
+    def windows_wget_vb
+      win_wget = <<-WGET
+url = WScript.Arguments.Named("url")
+path = WScript.Arguments.Named("path")
+proxy = null
+Set objXMLHTTP = CreateObject("MSXML2.ServerXMLHTTP")
+Set wshShell = CreateObject( "WScript.Shell" )
+Set objUserVariables = wshShell.Environment("USER")
+
+'http proxy is optional
+'attempt to read from HTTP_PROXY env var first
+On Error Resume Next
+
+If NOT (objUserVariables("HTTP_PROXY") = "") Then
+proxy = objUserVariables("HTTP_PROXY")
+
+'fall back to named arg
+ElseIf NOT (WScript.Arguments.Named("proxy") = "") Then
+proxy = WScript.Arguments.Named("proxy")
+End If
+
+If NOT isNull(proxy) Then
+'setProxy method is only available on ServerXMLHTTP 6.0+
+Set objXMLHTTP = CreateObject("MSXML2.ServerXMLHTTP.6.0")
+objXMLHTTP.setProxy 2, proxy
+End If
+
+On Error Goto 0
+
+objXMLHTTP.open "GET", url, false
+objXMLHTTP.send()
+If objXMLHTTP.Status = 200 Then
+Set objADOStream = CreateObject("ADODB.Stream")
+objADOStream.Open
+objADOStream.Type = 1
+objADOStream.Write objXMLHTTP.ResponseBody
+objADOStream.Position = 0
+Set objFSO = Createobject("Scripting.FileSystemObject")
+If objFSO.Fileexists(path) Then objFSO.DeleteFile path
+Set objFSO = Nothing
+objADOStream.SaveToFile path
+objADOStream.Close
+Set objADOStream = Nothing
+End if
+Set objXMLHTTP = Nothing
+WGET
+      escape_and_echo(win_wget)
+    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
+param(
+ [String] $remoteUrl,
+ [String] $localPath
+)
+
+$webClient = new-object System.Net.WebClient; 
+
+$webClient.DownloadFile($remoteUrl, $localPath);
+WGET_PS
+
+      escape_and_echo(win_wget_ps)
+    end
+
+    # @return [String]
+    def install_chef
+      'msiexec /qb /i "%LOCAL_DESTINATION_MSI_PATH%"'
+    end
+
+    # @return [String]
+    def first_boot
+      escape_and_echo(MultiJson.encode attributes.merge(run_list: run_list))
+    end
+
+    # @return [String]
+    def set_path
+      "SET \"PATH=%PATH%;C:\\ruby\\bin;C:\\opscode\\chef\\bin;C:\\opscode\\chef\\embedded\\bin\"\n"
+    end
+
+    # @return [String]
+    def local_download_path
+      "%TEMP%\\chef-client-#{chef_version}.msi"
+    end
+
+    # escape WIN BATCH special chars
+    # and prefixes each line with an
+    # echo
+    def escape_and_echo(file_contents)
+      file_contents.gsub(/^(.*)$/, 'echo.\1').gsub(/([(<|>)^])/, '^\1')
+    end
+  end
+end