knife-solo 0.3.0.pre2 → 0.3.0.pre3

data/lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/test_data_bags.rb

@@ -0,0 +1,44 @@
+#
+# 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.
+#
+
+require "test/unit"
+require "chef"
+
+# mocking chef such that it thinks it's running as chef-solo and knows about
+# the location of the data_bag
+Chef::Config[:solo] = true
+Chef::Config[:data_bag_path] = "tests/data/data_bags"
+
+def data_bag_item(bag, item)
+  # wrapper around creating a new Recipe instance and calling data_bag on it
+  node = Chef::Node.new()
+  cookbooks = Chef::CookbookCollection.new()
+  run_context = Chef::RunContext.new(node, cookbooks)
+  return Chef::Recipe.new("test_cookbook", "test_recipe", run_context).data_bag_item(bag, item)
+end
+
+class TestDataBags < Test::Unit::TestCase
+
+  def test_data_bag
+    item = data_bag_item("users", "mike")
+    assert_equal item["age"], 42
+    assert_equal item[:age], nil    #upstream code for chef-solo does not use mashes
+  end
+  
+end

data/lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/test_search.rb

@@ -0,0 +1,241 @@
+#
+# 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.
+#
+
+require "test/unit"
+require "chef"
+
+# mocking chef such that it thinks it's running as chef-solo and knows about
+# the location of the data_bag
+Chef::Config[:solo] = true
+Chef::Config[:data_bag_path] = "#{File.dirname(__FILE__)}/data/data_bags"
+
+# load the extension
+require File.expand_path('../../libraries/search', __FILE__)
+
+module SearchDbTests
+  
+  def test_search_all
+    # try to get data of all users
+    nodes = search(:users, "*:*")
+    assert_equal nodes.length, 4
+    nodes = search(:users)
+    assert_equal nodes.length, 4
+    nodes = search(:users, nil)
+    assert_equal nodes.length, 4
+  end
+  
+  def test_search_exact_match
+    nodes = search(:users, "username:speedy")
+    assert_equal nodes.length, 1
+    assert_equal nodes[0]["username"], "speedy"
+  end
+  
+  def test_get_all_with_field
+    nodes = search(:users, "username:*")
+    assert nodes.length > 0
+    assert nodes.all?{|x| !x["username"].nil?}
+  end
+  
+  def test_get_all_without_field
+    nodes = search(:users, "(NOT username:*)")
+    assert nodes.length == 0
+    nodes = search(:users, "(NOT color:*)")
+    assert nodes.length == 3
+    assert nodes.all?{|x| x["color"].nil?}
+  end
+  
+  def test_get_all_but_speedy
+    nodes = search(:users, "NOT username:speedy")
+    assert nodes.length > 0
+    assert nodes.all?{|x| x["username"] != "speedy"}
+  end
+  
+  def test_array_includes
+    nodes = search(:users, "children:tom")
+    assert nodes.length == 2
+    assert nodes.all?{ |x| x["children"].include?("tom") }
+    nodes = search(:users, "children:jerry")
+    assert nodes.length == 1
+    assert nodes.all?{ |x| x["children"].include?("jerry") }
+  end
+  
+  def test_boolean
+    nodes = search(:users, "married:true")
+    assert nodes.length == 3
+    assert nodes.all?{ |x| x["married"] == true }
+    nodes = search(:users, "married:false")
+    assert nodes.length == 1
+    assert nodes[0]["married"] == false
+  end
+  
+  def test_integer
+    nodes = search(:users, "age:35")
+    assert nodes.length == 1
+    assert nodes[0]["age"] == 35
+  end
+  
+  def test_AND_condition
+    nodes = search(:users, "married:true AND age:35")
+    assert nodes.length == 1
+    assert nodes[0]["username"] == "lea"
+  end
+  
+  def test_OR_condition
+    nodes = search(:users, "age:42 OR age:22")
+    assert nodes.length == 2
+  end
+  
+  def test_NOT_condition
+    nodes = search(:users, "children:tom AND (NOT gender:female)")
+    assert nodes.length == 1
+    nodes = search(:users, "children:tom AND (NOT gender:female) AND age:42")
+    assert nodes.length == 1
+    nodes = search(:users, "children:tom AND (NOT gender:female) AND (NOT age:42)")
+    assert nodes.length == 0
+  end
+  
+  def test_any_value
+    nodes = search(:users, "children:*")
+    assert nodes.length == 2
+  end
+  
+  def test_any_value_lucene_range
+    nodes = search(:users, "address:[* TO *]")
+    assert nodes.length == 2
+  end
+  
+  def test_general_lucene_range_fails
+    assert_raises RuntimeError do
+      nodes = search(:users, "children:[aaa TO zzz]")
+    end
+  end
+  
+  def test_block_usage
+    # bracket syntax
+    result = []
+    search(:users, "*:*") {|x| result << x["id"]}
+    assert result.length == 4
+    
+    # do...end syntax
+    result = []
+    search(:users) do |x|
+      result << x["id"]
+    end
+    assert result.length == 4
+  end
+  
+  def test_check_escaped_chars
+    nodes = search(:users, 'tag:tag\:\:test')
+    assert nodes.length == 1
+    nodes = search(:users, "tag:tag\\:\\:test")
+    assert nodes.length == 1
+    nodes = search(:users, 'tags:tag\:\:first')
+    assert nodes.length == 1
+    nodes = search(:users, "tags:tag\\:\\:first")
+    assert nodes.length == 1
+    nodes = search(:users, 'tags:tag\:\:*')
+    assert nodes.length == 1
+    nodes = search(:users, "tags:tag\\:\\:*")
+    assert nodes.length == 1
+  end
+  
+  def test_wildcards
+    nodes = search(:users, "gender:f??ale")
+    assert nodes.length == 1
+    nodes = search(:users, "username:spee?y")
+    assert nodes.length == 1
+    nodes = search(:users, "username:spee*")
+    assert nodes.length == 1
+  end
+  
+  def test_empty_field_value
+    assert_raise(RuntimeError) {
+      search(:users, "gender:#{nil} AND age:35")
+    }
+    assert_raise(RuntimeError) {
+      search(:users, "gender: AND age:35")
+    }
+    assert_raise(RuntimeError) {
+      search(:users, "gender:\"\" AND age:35")
+    }
+  end
+  
+  def test_OR_group
+    nodes = search(:users, "id:(mike OR tom)")
+    assert nodes.length == 2
+  end
+  
+  def test_nested_fieldnames
+    nodes = search(:users, "address_street:wilhelmsstrasse")
+    assert nodes.length == 1
+    nodes = search(:users, "address_street_floor:1")
+    assert nodes.length == 1
+  end
+end
+
+module SearchNodeTests
+  def test_list_nodes
+    nodes = search(:node)
+    assert_equal Chef::Node, nodes.first.class
+    assert_equal 3, nodes.length
+  end
+
+  def test_search_node_with_wide_filter
+    nodes = search(:node, "role:test_server AND chef_environment:default")
+    assert_equal 2, nodes.length
+  end
+
+  def test_search_node_with_narrow_filter
+    nodes = search(:node, "role:beta_server")
+    assert_equal 1, nodes.length
+  end
+
+  def test_search_node_with_attr_filter
+    nodes = search(:node, "hostname:beta.example.com")
+    assert_equal 1, nodes.length
+  end
+
+  def test_search_node_without_json_class
+    nodes = search(:node, "chef_environment:default")
+    assert_equal 3, nodes.length
+  end
+end
+
+class TestImplicitSearchDB < Test::Unit::TestCase
+  include SearchDbTests
+  include SearchNodeTests
+
+  def search(*args, &block)
+    # wrapper around creating a new Recipe instance and calling search on it
+    node = Chef::Node.new()
+    cookbooks = Chef::CookbookCollection.new()
+    run_context = Chef::RunContext.new(node, cookbooks, nil)
+    return Chef::Recipe.new("test_cookbook", "test_recipe", run_context).search(*args, &block)
+  end
+end
+
+class TestExplicitSearchDB < Test::Unit::TestCase
+  include SearchDbTests
+  include SearchNodeTests
+
+  def search(*args, &block)
+    Chef::Search::Query.new.search(*args, &block)
+  end
+end
+

data/lib/knife-solo/resources/solo.rb.erb

@@ -0,0 +1,10 @@
+base = File.expand_path('..', __FILE__)
+
+role_path                 File.join(base, 'roles')
+data_bag_path             File.join(base, 'data_bags')
+encrypted_data_bag_secret File.join(base, 'data_bag_key')
+
+cookbook_path []
+<% cookbook_paths.each_with_index do |path, i| -%>
+cookbook_path << File.join(base, 'cookbooks-<%= i+1 %>') # <%= path %>
+<% end -%>

data/lib/knife-solo/ssh_command.rb

@@ -257,12 +257,13 @@ module KnifeSolo
     # TODO:
     # - move this to a dedicated "portability" module?
     # - use ruby in all cases instead?
-    def run_portable_mkdir_p(folder)
+    def run_portable_mkdir_p(folder, mode = nil)
       if windows_node?
         # no mkdir -p on windows - fake it
-        run_command %Q{ruby -e "require 'fileutils'; FileUtils.mkdir_p('#{folder}')"}
+        run_command %Q{ruby -e "require 'fileutils'; FileUtils.mkdir_p('#{folder}', :mode => #{mode})"}
       else
-        run_command "mkdir -p #{folder}"
+        mode_option = (mode.nil? ? "" : "-m #{mode}")
+        run_command "mkdir -p #{mode_option} #{folder}"
       end
     end
 

data/lib/knife-solo/tools.rb

@@ -7,5 +7,27 @@ module KnifeSolo
     def windows_client?
       RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
     end
+
+    def config_value(key, default = nil)
+      Tools.config_value(config, key, default)
+    end
+
+    # Chef 10 compatible way of getting correct precedence for command line
+    # and configuration file options. Adds correct handling of `false` values
+    # to the original example in
+    # http://docs.opscode.com/breaking_changes_chef_11.html#knife-configuration-parameter-changes
+    def self.config_value(config, key, default = nil)
+      key = key.to_sym
+      if !config[key].nil?
+        config[key]
+      elsif !Chef::Config[:knife][key].nil?
+        # when Chef 10 support is dropped, this branch can be removed
+        # as Chef 11 automatically merges the values to the `config` hash
+        Chef::Config[:knife][key]
+      else
+        default
+      end
+    end
+
   end
 end

data/test/bootstraps_test.rb

@@ -6,7 +6,10 @@ class KnifeSolo::Bootstraps::StubOS < KnifeSolo::Bootstraps::Base
 end
 
 class KnifeSolo::Bootstraps::StubOS2 < KnifeSolo::Bootstraps::Base
-  def distro ; {:type => 'gem', :version => 'Fanny Faker'} ; end
+  def distro
+    {:type => 'gem'}
+  end
+
   def gem_install
     # dont' actually install anything
   end
@@ -43,16 +46,6 @@ class BootstrapsTest < TestCase
     assert_equal prepare, bootstrap.prepare
   end
 
-  def test_darwin_checks_for_xcode_install_and_barfs_if_missing
-    bootstrap = KnifeSolo::Bootstraps::Darwin.new(mock)
-    bootstrap.stubs(:gem_install)
-    bootstrap.expects(:has_xcode_installed?).returns(false)
-
-    assert_raises RuntimeError do
-      bootstrap.bootstrap!
-    end
-  end
-
   def test_omnibus_install_methdod
     bootstrap = bootstrap_instance
     bootstrap.stubs(:distro).returns({:type => "omnibus"})

data/test/integration/cases/encrypted_data_bag.rb

@@ -5,6 +5,9 @@ module EncryptedDataBag
     super
     FileUtils.cp $base_dir.join('support', 'data_bag_key'), 'data_bag_key'
     FileUtils.cp_r $base_dir.join('support', 'secret_cookbook'), 'cookbooks/secret_cookbook'
+    File.open('.chef/knife.rb', 'a') do |f|
+      f.puts 'encrypted_data_bag_secret "data_bag_key"'
+    end
     @password = "essential particles busy loud"
     create_data_bag
   end

data/test/integration/cases/knife_bootstrap.rb

@@ -0,0 +1,14 @@
+# Tries to bootstrap with apache2 cookbook and
+# verifies the "It Works!" page is present.
+
+require $base_dir.join('integration', 'cases', 'apache2_cook')
+
+module KnifeBootstrap
+  include Apache2Cook
+
+  def test_apache2
+    write_cheffile
+    assert_knife_command "bootstrap --solo --run-list=recipe[apache2]"
+    assert_match default_apache_message, http_response
+  end
+end

data/test/integration/debian6_bootstrap_test.rb

@@ -6,7 +6,7 @@ class Debian6BootstrapTest < IntegrationTest
   end
 
   def image_id
-    "ami-4d20a724"
+    "ami-7ce17315"
   end
 
   def prepare_server

data/test/integration/{debian7_bootstrap_test.rb → debian7_knife_bootstrap_test.rb}

@@ -1,6 +1,6 @@
 require 'integration_helper'
 
-class Debian7BootstrapTest < IntegrationTest
+class Debian7KnifeBootstrapTest < IntegrationTest
   def user
     "admin"
   end
@@ -10,12 +10,12 @@ class Debian7BootstrapTest < IntegrationTest
   end
 
   def prepare_server
-    # Do nothing as `solo bootstrap` will do everything
+    # Do nothing as `knife bootstrap --solo` will do everything
   end
 
   def default_apache_message
     /It works!/
   end
 
-  include Apache2Bootstrap
+  include KnifeBootstrap
 end

data/test/knife_bootstrap_test.rb

@@ -0,0 +1,61 @@
+require 'test_helper'
+require 'support/kitchen_helper'
+
+require 'chef/knife/bootstrap_solo'
+require 'chef/knife/solo_bootstrap'
+
+class KnifeBootstrapTest < TestCase
+  include KitchenHelper
+
+  def test_includes_solo_options
+    assert Chef::Knife::Bootstrap.options.include?(:solo)
+  end
+
+  def test_runs_solo_bootstrap_if_specified_as_option
+    Chef::Config.knife[:solo] = false
+    Chef::Knife::SoloBootstrap.any_instance.expects(:run)
+    Chef::Knife::Bootstrap.any_instance.expects(:run_with_chef_client).never
+    in_kitchen do
+      command("somehost", "--solo").run
+    end
+  end
+
+  def test_runs_solo_bootstrap_if_specified_as_chef_configuration
+    Chef::Config.knife[:solo] = true
+    Chef::Knife::SoloBootstrap.any_instance.expects(:run)
+    Chef::Knife::Bootstrap.any_instance.expects(:run_with_chef_client).never
+    in_kitchen do
+      command("somehost").run
+    end
+  end
+
+  def test_runs_original_bootstrap_by_default
+    Chef::Config.knife[:solo] = false
+    Chef::Knife::SoloBootstrap.any_instance.expects(:run).never
+    Chef::Knife::Bootstrap.any_instance.expects(:run_with_chef_client)
+    in_kitchen do
+      command("somehost").run
+    end
+  end
+
+  def test_runs_original_bootstrap_if_specified_as_option
+    Chef::Config.knife[:solo] = true
+    Chef::Knife::SoloBootstrap.any_instance.expects(:run).never
+    Chef::Knife::Bootstrap.any_instance.expects(:run_with_chef_client)
+    in_kitchen do
+      command("somehost", "--no-solo").run
+    end
+  end
+
+  def test_barks_without_atleast_a_hostname
+    cmd = command("--solo")
+    cmd.ui.expects(:err)
+    in_kitchen do
+      assert_exits cmd
+    end
+  end
+
+  def command(*args)
+    knife_command(Chef::Knife::Bootstrap, *args)
+  end
+end