caterer 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b3147ba0fe11638b59e9868a8d4acd806f26c77
-  data.tar.gz: 976a1d58307350bfb790500a54b118fbf88b4388
+  metadata.gz: e4c798c2f1c36ac80248f74196055b373f632dde
+  data.tar.gz: e7ef1a46ef4ae5accb35c636476a188d183c8dc6
 SHA512:
-  metadata.gz: f5aa87a973e936714fe87065ee3ac861c3ceeb0f7de726b00bf2b9f5989c57ebef776fb31989352c99551710d536d3ee81aec5820410b4f3fb65f7203c5a3294
-  data.tar.gz: 04c695725ef3e98cb235f974a7c2be6e80107690e6ba65c9a6fcb4fce96b9a929254053543a311a71dc31deda9ad0c47bb81f6d7a3400040af57f942cba434f8
+  metadata.gz: 4bb9ab8f4145b042315d78f3105c98215e22ccc00e50ad74220924f4e8f72a04c2580fadb3629fa6d137ab0b3d4977e2b7820f7a0002f0b03365f7c43ea5f403
+  data.tar.gz: 2b0ef6ca34b0d2380686edba5e69f012575dfffa56aaa96043426e866e6a9a21b6caa666bad471c9ed278157f995df3fb7834a63ab3c736d1f4f3387910e7d79

data/lib/caterer/provisioner/chef_solo.rb

@@ -71,7 +71,8 @@ module Caterer
 
         res = server.ssh.sudo bash(File.read(installer)), :stream => true
 
-        # somewhere mark (on the server) that we installed chef-solo for later uninstall
+        # mark (on the server) that we installed chef-solo for later uninstall
+        server.ssh.sudo "touch #{dest_var_dir}/INSTALL"
 
         unless res == 0
           server.ui.error "install failed with exit code: #{res}"
@@ -83,6 +84,29 @@ module Caterer
         res == 0 ? true : false
       end
 
+      def uninstall(server)
+        server.ui.info "Uninstalling..."
+
+        # figure out how to uninstall chef_solo IF we installed it
+        installed = server.ssh.sudo "[[ -f #{dest_var_dir}/INSTALL ]]"
+
+        if installed == 0
+          uninstaller = uninstall_script(server.platform)
+
+          if not File.exists? uninstaller
+            server.ui.error "#{server.platform} doesn't have an uninstall script"
+            return
+          end
+
+          res = server.ssh.sudo bash(File.read(uninstaller)), :stream => true
+
+          unless res == 0
+            server.ui.error "install failed with exit code: #{res}"
+          end
+        end
+
+      end
+
       def prepare(server)
         # create lib dir
         server.ssh.sudo "mkdir -p #{dest_lib_dir}", :stream => true
@@ -144,12 +168,6 @@ module Caterer
         "chef-solo -c #{target_solo_path} -j #{target_json_config_path}"
       end
 
-      def uninstall(server)
-        server.ui.info "Uninstalling..."
-
-        # figure out how to uninstall chef_solo IF we installed it
-      end
-
       protected
 
       def config
@@ -204,6 +222,10 @@ module Caterer
         File.expand_path("../../../templates/provisioner/chef_solo/install/#{platform}.sh", __FILE__)
       end
 
+      def uninstall_script(platform)
+        File.expand_path("../../../templates/provisioner/chef_solo/uninstall/#{platform}.sh", __FILE__)
+      end
+
       def solo_content(server)
         Tilt.new(File.expand_path('../../../templates/provisioner/chef_solo/solo.erb', __FILE__)).render(self, {:server => server})
       end

data/lib/caterer/version.rb

@@ -1,3 +1,3 @@
 module Caterer
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/lib/templates/provisioner/chef_solo/uninstall/debian.sh

@@ -0,0 +1,2 @@
+# purge the omnibus installer
+dpkg -P chef

data/lib/templates/provisioner/chef_solo/uninstall/el.sh

@@ -0,0 +1,2 @@
+# remove the omnibus installer 
+rpm -ev --nodeps chef

data/lib/templates/provisioner/chef_solo/uninstall/fedora.sh

@@ -0,0 +1,2 @@
+# remove the omnibus installer 
+rpm -ev --nodeps chef

data/lib/templates/provisioner/chef_solo/uninstall/sles.sh

@@ -0,0 +1,2 @@
+# remove the omnibus installer 
+rpm -ev --nodeps chef

data/lib/templates/provisioner/chef_solo/uninstall/smartos.sh

@@ -0,0 +1,5 @@
+# remove fat-client
+[[ -d /opt/chef ]] && rm -rf /opt/chef
+
+# drop symlink
+[[ -f /opt/local/bin/chef-solo ]] && rm -f /opt/local/bin/chef-solo

data/lib/templates/provisioner/chef_solo/uninstall/suse.sh

@@ -0,0 +1,2 @@
+# remove the omnibus installer 
+rpm -ev --nodeps chef

data/lib/templates/provisioner/chef_solo/uninstall/ubuntu.sh

@@ -0,0 +1,2 @@
+# purge the omnibus installer
+dpkg -P chef

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caterer
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Tyler Flint
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -236,6 +236,13 @@ files:
 - lib/templates/provisioner/chef_solo/install/suse.sh
 - lib/templates/provisioner/chef_solo/install/ubuntu.sh
 - lib/templates/provisioner/chef_solo/solo.erb
+- lib/templates/provisioner/chef_solo/uninstall/debian.sh
+- lib/templates/provisioner/chef_solo/uninstall/el.sh
+- lib/templates/provisioner/chef_solo/uninstall/fedora.sh
+- lib/templates/provisioner/chef_solo/uninstall/sles.sh
+- lib/templates/provisioner/chef_solo/uninstall/smartos.sh
+- lib/templates/provisioner/chef_solo/uninstall/suse.sh
+- lib/templates/provisioner/chef_solo/uninstall/ubuntu.sh
 - lib/templates/provisioner/shell/script.erb
 - lib/templates/server/platform.sh
 homepage: ''