knife-block 0.0.9 → 0.1.0

data/lib/chef/knife/block.rb

@@ -15,7 +15,7 @@ class Chef
       # 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]
+        config[:config_file] ||= ::Chef::Knife.locate_config_file
       else
         GreenAndSecure.locate_config_file config
       end

data/lib/knife-block/version.rb

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

data/test/unit/knifeblock_test.rb

@@ -5,12 +5,40 @@
 require 'chef/knife'
 require './lib/chef/knife/block'
 require 'test/unit'
+require 'fileutils'
 
-class TestKnifeBlock < Test::Unit::TestCase
+class TestGreenAndSecureModule < Test::Unit::TestCase
 
-    def test_list_file 
-    	chef_path = "#{ENV['WORKSPACE']}/.chef/"
-    	knifeblock = GreenAndSecure::BlockList.new
-	assert(!File.symlink?(chef_path+"/knife.rb"), "Knife.rb was not a symlink")
+  def setup
+    @green = Object.new
+    class << @green
+      include GreenAndSecure
     end
+
+    ENV['WORKSPACE'] ? (@chef_path ||= "#{ENV['WORKSPACE']}/.chef") : @chef_path = "#{ENV['HOME']}/.chef"
+    if ENV['TRAVIS']
+      @knife_ci = "#{@chef_path}/knife-ci.rb"
+      FileUtils.mkpath(@chef_path) unless File.exists?(@chef_path)
+      FileUtils.touch("#{@knife_ci}") unless File.exists?("#{@knife_ci}")
+      FileUtils.ln_s("#{@knife_ci}","#{@chef_path}/knife.rb") unless File.exists?("#{@chef_path}/knife.rb")
+    end
+  end
+
+  def teardown
+    if ENV['TRAVIS']
+      FileUtils.remove_entry_secure(@chef_path, force = true) if File.exists?(@chef_path)
+    end
+  end
+
+  def test_001_it_detects_a_version
+    assert_match(/\d+\.\d+\.\d+/,@green.current_chef_version.to_s, "FAIL: Chef version undetected!")
+  end
+
+  def test_002_it_locates_a_knife_config
+    assert_match(/.*\/.chef\/knife\.rb/,@green.chef_config_base+"/knife.rb", "FAIL: knife.rb not found!")
+  end
+
+  def test_003_knife_rb_is_a_symlink
+    assert(File.symlink?(@chef_path+"/knife.rb"), "knife.rb was not a symlink, please link it to #{@chef_path}/knife-<servername>.rb")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-block
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies: []
 description: Create and manage knife.rb files for OpsCodes' Chef
 email: