knife-block 0.0.8 → 0.0.9

data/Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+
+gem 'rake'
+gem 'chef'
 # Specify your gem's dependencies in knife-block.gemspec
 gemspec
-rake

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/testtask'
 
 
 desc "Run Unit Tests"
-Rake::TestTask.new("test") do |t|
+Rake::TestTask.new("default") do |t|
     t.pattern = "test/unit/*_test.rb"
     t.verbose = true
     t.warning = true

data/lib/chef/knife/block.rb

@@ -11,41 +11,86 @@
 class Chef
   class Knife
     def get_config_file
-      locate_config_file if not config[:config_file]
+
+      # locate_config_file is only compatible with Chef 11
+      _chef11 = ::Chef::Version.new('11.0.0')
+      if GreenAndSecure.current_chef_version >= _chef11
+        locate_config_file if not config[:config_file]
+      else
+        GreenAndSecure.locate_config_file config
+      end
+
       File.dirname(config[:config_file])
     end
   end
 end
 
 module GreenAndSecure
+  @@current_chef_version = ::Chef::Version.new(::Chef::VERSION)
   @@knife = ::Chef::Knife.new
+
+  def current_chef_version
+    @@current_chef_version
+  end
+
   def chef_config_base
     @@knife.get_config_file
   end
-  module_function :chef_config_base
+
+  # Copied from chef/knife.rb
+  #
+  # Chef 11 defines `locate_config_file` in its chef/knife.rb but Chef 10
+  # has this snippet of code inlined in chef/knife.rb:configure_chef.
+  def locate_config_file(config)
+    candidate_configs = []
+
+    # Look for $KNIFE_HOME/knife.rb (allow multiple knives config on same machine)
+    if ENV['KNIFE_HOME']
+      candidate_configs << File.join(ENV['KNIFE_HOME'], 'knife.rb')
+    end
+    # Look for $PWD/knife.rb
+    if Dir.pwd
+      candidate_configs << File.join(Dir.pwd, 'knife.rb')
+    end
+    # Look for $UPWARD/.chef/knife.rb
+    if ::Chef::Knife.chef_config_dir
+      candidate_configs << File.join(::Chef::Knife.chef_config_dir, 'knife.rb')
+    end
+    # Look for $HOME/.chef/knife.rb
+    if ENV['HOME']
+      candidate_configs << File.join(ENV['HOME'], '.chef', 'knife.rb')
+    end
+
+    candidate_configs.each do |candidate_config|
+      candidate_config = File.expand_path(candidate_config)
+      if File.exist?(candidate_config)
+        config[:config_file] = candidate_config
+        break
+      end
+    end
+  end
 
   def check_block_setup
     base = GreenAndSecure::chef_config_base
     if File.exists?(base+"/knife.rb") then
-      if !File.symlink?(base+"/knife.rb") then
+      unless File.symlink?(base+"/knife.rb")
         puts "#{base}/knife.rb is NOT a symlink."
         puts "Please copy the file to #{base}/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
 
   # Returns path to berkshelf
   def berkshelf_path
     @berkshelf_path ||= ENV['BERKSHELF_PATH'] || File.expand_path('~/.berkshelf')
   end
-  module_function :berkshelf_path
+
+  extend self
 
   class Block < Chef::Knife
 
@@ -71,20 +116,22 @@ module GreenAndSecure
     banner "knife block list"
 
     @current_server = nil
+
     def current_server
       GreenAndSecure::check_block_setup
 
       @current_server ||= if File.exists?(GreenAndSecure::chef_config_base+"/knife.rb") then
-        GreenAndSecure::printable_server(File.readlink(GreenAndSecure::chef_config_base+"/knife.rb"))
-      else
-        nil
-      end
+                            GreenAndSecure::printable_server(File.readlink(GreenAndSecure::chef_config_base+"/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(GreenAndSecure::chef_config_base+"/knife-*.rb").sort.map do | fn |
+      @servers ||= Dir.glob(GreenAndSecure::chef_config_base+"/knife-*.rb").sort.map do |fn|
         GreenAndSecure::printable_server(fn)
       end
     end
@@ -112,34 +159,39 @@ module GreenAndSecure
         puts "Please specify a server"
         server_list = GreenAndSecure::BlockList.new
         server_list.run
-      exit 1
+        exit 1
       end
+
       list = GreenAndSecure::BlockList.new
       new_server = name_args.first
 
       base = GreenAndSecure::chef_config_base
+
       if File.exists?(base+"/knife-#{new_server}.rb")
+
         if File.exists?(base+"/knife.rb")
           File.unlink(base+"/knife.rb")
         end
-        File.symlink(base+"/knife-#{new_server}.rb",
-          base+"/knife.rb")
+
+        File.symlink(base+"/knife-#{new_server}.rb", base+"/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
+          puts "The berkshelf configuration has been updated to use #{new_server}"
         else
-          puts "Knife configuration for #{new_server} not found, aborting switch"
+          puts "Berkshelf configuration for #{new_server} not found"
+        end
+      else
+        puts "Knife configuration for #{new_server} not found, aborting switch"
       end
     end
   end
@@ -173,7 +225,7 @@ module GreenAndSecure
       puts "#{GreenAndSecure::chef_config_base}/knife-#{@config_name}.rb has been sucessfully created"
       GreenAndSecure::BlockList.new.run
       use = GreenAndSecure::BlockUse.new
-      use.name_args = [ @config_name ]
+      use.name_args = [@config_name]
       use.run
     end
   end

data/lib/knife-block/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Block
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-block
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies: []
 description: Create and manage knife.rb files for OpsCodes' Chef
 email:
@@ -49,10 +49,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.26
 signing_key: 
 specification_version: 3
 summary: Create and manage knife.rb files for OpsCodes' Chef
 test_files:
 - test/unit/knifeblock_test.rb
-has_rdoc: