ridley 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 671f8cbe8bd8971f86b37681c2e2e607ce379e01
-  data.tar.gz: dca7dbfa8709346fd021d688277f5bb4c1c60cba
+  metadata.gz: 968e81fedae6ac8df2b43fa45ba63c2675649712
+  data.tar.gz: 8355ce066cb04cb21759e6392719c5f555370697
 SHA512:
-  metadata.gz: 0d8d2ed4e008bfc5ee20c67114a97823c5ad944d7b6bc62ba1e05ed519474aba4f9d2100bb98d37335837917a64077b8710d3201d0f83467d5a83ccf55ba6601
-  data.tar.gz: b2c9e1b9d4a5f21100adbe9e0733134c829f28cfa00fdc4cf7d07fc5dd7c06744a25011eb0110d6114264a41d6f35f4f4a3931b29fe481b1d597d991f5342660
+  metadata.gz: 0bc2d17acabc40f0aa5115cc2984ba6e065a8edaac9c5711a8c2a191af51ac634b758d341a1e3b948aa1de3e1529e8422dd381d7c847fc904f65fee0e5fbeb7c
+  data.tar.gz: eddbbb6c33c0a06e3a6ccc845ccf98b1f4df87f689115bb57b6d56d0beadd57facd41f74888ab9ad4e273f49a4376159139d04e10b8117b47585aabff674d500

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 3.1.0
+
+* Fix issue with evaluating metadata generated by older versions of knife
+* Move remaining host-connector code out of Ridley and into Ridley-Connectors
+
+# 3.0.0
+
+* Update Faraday
+* Update Celluloid
+* Fix noise in chefignore when debug flag is turned on
+* Fix issue reading files that contain UTF-8
+
 # 2.5.1
 
 * Fix no method error bug in partial search

data/lib/ridley.rb

@@ -55,18 +55,11 @@ module Ridley
     def root
       @root ||= Pathname.new(File.expand_path('../', File.dirname(__FILE__)))
     end
-
-    # @return [Pathname]
-    def scripts
-      root.join('scripts')
-    end
   end
 
   require_relative 'ridley/mixin'
   require_relative 'ridley/logging'
   require_relative 'ridley/logger'
-  require_relative 'ridley/bootstrap_context'
-  require_relative 'ridley/command_context'
   require_relative 'ridley/chef_object'
   require_relative 'ridley/chef_objects'
   require_relative 'ridley/client'

data/lib/ridley/chef/cookbook/metadata.rb

@@ -440,7 +440,7 @@ module Ridley::Chef
         @maintainer       = o[MAINTAINER] if o.has_key?(MAINTAINER)
         @maintainer_email = o[MAINTAINER_EMAIL] if o.has_key?(MAINTAINER_EMAIL)
         @license          = o[LICENSE] if o.has_key?(LICENSE)
-        @platforms        = o[PLATFORMS] if o.has_key?(PLATFORMS)
+        @platforms        = handle_deprecated_constraints(o[PLATFORMS]) if o.has_key?(PLATFORMS)
         @dependencies     = handle_deprecated_constraints(o[DEPENDENCIES]) if o.has_key?(DEPENDENCIES)
         @recommendations  = handle_deprecated_constraints(o[RECOMMENDATIONS]) if o.has_key?(RECOMMENDATIONS)
         @suggestions      = handle_deprecated_constraints(o[SUGGESTIONS]) if o.has_key?(SUGGESTIONS)
@@ -548,15 +548,20 @@ module Ridley::Chef
         # Before we began respecting version constraints, we allowed
         # multiple constraints to be placed on cookbooks, as well as the
         # << and >> operators, which are now just < and >. For
-        # specifications with more than one constraint, we return an
-        # empty array (otherwise, we're silently abiding only part of
-        # the contract they have specified to us). If there is only one
+        # specifications with more than one constraint, this method switches to
+        # the default constraint from SemVerse. If there is only one
         # constraint, we are replacing the old << and >> with the new <
         # and >.
         def handle_deprecated_constraints(specification)
           specification.inject(Hashie::Mash.new) do |acc, (cb, constraints)|
             constraints = Array(constraints)
-            acc[cb] = (constraints.empty? || constraints.size > 1) ? [] : constraints.first.gsub(/>>/, '>').gsub(/<</, '<')
+
+            acc[cb] = if constraints.size == 1
+              constraints.first.gsub(/>>/, '>').gsub(/<</, '<')
+            else
+              Semverse::DEFAULT_CONSTRAINT.to_s
+            end
+
             acc
           end
         end

data/lib/ridley/errors.rb

@@ -66,27 +66,8 @@ module Ridley
       alias_method :message, :to_s
     end
 
-    class BootstrapError < RidleyError; end
-    class ClientKeyFileNotFoundOrInvalid < BootstrapError; end
-    class EncryptedDataBagSecretNotFound < BootstrapError; end
-
-    class HostConnectionError < RidleyError; end
-    class DNSResolvError < HostConnectionError; end
-
-    class RemoteCommandError < RidleyError; end
-    class RemoteScriptError < RemoteCommandError; end
-    class CommandNotProvided < RemoteCommandError
-      attr_reader :connector_type
-
-      # @params [Symbol] connector_type
-      def initialize(connector_type)
-        @connector_type = connector_type
-      end
-
-      def to_s
-        "No command provided in #{connector_type.inspect}, however the #{connector_type.inspect} connector was selected."
-      end
-    end
+    class ClientKeyFileNotFoundOrInvalid < RidleyError; end
+    class EncryptedDataBagSecretNotFound < RidleyError; end
 
     # Exception thrown when the maximum amount of requests is exceeded.
     class RedirectLimitReached < RidleyError

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "3.0.0"
+  VERSION = "3.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -266,12 +266,7 @@ files:
 - LICENSE
 - README.md
 - Thorfile
-- bootstrappers/unix_omnibus.erb
-- bootstrappers/windows_omnibus.erb
 - lib/ridley.rb
-- lib/ridley/bootstrap_context.rb
-- lib/ridley/bootstrap_context/unix.rb
-- lib/ridley/bootstrap_context/windows.rb
 - lib/ridley/chef.rb
 - lib/ridley/chef/chefignore.rb
 - lib/ridley/chef/config.rb
@@ -291,9 +286,6 @@ files:
 - lib/ridley/chef_objects/sandbox_object.rb
 - lib/ridley/chef_objects/user_object.rb
 - lib/ridley/client.rb
-- lib/ridley/command_context.rb
-- lib/ridley/command_context/unix_uninstall.rb
-- lib/ridley/command_context/windows_uninstall.rb
 - lib/ridley/connection.rb
 - lib/ridley/errors.rb
 - lib/ridley/logger.rb
@@ -323,8 +315,6 @@ files:
 - lib/ridley/sandbox_uploader.rb
 - lib/ridley/version.rb
 - ridley.gemspec
-- scripts/unix_uninstall_omnibus.erb
-- scripts/windows_uninstall_omnibus.erb
 - spec/acceptance/client_resource_spec.rb
 - spec/acceptance/cookbook_resource_spec.rb
 - spec/acceptance/data_bag_item_resource_spec.rb
@@ -362,9 +352,6 @@ files:
 - spec/support/filepath_matchers.rb
 - spec/support/shared_examples/ridley_resource.rb
 - spec/support/spec_helpers.rb
-- spec/unit/ridley/bootstrap_context/unix_spec.rb
-- spec/unit/ridley/bootstrap_context/windows_spec.rb
-- spec/unit/ridley/bootstrap_context_spec.rb
 - spec/unit/ridley/chef/chefignore_spec.rb
 - spec/unit/ridley/chef/cookbook/metadata_spec.rb
 - spec/unit/ridley/chef/cookbook/syntax_check_spec.rb
@@ -463,9 +450,6 @@ test_files:
 - spec/support/filepath_matchers.rb
 - spec/support/shared_examples/ridley_resource.rb
 - spec/support/spec_helpers.rb
-- spec/unit/ridley/bootstrap_context/unix_spec.rb
-- spec/unit/ridley/bootstrap_context/windows_spec.rb
-- spec/unit/ridley/bootstrap_context_spec.rb
 - spec/unit/ridley/chef/chefignore_spec.rb
 - spec/unit/ridley/chef/cookbook/metadata_spec.rb
 - spec/unit/ridley/chef/cookbook/syntax_check_spec.rb

data/bootstrappers/unix_omnibus.erb

@@ -1,91 +0,0 @@
-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_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 wget; then
-    bash <(wget ${proxy_string} ${install_sh} -O -) ${version_string}
-  else
-    if exists curl; then
-      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
-
-(
-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
-
-<%# Remove client pem if it already exists -%>
-rm /etc/chef/client.pem
-
-(
-cat <<'EOP'
-<%= first_boot %>
-EOP
-) > /etc/chef/first-boot.json
-
-<%= chef_run %>'

data/bootstrappers/windows_omnibus.erb

@@ -1,113 +0,0 @@
-@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.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"
-
-powershell -ExecutionPolicy Unrestricted -NoProfile -NonInteractive "& '<%= bootstrap_directory %>\wget.ps1' '%REMOTE_SOURCE_MSI_URL%%FALLBACK_QUERY_STRING%' '%LOCAL_DESTINATION_MSI_PATH%'"
-
-<%= 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=%PATH%;<%= env_path %>"
-SETX PATH "%PATH;<%= env_path %>"
-
-<%= chef_run %>

data/lib/ridley/bootstrap_context.rb

@@ -1,100 +0,0 @@
-require 'erubis'
-
-module Ridley
-  module BootstrapContext
-    class Base
-      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
-
-      attr_reader :template_file
-      attr_reader :bootstrap_proxy
-      attr_reader :chef_version
-      attr_reader :validator_path
-      attr_reader :encrypted_data_bag_secret
-      attr_reader :server_url
-      attr_reader :validator_client
-      attr_reader :node_name
-      attr_reader :attributes
-      attr_reader :run_list
-      attr_reader :environment
-      attr_reader :hints
-
-      def initialize(options = {})
-        options = options.reverse_merge(
-          validator_client: "chef-validator",
-          attributes: Hash.new,
-          run_list: Array.new,
-          environment: "_default",
-          sudo: true,
-          hints: Hash.new,
-          chef_version: "latest"
-        )
-        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 = 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]
-      def bootstrap_command
-        raise RuntimeError, "abstract function: must be implemented on includer"
-      end
-
-      # @return [String]
-      def default_template
-        raise RuntimeError, "abstract function: must be implemented on includer"
-      end
-
-      # @return [Pathname]
-      def templates_path
-        Ridley.root.join('bootstrappers')
-      end
-
-      # @return [String]
-      def first_boot
-        JSON.fast_generate(attributes.merge(run_list: run_list))
-      end
-
-      # The validation key to create a new client for the node
-      #
-      # @raise [Ridley::Errors::ValidatorNotFound]
-      #
-      # @return [String]
-      def validation_key
-        IO.read(File.expand_path(validator_path)).chomp
-      rescue Errno::ENOENT
-        raise Errors::ValidatorNotFound, "Error bootstrapping: Validator not found at '#{validator_path}'"
-      end
-
-      # @return [Erubis::Eruby]
-      def template
-        Erubis::Eruby.new(IO.read(template_file).chomp)
-      end
-    end
-  end
-end
-
-Dir["#{File.dirname(__FILE__)}/bootstrap_context/*.rb"].sort.each do |path|
-  require_relative "bootstrap_context/#{File.basename(path, '.rb')}"
-end

data/lib/ridley/bootstrap_context/unix.rb

@@ -1,66 +0,0 @@
-module Ridley
-  module BootstrapContext
-    # 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.
-    class Unix < BootstrapContext::Base
-      attr_reader :sudo
-
-      # @option options [Boolean] :sudo (true)
-      #   bootstrap with sudo (default: true)
-      def initialize(options = {})
-        options = options.reverse_merge(sudo: true)
-        @sudo   = options[:sudo]
-        super(options)
-      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
-
-        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
-end

data/lib/ridley/bootstrap_context/windows.rb

@@ -1,118 +0,0 @@
-module Ridley
-  module BootstrapContext
-    # 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.
-    #
-    # 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 Windows < BootstrapContext::Base
-      # @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(super)
-      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
-
-        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
-  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(super)
-      end
-
-      # @return [String]
-      def env_path
-        "C:\\opscode\\chef\\bin;C:\\opscode\\chef\\embedded\\bin"
-      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
-end

data/lib/ridley/command_context.rb

@@ -1,76 +0,0 @@
-require 'erubis'
-
-module Ridley
-  module CommandContext
-    # A base class to provide common functionality between OS specific command contexts. A
-    # command context takes an options hash and binds it against a template file. You can then
-    # retrieve the command to be run on a node by calling {CommandContext::Base#command}.
-    #
-    # @example
-    #   my_context = MyCommandContext.new(message: "hello, world!")
-    #   my_context.command #=> "echo 'hello, world!'"
-    class Base
-      class << self
-        # Build a command context and immediately run it's command
-        #
-        # @param [Hash] options
-        #   an options hash to pass to the new CommandContext
-        def command(options = {})
-          new(options).command
-        end
-
-        # Set or get the path to the template file for the inheriting class
-        #
-        # @param [String] filename
-        #   the filename (without extension) of the template file to use to bind
-        #   the inheriting command context class to
-        #
-        # @return [Pathname]
-        def template_file(filename = nil)
-          return @template_file if filename.nil?
-          @template_file = Ridley.scripts.join("#{filename}.erb")
-        end
-      end
-
-      # @param [Hash] options
-      def initialize(options = {}); end
-
-      # @return [String]
-      def command
-        template.evaluate(self)
-      end
-
-      private
-
-        # @return [Erubis::Eruby]
-        def template
-          @template ||= Erubis::Eruby.new(IO.read(self.class.template_file).chomp)
-        end
-    end
-
-    # A command context for Unix based OSes
-    class Unix < Base
-      # @return [Boolean]
-      attr_reader :sudo
-
-      # @option options [Boolean] :sudo (true)
-      #   bootstrap with sudo (default: true)
-      def initialize(options = {})
-        options = options.reverse_merge(sudo: true)
-        @sudo   = options[:sudo]
-      end
-
-      # @return [String]
-      def command
-        sudo ? "sudo #{super}" : super
-      end
-    end
-
-    # A command context for Windows based OSes
-    class Windows < Base; end
-  end
-end
-
-Dir["#{File.dirname(__FILE__)}/command_context/*.rb"].sort.each do |path|
-  require_relative "command_context/#{File.basename(path, '.rb')}"
-end

data/lib/ridley/command_context/unix_uninstall.rb

@@ -1,42 +0,0 @@
-module Ridley
-  module CommandContext
-    # Context class for generating an uninstall command for Unix based OSes
-    class UnixUninstall < CommandContext::Unix
-      template_file 'unix_uninstall_omnibus'
-
-      # @return [Boolean]
-      attr_reader :skip_chef
-
-      # @option options [Boolena] :skip_chef (false)
-      #   skip removal of the Chef package and the contents of the installation
-      #   directory. Setting this to true will only remove any data and configurations
-      #   generated by running Chef client.
-      def initialize(options = {})
-        super(options)
-        options    = options.reverse_merge(skip_chef: false)
-        @skip_chef = options[:skip_chef]
-      end
-
-      # The path to the Chef configuration directory on the target host
-      #
-      # @return [String]
-      def config_directory
-        "/etc/chef"
-      end
-
-      # The path to the Chef data directory on the target host
-      #
-      # @return [String]
-      def data_directory
-        "/var/chef"
-      end
-
-      # The path to the Omnibus Chef installation on the target host
-      #
-      # @return [String]
-      def install_directory
-        "/opt/chef"
-      end
-    end
-  end
-end

data/lib/ridley/command_context/windows_uninstall.rb

@@ -1,35 +0,0 @@
-module Ridley
-  module CommandContext
-    # Context class for generating an uninstall command for Unix based OSes
-    class WindowsUninstall < CommandContext::Windows
-      template_file 'windows_uninstall_omnibus'
-
-      # @return [Boolean]
-      attr_reader :skip_chef
-
-      # @option options [Boolena] :skip_chef (false)
-      #   skip removal of the Chef package and the contents of the installation
-      #   directory. Setting this to true will only remove any data and configurations
-      #   generated by running Chef client.
-      def initialize(options = {})
-        super(options)
-        options    = options.reverse_merge(skip_chef: false)
-        @skip_chef = options[:skip_chef]
-      end
-
-      # The path to the Chef configuration directory on the target host
-      #
-      # @return [String]
-      def config_directory
-        "C:\\chef"
-      end
-
-      # The path to the Omnibus Chef installation on the target host
-      #
-      # @return [String]
-      def install_directory
-        "C:\\opscode\\chef"
-      end
-    end
-  end
-end

data/scripts/unix_uninstall_omnibus.erb

@@ -1,31 +0,0 @@
-bash -c '
-if [ -f "/etc/lsb-release" ]; then
-  platform=$(grep DISTRIB_ID /etc/lsb-release | cut -d "=" -f 2 | tr "[A-Z]" "[a-z]")
-elif [ -f "/etc/debian_version" ]; then
-  platform="debian"
-elif [ -f "/etc/redhat-release" ]; then
-  platform="el"
-elif [ -f "/etc/system-release" ]; then
-  platform=$(sed "s/^\(.\+\) release.\+/\1/" /etc/system-release | tr "[A-Z]" "[a-z]")
-  if [ "$platform" = "amazon linux ami" ]; then
-    platform="el"
-  fi
-elif [ -f "/etc/SuSE-release" ]; then
-  platform="el"
-fi
-
-<% unless skip_chef -%>
-echo "Un-Installing installed Chef package"
-case "$platform" in
-  "el") yum remove chef -y ;;
-  "debian") apt-get purge chef -y ;;
-esac
-<% end -%>
-
-rm -Rdf <%= config_directory %>
-rm -Rdf <%= data_directory %>
-
-<% unless skip_chef -%>
-rm -Rdf <%= install_directory %>
-<% end -%>
-'

data/scripts/windows_uninstall_omnibus.erb

@@ -1,10 +0,0 @@
-$productName      = "Chef"
-$installDirectory = "<%= install_directory %>"
-$configDirectory  = "<%= config_directory %>"
-
-<% unless skip_chef -%>
-$app = Get-WmiObject -Class Win32_Product | Where-Object {  $_.Name -match $productName  }
-If ($app) { $app.Uninstall() }
-If (Test-Path $installDirectory) { Remove-Item -Recurse -Force $installDirectory }
-<% end -%>
-If (Test-Path $configDirectory) { Remove-Item -Recurse -Force $configDirectory }

data/spec/unit/ridley/bootstrap_context/unix_spec.rb

@@ -1,101 +0,0 @@
-require 'spec_helper'
-
-describe Ridley::BootstrapContext::Unix do
-  let(:options) do
-    {
-      server_url: "https://api.opscode.com/organizations/vialstudios",
-      validator_client: "chef-validator",
-      validator_path: fixtures_path.join("reset.pem").to_s,
-      encrypted_data_bag_secret: File.read(fixtures_path.join("reset.pem"))
-    }
-  end
-
-  describe "ClassMethods" do
-    subject { described_class }
-
-    describe "::new" do
-      context "when no sudo option is passed through" do
-        it "sets a default value of 'true' to 'sudo'" do
-          options.delete(:sudo)
-          obj = subject.new(options)
-
-          obj.send(:sudo).should be_true
-        end
-      end
-
-      context "when the sudo option is passed through as false" do
-        it "sets the value of sudo to 'false' if provided" do
-          options.merge!(sudo: false)
-          obj = subject.new(options)
-
-          obj.send(:sudo).should be_false
-        end
-      end
-    end
-  end
-
-  subject { described_class.new(options) }
-
-  describe "MixinMethods" do
-
-    describe "#templates_path" do
-      it "returns a pathname" do
-        subject.templates_path.should be_a(Pathname)
-      end
-    end
-
-    describe "#first_boot" do
-      it "returns a string" do
-        subject.first_boot.should be_a(String)
-      end
-    end
-
-    describe "#encrypted_data_bag_secret" do
-      it "returns a string" do
-        subject.encrypted_data_bag_secret.should be_a(String)
-      end
-    end
-
-    describe "#validation_key" do
-      it "returns a string" do
-        subject.validation_key.should be_a(String)
-      end
-    end
-
-    describe "template" do
-      it "returns a string" do
-        subject.template.should be_a(Erubis::Eruby)
-      end
-    end
-  end
-
-  describe "#boot_command" do
-    it "returns a string" do
-      subject.boot_command.should be_a(String)
-    end
-  end
-
-  describe "#chef_run" do
-    it "returns a string" do
-      subject.chef_run.should be_a(String)
-    end
-  end
-
-  describe "#chef_config" do
-    it "returns a string" do
-      subject.chef_config.should be_a(String)
-    end
-  end
-
-  describe "#default_template" do
-    it "returns a string" do
-      subject.default_template.should be_a(String)
-    end
-  end
-
-  describe "#bootstrap_directory" do
-    it "returns a string" do
-      subject.bootstrap_directory.should be_a(String)
-    end
-  end
-end

data/spec/unit/ridley/bootstrap_context/windows_spec.rb

@@ -1,116 +0,0 @@
-require 'spec_helper'
-
-describe Ridley::BootstrapContext::Windows do
-  let(:options) do
-    {
-      server_url: "https://api.opscode.com/organizations/vialstudios",
-      validator_client: "chef-validator",
-      validator_path: fixtures_path.join("reset.pem").to_s,
-      encrypted_data_bag_secret: File.read(fixtures_path.join("reset.pem")),
-      chef_version: "11.4.0"
-    }
-  end
-
-  describe "ClassMethods" do
-    subject { described_class }
-
-    describe "::new" do
-      context "when a chef_version is passed through" do
-        it "sets the chef_version attribute to the same value" do
-          subject.new(options).chef_version.should eq("11.4.0")
-        end
-      end
-
-      context "when the chef_version is not passed through" do
-        it "sets the chef_version to 'latest'" do
-          options.delete(:chef_version)
-          subject.new(options).chef_version.should eq("latest")
-        end
-      end
-    end
-  end
-
-  subject { described_class.new(options) }
-
-  describe "MixinMethods" do
-    describe "#templates_path" do
-      it "returns a pathname" do
-        subject.templates_path.should be_a(Pathname)
-      end
-    end
-
-    describe "#first_boot" do
-      it "returns a string" do
-        subject.first_boot.should be_a(String)
-      end
-    end
-
-    describe "#encrypted_data_bag_secret" do
-      it "returns a string" do
-        subject.encrypted_data_bag_secret.should be_a(String)
-      end
-    end
-
-    describe "#validation_key" do
-      it "returns a string" do
-        subject.validation_key.should be_a(String)
-      end
-    end
-
-    describe "template" do
-      it "returns a string" do
-        subject.template.should be_a(Erubis::Eruby)
-      end
-    end
-  end
-
-  describe "#boot_command" do
-    it "returns a string" do
-      subject.boot_command.should be_a(String)
-    end
-  end
-
-  describe "#chef_run" do
-    it "returns a string" do
-      subject.chef_run.should be_a(String)
-    end
-  end
-
-  describe "#chef_config" do
-    it "returns a string" do
-      subject.chef_config.should be_a(String)
-    end
-  end
-
-  describe "#env_path" do
-    it "returns a string" do
-      expect(subject.env_path).to be_a(String)
-    end
-  end
-
-  describe "#default_template" do
-    it "returns a string" do
-      subject.default_template.should be_a(String)
-    end
-  end
-
-  describe "#bootstrap_directory" do
-    it "returns a string" do
-      subject.bootstrap_directory.should be_a(String)
-    end
-  end
-
-  describe "#escape_and_echo" do
-    let(:output) { "foo()" }
-
-    it "adds 'echo.' to the beginning of each line and escapes special batch characters" do
-      subject.escape_and_echo(output).should eq("echo.foo^(^)")
-    end
-  end
-
-  describe "#windows_wget_powershell" do
-    it "returns a string" do
-      subject.windows_wget_powershell.should be_a(String)
-    end
-  end
-end

data/spec/unit/ridley/bootstrap_context_spec.rb

@@ -1,52 +0,0 @@
-require 'spec_helper'
-
-describe Ridley::BootstrapContext::Base do
-  let(:host) { "reset.riotgames.com" }
-  let(:options) do
-    {
-      server_url: "https://api.opscode.com/organizations/vialstudios",
-      validator_client: "chef-validator",
-      validator_path: fixtures_path.join("reset.pem").to_s,
-      encrypted_data_bag_secret: File.read(fixtures_path.join("reset.pem")),
-      chef_version: "11.4.0"
-    }
-  end
-
-  describe "ClassMethods" do
-    subject { described_class }
-
-    describe ":included" do
-      context "when a class includes Ridley::BootstrapBinding" do
-        it "should have a validate_options class method`" do
-          subject.methods.should include(:validate_options)
-        end
-      end
-    end
-
-    describe ":validate_options" do
-      context "when server_url is not specified" do
-        let(:options) { Hash.new }
-
-        it "raises an ArgumentError" do
-          expect {
-            subject.validate_options(options)
-          }.to raise_error(Ridley::Errors::ArgumentError)
-        end
-      end
-    end
-
-    context "when validator_path is not specified" do
-      let(:options) do
-        {
-          server_url: "https://api.opscode.com/organizations/vialstudios"
-        }
-      end
-
-      it "raises an ArgumentError" do
-        expect {
-          subject.validate_options(options)
-        }.to raise_error(Ridley::Errors::ArgumentError)
-      end
-    end
-  end
-end