ridley 1.0.0.rc1 → 1.0.0.rc2

data/README.md

@@ -184,7 +184,7 @@ _With the `#regenerate_key` function on an instance of a Client Object_
 A data bag is managed exactly the same as any other Chef resource
 
     ridley = Ridley.new(...)
-    ridley.data_bag.create("ridley-test")
+    ridley.data_bag.create(name: "ridley-test")
 
 You can create, delete, update, or retrieve a data bag exactly how you would expect if you read through the
 Manipulating Chef Resources portion of this document.
@@ -194,7 +194,7 @@ Unlike a role, node, client, or environment, a data bag is a container for other
 ### Creating a Data Bag Item
 
     ridley   = Ridley.new(...)
-    data_bag = ridley.data_bag.create("ridley-test")
+    data_bag = ridley.data_bag.create(name: "ridley-test")
 
     data_bag.item.create(id: "appconfig", host: "reset.local", user: "jamie") #=>
       #<Ridley::DataBagItemObject: chef_id:appconfig, host="reset.local", user="jamie">

data/lib/ridley.rb

@@ -15,23 +15,6 @@ JSON.create_id = nil
 module Ridley
   CHEF_VERSION = '11.4.0'.freeze
 
-  require_relative 'ridley/mixin'
-  require_relative 'ridley/logging'
-  require_relative 'ridley/bootstrap_context'
-  require_relative 'ridley/chef_object'
-  require_relative 'ridley/chef_objects'
-  require_relative 'ridley/client'
-  require_relative 'ridley/connection'
-  require_relative 'ridley/chef'
-  require_relative 'ridley/host_commander'
-  require_relative 'ridley/host_connector'
-  require_relative 'ridley/middleware'
-  require_relative 'ridley/resource'
-  require_relative 'ridley/resources'
-  require_relative 'ridley/sandbox_uploader'
-  require_relative 'ridley/version'
-  require_relative 'ridley/errors'
-
   class << self
     extend Forwardable
 
@@ -41,6 +24,7 @@ module Ridley
     def_delegator "Ridley::Logging", :logger=
     def_delegator "Ridley::Logging", :set_logger
 
+    # @return [Ridley::Client]
     def new(*args)
       Client.new(*args)
     end
@@ -53,7 +37,30 @@ 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/bootstrap_context'
+  require_relative 'ridley/command_context'
+  require_relative 'ridley/chef_object'
+  require_relative 'ridley/chef_objects'
+  require_relative 'ridley/client'
+  require_relative 'ridley/connection'
+  require_relative 'ridley/chef'
+  require_relative 'ridley/host_commander'
+  require_relative 'ridley/host_connector'
+  require_relative 'ridley/middleware'
+  require_relative 'ridley/resource'
+  require_relative 'ridley/resources'
+  require_relative 'ridley/sandbox_uploader'
+  require_relative 'ridley/version'
+  require_relative 'ridley/errors'
 end
 
 Celluloid.logger = Ridley.logger

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

@@ -127,25 +127,29 @@ module Ridley::Chef
       end
 
       def validate_template(erb_file)
-        result = quietly { shell_out("erubis -x #{erb_file.shellescape} | ruby -c") }
-        result.error!
+        result = shell_out("erubis -x #{erb_file.shellescape} | ruby -c")
+
+        if result.error?
+          file_relative_path = erb_file[/^#{Regexp.escape(cookbook_path+File::Separator)}(.*)/, 1]
+          log.error { "Erb template #{file_relative_path} has a syntax error:" }
+          result.stderr.each_line { |l| Ridley.log.fatal(l.chomp) }
+          return false
+        end
+
         true
-      rescue Mixlib::ShellOut::ShellCommandFailed
-        file_relative_path = erb_file[/^#{Regexp.escape(cookbook_path+File::Separator)}(.*)/, 1]
-        log.error { "Erb template #{file_relative_path} has a syntax error:" }
-        result.stderr.each_line { |l| Ridley.log.fatal(l.chomp) }
-        false
       end
 
       def validate_ruby_file(ruby_file)
-        result = quietly { shell_out("ruby -c #{ruby_file.shellescape}") }
-        result.error!
+        result = shell_out("ruby -c #{ruby_file.shellescape}")
+
+        if result.error?
+          file_relative_path = ruby_file[/^#{Regexp.escape(cookbook_path+File::Separator)}(.*)/, 1]
+          log.error { "Cookbook file #{file_relative_path} has a ruby syntax error:" }
+          result.stderr.each_line { |l| Ridley.log.error(l.chomp) }
+          return false
+        end
+
         true
-      rescue Mixlib::ShellOut::ShellCommandFailed
-        file_relative_path = ruby_file[/^#{Regexp.escape(cookbook_path+File::Separator)}(.*)/, 1]
-        log.error { "Cookbook file #{file_relative_path} has a ruby syntax error:" }
-        result.stderr.each_line { |l| Ridley.log.error(l.chomp) }
-        false
       end
     end
   end

data/lib/ridley/command_context.rb

@@ -0,0 +1,76 @@
+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

@@ -0,0 +1,42 @@
+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

@@ -0,0 +1,35 @@
+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/lib/ridley/host_commander.rb

@@ -153,6 +153,31 @@ module Ridley
       execute(__method__, host, command_lines, options)
     end
 
+    # Uninstall Chef from a node
+    #
+    # @param [String] host
+    #   the host to perform the action on
+    #
+    # @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.
+    # @option options [Hash] :ssh
+    #   * :user (String) a shell user that will login to each node and perform the bootstrap command on
+    #   * :password (String) the password for the shell user that will perform the bootstrap
+    #   * :keys (Array, String) an array of key(s) to authenticate the ssh user with instead of a password
+    #   * :timeout (Float) timeout value for SSH bootstrap (5.0)
+    #   * :sudo (Boolean) run as sudo (true)
+    # @option options [Hash] :winrm
+    #   * :user (String) a user that will login to each node and perform the bootstrap command on
+    #   * :password (String) the password for the user that will perform the bootstrap (required)
+    #   * :port (Fixnum) the winrm port to connect on the node the bootstrap will be performed on (5985)
+    #
+    # @return [HostConnector::Response]
+    def uninstall_chef(host, options = {})
+      execute(__method__, host, options)
+    end
+
     private
 
       def execute(method, host, *args)

data/lib/ridley/host_connector.rb

@@ -64,6 +64,17 @@ module Ridley
       def ruby_script(host, command_lines, options = {})
         raise RuntimeError, "abstract function: must be implemented on includer"
       end
+
+      # Uninstall Chef from a node
+      #
+      # @param [String] host
+      #   the host to perform the action on
+      # @param [Hash] options
+      #
+      # @return [HostConnector::Response]
+      def uninstall_chef(host, options = {})
+        raise RuntimeError, "abstract function: must be implemented on includer"
+      end
     end
 
     require_relative 'host_connector/response'

data/lib/ridley/host_connector/ssh.rb

@@ -140,6 +140,31 @@ module Ridley
         run(host, "#{EMBEDDED_RUBY_PATH} -e \"#{command_lines.join(';')}\"", options)
       end
 
+      # Uninstall Chef from a node
+      #
+      # @param [String] host
+      #   the host to perform the action on
+      #
+      # @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.
+      # @option options [Hash] :ssh
+      #   * :user (String) a shell user that will login to each node and perform the bootstrap command on
+      #   * :password (String) the password for the shell user that will perform the bootstrap
+      #   * :keys (Array, String) an array of key(s) to authenticate the ssh user with instead of a password
+      #   * :timeout (Float) timeout value for SSH bootstrap (5.0)
+      #   * :sudo (Boolean) run as sudo (true)
+      #
+      # @return [HostConnector::Response]
+      def uninstall_chef(host, options = {})
+        options = options.reverse_merge(ssh: Hash.new)
+        options[:ssh].reverse_merge!(sudo: true, timeout: 5.0)
+
+        log.info "Uninstalling Chef from host: #{host}"
+        run(host, CommandContext::UnixUninstall.command(options), options)
+      end
+
       private
 
         def channel_exec(channel, command, host, response)

data/lib/ridley/host_connector/winrm.rb

@@ -11,8 +11,12 @@ module Ridley
     class WinRM < HostConnector::Base
       require_relative 'winrm/command_uploader'
 
-      DEFAULT_PORT       = 5985
-      EMBEDDED_RUBY_PATH = 'C:\opscode\chef\embedded\bin\ruby'.freeze
+      DEFAULT_PORT                 = 5985
+      EMBEDDED_RUBY_PATH           = 'C:\opscode\chef\embedded\bin\ruby'.freeze
+      SESSION_TYPE_COMMAND_METHODS = {
+        powershell: :run_powershell_script,
+        cmd: :run_cmd
+      }.freeze
 
       # Execute a shell command on a node
       #
@@ -20,6 +24,9 @@ module Ridley
       #   the host to perform the action on
       # @param [String] command
       #
+      # @option options [Symbol] :session_type (:cmd)
+      #   * :powershell - run the given command in a powershell session
+      #   * :cmd - run the given command in a cmd session
       # @option options [Hash] :winrm
       #   * :user (String) a user that will login to each node and perform the bootstrap command on
       #   * :password (String) the password for the user that will perform the bootstrap (required)
@@ -27,7 +34,7 @@ module Ridley
       #
       # @return [HostConnector::Response]
       def run(host, command, options = {})
-        options = options.reverse_merge(winrm: Hash.new)
+        options = options.reverse_merge(winrm: Hash.new, session_type: :cmd)
         options[:winrm].reverse_merge!(port: DEFAULT_PORT)
 
         command_uploaders = Array.new
@@ -36,6 +43,11 @@ module Ridley
         port              = options[:winrm][:port]
         connection        = winrm(host, port, options[:winrm].slice(:user, :password))
 
+        unless command_method = SESSION_TYPE_COMMAND_METHODS[options[:session_type]]
+          raise RuntimeError, "unknown session type: #{options[:session_type]}. Known session types " +
+            "are: #{SESSION_TYPE_COMMAND_METHODS.keys}"
+        end
+
         HostConnector::Response.new(host).tap do |response|
           command_uploaders << command_uploader = CommandUploader.new(connection)
           command = get_command(command, command_uploader)
@@ -43,15 +55,15 @@ module Ridley
           begin
             log.info "Running WinRM Command: '#{command}' on: '#{host}' as: '#{user}'"
 
-            output = connection.run_cmd(command) do |stdout, stderr|
-              if stdout
+            output = connection.send(command_method, command) do |stdout, stderr|
+              if stdout && stdout.present?
                 response.stdout += stdout
                 log.info "[#{host}](WinRM) #{stdout}"
               end
 
-              if stderr
-                response.stderr += stderr unless stderr.nil?
-                log.info "[#{host}](WinRM) #{stdout}"
+              if stderr && stderr.present?
+                response.stderr += stderr
+                log.info "[#{host}](WinRM) #{stderr}"
               end
             end
 
@@ -159,6 +171,27 @@ module Ridley
         run(host, command, options)
       end
 
+      # Uninstall Chef from a node
+      #
+      # @param [String] host
+      #   the host to perform the action on
+      #
+      # @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.
+      # @option options [Hash] :winrm
+      #   * :user (String) a user that will login to each node and perform the bootstrap command on
+      #   * :password (String) the password for the user that will perform the bootstrap (required)
+      #   * :port (Fixnum) the winrm port to connect on the node the bootstrap will be performed on (5985)
+      #
+      # @return [HostConnector::Response]
+      def uninstall_chef(host, options = {})
+        options[:session_type] = :powershell
+        log.info "Uninstalling Chef from host: #{host}"
+        run(host, CommandContext::WindowsUninstall.command(options), options)
+      end
+
       private
 
         # @param [String] host

data/lib/ridley/mixin/shell_out.rb

@@ -1,23 +1,89 @@
-require 'mixlib/shellout'
-
-module Ridley::Mixin
-  # @author Jamie Winsor <reset@riotgames.com>
-  module ShellOut
-    # @return [Mixlib::ShellOut]
-    def shell_out(*command_args)
-      cmd = Mixlib::ShellOut.new(*command_args)
-      if STDOUT.tty?
-        cmd.live_stream = STDOUT
+module Ridley
+  module Mixin
+    # A Ruby platform agnostic way of executing shell commands on the local system
+    module ShellOut
+      class Response
+        extend Forwardable
+
+        # @return [String]
+        attr_reader :stdout
+        # @return [String]
+        attr_reader :stderr
+
+        def_delegator :process_status, :exitstatus
+        def_delegator :process_status, :pid
+        def_delegator :process_status, :success?
+        def_delegator :process_status, :exited?
+        def_delegator :process_status, :stopped?
+
+        # @param [Process::Status] process_status
+        # @param [String] stdout
+        # @param [String] stderr
+        def initialize(process_status, stdout, stderr)
+          @process_status = process_status
+          @stdout         = stdout
+          @stderr         = stderr
+        end
+
+        def error?
+          !success?
+        end
+        alias_method :failure?, :error?
+
+        private
+
+          # @return [Process::Status]
+          attr_reader :process_status
       end
-      cmd.run_command
-      cmd
-    end
 
-    # @return [Mixlib::ShellOut]
-    def shell_out!(*command_args)
-      cmd = shell_out(*command_args)
-      cmd.error!
-      cmd
+      include Chozo::RubyEngine
+      extend self
+
+      # Executes the given shell command on the local system
+      #
+      # @param [String] command
+      #   The command to execute
+      #
+      # @return [ShellOut::Response]
+      def shell_out(command)
+        process_status, out, err = jruby? ? jruby_out(command) : mri_out(command)
+        Response.new(process_status, out, err)
+      end
+
+      private
+
+        # @param [String] command
+        #   The command to execute
+        def mri_out(command)
+          out, err = Tempfile.new('ridley.shell_out.stdout'), Tempfile.new('ridley.shell_out.stderr')
+
+          begin
+            pid = Process.spawn(command, out: out.to_i, err: err.to_i)
+            Process.waitpid(pid)
+          rescue Errno::ENOENT
+            out.write("")
+            err.write("command not found: #{command}")
+          end
+
+          out.close
+          err.close
+
+          [ $?, File.read(out), File.read(err) ]
+        end
+
+        # @param [String] command
+        #   The command to execute
+        def jruby_out(command)
+          out, err = StringIO.new, StringIO.new
+          $stdout, $stderr = out, err
+          system(command)
+
+          out.rewind
+          err.rewind
+          [ $?, out.read, err.read ]
+        ensure
+          $stdout, $stderr = STDOUT, STDERR
+        end
     end
   end
 end

data/lib/ridley/resources/node_resource.rb

@@ -160,6 +160,32 @@ module Ridley
       update(node.merge_data(options))
     end
 
+    # Uninstall Chef from a node
+    #
+    # @param [String] host
+    #   the host to perform the action on
+    #
+    # @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.
+    # @option options [Hash] :ssh
+    #   * :user (String) a shell user that will login to each node and perform the bootstrap command on
+    #   * :password (String) the password for the shell user that will perform the bootstrap
+    #   * :keys (Array, String) an array of key(s) to authenticate the ssh user with instead of a password
+    #   * :timeout (Float) timeout value for SSH bootstrap (5.0)
+    #   * :sudo (Boolean) run as sudo (true)
+    # @option options [Hash] :winrm
+    #   * :user (String) a user that will login to each node and perform the bootstrap command on
+    #   * :password (String) the password for the user that will perform the bootstrap (required)
+    #   * :port (Fixnum) the winrm port to connect on the node the bootstrap will be performed on (5985)
+    #
+    # @return [HostConnector::Response]
+    def uninstall_chef(host, options = {})
+      options = options.reverse_merge(ssh: ssh, winrm: winrm)
+      host_commander.uninstall_chef(host, options)
+    end
+
     private
 
       # @return [Ridley::HostCommander]

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "1.0.0.rc1"
+  VERSION = "1.0.0.rc2"
 end

data/ridley.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'erubis'
   s.add_runtime_dependency 'faraday',                 '>= 0.8.4'
   s.add_runtime_dependency 'hashie',                  '>= 2.0.2'
-  s.add_runtime_dependency 'mixlib-shellout',         '>= 1.1.0'
   s.add_runtime_dependency 'mixlib-authentication',   '>= 1.3.0'
   s.add_runtime_dependency 'net-http-persistent',     '>= 2.8'
   s.add_runtime_dependency 'net-ssh'

data/scripts/unix_uninstall_omnibus.erb

@@ -0,0 +1,31 @@
+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

@@ -0,0 +1,10 @@
+$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/support/actor_mocking.rb

@@ -2,8 +2,8 @@ RSpec.configuration.before(:each) do
   class Celluloid::ActorProxy
     unless @rspec_compatible
       @rspec_compatible = true
-      undef_method :should_receive
-      undef_method :stub
+      undef_method :should_receive if method_defined?(:should_receive)
+      undef_method :stub if method_defined?(:stub)
     end
   end
 end

data/spec/unit/ridley/host_connector_spec.rb

@@ -41,4 +41,10 @@ describe Ridley::HostConnector::Base do
       expect { subject.ruby_script(host, command_lines, options) }.to raise_error(RuntimeError)
     end
   end
+
+  describe "#uninstall_chef" do
+    it "raises a RuntimeError" do
+      expect { subject.uninstall_chef(host, options) }.to raise_error(RuntimeError)
+    end
+  end
 end

data/spec/unit/ridley/mixin/shell_out_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe Ridley::Mixin::ShellOut do
+  describe "shell_out" do
+    let(:command) { "ls" }
+
+    subject(:result) { described_class.shell_out(command) }
+
+    it "returns a ShellOut::Response" do
+      expect(result).to be_a(described_class::Response)
+    end
+
+    its(:stdout) { should be_a(String) }
+    its(:stderr) { should be_a(String) }
+    its(:exitstatus) { should be_a(Fixnum) }
+    its(:pid) { should be_a(Fixnum) }
+    its(:success?) { should be_true }
+    its(:error?) { should be_false }
+
+    context "when on MRI" do
+      before { described_class.stub(jruby?: false) }
+
+      it "delegates to #mri_out" do
+        described_class.should_receive(:mri_out).with(command)
+        result
+      end
+    end
+
+    context "when on JRuby" do
+      before { described_class.stub(jruby?: true) }
+
+      it "delegates to #jruby_out" do
+        described_class.should_receive(:jruby_out).with(command)
+        result
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -107,22 +107,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.2
-- !ruby/object:Gem::Dependency
-  name: mixlib-shellout
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: mixlib-authentication
   requirement: !ruby/object:Gem::Requirement
@@ -257,6 +241,9 @@ files:
 - lib/ridley/chef_objects/role_object.rb
 - lib/ridley/chef_objects/sandbox_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/host_commander.rb
@@ -290,7 +277,8 @@ files:
 - lib/ridley/sandbox_uploader.rb
 - lib/ridley/version.rb
 - ridley.gemspec
-- spec/acceptance/bootstrapping_spec.rb
+- 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
@@ -350,6 +338,7 @@ files:
 - spec/unit/ridley/middleware/chef_response_spec.rb
 - spec/unit/ridley/middleware/gzip_spec.rb
 - spec/unit/ridley/middleware/parse_json_spec.rb
+- spec/unit/ridley/mixin/shell_out_spec.rb
 - spec/unit/ridley/resource_spec.rb
 - spec/unit/ridley/resources/client_resource_spec.rb
 - spec/unit/ridley/resources/cookbook_resource_spec.rb
@@ -388,7 +377,6 @@ signing_key:
 specification_version: 3
 summary: A reliable Chef API client with a clean syntax
 test_files:
-- spec/acceptance/bootstrapping_spec.rb
 - spec/acceptance/client_resource_spec.rb
 - spec/acceptance/cookbook_resource_spec.rb
 - spec/acceptance/data_bag_item_resource_spec.rb
@@ -448,6 +436,7 @@ test_files:
 - spec/unit/ridley/middleware/chef_response_spec.rb
 - spec/unit/ridley/middleware/gzip_spec.rb
 - spec/unit/ridley/middleware/parse_json_spec.rb
+- spec/unit/ridley/mixin/shell_out_spec.rb
 - spec/unit/ridley/resource_spec.rb
 - spec/unit/ridley/resources/client_resource_spec.rb
 - spec/unit/ridley/resources/cookbook_resource_spec.rb

data/spec/acceptance/bootstrapping_spec.rb

@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe "Bootstrapping a node", type: "acceptance" do
-  let(:server_url) { "https://api.opscode.com" }
-  let(:client_name) { "reset" }
-  let(:client_key) { "/Users/reset/.chef/reset.pem" }
-  let(:organization) { "vialstudios" }
-
-  let(:connection) do
-    Ridley.new(
-      server_url: server_url,
-      client_name: client_name,
-      client_key: client_key,
-      organization: organization,
-      validator_client: "vialstudios-validator",
-      validator_path: "/Users/reset/.chef/vialstudios-validator.pem",
-      ssh: {
-        user: "vagrant",
-        password: "vagrant"
-      }
-    )
-  end
-
-  it "returns an array of response objects" do
-    pending
-
-    connection.node.bootstrap("33.33.33.10").should_not have_errors
-  end
-end