knife-block 0.1.0 → 0.1.1

data/README.md

@@ -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-&lt;service_name&gt;.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.**
 
@@ -40,13 +40,13 @@ Create a knife-<service_name>.rb configuration file in your ~/.chef directory fo
     The knife configuration has been updated to use opscode-hosted-chef
 
 #### Create a new server
-(Launches "knife configure" and creates $HOME/.chef/knife-<friendlyname>.rb)
+(Launches "knife configure" and creates $HOME/.chef/knife-&lt;friendlyname&gt;.rb)
 
     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.
+Knife block supports Berkshelf, however, the berkshelf config files must be manually created and named "config-&lt;block&gt;.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/knife-block.gemspec

@@ -6,7 +6,8 @@ Gem::Specification.new do |gem|
   gem.email         = ["theprofessor@threedrunkensysadsonthe.net"]
   gem.description   = %q{Create and manage knife.rb files for OpsCodes' Chef}
   gem.summary       = %q{Create and manage knife.rb files for OpsCodes' Chef}
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/greenandsecure/knife-block"
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/chef/knife/block.rb

@@ -11,22 +11,23 @@
 class Chef
   class Knife
     def get_config_file
-
       # locate_config_file is only compatible with Chef 11
-      _chef11 = ::Chef::Version.new('11.0.0')
-      if GreenAndSecure.current_chef_version >= _chef11
+      if GreenAndSecure.current_chef_version >= ::Gem::Version.new('11.8.0')
         config[:config_file] ||= ::Chef::Knife.locate_config_file
+      elsif GreenAndSecure.current_chef_version >= ::Gem::Version.new('11.0.0')
+        locate_config_file
       else
         GreenAndSecure.locate_config_file config
       end
 
-      File.dirname(config[:config_file])
+      # if we haven't created our knife.rb yet, set defaults to ~/.chef so we can create the config.
+      config[:config_file] ? File.dirname(config[:config_file]) : File.join(ENV['HOME'], '.chef')
     end
   end
 end
 
 module GreenAndSecure
-  @@current_chef_version = ::Chef::Version.new(::Chef::VERSION)
+  @@current_chef_version = ::Gem::Version.new(::Chef::VERSION)
   @@knife = ::Chef::Knife.new
 
   def current_chef_version
@@ -222,7 +223,7 @@ module GreenAndSecure
       knife_config.config[:client_key] = "#{GreenAndSecure::chef_config_base}/#{@client_name}-#{@config_name}.pem"
       knife_config.run
 
-      puts "#{GreenAndSecure::chef_config_base}/knife-#{@config_name}.rb has been sucessfully created"
+      puts "#{GreenAndSecure::chef_config_base}/knife-#{@config_name}.rb has been successfully created"
       GreenAndSecure::BlockList.new.run
       use = GreenAndSecure::BlockUse.new
       use.name_args = [@config_name]

data/lib/knife-block/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Block
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-block
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies: []
 description: Create and manage knife.rb files for OpsCodes' Chef
 email:
@@ -29,8 +29,9 @@ files:
 - lib/knife-block.rb
 - lib/knife-block/version.rb
 - test/unit/knifeblock_test.rb
-homepage: ''
-licenses: []
+homepage: https://github.com/greenandsecure/knife-block
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: