ridley-connectors 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83951fdd4b407da750f1650dda96da6092dc5d87
-  data.tar.gz: 6781793e33583fb2a2a0c66803daaa93a3bd6a5b
+  metadata.gz: 75a45b3d5ebe84723f39a4eab4449f2d62232a7e
+  data.tar.gz: c35e78280d736f252028d9a167092d8bdfe85b7f
 SHA512:
-  metadata.gz: 0e948a143d321f8036a4ca2bdb1c03551082a90f7de15622df2e5cfc70c5937399eb619855a04c43bfbee639ad20f5d62f0781f0479ba7c255e4d97d04e38e85
-  data.tar.gz: 80e8ebdc8e53faf8096eb541d291a89813db4914fdb0cfac5b47d12bde0d2ebda245a9d4d9e91a6dcf12facaa81141b62020775f6ddd2e4f1b42078989fb311b
+  metadata.gz: d55c6296fc29e58250b15c4d80dc01eda0efd20014c8beb2e5ca707145cc8824251a0350e6fb470b319dbc1e05d65f2404ec0a2ff56dc98984cfb8d0bab36e85
+  data.tar.gz: c7bbc2ae0143b1db7c5c6bc52a4fc5b8c848fe8b753a3853098f6f7d851324e25cd485791ecb4b7b5c9eed452cc0053ee2263820f7e1ce9cdf09990f85ce94ef

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v.2.2.0
+
+* [#27](https://github.com/RiotGames/ridley-connectors/pull/27) New upgrade_omnibus feature for updating a node's Omnibus installation of Chef
+
 ## v.2.1.2
 
 * [#25](https://github.com/RiotGames/ridley-connectors/pull/25) Fix an edge case in the connector_for logic from #22

data/lib/ridley-connectors/command_context.rb

@@ -49,22 +49,7 @@ module Ridley
     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
+    class Unix < Base; end
 
     # A command context for Windows based OSes
     class Windows < Base; end

data/lib/ridley-connectors/command_context/unix_update_omnibus.rb

@@ -0,0 +1,60 @@
+module Ridley
+  module CommandContext
+    # Context class for generating an upgrade command for an Omnibus Chef installation on Unix based OSes
+    class UnixUpdateOmnibus < CommandContext::Unix
+      template_file 'unix_update_omnibus'
+
+      # @return [String]
+      attr_reader :chef_version
+
+      # @return [Boolean]
+      attr_reader :prerelease
+
+      # @return [String]
+      attr_reader :direct_url
+
+      def initialize(options = {})
+        super(options)
+        options = options.reverse_merge(chef_version: "latest", prerelease: false)
+        @chef_version = options[:chef_version]
+        @prerelease = options[:prerelease]
+        @direct_url = options[:direct_url]
+      end
+
+      # @return [String]
+      def update_dir
+        "/tmp"
+      end
+
+      # @return [String]
+      def recipe_path
+        File.join(update_dir, "default.rb")
+      end
+
+      # @return [String]
+      def upgrade_solo_rb_path
+        File.join(update_dir, "upgrade_solo.rb")
+      end
+
+      # @return [String]
+      def tmp_cookbook_path
+        File.join(update_dir, "cookbooks")
+      end
+
+      # @return [String]
+      def tmp_cookbook
+        File.join(tmp_cookbook_path, "upgrade_omnibus")
+      end
+
+      # @return [String]
+      def chef_solo_command
+        "chef-solo -c #{upgrade_solo_rb_path} -o upgrade_omnibus"
+      end
+
+      # @return [String]
+      def chef_apply_command
+        "chef-apply #{recipe_path}"
+      end
+    end
+  end
+end

data/lib/ridley-connectors/command_context/windows_update_omnibus.rb

@@ -0,0 +1,144 @@
+module Ridley
+  module CommandContext
+    # Context class for generating an upgrade command for an Omnibus Chef installation on Windows based OSes
+    class WindowsUpdateOmnibus < CommandContext::Windows
+      template_file 'windows_update_omnibus'
+
+      # @return [String]
+      attr_reader :chef_version
+
+      # @return [Boolean]
+      attr_reader :prerelease
+
+      # @return [String]
+      attr_reader :direct_url
+
+      def initialize(options = {})
+        super(options)
+        options = options.reverse_merge(chef_version: "latest", prerelease: false)
+        @chef_version = options[:chef_version]
+        @prerelease = options[:prerelease]
+        @direct_url = options[:direct_url]
+      end
+
+      # @return [String]
+      def update_dir
+        "C:\\chef\\update"
+      end
+
+      # @return [String]
+      def recipe_path
+        "#{update_dir}\\default.rb"
+      end
+
+      # @return [String]
+      def tmp_cookbook_path
+        "#{update_dir}\\cookbooks\\upgrade_omnibus"
+      end
+
+      # @return [String]
+      def tmp_recipes_path
+        "#{tmp_cookbook_path}\\recipes"
+      end
+
+      # @return [String]
+      def upgrade_solo_rb_path
+        "#{update_dir}\\upgrade_solo.rb"
+      end
+
+      # @return [String]
+      def chef_solo_command
+        "chef-solo -c #{upgrade_solo_rb_path} -o upgrade_omnibus"
+      end
+
+      # @return [String]
+      def chef_apply_command
+        "chef-apply #{recipe_path}"
+      end
+
+      # Writes a recipe that uses remote_file to download the appropriate
+      # Chef MSI file
+      #
+      # @return [String]
+      def recipe_code
+        code = <<-RECIPE_CODE
+chef_version = '#{chef_version}'
+prerelease = #{prerelease}
+
+platform = node[:platform]
+platform_version = if node[:product_type] == 1 # Not server
+  case node[:platform_version]
+  when /6\.1\./
+    "7"
+  when /6\.2\./
+    "8"
+  end
+else # server
+  case node[:platform_version]
+  when /5\.2\.3/
+    "2003r2"
+  when /6\.0\./
+    "2008"
+  when /6\.1\./
+    "2008r2"
+  when /6\.2\./
+    "2012"
+  when /6\.3\./
+    "2012r2"
+  end
+end
+
+machine = node[:kernel][:machine]
+nightlies = false
+
+url = 'http://www.opscode.com/chef/download'
+url_args = [ "p=\#{platform}", "pv=\#{platform_version}", "m=\#{machine}", "v=\#{chef_version}", "prerelease=\#{prerelease}", "nightlies=\#{nightlies}" ]
+
+composed_url = "\#{url}?\#{url_args.join '&'}"
+
+#{direct_url.nil? ? "full_url = composed_url" : "full_url = \"#{direct_url}\""}
+request = Chef::REST::RESTRequest.new(:head, URI.parse(full_url), nil)
+result = request.call
+
+if result.kind_of?(Net::HTTPRedirection)
+  full_url = result['location']
+end
+
+file_name = ::File.basename(full_url)
+file_download_path = "C:\\\\chef\\\\update\\\\\#{file_name}"
+
+remote_file file_download_path do
+  source full_url
+  backup false
+  action :create_if_missing
+end
+
+file_extension = ::File.extname(file_name)
+
+RECIPE_CODE
+        escape_and_echo(code)
+      end
+
+      # Uses powershell to find a Chef installation and uninstalls it
+      #
+      # @return [String]
+      def uninstall_chef
+        win_uninstall_chef = <<-UNIN_PS
+      $productName      = "Chef"
+      $app = Get-WmiObject -Class Win32_Product | Where-Object {  $_.Name -match $productName  }
+      If ($app) { $app.Uninstall() }
+        UNIN_PS
+
+        escape_and_echo(win_uninstall_chef)
+      end
+
+      private
+
+      # 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-connectors/host_commander.rb

@@ -194,6 +194,33 @@ module Ridley
       execute(__method__, host, options)
     end
 
+    # Update a node's Omnibus installation of Chef
+    #
+    # @param [String] host
+    #   the host to perform the action on
+    #
+    # @option options [String] :chef_version
+    #   the version of Chef to install on the node
+    # @option options [Boolean] :prerelease
+    #   install a prerelease version of Chef
+    # @option options [String] :direct_url
+    #   a url pointing directly to a Chef package to install
+    # @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 update_omnibus(host, options = {})
+      execute(__method__, host, options)
+    end
+
     # Finds and returns the best HostConnector for a given host
     #
     # @param [String] host

data/lib/ridley-connectors/host_connector/ssh.rb

@@ -194,6 +194,37 @@ module Ridley
         run(host, CommandContext::UnixUninstall.command(options), options)
       end
 
+      # Update a node's Omnibus installation of Chef
+      #
+      # @param [String] host
+      #   the host to perform the action on
+      #
+      # @option options [String] :chef_version
+      #   the version of Chef to install on the node
+      # @option options [Boolean] :prerelease
+      #   install a prerelease version of Chef
+      # @option options [String] :direct_url
+      #   a url pointing directly to a Chef package to install
+      # @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 update_omnibus(host, options = {})
+        options = options.reverse_merge(ssh: Hash.new)
+        options[:ssh].reverse_merge!(sudo: true, timeout: 5.0)
+
+        log.info "Updating Omnibus installation on host: #{host}"
+        run(host, CommandContext::UnixUpdateOmnibus.command(options), options)
+      end
+
       private
 
         def channel_exec(channel, command, host, response)

data/lib/ridley-connectors/host_connector/winrm.rb

@@ -213,6 +213,11 @@ module Ridley
         run(host, CommandContext::WindowsUninstall.command(options), options)
       end
 
+      def update_omnibus(host, options = {})
+        log.info "Updating Omnibus installation on host: #{host}"
+        run(host, CommandContext::WindowsUpdateOmnibus.command(options), options)
+      end
+
       private
 
         # @param [String] host

data/lib/ridley-connectors/resources/node_resource.rb

@@ -192,6 +192,35 @@ module Ridley
       host_commander.uninstall_chef(host, options)
     end
 
+
+    # Update a node's Omnibus installation of Chef
+    #
+    # @param [String] host
+    #   the host to perform the action on
+    #
+    # @option options [String] :chef_version
+    #   the version of Chef to install on the node
+    # @option options [Boolean] :prerelease
+    #   install a prerelease version of Chef
+    # @option options [String] :direct_url
+    #   a url pointing directly to a Chef package to install
+    # @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 update_omnibus(host, options = {})
+      options = options.reverse_merge(ssh: ssh, winrm: winrm)
+      host_commander.update_omnibus(host, options)
+    end
+
     private
 
       # @return [Ridley::HostCommander]

data/lib/ridley-connectors/version.rb

@@ -1,5 +1,5 @@
 module Ridley
   module Connectors
-    VERSION = "2.1.2"
+    VERSION = "2.2.0"
   end
 end

data/scripts/unix_update_omnibus.erb

@@ -0,0 +1,78 @@
+cat << EOP > <%= recipe_path %>
+
+# Set Variables
+
+chef_version = '<%= chef_version %>'
+prerelease = <%= prerelease %>
+
+platform = node[:platform]
+platform_version = node[:platform_version]
+machine = node[:kernel][:machine]
+nightlies = false
+
+# Compose Chef download URL
+
+url = 'http://www.opscode.com/chef/download'
+url_args = [ "p=#{platform}", "pv=#{platform_version}", "m=#{machine}", "v=#{chef_version}", "prerelease=#{prerelease}", "nightlies=#{nightlies}" ]
+
+composed_url = "#{url}?#{url_args.join('&')}"
+
+# Download the Chef file
+
+<% if direct_url.nil? -%>
+full_url = composed_url
+<% else -%>
+full_url = <%= direct_url %>
+<% end -%>
+request = Chef::REST::RESTRequest.new(:head, URI.parse(full_url), nil)
+result = request.call
+
+if result.kind_of?(Net::HTTPRedirection)
+  full_url = result['location']
+end
+
+file_name = ::File.basename(full_url)
+file_download_path = ::File.join("<%= update_dir %>", file_name)
+
+remote_file file_download_path do
+  source full_url
+  backup false
+  action :create_if_missing
+end
+
+# Install the Chef file
+
+file_extension = ::File.extname(file_name)
+
+execute "Install the Omnibus package: #{file_download_path}" do
+  case file_extension
+  when '.rpm'
+    command "rpm -Uvh --oldpackage --replacepkgs #{file_download_path}"
+  when '.deb'
+    command "dpkg -i #{file_download_path}"
+  else
+    raise 'Unknown package type encountered!'
+  end
+end
+
+EOP
+
+# Install the Chef package using the resources above and chef-solo / chef-apply
+
+installed_major_chef_version=`chef-client -v | awk '{print $2}' | awk -F \. '{print $1}'`
+
+if [ $installed_major_chef_version -lt 11 ]; then
+  mkdir -p <%= File.join(tmp_cookbook_path, "upgrade_omnibus/recipes/") %>
+  cp <%= recipe_path %> <%= File.join(tmp_cookbook, "recipes") %>
+  echo 'cookbook_path "/tmp/cookbooks"' > <%= upgrade_solo_rb_path %>
+  <%= chef_solo_command %>
+else
+  <%= chef_apply_command %>
+fi
+
+# Cleanup
+
+rm -f <%= upgrade_solo_rb_path %>
+rm -rf <%= tmp_cookbook_path %>
+rm -f <%= recipe_path %>
+rm -rf <%= update_dir %>/*.rpm

data/scripts/windows_update_omnibus.erb

@@ -0,0 +1,30 @@
+mkdir <%= update_dir %>
+
+> <%= recipe_path %> (
+<%= recipe_code %>
+)
+
+chef-client -v | awk '{print $2}' | awk -F \. '{print $1}' > <%= update_dir %>\major_version.txt
+SET /p installed_major_chef_version=<<%= update_dir %>\major_version.txt
+
+IF %installed_major_chef_version% LSS 11 (
+  mkdir <%= tmp_cookbook_path %>
+  mkdir <%= tmp_recipes_path %>
+  cp <%= recipe_path %> <%= tmp_recipes_path %>
+  echo cookbook_path 'C:\chef\update\cookbooks' > <%= upgrade_solo_rb_path %>
+  call <%= chef_solo_command %>
+) else (
+  call <%= chef_apply_command %>
+)
+
+> <%= update_dir %>\uninstall_chef.ps1 (
+  <%= uninstall_chef %>
+)
+
+ls <%= update_dir %> | grep "chef-client" > <%= update_dir %>\msi_name.txt
+SET /p msi_name=<<%= update_dir %>\msi_name.txt
+powershell -ExecutionPolicy Unrestricted -NoProfile -NonInteractive <%= update_dir %>\uninstall_chef.ps1
+
+msiexec /qb /norestart /i "<%= update_dir %>\%msi_name%"
+
+rm -rf <%= update_dir %>

data/spec/unit/ridley-connectors/command_context/unix_uninstall_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe Ridley::CommandContext::UnixUninstall do
+  let(:unix_uninstall) { described_class.new }
+
+  describe "::new" do
+    context "when skip_chef is not provided" do
+      it "sets skip_chef to false" do
+        expect(unix_uninstall.skip_chef).to be_false
+      end
+    end
+  end
+
+  describe "#command" do
+    it "returns a string" do
+      expect(unix_uninstall.command).to be_a(String)
+    end
+  end
+
+  describe "#config_directory" do
+    it "returns a string" do
+      expect(unix_uninstall.config_directory).to be_a(String)
+    end
+  end
+
+  describe "#data_directory" do
+    it "returns a string" do
+      expect(unix_uninstall.data_directory).to be_a(String)
+    end
+  end
+
+  describe "#install_directory" do
+    it "returns a string" do
+      expect(unix_uninstall.install_directory).to be_a(String)
+    end
+  end
+end

data/spec/unit/ridley-connectors/command_context/unix_update_omnibus_spec.rb

@@ -0,0 +1,98 @@
+require 'spec_helper'
+
+describe Ridley::CommandContext::UnixUpdateOmnibus do
+  let(:unix_update_omnibus) { described_class.new }
+
+  describe "::new" do
+    context "when a chef_version is not given" do
+      it "chef_version is set to latest" do
+        expect(unix_update_omnibus.chef_version).to eql("latest")
+      end
+    end
+
+    context "when prerelease is not given" do
+      it "prerelease is set to false" do
+        expect(unix_update_omnibus.prerelease).to be_false
+      end
+    end
+
+    context "when options are set" do
+      let(:unix_update_omnibus) { described_class.new(options) }
+      let(:options) do
+        {
+          chef_version: "1.2.3",
+          prerelease: true,
+          direct_url: "http://my.package.com/"
+        }
+      end
+
+      it "sets chef_version" do
+        expect(unix_update_omnibus.chef_version).to eql("1.2.3")
+      end
+
+      it "sets prerelease" do
+        expect(unix_update_omnibus.prerelease).to be_true
+      end
+
+      it "sets direct_url" do
+        expect(unix_update_omnibus.direct_url).to eql("http://my.package.com/")
+      end
+    end
+  end
+
+  describe "#command" do
+    it "returns a string" do
+      expect(unix_update_omnibus.command).to be_a(String)
+    end
+  end
+
+  describe "#update_dir" do
+    it "returns a string" do
+      expect(unix_update_omnibus.update_dir).to be_a(String)
+    end
+  end
+
+  describe "#upgrade_solo_rb_path" do
+    it "returns a string" do
+      expect(unix_update_omnibus.upgrade_solo_rb_path).to be_a(String)
+    end
+  end
+
+  describe "#recipe_path" do
+    it "returns a string" do
+      expect(unix_update_omnibus.recipe_path).to be_a(String)
+    end
+  end
+
+  describe "#tmp_cookbook_path" do
+    it "returns a string" do
+      expect(unix_update_omnibus.tmp_cookbook_path).to be_a(String)
+    end
+  end
+
+  describe "#tmp_cookbook" do
+    it "returns a string" do
+      expect(unix_update_omnibus.tmp_cookbook).to be_a(String)
+    end
+  end
+
+  describe "#chef_solo_command" do
+    it "returns a string" do
+      expect(unix_update_omnibus.chef_solo_command).to be_a(String)
+    end
+
+    it "calls chef-solo" do
+      expect(unix_update_omnibus.chef_solo_command).to start_with("chef-solo")
+    end
+  end
+
+  describe "#chef_apply_command" do
+    it "returns a string" do
+      expect(unix_update_omnibus.chef_apply_command).to be_a(String)
+    end
+
+    it "calls chef-apply" do
+      expect(unix_update_omnibus.chef_apply_command).to start_with("chef-apply")
+    end
+  end
+end

data/spec/unit/ridley-connectors/command_context/windows>update_omnibus_spec.rb

@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+describe Ridley::CommandContext::WindowsUpdateOmnibus do
+  let(:windows_update_omnibus) { described_class.new }
+
+  describe "::new" do
+    context "when a chef_version is not given" do
+      it "chef_version is set to latest" do
+        expect(windows_update_omnibus.chef_version).to eql("latest")
+      end
+    end
+
+    context "when prerelease is not given" do
+      it "prerelease is set to false" do
+        expect(windows_update_omnibus.prerelease).to be_false
+      end
+    end
+
+    context "when options are set" do
+      let(:windows_update_omnibus) { described_class.new(options) }
+      let(:options) do
+        {
+          chef_version: "1.2.3",
+          prerelease: true,
+          direct_url: "http://my.package.com/"
+        }
+      end
+
+      it "sets chef_version" do
+        expect(windows_update_omnibus.chef_version).to eql("1.2.3")
+      end
+
+      it "sets prerelease" do
+        expect(windows_update_omnibus.prerelease).to be_true
+      end
+
+      it "sets direct_url" do
+        expect(windows_update_omnibus.direct_url).to eql("http://my.package.com/")
+      end
+    end
+  end
+
+  describe "#command" do
+    it "returns a string" do
+      expect(windows_update_omnibus.command).to be_a(String)
+    end
+  end
+
+  describe "#update_dir" do
+    it "returns a string" do
+      expect(windows_update_omnibus.update_dir).to be_a(String)
+    end
+  end
+
+  describe "#upgrade_solo_rb_path" do
+    it "returns a string" do
+      expect(windows_update_omnibus.upgrade_solo_rb_path).to be_a(String)
+    end
+  end
+
+  describe "#recipe_path" do
+    it "returns a string" do
+      expect(windows_update_omnibus.recipe_path).to be_a(String)
+    end
+  end
+
+  describe "#tmp_cookbook_path" do
+    it "returns a string" do
+      expect(windows_update_omnibus.tmp_cookbook_path).to be_a(String)
+    end
+  end
+
+  describe "#chef_solo_command" do
+    it "returns a string" do
+      expect(windows_update_omnibus.chef_solo_command).to be_a(String)
+    end
+
+    it "calls chef-solo" do
+      expect(windows_update_omnibus.chef_solo_command).to start_with("chef-solo")
+    end
+  end
+
+  describe "#chef_apply_command" do
+    it "returns a string" do
+      expect(windows_update_omnibus.chef_apply_command).to be_a(String)
+    end
+
+    it "calls chef-apply" do
+      expect(windows_update_omnibus.chef_apply_command).to start_with("chef-apply")
+    end
+  end
+end

data/spec/unit/ridley-connectors/command_context_spec.rb

@@ -31,26 +31,3 @@ describe Ridley::CommandContext::Base do
     end
   end
 end
-
-describe Ridley::CommandContext::Unix do
-  let(:unix) { described_class.new(options) }
-
-  describe "#command" do
-    context "when sudo is true" do
-      let(:command) { unix.command }
-      let(:template) { double(:evaluate => command_string) }
-      let(:options) do
-        {sudo: true}
-      end
-      let(:command_string) { "echo 'hi'" }
-
-      before do
-        unix.stub(:template).and_return(template)
-      end
-
-      it "prepends sudo to the command" do
-        expect(command).to eql("sudo echo 'hi'")
-      end
-    end
-  end
-end

data/spec/unit/ridley-connectors/host_connector/ssh_spec.rb

@@ -66,4 +66,32 @@ describe Ridley::HostConnector::SSH do
       connector.ruby_script(host, command_lines, options)
     end
   end
+
+  describe "#uninstall_chef" do
+    let(:command) { "uninstall chef" }
+
+    before do
+      Ridley::CommandContext::UnixUninstall.stub(:command).and_return(command)
+    end
+
+    it "receives a run command to uninstall chef" do
+      connector.should_receive(:run).with(host, command, options)
+
+      connector.uninstall_chef(host, options)
+    end
+  end
+
+  describe "#update_omnibus" do
+    let(:command) { "update omnibus" }
+
+    before do
+      Ridley::CommandContext::UnixUpdateOmnibus.stub(:command).and_return(command)
+    end
+
+    it "receives a run command to update omnibus" do
+      connector.should_receive(:run).with(host, command, options)
+
+      connector.update_omnibus(host, options)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley-connectors
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -136,7 +136,9 @@ files:
 - lib/ridley-connectors/client.rb
 - lib/ridley-connectors/command_context.rb
 - lib/ridley-connectors/command_context/unix_uninstall.rb
+- lib/ridley-connectors/command_context/unix_update_omnibus.rb
 - lib/ridley-connectors/command_context/windows_uninstall.rb
+- lib/ridley-connectors/command_context/windows_update_omnibus.rb
 - lib/ridley-connectors/errors.rb
 - lib/ridley-connectors/host_commander.rb
 - lib/ridley-connectors/host_connector.rb
@@ -148,7 +150,9 @@ files:
 - lib/ridley-connectors/version.rb
 - ridley-connectors.gemspec
 - scripts/unix_uninstall_omnibus.erb
+- scripts/unix_update_omnibus.erb
 - scripts/windows_uninstall_omnibus.erb
+- scripts/windows_update_omnibus.erb
 - spec/fixtures/encrypted_data_bag_secret
 - spec/fixtures/my-fake.pem
 - spec/spec_helper.rb
@@ -160,6 +164,9 @@ files:
 - spec/unit/ridley-connectors/bootstrap_context_spec.rb
 - spec/unit/ridley-connectors/chef_objects/node_object_spec.rb
 - spec/unit/ridley-connectors/client_spec.rb
+- spec/unit/ridley-connectors/command_context/unix_uninstall_spec.rb
+- spec/unit/ridley-connectors/command_context/unix_update_omnibus_spec.rb
+- spec/unit/ridley-connectors/command_context/windows>update_omnibus_spec.rb
 - spec/unit/ridley-connectors/command_context_spec.rb
 - spec/unit/ridley-connectors/host_commander_spec.rb
 - spec/unit/ridley-connectors/host_connector/ssh_spec.rb
@@ -203,6 +210,9 @@ test_files:
 - spec/unit/ridley-connectors/bootstrap_context_spec.rb
 - spec/unit/ridley-connectors/chef_objects/node_object_spec.rb
 - spec/unit/ridley-connectors/client_spec.rb
+- spec/unit/ridley-connectors/command_context/unix_uninstall_spec.rb
+- spec/unit/ridley-connectors/command_context/unix_update_omnibus_spec.rb
+- spec/unit/ridley-connectors/command_context/windows>update_omnibus_spec.rb
 - spec/unit/ridley-connectors/command_context_spec.rb
 - spec/unit/ridley-connectors/host_commander_spec.rb
 - spec/unit/ridley-connectors/host_connector/ssh_spec.rb