knife-block 0.0.6 → 0.0.7

data/README.md

@@ -6,7 +6,7 @@ The knife block plugin has been created to enable the use of multiple knife.rb f
 
 The premise is that you have a "block" in which you store all your "knives" and you can choose the one best suited to the task.
 
-## Requirements 
+## Requirements
 
 At present, knife-block requires ruby 1.9.2 or above.  This is owing to the use of "Dir.home()" to find a user's home directory.
 
@@ -18,7 +18,7 @@ At present, knife-block requires ruby 1.9.2 or above.  This is owing to the use
 
 Knife looks for knife.rb in ~/.chef - all this script does is create a symlink from the required configuration to knife.rb so that knife can act on the appropriate server.
 
-Create a knife-<service_name>.rb configuration file in your ~/.chef directory for each Chef server that you wish to connect to. 
+Create a knife-<service_name>.rb configuration file in your ~/.chef directory for each Chef server that you wish to connect to.
 
 **Please note - this script will check to see if knife.rb exists and whether it is a symlink or not.**
 
@@ -28,14 +28,14 @@ Create a knife-<service_name>.rb configuration file in your ~/.chef directory fo
 (This command will also tell you which server is currently selected)
 
     knife block list
-    
+
     The available chef servers are:
         * local-testing [ Currently Selected ]
         * opscode-hosted-chef
 
 #### Change to a new server
     knife block use <server_name>
-    
+
     You are asking to change from local-testing to opscode-hosted-chef. Are you sure? (Y/N) y
     The knife configuration has been updated to use opscode-hosted-chef
 
@@ -45,6 +45,9 @@ Create a knife-<service_name>.rb configuration file in your ~/.chef directory fo
     knife block new <friendlyname>
 
 
+### Berkshelf integration
+Knife block supports Berkshelf, however, the berkshelf config files must be manually created and named "config-<block>.json" and put in the Berkshelf directory (typically ~/.berkshelf). In the future, these files could be automatically created by knife block.
+
 
 These knife plugins are supplied without any warranty or guarantees regarding suitability for purpose.
 

data/lib/chef/knife/block.rb

@@ -22,9 +22,16 @@ module GreenAndSecure
     end
     module_function :printable_server
 
+    # Returns path to berkshelf
+    def berkshelf_path
+      @berkshelf_path ||= ENV['BERKSHELF_PATH'] || File.expand_path('~/.berkshelf')
+    end
+    module_function :berkshelf_path
+
     class Block < Chef::Knife
     banner "knife block"
     	def run
+            GreenAndSecure::check_block_setup
     	    list = GreenAndSecure::BlockList.new
             if name_args.size == 1 and list.servers.include?(name_args[0])
     	        use = GreenAndSecure::BlockUse.new
@@ -45,7 +52,7 @@ module GreenAndSecure
         @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
@@ -63,6 +70,7 @@ module GreenAndSecure
 
     	# list the available environments
     	def run
+        GreenAndSecure::check_block_setup
 	    puts "The available chef servers are:"
 	    servers.each do |server|
 		if server == current_server then
@@ -94,6 +102,19 @@ module GreenAndSecure
           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}"
+
+          # update berkshelf
+          berks = GreenAndSecure::berkshelf_path+"/config.json"
+          berks_new = GreenAndSecure::berkshelf_path+"/config-#{new_server}.json"
+          if File.exists?(berks_new)
+            if File.exists?(berks)
+              File.unlink(berks)
+            end
+            File.symlink(berks_new, berks)
+            puts "The berkshelf configuration has been updated to use #{new_server}"
+          else
+            puts "Berkshelf configuration for #{new_server} not found"
+          end
        else
           puts "Knife configuration for #{new_server} not found, aborting switch"
        end
@@ -111,12 +132,15 @@ module GreenAndSecure
 	    end
 
 	    @chef_server = ui.ask_question("Please enter the url to your Chef Server: ")
+	    @client_name = ui.ask_question("Please enter the name of the Chef client: ")
 	    require 'ohai'
 	    require 'chef/knife/configure'
             GreenAndSecure::check_block_setup
 	    knife_config = Chef::Knife::Configure.new
 	    knife_config.config[:config_file] = "#{::Chef::Knife::chef_config_dir}/knife-#{@config_name}.rb"
 	    knife_config.config[:chef_server_url] = @chef_server
+	    knife_config.config[:node_name] = @client_name
+	    knife_config.config[:client_key] = "#{::Chef::Knife::chef_config_dir}/#{@client_name}-#{@config_name}.pem"
 	    knife_config.run
 	    puts "#{::Chef::Knife::chef_config_dir}/knife-#{@config_name}.rb has been sucessfully created"
 	    GreenAndSecure::BlockList.new.run

data/lib/knife-block/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Block
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-block
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-03 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies: []
 description: Create and manage knife.rb files for OpsCodes' Chef
 email:
@@ -27,6 +27,7 @@ files:
 - lib/chef/knife/block.rb
 - lib/knife-block.rb
 - lib/knife-block/version.rb
+- libpeerconnection.log
 - test/unit/knifeblock_test.rb
 homepage: ''
 licenses: []