knife-brightbox 0.2.2 → 0.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NGI4N2JhNzFjYThjNDY3NjY4YTQxOGQ1NDQyNTVhYTljMDFhN2ZjYw==
+  data.tar.gz: !binary |-
+    YTA5YzM3NjA2MWRlMDNiZTIyYWEwOGEyZTI4YWY4N2ZjNDk2NTc5Yw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZTNlMzlkZjU2ZThjMDY1MjdmZDIzNjMwNzAzMzI5YjU5YWE2ZTMwOTAzYjYz
+    OTUzMmUwOTI5Y2Q0ZmYyMGQwZGU2MTU1ZDU2MjlmMmFmYWNjMTc1ZmI5NTdj
+    ODkzMGUxYTE4NTZlMjZlMTc4Nzg2NDY4YjA5MTk3NTc4NjE2YWY=
+  data.tar.gz: !binary |-
+    NjlkZDc1YTY1MTBkMTkxZTg0NzU3NDBmNTU5YTA2ODBhZmE3NjQ2YTFjZjEz
+    YWQyYWE3YTQ2NmRkNjNiZWYxZTE2OTE4ZTc2NWZkZWMzODcwNWE4ZmFhN2M4
+    ZDY0ZmRjZjQ0ODZiMmEwNTExYjgwNGI5MzQ2ZTY4MjQyM2I0ZDY=

data/CHANGELOG

@@ -1,3 +1,10 @@
+# 0.3.0
+
+* introducing `--purge` and `--node-name` command line options for the
+  delete subcommand to clean up resources after destroying a server
+* Relaxes fog dependency to allow 1.x versions of fog
+* Updates gemspec licence and description
+
 # 0.2.2
 
 * Updates fog dependency to 1.7.0
@@ -10,7 +17,7 @@
 # 0.2
 
 * Added the ability to add server groups during bootstrap (@gkarekinian)
-  
+
   http://git.io/TOcHhQ
 
 * Fixes from @gkarekinian, @kangguru

data/README.rdoc

@@ -62,7 +62,7 @@ Provisions a new server in the Brightbox Cloud and then perform a Chef bootstrap
 
 == knife brightbox server delete
 
-Deletes an existing server in the currently configured Brightbox Cloud account by the server/instance id. You can find the instance id by entering 'knife brightbox server list'. Please note - this does not delete the associated node and client objects from the Chef server.
+Deletes an existing server in the currently configured Brightbox Cloud account by the server/instance id. You can find the instance id by entering 'knife brightbox server list'. You can specify the `--purge` flag to delete the associated node and client objects from the Chef server along with the cloup ip.
 
 == knife brightbox server list
 

data/knife-brightbox.gemspec

@@ -5,18 +5,19 @@ require "knife-brightbox/version"
 Gem::Specification.new do |s|
   s.name        = "knife-brightbox"
   s.version     = Knife::Brightbox::VERSION
+  s.license     = "Apache License, Version 2.0"
   s.has_rdoc = true
   s.authors     = ["Sergio Rubio"]
   s.email       = ["rubiojr@frameos.org","rubiojr@frameos.org"]
   s.homepage = "http://wiki.opscode.com/display/chef"
   s.summary = "Brightbox Support for Chef's Knife Command"
-  s.description = s.summary
+  s.description = "Plugin to add support for Brightbox's Cloud service to Chef's Knife command"
   s.extra_rdoc_files = ["README.rdoc", "LICENSE" ]
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.add_dependency "fog", "~> 1.7.0"
+  s.add_dependency "fog", "~> 1.12"
   s.add_dependency "chef", ">= 0.10"
   s.require_paths = ["lib"]
 end

data/lib/chef/knife/brightbox_server_delete.rb

@@ -26,9 +26,45 @@ class Chef
 
       banner "knife brightbox server delete SERVER_ID [SERVER_ID] (options)"
 
+      option :purge,
+        :short => "-P",
+        :long => "--purge",
+        :boolean => true,
+        :default => false,
+        :description => "Destroy corresponding node and client on the Chef Server, in addition to destroying the EC2 node itself.  Assumes node and client have the same name as the server (if not, add the '--node-name' option)."
+
+      option :chef_node_name,
+        :short => "-N NAME",
+        :long => "--node-name NAME",
+        :description => "The name of the node and client to delete, if it differs from the server name.  Only has meaning when used with the '--purge' option."
+
+      # Extracted from Chef::Knife.delete_object, because it has a
+      # confirmation step built in... By specifying the '--purge'
+      # flag (and also explicitly confirming the server destruction!)
+      # the user is already making their intent known.  It is not
+      # necessary to make them confirm two more times.
+      def destroy_item(klass, name, type_name)
+        begin
+          object = klass.load(name)
+          object.destroy
+          ui.warn("Deleted #{type_name} #{name}")
+        rescue Net::HTTPServerException
+          ui.warn("Could not find a #{type_name} named #{name} to delete!")
+        end
+      end
+
+      def wait_for_release
+        yield
+        true
+      rescue Excon::Errors::Forbidden
+        sleep 1
+        false
+      end
+
       def run
         @name_args.each do |instance_id|
           server = connection.servers.get(instance_id)
+
           if server.nil?
             ui.error("Server instance #{instance_id} not found. Aborting.")
             exit 1
@@ -37,6 +73,7 @@ class Chef
           msg("Name", server.name)
           msg("Flavor", server.flavor.name)
           msg("Image", server.image.name)
+          msg("Public IP Address", server.public_ip_address)
 
           puts "\n"
           confirm("Do you really want to delete this server")
@@ -44,6 +81,20 @@ class Chef
           server.destroy
 
           ui.warn("Deleted server #{server.id} named #{server.name}")
+
+          if config[:purge]
+            thing_to_delete = config[:chef_node_name] || server.name
+            destroy_item(Chef::Node, thing_to_delete, "node")
+            destroy_item(Chef::ApiClient, thing_to_delete, "client")
+
+            server.cloud_ips.each do |cid|
+              cid = connection.cloud_ips.get(cid["id"])
+              print "#{ui.color("WARNING: ", :yellow)} Deleted cloud ip (#{cid.id})"
+              print(".") until wait_for_release { cid.destroy; puts("done!") }
+            end
+          else
+            ui.warn("Corresponding node and client for the #{instance_id} server were not deleted and remain registered with the Chef Server")
+          end
         end
       end
 

data/lib/knife-brightbox/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Brightbox
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: knife-brightbox
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Sergio Rubio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,12 +34,11 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.10'
-description: Brightbox Support for Chef's Knife Command
+description: Plugin to add support for Brightbox's Cloud service to Chef's Knife command
 email:
 - rubiojr@frameos.org
 - rubiojr@frameos.org
@@ -65,28 +60,28 @@ files:
 - lib/chef/knife/brightbox_server_list.rb
 - lib/knife-brightbox/version.rb
 homepage: http://wiki.opscode.com/display/chef
-licenses: []
+licenses:
+- Apache License, Version 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Brightbox Support for Chef's Knife Command
 test_files: []
 has_rdoc: true