knife-block 0.0.4 → 0.0.5

data/lib/chef/knife/block.rb

@@ -6,37 +6,63 @@
 # Copyright (c) Matthew Macdonald-Wallace / Green and Secure IT Limited 2012
 #
 module GreenAndSecure
+    def check_block_setup
+	if File.exists?(::Chef::Knife::chef_config_dir+"/knife.rb") then
+	    if !File.symlink?(::Chef::Knife::chef_config_dir+"/knife.rb") then
+		puts "#{::Chef::Knife::chef_config_dir}/knife.rb is NOT a symlink."
+		puts "Please copy the file to #{::Chef::Knife::chef_config_dir}/knife-<servername>.rb and re-run this command."
+		exit 3
+	    end
+	end
+    end
+    module_function :check_block_setup
+
+    def printable_server(server_config)
+	File.basename(server_config, ".rb").split('-')[1 .. -1].join('-')
+    end
+    module_function :printable_server
+
     class Block < Chef::Knife
     banner "knife block"
     	def run
-	    puts 'Did you mean to run "knife block list" instead?'
-	    puts 'Running "knife block list" for you now'
     	    list = GreenAndSecure::BlockList.new
-    	    list.run
+            if name_args.size == 1 and list.servers.include?(name_args[0])
+    	        use = GreenAndSecure::BlockUse.new
+                use.name_args = name_args
+                use.run
+            else
+	        puts 'Did you mean to run "knife block list" instead?'
+	        puts 'Running "knife block list" for you now'
+    	        list.run
+            end
 	end
     end
+
     class BlockList < Chef::Knife
 
 	banner "knife block list"
 
+        @current_server = nil
+        def current_server
+            GreenAndSecure::check_block_setup
+	
+            @current_server ||= if File.exists?(::Chef::Knife::chef_config_dir+"/knife.rb") then
+                    GreenAndSecure::printable_server(File.readlink(::Chef::Knife::chef_config_dir+"/knife.rb"))
+                else
+                    nil
+                end
+        end
+
+	@servers = []
+        def servers
+	    ## get the list of available environments by searching ~/.chef for knife.rb files
+	    @servers ||= Dir.glob(::Chef::Knife::chef_config_dir+"/knife-*.rb").sort.map do | fn |
+		    GreenAndSecure::printable_server(fn)
+	        end
+        end
+
     	# list the available environments
     	def run
-	    chef_path = Dir.home + "/.chef"
-	    ## get the list of available environments by searching ~/.chef for knife.rb files
-	    file_list = Dir.glob(chef_path+"/knife-*.rb").sort
-	    current_server = ""
-	    if File.exists?(chef_path+"/knife.rb") then
-		if !File.symlink?(chef_path+"/knife.rb") then
-		    puts "#{chef_path}/knife.rb is NOT a symlink."
-		    puts "Please copy the file to #{chef_path}/knife-<servername>.rb and re-run this command."
-		    exit 3
-		end
-		    current_server = File.readlink(chef_path+"/knife.rb").split('-')[1 .. -1].join('-').split('.')[0]
-	    end
-	    servers = []
-	    file_list.each do | fn |
-		servers << fn.split('-')[1 .. -1].join('-').split('.')[0]
-	    end
 	    puts "The available chef servers are:"
 	    servers.each do |server|
 		if server == current_server then
@@ -47,6 +73,7 @@ module GreenAndSecure
 	    end
 	end
     end
+
     class BlockUse < Chef::Knife
 
     	banner "knife block use SERVERNAME"
@@ -58,32 +85,21 @@ module GreenAndSecure
     	    	server_list.run
     	    	exit 1
 	    end
-	    chef_path = Dir.home + "/.chef"
-	    current_server = ""
-	    if File.exists?(chef_path+"/knife.rb") then
-		if !File.symlink?(chef_path+"/knife.rb") then
-		    puts "#{chef_path}/knife.rb is NOT a symlink."
-		    puts "Please copy the file to #{chef_path}/knife-<servername>.rb and re-run this command."
-		    exit 3
-		end
-		    current_server = File.readlink(chef_path+"/knife.rb").split('-')[1 .. -1].join('-').split('.')[0]
-	    end
+    	    list = GreenAndSecure::BlockList.new
 	    new_server = name_args.first
-	    ui.confirm("You are asking to change from #{current_server} to #{new_server}. Are you sure")
-	    if File.exists?(chef_path+"/knife.rb")
-		    File.unlink(chef_path+"/knife.rb")
+	    ui.confirm("You are asking to change from #{list.current_server} to #{new_server}. Are you sure")
+	    if File.exists?(::Chef::Knife::chef_config_dir+"/knife.rb")
+		    File.unlink(::Chef::Knife::chef_config_dir+"/knife.rb")
 	    end
-	    File.symlink(chef_path+"/knife-#{new_server}.rb",chef_path+"/knife.rb")
-	    if File.exists?(chef_path+"/knife.rb") then
-		    current_server = File.readlink(chef_path+"/knife.rb").split('-')[1 .. -1].join('-').split('.')[0]
-	    end
-	    puts "The knife configuration has been updated to use #{current_server}"
+	    File.symlink(::Chef::Knife::chef_config_dir+"/knife-#{new_server}.rb",
+                ::Chef::Knife::chef_config_dir+"/knife.rb")
+	    puts "The knife configuration has been updated to use #{new_server}"
 	end
     end
+
     class BlockNew < Chef::Knife
     	banner "knife block new SERVERNAME"
     	def run
-    	    chef_path = Dir.home + "/.chef"
     	    puts "This will create a new knife configuration file for you to use with knife-block"
     	    unless name_args.size == 1
     	    	@config_name = ui.ask_question("Please provide a friendly name for the new configuration file: ")
@@ -94,28 +110,16 @@ module GreenAndSecure
 	    @chef_server = ui.ask_question("Please enter the url to your Chef Server: ")
 	    require 'ohai'
 	    require 'chef/knife/configure'
-	    if File.exists?(chef_path+"/knife.rb") then
-		if !File.symlink?(chef_path+"/knife.rb") then
-		    puts "#{chef_path}/knife.rb already exists!"
-		    puts "Please copy the file to #{chef_path}/knife-<servername>.rb and re-run this command."
-		    exit 3
-		end
-	    end
+            GreenAndSecure::check_block_setup
 	    knife_config = Chef::Knife::Configure.new
-	    knife_config.config[:config_file] = "#{chef_path}/knife-#{@config_name}.rb"
+	    knife_config.config[:config_file] = "#{::Chef::Knife::chef_config_dir}/knife-#{@config_name}.rb"
 	    knife_config.config[:chef_server_url] = @chef_server
 	    knife_config.run
-	    puts "#{chef_path}/knife-#{@config_name}.rb has been sucessfully created"
+	    puts "#{::Chef::Knife::chef_config_dir}/knife-#{@config_name}.rb has been sucessfully created"
 	    GreenAndSecure::BlockList.new.run
-	    ui.confirm("Would you like to switch to it now? ")
-	    if File.exists?(chef_path+"/knife.rb")
-		    File.unlink(chef_path+"/knife.rb")
-	    end
-	    File.symlink(chef_path+"/knife-#{@config_name}.rb",chef_path+"/knife.rb")
-	    if File.exists?(chef_path+"/knife.rb") then
-		    current_server = File.readlink(chef_path+"/knife.rb").split('-')[1 .. -1].join('-').split('.')[0]
-	    end
-	    puts "The knife configuration has been updated to use #{current_server}"
+	    use = GreenAndSecure::BlockUse.new
+	    use.name_args = [ @config_name ]
+	    use.run
 	end
     end
 end

data/lib/knife-block/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Block
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-block
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-06 00:00:00.000000000Z
+date: 2012-04-18 00:00:00.000000000Z
 dependencies: []
 description: Create and manage knife.rb files for OpsCodes' Chef
 email: