knife-solo 0.3.0.pre2 → 0.3.0.pre3

data/test/solo_cook_test.rb

@@ -29,6 +29,50 @@ class SoloCookTest < TestCase
     end
   end
 
+  def test_expanded_config_paths_returns_empty_array_for_nil
+    Chef::Config[:foo] = nil
+    assert_equal [], command.expanded_config_paths(:foo)
+  end
+
+  def test_expanded_config_paths_returns_pathnames
+    Chef::Config[:foo] = ["foo"]
+    assert_instance_of Pathname, command.expanded_config_paths(:foo).first
+  end
+
+  def test_expanded_config_paths_expands_paths
+    Chef::Config[:foo] = ["foo", "/absolute/path"]
+    paths = command.expanded_config_paths(:foo)
+    assert_equal File.join(Dir.pwd, "foo"), paths[0].to_s
+    assert_equal "/absolute/path", paths[1].to_s
+  end
+
+  def test_patch_cookbooks_paths_exists
+    path = command.patch_cookbooks_path
+    refute_nil path, "patch_cookbooks_path should not be nil"
+    assert Dir.exist?(path), "patch_cookbooks_path is not a directory"
+  end
+
+  def test_cookbook_paths_includes_patch_cookbooks
+    cmd = command
+    assert_equal cmd.patch_cookbooks_path, cmd.cookbook_paths.last, "patch_cookbooks is not included"
+  end
+
+  def test_cookbook_paths_expands_paths
+    cmd = command
+    Chef::Config.cookbook_path = ["mycookbooks", "/some/other/path"]
+    assert_equal File.join(Dir.pwd, "mycookbooks"), cmd.cookbook_paths[0].to_s
+    assert_equal "/some/other/path", cmd.cookbook_paths[1].to_s
+  end
+
+  def test_add_cookbook_path_prepends_the_path
+    cmd = command
+    Chef::Config.cookbook_path = ["mycookbooks", "/some/other/path"]
+    cmd.add_cookbook_path "/new/path"
+    assert_equal "/new/path", cmd.cookbook_paths[0].to_s
+    assert_equal File.join(Dir.pwd, "mycookbooks"), cmd.cookbook_paths[1].to_s
+    assert_equal "/some/other/path", cmd.cookbook_paths[2].to_s
+  end
+
   def test_does_not_run_librarian_if_no_cheffile
     in_kitchen do
       Librarian::Action::Install.any_instance.expects(:run).never
@@ -38,7 +82,7 @@ class SoloCookTest < TestCase
 
   def test_runs_librarian_if_cheffile_found
     in_kitchen do
-      File.open("Cheffile", 'w') {}
+      FileUtils.touch "Cheffile"
       Librarian::Action::Install.any_instance.expects(:run)
       command("somehost").run
     end
@@ -46,12 +90,43 @@ class SoloCookTest < TestCase
 
   def test_does_not_run_librarian_if_denied_by_option
     in_kitchen do
-      File.open("Cheffile", 'w') {}
+      FileUtils.touch "Cheffile"
       Librarian::Action::Install.any_instance.expects(:run).never
       command("somehost", "--no-librarian").run
     end
   end
 
+  def test_complains_if_librarian_gem_missing
+    in_kitchen do
+      FileUtils.touch "Cheffile"
+      cmd = command("somehost")
+      cmd.expects(:load_librarian).returns(false)
+      cmd.ui.expects(:err).with(regexp_matches(/librarian-chef gem/))
+      Librarian::Action::Install.any_instance.expects(:run).never
+      cmd.run
+    end
+  end
+
+  def test_wont_complain_if_librarian_gem_missing_but_no_cheffile
+    in_kitchen do
+      cmd = command("somehost")
+      cmd.expects(:load_librarian).never
+      cmd.ui.expects(:err).never
+      Librarian::Action::Install.any_instance.expects(:run).never
+      cmd.run
+    end
+  end
+
+  def test_adds_librarian_path_to_cookbooks
+    ENV['LIBRARIAN_CHEF_PATH'] = "librarian/path"
+    in_kitchen do
+      FileUtils.touch "Cheffile"
+      cmd = command("somehost")
+      cmd.run
+      assert_equal File.join(Dir.pwd, "librarian/path"), cmd.cookbook_paths[0].to_s
+    end
+  end
+
   def test_validates_chef_version
     in_kitchen do
       cmd = command("somehost")
@@ -144,7 +219,7 @@ class SoloCookTest < TestCase
   def command(*args)
     cmd = knife_command(Chef::Knife::SoloCook, *args)
     cmd.stubs(:check_chef_version)
-    cmd.stubs(:add_patches)
+    cmd.stubs(:run_portable_mkdir_p)
     cmd.stubs(:rsync)
     cmd.stubs(:stream_command).returns(SuccessfulResult.new)
     cmd

data/test/support/integration_test.rb

@@ -85,10 +85,15 @@ class IntegrationTest < TestCase
     "-i #{key_file} #{user}@#{server.public_ip_address}"
   end
 
-  # Asserts that a prepare or cook command is successful
-  def assert_subcommand(subcommand)
-    system "knife solo #{subcommand} #{connection_string} -VV >> #{log_file}"
+  # Asserts that a knife command is successful
+  def assert_knife_command(subcommand)
+    system "knife #{subcommand} #{connection_string} -VV >> #{log_file}"
     assert $?.success?
   end
+
+  # Asserts that a knife solo subcommand is successful
+  def assert_subcommand(subcommand)
+    assert_knife_command "solo #{subcommand}"
+  end
 end
 

data/test/tools_test.rb

@@ -0,0 +1,82 @@
+require 'test_helper'
+require 'support/kitchen_helper'
+
+require 'chef/config'
+require 'knife-solo/tools'
+
+class DummyToolsCommand < Chef::Knife
+  include KnifeSolo::Tools
+
+  option :foo,
+    :long => '--foo FOO'
+
+  option :boo,
+    :long => '--[no-]boo'
+end
+
+class ToolsTest < TestCase
+  include KitchenHelper
+
+  def setup
+    Chef::Config[:knife][:foo] = nil
+    Chef::Config[:knife][:boo] = nil
+  end
+
+  def test_config_value_defaults_to_nil
+    assert_nil command.config_value(:foo)
+    assert_nil command.config_value(:boo)
+  end
+
+  def test_config_value_returns_the_default
+    assert_equal 'bar', command.config_value(:foo, 'bar')
+
+    assert_equal true,  command.config_value(:boo, true)
+    assert_equal false, command.config_value(:boo, false)
+  end
+
+  def test_config_value_uses_cli_option
+    assert_equal 'bar', command('--foo=bar').config_value(:foo)
+    assert_equal 'bar', command('--foo=bar').config_value(:foo, 'baz')
+
+    assert_equal true, command('--boo').config_value(:boo)
+    assert_equal true, command('--boo').config_value(:boo, false)
+    assert_equal false, command('--no-boo').config_value(:boo)
+    assert_equal false, command('--no-boo').config_value(:boo, true)
+  end
+
+  def test_config_value_uses_configuration
+    Chef::Config[:knife][:foo] = 'bar'
+    assert_equal 'bar', command.config_value(:foo)
+    assert_equal 'bar', command.config_value(:foo, 'baz')
+
+    Chef::Config[:knife][:boo] = true
+    assert_equal true, command.config_value(:boo)
+    assert_equal true, command.config_value(:boo, false)
+
+    Chef::Config[:knife][:boo] = false
+    assert_equal false, command.config_value(:boo)
+    assert_equal false, command.config_value(:boo, true)
+  end
+
+  def test_config_value_prefers_cli_option
+    Chef::Config[:knife][:foo] = 'foo'
+    assert_equal 'bar', command('--foo=bar').config_value(:foo)
+    assert_equal 'bar', command('--foo=bar').config_value(:foo, 'baz')
+
+    Chef::Config[:knife][:boo] = true
+    assert_equal true, command('--boo').config_value(:boo)
+    assert_equal true, command('--boo').config_value(:boo, false)
+    assert_equal false, command('--no-boo').config_value(:boo)
+    assert_equal false, command('--no-boo').config_value(:boo, true)
+
+    Chef::Config[:knife][:boo] = false
+    assert_equal true, command('--boo').config_value(:boo)
+    assert_equal true, command('--boo').config_value(:boo, false)
+    assert_equal false, command('--no-boo').config_value(:boo)
+    assert_equal false, command('--no-boo').config_value(:boo, true)
+  end
+
+  def command(*args)
+    knife_command(DummyToolsCommand, *args)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre2
+  version: 0.3.0.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: fog
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: librarian-chef
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: parallel
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,7 +108,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: parallel
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -162,13 +178,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: librarian
+  name: erubis
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.20
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -176,7 +192,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.20
+        version: 2.7.0
 description: Handles bootstrapping, running chef solo, rsyncing cookbooks etc
 email: mat@schaffer.me
 executables: []
@@ -187,10 +203,9 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- lib/chef/knife/bootstrap_solo.rb
 - lib/chef/knife/cook.rb
 - lib/chef/knife/kitchen.rb
-- lib/chef/knife/patches/parser.rb
-- lib/chef/knife/patches/search.rb
 - lib/chef/knife/prepare.rb
 - lib/chef/knife/solo_bootstrap.rb
 - lib/chef/knife/solo_clean.rb
@@ -204,12 +219,12 @@ files:
 - lib/knife-solo/bootstraps/freebsd.rb
 - lib/knife-solo/bootstraps/linux.rb
 - lib/knife-solo/bootstraps/sun_os.rb
-- lib/knife-solo/config.rb
 - lib/knife-solo/deprecated_command.rb
 - lib/knife-solo/gitignore.rb
 - lib/knife-solo/info.rb
 - lib/knife-solo/node_config_command.rb
-- lib/knife-solo/resources/solo.rb
+- lib/knife-solo/resources/knife.rb
+- lib/knife-solo/resources/solo.rb.erb
 - lib/knife-solo/ssh_command.rb
 - lib/knife-solo/tools.rb
 - test/bootstraps_test.rb
@@ -221,9 +236,10 @@ files:
 - test/integration/cases/cache_path_usage.rb
 - test/integration/cases/empty_cook.rb
 - test/integration/cases/encrypted_data_bag.rb
+- test/integration/cases/knife_bootstrap.rb
 - test/integration/centos5_6_test.rb
 - test/integration/debian6_bootstrap_test.rb
-- test/integration/debian7_bootstrap_test.rb
+- test/integration/debian7_knife_bootstrap_test.rb
 - test/integration/gentoo2011_test.rb
 - test/integration/omnios_r151004_test.rb
 - test/integration/scientific_linux_63_test.rb
@@ -232,7 +248,7 @@ files:
 - test/integration/ubuntu12_04_bootstrap_test.rb
 - test/integration/ubuntu12_04_test.rb
 - test/integration_helper.rb
-- test/knife-solo/config_test.rb
+- test/knife_bootstrap_test.rb
 - test/minitest/parallel.rb
 - test/node_config_command_test.rb
 - test/solo_bootstrap_test.rb
@@ -258,7 +274,31 @@ files:
 - test/support/test_case.rb
 - test/support/validation_helper.rb
 - test/test_helper.rb
-homepage: http://matschaffer.github.com/knife-solo/
+- test/tools_test.rb
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/.travis.yml
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/CHANGELOG
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/LICENSE
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/NOTICE
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/README.md
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/libraries/search.rb
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/libraries/search/overrides.rb
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/libraries/search/parser.rb
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/libraries/vendor/chef/solr_query/lucene.treetop
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/libraries/vendor/chef/solr_query/lucene_nodes.rb
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/libraries/vendor/chef/solr_query/query_transform.rb
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/metadata.rb
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/recipes/default.rb
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/Gemfile
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/data/data_bags/node/alpha.json
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/data/data_bags/node/beta.json
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/data/data_bags/node/without_json_class.json
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/data/data_bags/users/jerry.json
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/data/data_bags/users/lea.json
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/data/data_bags/users/mike.json
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/data/data_bags/users/tom.json
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/test_data_bags.rb
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/test_search.rb
+homepage: http://matschaffer.github.io/knife-solo/
 licenses: []
 post_install_message: ! "Thanks for installing knife-solo!\n\nIf you run into any
   issues please let us know at:\n  https://github.com/matschaffer/knife-solo/issues\n\nIf
@@ -276,7 +316,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3096439346196899405
+      hash: 281010758936316492
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -299,9 +339,10 @@ test_files:
 - test/integration/cases/cache_path_usage.rb
 - test/integration/cases/empty_cook.rb
 - test/integration/cases/encrypted_data_bag.rb
+- test/integration/cases/knife_bootstrap.rb
 - test/integration/centos5_6_test.rb
 - test/integration/debian6_bootstrap_test.rb
-- test/integration/debian7_bootstrap_test.rb
+- test/integration/debian7_knife_bootstrap_test.rb
 - test/integration/gentoo2011_test.rb
 - test/integration/omnios_r151004_test.rb
 - test/integration/scientific_linux_63_test.rb
@@ -310,7 +351,7 @@ test_files:
 - test/integration/ubuntu12_04_bootstrap_test.rb
 - test/integration/ubuntu12_04_test.rb
 - test/integration_helper.rb
-- test/knife-solo/config_test.rb
+- test/knife_bootstrap_test.rb
 - test/minitest/parallel.rb
 - test/node_config_command_test.rb
 - test/solo_bootstrap_test.rb
@@ -336,3 +377,4 @@ test_files:
 - test/support/test_case.rb
 - test/support/validation_helper.rb
 - test/test_helper.rb
+- test/tools_test.rb

data/lib/chef/knife/patches/search.rb

@@ -1,110 +0,0 @@
-#
-# Copyright 2011, edelight GmbH
-#
-# Authors:
-#       Markus Korn <markus.korn@edelight.de>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-if Chef::Config[:solo]
-
-  if (defined? require_relative).nil?
-    # defenition of 'require_relative' for ruby < 1.9, found on stackoverflow.com
-    def require_relative(relative_feature)
-      c = caller.first
-      fail "Can't parse #{c}" unless c.rindex(/:\d+(:in `.*')?$/)
-      file = $`
-      if /\A\((.*)\)/ =~ file # eval, etc.
-        raise LoadError, "require_relative is called in #{$1}"
-      end
-      absolute = File.expand_path(relative_feature, File.dirname(file))
-      require absolute
-    end
-  end
-
-  require_relative 'parser.rb'
-
-  class Chef
-    module Mixin
-      module Language
-
-        # Overwrite the search method of recipes to operate locally by using
-        # data found in data_bags.
-        # Only very basic lucene syntax is supported and also sorting the result
-        # is not implemented, if this search method does not support a given query
-        # an exception is raised.
-        # This search() method returns a block iterator or an Array, depending
-        # on how this method is called.
-        def search(obj, query=nil, sort=nil, start=0, rows=1000, &block)
-          if !sort.nil?
-            raise "Sorting search results is not supported"
-          end
-          @_query = Query.parse(query)
-          if @_query.nil?
-            raise "Query #{query} is not supported"
-          end
-          @_result = []
-
-          case obj
-          when :node
-            search_nodes(start, rows, &block)
-          when :role
-            search_roles(start, rows, &block)
-          else
-            search_data_bag(obj, start, rows, &block)
-          end
-
-
-          if block_given?
-            pos = 0
-            while (pos >= start and pos < (start + rows) and pos < @_result.size)
-              yield @_result[pos]
-              pos += 1
-            end
-          else
-            return @_result.slice(start, rows)
-          end
-        end
-
-        def search_nodes(start, rows, &block)
-          Dir.glob(File.join(Chef::Config[:data_bag_path], "node", "*.json")).map do |f|
-            # parse and hashify the node
-            node = JSON.parse(IO.read(f))
-            if @_query.match(node.to_hash)
-              @_result << node
-            end
-          end
-        end
-
-        def search_roles(start, rows, &block)
-          raise "Role searching not implemented"
-        end
-
-        def search_data_bag(bag_name, start, rows, &block)
-          secret_path = Chef::Config[:encrypted_data_bag_secret]
-          data_bag(bag_name.to_s).each do |bag_item_id|
-            if secret_path && secret = Chef::EncryptedDataBagItem.load_secret(secret_path)
-              bag_item = Chef::EncryptedDataBagItem.load(bag_name, bag_item_id, secret)
-            else
-              bag_item = data_bag_item(bag_name.to_s, bag_item_id)
-            end
-            if @_query.match(bag_item)
-              @_result << bag_item
-            end
-          end
-        end
-      end
-    end
-  end
-end