Allow configuration of solo.rb via knife.rb

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lib/knife-solo/resources/patch_cookbooks/chef-solo-search"]
+	path = lib/knife-solo/resources/patch_cookbooks/chef-solo-search
+	url = https://github.com/edelight/chef-solo-search.git

Manifest.txt

@@ -4,8 +4,6 @@ README.rdoc
 Rakefile
 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
@@ -19,12 +17,13 @@ lib/knife-solo/bootstraps/darwin.rb
 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/patch_cookbooks/chef-solo-search
+lib/knife-solo/resources/solo.rb.erb
 lib/knife-solo/ssh_command.rb
 lib/knife-solo/tools.rb
 test/bootstraps_test.rb
@@ -47,7 +46,6 @@ test/integration/ubuntu10_04_test.rb
 test/integration/ubuntu12_04_bootstrap_test.rb
 test/integration/ubuntu12_04_test.rb
 test/integration_helper.rb
-test/knife-solo/config_test.rb
 test/minitest/parallel.rb
 test/node_config_command_test.rb
 test/solo_bootstrap_test.rb
@@ -73,3 +71,24 @@ test/support/ssh_config
 test/support/test_case.rb
 test/support/validation_helper.rb
 test/test_helper.rb
+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/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

Rakefile

@@ -5,6 +5,7 @@ require File.join(File.dirname(__FILE__), 'lib', 'knife-solo', 'info')
 MANIFEST_IGNORES = %w[
     .travis.yml
     .gitignore
+    .gitmodules
     Gemfile
     Gemfile.lock
     Manifest.txt
@@ -24,10 +25,11 @@ namespace :manifest do
 
   desc 'Updates Manifest.txt with a list of files from git'
   task :update do
-    git_files = `git ls-files`.split("\n")
+    git_files       = `git ls-files`.split("\n")
+    submodule_files = `git submodule foreach -q 'for f in $(git ls-files); do echo $path/$f; done'`.split("\n")
 
     File.open('Manifest.txt', 'w') do |f|
-      f.puts((git_files - MANIFEST_IGNORES).join("\n"))
+      f.puts((git_files + submodule_files - MANIFEST_IGNORES).join("\n"))
     end
   end
 end

knife-solo.gemspec

@@ -31,7 +31,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'parallel'
 
-  s.add_dependency 'chef',     chef_version
-  s.add_dependency 'net-ssh',  '>= 2.2.2', '< 3.0'
+  s.add_dependency 'chef',      chef_version
+  s.add_dependency 'net-ssh',   '>= 2.2.2', '< 3.0'
   s.add_dependency 'librarian', '~> 0.0.20'
+  s.add_dependency 'erubis',    '~> 2.7.0'
 end