Attempt to address Issue chef-cookbooks#34

Author: jeremymv2

README.md

@@ -2,7 +2,7 @@
 
 # supermarket-omnibus-cookbook
 
-This cookbook installs the [Chef Supermarket](https://github.com/opscode/supermarket) server using the [omnibus-supermarket](https://github.com/opscode/omnibus-supermarket) packages from PackageCloud.  
+This cookbook installs the [Chef Supermarket](https://github.com/opscode/supermarket) server using the [omnibus-supermarket](https://github.com/opscode/omnibus-supermarket) packages from PackageCloud.
 This cookbook also renders supermarket.json file which is used for managing configuration of Supermarket.
 
 # Usage
@@ -18,18 +18,26 @@ default['supermarket_omnibus']['chef_oauth2_secret'] = 'a49402219627cfa6318d58b1
 default['supermarket_omnibus']['chef_oauth2_verify_ssl'] = false
 ```
 
-If you wish to specify a package version, a repository or a source, you can do that now:
+# Install from the repository of nightly packages
 ```ruby
-default['supermarket_omnibus']['package_version'] = '1.2.3'
-
-# install from the repository of nightly packages
 default['supermarket_omnibus']['package_repo'] = 'chef-current'
+```
 
+```ruby
 # OR, specify a Supermarket package explicitly from a location of your choosing
 default['supermarket_omnibus']['package_url'] = 'http://bit.ly/98K8eH'
 ```
 
-If you wish to specify additional settings, you can pass them via the `default['supermarket_omnibus']['config']` attribute.  
+# Enable easy upgrades of your Supermarket installation (disabled by default)
+```ruby
+# set the following in a wrapper cookbook
+default['supermarket_omnibus']['upgrades_enabled'] = true # enables upgrade action
+default['supermarket_omnibus']['reconfig_after_upgrades'] = true # run `supermarket-ctl reconfigure` after upgrades
+default['supermarket_omnibus']['restart_after_upgrades'] = true # run `supermarket-ctl restart` after upgrades
+default['supermarket_omnibus']['package_version'] = '2.3.3' # pin to a desired semantic version; upgrade will occurr if necessary
+```
+
+If you wish to specify additional settings, you can pass them via the `default['supermarket_omnibus']['config']` attribute.
 Example: for custom SSL certificates define the following `config` attributes:
 
 ```ruby

attributes/default.rb

@@ -1,9 +1,11 @@
-
 default['supermarket_omnibus']['chef_server_url'] = nil
 default['supermarket_omnibus']['chef_oauth2_app_id'] = nil
 default['supermarket_omnibus']['chef_oauth2_secret'] = nil
 default['supermarket_omnibus']['chef_oauth2_verify_ssl'] = false
 default['supermarket_omnibus']['config'] = {}
+default['supermarket_omnibus']['upgrades_enabled'] = false
+default['supermarket_omnibus']['reconfig_after_upgrades'] = false
+default['supermarket_omnibus']['restart_after_upgrades'] = false
 
 default['supermarket_omnibus']['package_url'] = nil
 default['supermarket_omnibus']['package_version'] = :latest

libraries/supermarket_server.rb

@@ -3,14 +3,16 @@
 
 class Chef
   class Resource
-    # Missing top-level class documentation comment
+    # Missing top-level class documentation comment.
     class SupermarketServer < Chef::Resource
+      attr_accessor :exists, :supermarket_version
+
       def initialize(name, run_context = nil)
         super
         @resource_name = :supermarket_server
         @provider = Chef::Provider::SupermarketServer
-        @action = :create
-        @allowed_actions = [:create]
+        @allowed_actions = [:create, :upgrade, :reconfigure]
+        @default_action = :create
       end
 
       def chef_server_url(arg = nil)
@@ -29,6 +31,18 @@ def chef_oauth2_verify_ssl(arg = nil)
         set_or_return(:chef_oauth2_verify_ssl, arg, kind_of: [TrueClass, FalseClass], required: true)
       end
 
+      def reconfig_after_upgrades(arg = nil)
+        set_or_return(:reconfig_after_upgrades, arg, kind_of: [TrueClass, FalseClass], required: true)
+      end
+
+      def restart_after_upgrades(arg = nil)
+        set_or_return(:restart_after_upgrades, arg, kind_of: [TrueClass, FalseClass], required: true)
+      end
+
+      def supermarket_version(arg = nil)
+        set_or_return(:supermarket_version, arg, kind_of: [String, Symbol], required: true)
+      end
+
       def config(arg = nil)
         set_or_return(:config, arg, kind_of: [Hash])
       end
@@ -38,18 +52,57 @@ def config(arg = nil)
 
 class Chef
   class Provider
-    # Missing top-level class documentation comment
+    # Missing top-level class documentation comment.
     class SupermarketServer < Chef::Provider::LWRPBase
+      SUPERMARKET_VERSION_FILE = '/opt/supermarket/version-manifest.json'.freeze
+      SUPERMARKET_CONFIG = '/etc/supermarket/supermarket.json'.freeze
+
       use_inline_resources if defined?(use_inline_resources)
 
       def whyrun_supported?
         true
       end
 
+      def load_current_resource
+        @current_resource = Chef::Resource::SupermarketServer.new(@new_resource.name)
+        load_version
+        Chef::Log.info("Current version: #{@current_resource.supermarket_version}")
+        Chef::Log.info("Requested version: #{@new_resource.supermarket_version}")
+        @current_resource
+      end
+
+      def load_version
+        require 'json'
+        version_manifest = JSON.parse(::File.read(SUPERMARKET_VERSION_FILE))
+        @current_resource.supermarket_version = version_manifest['software']['supermarket']['described_version']
+        @current_resource.exists = ::File.exist?(SUPERMARKET_CONFIG) && ::File.exist?(SUPERMARKET_VERSION_FILE)
+      rescue
+        @current_resource.exists = false
+        @current_resource.supermarket_version = nil
+      end
+
+      def action_reconfigure
+        execute 'reconfigure_supermarket_instance' do
+          command 'sudo supermarket-ctl reconfigure'
+          only_if { new_resource.reconfig_after_upgrades }
+        end
+
+        execute 'restart_supermarket_instance' do
+          command 'sudo supermarket-ctl restart'
+          only_if { new_resource.restart_after_upgrades }
+        end
+      end
+
+      def can_upgrade?(vnow, vnext)
+        return true if vnow.nil? && vnext == :latest
+        Gem::Version.new(vnext) > Gem::Version.new(vnow)
+      rescue
+        Chef::Log.warn("Cannot upgrade. Please set `node['supermarket_omnibus']['package_version']` to a semantic version.")
+        false
+      end
+
       def supermarket_config
         {
-          'chef_server_url' => new_resource.chef_server_url,
-          'chef_oauth2_app_id' => new_resource.chef_oauth2_app_id,
           'chef_oauth2_secret' => new_resource.chef_oauth2_secret,
           'chef_oauth2_verify_ssl' => new_resource.chef_oauth2_verify_ssl
         }
@@ -59,7 +112,13 @@ def merged_supermarket_config
         new_resource.config.merge(supermarket_config)
       end
 
-      action :create do
+      def action_upgrade
+        return unless can_upgrade?(@current_resource.supermarket_version, new_resource.supermarket_version)
+        action_create
+        action_reconfigure if @current_resource.exists
+      end
+
+      def action_create
         hostsfile_entry node['ipaddress'] do
           hostname node['hostname']
           not_if "grep #{node['hostname']} /etc/hosts"
@@ -107,7 +166,7 @@ def merged_supermarket_config
             package_source cache_path
           else
             Chef::Log.info "Using CHEF's public repository #{node['supermarket_omnibus']['package_repo']}"
-            version node['supermarket_omnibus']['package_version']
+            version new_resource.supermarket_version
           end
         end
       end

recipes/default.rb

@@ -14,4 +14,10 @@
   chef_oauth2_secret node['supermarket_omnibus']['chef_oauth2_secret']
   chef_oauth2_verify_ssl node['supermarket_omnibus']['chef_oauth2_verify_ssl']
   config node['supermarket_omnibus']['config'].to_hash
+  reconfig_after_upgrades node['supermarket_omnibus']['reconfig_after_upgrades']
+  restart_after_upgrades node['supermarket_omnibus']['restart_after_upgrades']
+  supermarket_version node['supermarket_omnibus']['package_version']
+  action :create
 end
+
+include_recipe 'supermarket-omnibus-cookbook::upgrades'

recipes/upgrades.rb

@@ -0,0 +1,13 @@
+## Cookbook Name:: supermarket-omnibus-cookbook
+## Recipe:: upgrade
+##
+## Copyright (c) 2014 The Authors, All Rights Reserved.
+#
+
+unless node['supermarket_omnibus']['upgrades_enabled']
+  Chef::Log.warn('The attribute `node["supermarket_omnibus"]["upgrades_enabled"]` is not set to true.')
+  Chef::Log.warn('Will not attempt upgrades on this node.')
+  return
+end
+
+resources(supermarket_server: 'supermarket').action :upgrade