knife-bluebox 0.7.0 → 0.7.1

data/README.rdoc

@@ -10,8 +10,14 @@ Depending on your system configuration, you may need to run this command with
 root privileges.
 
 == Configuration
-TODO
+Set the following environmental variables
+
+export BLUEBOX_API_KEY="YourAPIKey"              # should match /[a-f0-9]+/
+export BLUEBOX_CUSTOMER_ID="YourCustomerNumber"  # should match /d+/
 
 == Usage
-TODO
+knife bluebox images list
+knife bluebox server create [RUN LIST...] (options)
+knife bluebox server delete BLOCK-HOSTNAME
+knife bluebox server list (options)
 

data/lib/chef/knife/bluebox_server_create.rb

@@ -72,7 +72,7 @@ class Chef
         :short => "-d DISTRO",
         :long => "--distro DISTRO",
         :description => "Bootstrap a distro using a template",
-        :default => "ubuntu10.04-gems"
+        :default => "chef-full"
 
       option :identity_file,
         :short => "-I IDENTITY_FILE",
@@ -165,7 +165,7 @@ class Chef
             begin
               bootstrap = Chef::Knife::Bootstrap.new
               bootstrap.name_args = [ server.ips[0]['address'] ]
-              bootstrap.config[:run_list] = @name_args
+              bootstrap.config[:run_list] = run_list
               bootstrap.config[:password] = password unless config[:password].empty?
               bootstrap.config[:ssh_user] = config[:username]
               bootstrap.config[:identity_file] = config[:identity_file]
@@ -190,8 +190,14 @@ class Chef
           puts "\n\n#{h.color("Encountered error starting up BBG block. Auto destroy called.  Please try again.", :red)}"
 
         end
+      end
 
+      def run_list
+        candidate = @name_args.first
+        return candidate if /[\s,]+/ !~ candidate
+        candidate.split(/[\s,]+/)
       end
+
     end
   end
 end

data/lib/chef/knife/bluebox_server_delete.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,42 +27,102 @@ class Chef
         require 'highline'
         require 'readline'
         require 'chef/json_compat'
+        require 'chef/node'
+        require 'chef/api_client'
+        require 'chef/search/query'
       end
 
       banner "knife bluebox server delete BLOCK-HOSTNAME"
 
-      def h
-        @highline ||= HighLine.new
-      end
-
       def run
         bluebox = Fog::Compute::Bluebox.new(
           :bluebox_customer_id => Chef::Config[:knife][:bluebox_customer_id],
           :bluebox_api_key => Chef::Config[:knife][:bluebox_api_key]
         )
 
+        @server_to_remove = @name_args[0]
+
         # Build hash of hostname => id
         servers = bluebox.servers.inject({}) { |h,f| h[f.hostname] = f.id; h }
 
-        unless servers.has_key?(@name_args[0])
-          ui.error("Can't find a block named #{@name_args[0]}")
+        unless servers.has_key?(@server_to_remove)
+          ui.error("Can't find a block named #{@server_to_remove}")
           exit 1
         end
 
-        confirm(h.color("Do you really want to delete block UUID #{servers[@name_args[0]]} with hostname #{@name_args[0]}", :green))
-
+        # remove the block instance
+        ui.confirm("Do you really want to delete block UUID #{servers[@server_to_remove]} with hostname #{@server_to_remove}")
         begin
-          response = bluebox.destroy_block(servers[@name_args[0]])
+          response = bluebox.destroy_block(servers[@server_to_remove])
           if response.status == 200
-            puts "\n\n#{h.color("Successfully destroyed #{@name_args[0]}", :green)}"
+            ui.msg(green("Successfully destroyed #{@server_to_remove}"))
           else
-            puts "\n\n#{h.color("There was a problem destroying #{@name_args[0]}. Please check Box Panel.", :red)}"
+            ui.msg(red("There was a problem destroying #{@server_to_remove}. Please check Box Panel."))
             exit 1
           end
         rescue Excon::Errors::UnprocessableEntity
-          puts "\n\n#{h.color("There was a problem destroying #{@name_args[0]}. Please check Box Panel.", :red)}"
+          ui.msg(red("There was a problem destroying #{@server_to_remove}. Please check Box Panel."))
+        end
+
+        # remove chef client and node
+        ui.confirm("Do you wish to remove the #{chef_name} node and client objects from the chef server?")
+        if !chef_name.nil?
+          remove_node(chef_name)
+          remove_client(chef_name)
+        else
+          ui.msg "Could not locate a chef node associated with #{@server_to_remove}"
+        end
+      end
+
+      def chef_name
+        short_name = @server_to_remove.split(".").first
+
+        if node_exists?(@server_to_remove)
+          @server_to_remove
+        elsif node_exists?(short_name)
+          short_name
+        else
+          nil
         end
       end
+
+      def remove_node(node)
+        begin
+          object = Chef::Node.load(node)
+          object.destroy
+          ui.msg(green("#{node} node removed from chef server"))
+        rescue
+          ui.warn(" Could not remove the #{node} node")
+        end
+      end
+
+      def remove_client(client)
+        begin
+          object = Chef::ApiClient.load(client)
+          object.destroy
+          ui.msg(green("#{client} client removed from chef server"))
+        rescue
+          ui.warn("Could not remove the #{client} client")
+        end
+      end
+
+      def node_exists?(node)
+        search = Chef::Search::Query.new
+        !search.search('node', "name:#{node}").first.empty?
+      end
+
+      def highline
+        @highline ||= HighLine.new
+      end
+
+      def green(text)
+        "#{highline.color(text, :green)}"
+      end
+
+      def red(text)
+        "#{highline.color(text, :red)}"
+      end
+
     end
   end
 end

data/lib/knife-bluebox/version.rb

@@ -1,3 +1,3 @@
 module KnifeBlueBox
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-bluebox
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -84,3 +84,4 @@ signing_key:
 specification_version: 3
 summary: Chef knife plugin for Blue Box
 test_files: []
+has_rdoc: true