knife-block 0.1.1 → 0.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8125038f02b6706bb26ab1398318190de497b629
+  data.tar.gz: ca88ab7af3a2ed0432c277a063fba765d6593785
+SHA512:
+  metadata.gz: c23baa601cc3712904cbbb7b2125d29f6f73b5e0d82591f1b42d56da897b3e6c195df402f8323cc35bdd9e555b58e0d5ab28f4d80ba09429c855e9c8bce2817b
+  data.tar.gz: 29579dc6f087ceefa743c5321ba5762a4d4ce25883f0d891fdc3bc640b8aced7d35853a8390c8ea2233506b5e4582d9839321f9919cae380de8f309c124fc3e9

data/.travis.yml

@@ -1,4 +1,17 @@
 language: ruby
-rvm:
-  - 1.9.3
-  - 1.8.7
+before_install:
+    - sudo apt-get update -qq
+    - sudo apt-get install -y apt-transport-https
+matrix:
+  include:
+    - rvm: "2.0"
+    - rvm: "2.1"
+      env: CHEF_DK=true
+    - rvm: "2.1"
+      env: CHEF_DK=false
+    - rvm: "2.2"
+cache:
+  - bundler
+  - apt
+script:
+  - ./test/bin/tests.sh $CHEF_DK

data/Gemfile

@@ -1,5 +1,8 @@
 source 'https://rubygems.org'
 
+group :test do
+  gem 'rubocop'
+end
 
 gem 'rake'
 gem 'chef'

data/README.md

@@ -1,19 +1,25 @@
 # Knife Block
 
-Green and Secure IT Limited often have a need to work with multiple chef servers at the same time, be it due to testing/development/live scenarios or purely through working for a number of clients at once.
-
 The knife block plugin has been created to enable the use of multiple knife.rb files against multiple chef servers.
 
 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.
 
+![Knife Block](/assets/knife-block.png)
+
 ## 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.
 
 ## Installation
 
+If you've installed Chef via rubygems, homebrew, etc, then install using
+
     gem install knife-block
 
+If you've installed Chef via ChefDK, then install using
+
+    chef gem install knife-block
+
 ### How does it work?
 
 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.
@@ -55,6 +61,8 @@ The code requires far more tests than the simple one that currently exists.
 
 Having said all of that, it works for us!
 
-Copyright: Green and Secure IT Limited 2012
+Copyright:
+- Brandon Burton, 2015
+- Green and Secure IT Limited, 2012 - 2015
 
 License: Apache 2 (http://apache.org/licenses/LICENSE-2.0.html)

data/Rakefile

@@ -1,11 +1,22 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
 require 'rake/testtask'
+require 'rubocop/rake_task'
 
+desc "Run rubocop"
+task :rubocop do
+  puts "Running Rubocop checks"
+  RuboCop::RakeTask.new
+  puts "Rubocop Finished"
+  puts "==============="
+end
 
 desc "Run Unit Tests"
+puts "Running Unit Tests"
 Rake::TestTask.new("default") do |t|
     t.pattern = "test/unit/*_test.rb"
     t.verbose = true
     t.warning = true
+puts "Unit Tests finished"
+puts "==================="
 end

data/knife-block.gemspec

@@ -2,11 +2,11 @@
 require File.expand_path('../lib/knife-block/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["proffalken"]
-  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      = "https://github.com/greenandsecure/knife-block"
+  gem.authors       = ["solarce"]
+  gem.email         = ["brandon@inatree.org"]
+  gem.description   = %q{Create and manage knife.rb files for Chef}
+  gem.summary       = %q{Create and manage knife.rb files for Chef}
+  gem.homepage      = "https://github.com/knife-block/knife-block"
   gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($\)
@@ -15,4 +15,6 @@ Gem::Specification.new do |gem|
   gem.name          = "knife-block"
   gem.require_paths = ["lib"]
   gem.version       = Knife::Block::VERSION
+
+  gem.add_dependency('test-unit', '~> 2.5')
 end

data/lib/chef/knife/block.rb

@@ -11,12 +11,15 @@
 class Chef
   class Knife
     def get_config_file
-      # locate_config_file is only compatible with Chef 11
-      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
+      case
+        when GreenAndSecure.current_chef_version >= ::Gem::Version.new('12.0.0')
+          config[:config_file] ||= ::Chef::Knife.config_loader.config_location
+        when ((GreenAndSecure.current_chef_version < ::Gem::Version.new('12.0.0')) && \
+          (GreenAndSecure.current_chef_version >= ::Gem::Version.new('11.8.0')))
+          config[:config_file] ||= ::Chef::Knife.locate_config_file
+        when GreenAndSecure.current_chef_version >= ::Gem::Version.new('11.0.0')
+          locate_config_file
+        else
         GreenAndSecure.locate_config_file config
       end
 
@@ -76,7 +79,7 @@ module GreenAndSecure
     if File.exists?(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."
+        puts "Please move the file to #{base}/knife-<servername>.rb and re-run this command."
         exit 3
       end
     end
@@ -230,5 +233,15 @@ module GreenAndSecure
       use.run
     end
   end
-end
 
+  # Shows the currently selected knife block
+  class BlockShow < Chef::Knife
+    banner "knife block show"
+
+    def run
+      GreenAndSecure::check_block_setup
+      list = GreenAndSecure::BlockList.new
+      puts list.current_server
+    end
+  end
+end

data/lib/knife-block/version.rb

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

data/test/bin/chef_dk_install.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+# helper script to install chefdk for testing on travis-ci
+
+ubuntu_check(){
+  grep 'Ubuntu' /etc/issue
+
+  if [[ $? != 0 ]]; then
+    echo "This is only meant to run on Ubuntu!"
+    exit 1
+  fi
+}
+
+install_chefdk() {
+  ubuntu_check
+
+  curl -s https://packagecloud.io/gpg.key | sudo apt-key add -
+  echo "deb https://packagecloud.io/chef/stable/ubuntu/ precise main" \
+    | sudo tee -a /etc/apt/sources.list.d/chef.list
+  sudo apt-get update -qq
+  sudo apt-get install -yqq chefdk
+  chef verify > /dev/null 2>&1
+  chefdk_installed_correctly=$?
+  if [[ $chefdk_installed_correctly != 0 ]]; then
+    echo "ChefDK not installed correctly, failing"
+    exit 1
+  fi
+  eval "$(chef shell-init bash)"
+}
+

data/test/bin/tests.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+# Check if there is an argument for chefdk, if there is
+# install chefdk and use it's ruby, otherwise use the
+# one provided by travis-ci
+
+if [[ -n $1 ]]; then
+  CHEF_DK_INSTALL=$1
+  if [[ $CHEF_DK_INSTALL == true ]]; then
+    source ./bin/chef_dk_install.sh
+
+    echo "Installing chefdk"
+    install_chefdk
+  fi
+fi
+
+# Run our tests
+bundle install --jobs=3 --retry=3
+bundle exec rake rubocop
+bundle exec rake
+
+mkdir ~/.chef
+echo 1 > ~/.chef/knife-my-cool-server.rb
+
+echo "Testing knife block list"
+bundle exec knife block list > /tmp/knife_block_list.txt
+echo "Output of knife block list"
+cat /tmp/knife_block_list.txt
+
+echo "Testing if knife block list worked as expected"
+grep 'my-cool-server' /tmp/knife_block_list.txt
+if [[ $? != 0 ]]
+then
+  echo "No knife config found and it should have found it"
+  exit 1
+fi

data/test/unit/knifeblock_test.rb

@@ -18,15 +18,15 @@ class TestGreenAndSecureModule < Test::Unit::TestCase
     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")
+      FileUtils.mkpath(@chef_path) unless File.exist?(@chef_path)
+      FileUtils.touch("#{@knife_ci}") unless File.exist?("#{@knife_ci}")
+      FileUtils.ln_s("#{@knife_ci}","#{@chef_path}/knife.rb") unless File.exist?("#{@chef_path}/knife.rb")
     end
   end
 
   def teardown
     if ENV['TRAVIS']
-      FileUtils.remove_entry_secure(@chef_path, force = true) if File.exists?(@chef_path)
+      FileUtils.remove_entry_secure(@chef_path, force = true) if File.exist?(@chef_path)
     end
   end
 
@@ -35,7 +35,7 @@ class TestGreenAndSecureModule < Test::Unit::TestCase
   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!")
+    assert_match(/.*\/.chef\/knife.rb/,@green.chef_config_base+"/.chef/knife.rb", "FAIL: knife.rb not found!")
   end
 
   def test_003_knife_rb_is_a_symlink

metadata

@@ -1,58 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: knife-block
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
-- proffalken
+- solarce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
-dependencies: []
-description: Create and manage knife.rb files for OpsCodes' Chef
+date: 2015-03-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+description: Create and manage knife.rb files for Chef
 email:
-- theprofessor@threedrunkensysadsonthe.net
+- brandon@inatree.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- assets/knife-block.png
 - knife-block.gemspec
 - lib/chef/knife/block.rb
 - lib/knife-block.rb
 - lib/knife-block/version.rb
+- test/bin/chef_dk_install.sh
+- test/bin/tests.sh
 - test/unit/knifeblock_test.rb
-homepage: https://github.com/greenandsecure/knife-block
+homepage: https://github.com/knife-block/knife-block
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.26
+rubygems_version: 2.4.6
 signing_key: 
-specification_version: 3
-summary: Create and manage knife.rb files for OpsCodes' Chef
+specification_version: 4
+summary: Create and manage knife.rb files for Chef
 test_files:
+- test/bin/chef_dk_install.sh
+- test/bin/tests.sh
 - test/unit/knifeblock_test.rb