knife-solo 0.1.0.pre1 → 0.1.0

data/CHANGELOG.md

@@ -1,24 +1,39 @@
-# 0.1.0: In progress
+# 0.1.0: January 12, 2013
 
-## Goals
-
-* Cleaner bootstrap code
-* Local integration testing
-* Compatibility with plugins like knife-ec2
-
-# Not released yet
+## Changes and new features
 
 * Move all commands under "knife solo" namespace (#118)
     - Rename `knife kitchen` to `knife solo init`
     - Rename `knife wash_up` to `knife solo clean`
 * Add `knife solo bootstrap` command (#120)
+* OmniOS support (#144)
 * Detect Fedora 17 (#141)
+* Update chef-solo-search and add support of encrypted data bags (#127)
+* Support Librarian (#36)
+* Always install rsync from yum on RPM-based Linuxes (#157)
+* Debian wheezy (7) support (#165)
+
+## Fixes
+
 * Improve help/error messages and validation (#142)
 * Fix exit status of "cook" if chef-solo fails (#97)
+* Fix option passing to the Omnibus installer (#163)
+* Other fixes: SuSE omnibus #146, #155, #158, #160, #164
+
+## Documentation
+
+* Include documentation and tests in the gem (e01c23)
+* [Home page](http://matschaffer.github.com/knife-solo/)
+  that reflects always the current release (#151)
 
 ## Thanks to our contributors!
 
 * [Marek Hulan][ares]
+* [Anton Orel][skyeagle]
+* [Adam Carlile][Frozenproduce]
+* [Chris Lundquist][ChrisLundquist]
+* [Hiten Parmar][hrp]
+* [Patrick Connolly][patcon]
 
 # 0.0.15: November 29th, 2012
 
@@ -182,7 +197,9 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 * Generate node config on prepare
 * Cook via rsync
 
+[ChrisLundquist]:https://github.com/ChrisLundquist
 [DrGonzo65]:     https://github.com/DrGonzo65
+[Frozenproduce]: https://github.com/Frozenproduce
 [Motiejus]:      https://github.com/Motiejus
 [Nix-wie-weg]:   https://github.com/Nix-wie-weg
 [TylerRick]:     https://github.com/TylerRick
@@ -195,10 +212,11 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 [davidsch]:      https://github.com/davidsch
 [deepak]:        https://github.com/deepak
 [fnichol]:       https://github.com/fnichol
-[funglaub]:      https://github/funglaub
+[funglaub]:      https://github.com/funglaub
 [gregf]:         https://github.com/gregf
 [gsterndale]:    https://github.com/gsterndale
 [hectcastro]:    https://github.com/hectcastro
+[hrp]:           https://github.com/hrp
 [jgarber]:       https://github.com/jgarber
 [jgrevich]:      https://github.com/jgrevich
 [natlownes]:     https://github.com/natlownes
@@ -207,10 +225,11 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 [pferdefleisch]: https://github.com/pferdefleisch
 [portertech]:    https://github.com/portertech
 [retr0h]:        https://github.com/retr0h
-[rmoriz]:        http://github.com/rmoriz
+[rmoriz]:        https://github.com/rmoriz
 [rosstimson]:    https://github.com/rosstimson
 [rubiojr]:       https://github.com/rubiojr
 [ryandub]:       https://github.com/ryandub
+[skyeagle]:      https://github.com/skyeagle
 [tmatilai]:      https://github.com/tmatilai
 [vjpr]:          https://github.com/vjpr
 [zeph]:          https://github.com/zeph

data/README.rdoc

@@ -1,11 +1,8 @@
 = knife-solo
 
-{<img src="https://secure.travis-ci.org/matschaffer/knife-solo.png" alt="Build Status" />}[http://travis-ci.org/matschaffer/knife-solo]
-{<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/matschaffer/knife-solo]
-
 == DESCRIPTION:
 
-Knife-solo is a gem plugin for Chef's knife utility. It currently adds 5 subcommands to knife:
+knife-solo adds a handful of commands that aim to make working with chef-solo as powerful as chef-server. It currently adds 5 subcommands to knife:
 
 - <tt>knife solo init</tt> is used to create a new directory structure (i.e. "kitchen") that fits with Chef's standard structure and can be used to build and store recipes.
 
@@ -27,13 +24,13 @@ Installation is a normal gem installation.
 
 If you need to install from git run:
 
-    rake install
+    bundle && bundle exec rake install
 
 === Init command
 
 The init command simply takes a name of the directory to store the kitchen structure. Use "." to initialize the current directory.
 
-    knife init mychefrepo
+    knife solo init mychefrepo
 
 Currently the directory structure looks like this, but could change as development continues.
 

data/Rakefile

@@ -1,18 +1,63 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 
+MANIFEST_IGNORES = %w[
+    .travis.yml
+    .gitignore
+    Gemfile
+    Gemfile.lock
+    Manifest.txt
+    README.md
+    knife-solo.gemspec
+    script/newb
+    script/test
+  ]
+
 desc 'Updates Manifest.txt with a list of files from git'
 task :manifest do
   git_files = `git ls-files`.split("\n")
-  ignored = %w(.gitignore Gemfile Gemfile.lock Manifest.txt knife-solo.gemspec script/newb script/test)
 
   File.open('Manifest.txt', 'w') do |f|
-    f.puts (git_files - ignored).join("\n")
+    f.puts (git_files - MANIFEST_IGNORES).join("\n")
   end
 end
-
 task :release => :manifest
 
+# Returns the parsed RDoc for a single file as HTML
+# Somewhat gnarly, but does the job.
+def parsed_rdoc file
+  options = RDoc::Options.new
+  options.template_dir = options.template_dir_for 'darkfish'
+
+  rdoc = RDoc::RDoc.current = RDoc::RDoc.new
+  rdoc.options = options
+  rdoc.generator = RDoc::Generator::Darkfish.new(options)
+  parsed = rdoc.parse_files([file])
+  parsed.first.description
+end
+
+desc 'Renerates gh-pages from project'
+task 'gh-pages' do
+  require 'tmpdir'
+  gem 'rdoc'; require 'rdoc/rdoc'
+
+  Dir.mktmpdir do |clone|
+    sh "git clone -b gh-pages git@github.com:matschaffer/knife-solo.git #{clone}"
+    File.open(clone + "/index.html", 'w') do |f|
+      f.puts '---'
+      f.puts 'layout: default'
+      f.puts '---'
+      f.puts parsed_rdoc("README.rdoc")
+    end
+    rev = `git rev-parse HEAD`[0..7]
+    Dir.chdir(clone) do
+      sh "git commit --allow-empty -m 'Updated index from README.rdoc rev #{rev}' index.html"
+      sh "git push origin gh-pages"
+    end
+  end
+end
+task :release => 'gh-pages'
+
 namespace :test do
   Rake::TestTask.new(:integration) do |t|
     t.libs << "test"
@@ -23,6 +68,9 @@ namespace :test do
     t.libs << "test"
     t.test_files = FileList['test/*_test.rb']
   end
+
+  desc 'Run both unit and integration tests'
+  task :all => [:units, :integration]
 end
 
 desc "Alias for test:units"

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

@@ -70,22 +70,34 @@ module Lucene
       end
     end
   end
-  
+
   # we don't support range matches
   # range of integers would be easy to implement
   # but string ranges are hard
   class FiledRange < Treetop::Runtime::SyntaxNode
   end
-  
-  class InclFieldRange < FieldRange
+
+  # we handle '[* TO *]' as a special case since it is common in
+  # cookbooks for matching the existence of keys
+  class InclFieldRange
+    def match(item)
+      field = self.elements[0].text_value
+      range_start = self.elements[1].transform
+      range_end = self.elements[2].transform
+      if range_start == "*" and range_end == "*"
+        !!item[field]
+      else
+        raise "Ranges not really supported yet"
+      end
+    end
   end
-  
+
   class ExclFieldRange < FieldRange
   end
-  
+
   class RangeValue < Treetop::Runtime::SyntaxNode
   end
-  
+
   class FieldName < Treetop::Runtime::SyntaxNode
     def match( item )
       if self.text_value.count("_") > 0
@@ -95,7 +107,7 @@ module Lucene
         part = self.text_value.chomp("*")
         item.keys.collect{ |key| key.start_with?(part)? key: nil}.compact
       else
-        if item.has_key?(self.text_value)
+        if item[self.text_value]
           [self.text_value,]
         else
           nil
@@ -109,13 +121,13 @@ module Lucene
       self.elements[0].match( item )
     end
   end
-  
+
   class Group < Treetop::Runtime::SyntaxNode
     def match( item )
       self.elements[0].match(item)
     end
   end
-  
+
   class BinaryOp < Treetop::Runtime::SyntaxNode
     def match( item )
       self.elements[1].match(
@@ -124,29 +136,29 @@ module Lucene
       )
     end
   end
-  
+
   class OrOperator < Treetop::Runtime::SyntaxNode
     def match( cond1, cond2 )
       cond1 or cond2
     end
   end
-  
+
   class AndOperator < Treetop::Runtime::SyntaxNode
     def match( cond1, cond2 )
       cond1 and cond2
     end
   end
-  
+
   # we don't support fuzzy string matching
   class FuzzyOp < Treetop::Runtime::SyntaxNode
   end
-  
+
   class BoostOp < Treetop::Runtime::SyntaxNode
   end
-  
+
   class FuzzyParam < Treetop::Runtime::SyntaxNode
   end
-  
+
   class UnaryOp < Treetop::Runtime::SyntaxNode
     def match( item )
       self.elements[0].match(
@@ -154,19 +166,19 @@ module Lucene
       )
     end
   end
-  
+
   class NotOperator < Treetop::Runtime::SyntaxNode
     def match( cond )
       not cond
     end
   end
-  
+
   class RequiredOperator < Treetop::Runtime::SyntaxNode
   end
-  
+
   class ProhibitedOperator < Treetop::Runtime::SyntaxNode
   end
-  
+
   class Phrase < Treetop::Runtime::SyntaxNode
     # a quoted ::Term
     def match( value )
@@ -195,7 +207,7 @@ class Query
     self.clean_tree(tree)
     tree
   end
-  
+
   private
 
   def self.clean_tree(root_node)

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

@@ -0,0 +1,110 @@
+#
+# 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

data/lib/chef/knife/solo_cook.rb

@@ -10,8 +10,8 @@ class Chef
     # Approach ported from spatula (https://github.com/trotter/spatula)
     # Copyright 2009, Trotter Cashion
     class SoloCook < Knife
-      OMNIBUS_EMBEDDED_PATHS     ||= ["/opt/chef/embedded/bin", "/opt/opscode/embedded/bin"]
-      OMNIBUS_EMBEDDED_GEM_PATHS ||= ["/opt/chef/embedded/lib/ruby/gems/1.9.1", "/opt/opscode/embedded/lib/ruby/gems/1.9.1"]
+      OMNIBUS_EMBEDDED_PATHS     ||= %w[/opt/chef/embedded/bin /opt/opscode/embedded/bin]
+      OMNIBUS_EMBEDDED_GEM_PATHS ||= %w[/opt/chef/embedded/lib/ruby/gems/1.9.1 /opt/opscode/embedded/lib/ruby/gems/1.9.1]
       CHEF_VERSION_CONSTRAINT    ||= ">=0.10.4"
 
       include KnifeSolo::SshCommand
@@ -21,6 +21,8 @@ class Chef
 
       deps do
         require 'chef/cookbook/chefignore'
+        require 'librarian/action'
+        require 'librarian/chef'
         require 'pathname'
         KnifeSolo::SshCommand.load_deps
         KnifeSolo::NodeConfigCommand.load_deps
@@ -29,20 +31,17 @@ class Chef
       banner "knife solo cook [USER@]HOSTNAME [JSON] (options)"
 
       option :skip_chef_check,
-        :long => '--skip-chef-check',
-        :boolean => true,
-        :description => "Skip the version check on the Chef gem"
+        :long        => '--skip-chef-check',
+        :description => 'Skip the version check on the Chef gem'
 
       option :sync_only,
-        :long => '--sync-only',
-        :boolean => false,
-        :description => "Only sync the cookbook - do not run Chef"
+        :long        => '--sync-only',
+        :description => 'Only sync the cookbook - do not run Chef'
 
       option :why_run,
-        :short        => '-W',
-        :long         => '--why-run',
-        :boolean      => true,
-        :description  => "Enable whyrun mode"
+        :short       => '-W',
+        :long        => '--why-run',
+        :description => 'Enable whyrun mode'
 
       def run
         time('Run') do
@@ -50,6 +49,7 @@ class Chef
           Chef::Config.from_file('solo.rb')
           check_chef_version unless config[:skip_chef_check]
           generate_node_config
+          librarian_install
           rsync_kitchen
           add_patches
           cook unless config[:sync_only]
@@ -96,6 +96,17 @@ class Chef
         ui.msg "#{msg} finished in #{Time.now - start} seconds"
       end
 
+      def librarian_install
+        return unless File.exist? 'Cheffile'
+        Chef::Log.debug("Installing Librarian cookbooks")
+        Librarian::Action::Resolve.new(librarian_env).run
+        Librarian::Action::Install.new(librarian_env).run
+      end
+
+      def librarian_env
+        @librarian_env ||= Librarian::Chef::Environment.new
+      end
+
       def rsync_kitchen
         time('Rsync kitchen') do
           cmd = %Q{rsync -rl --rsh="ssh #{ssh_args}" --delete #{rsync_exclude.collect{ |ignore| "--exclude #{ignore} " }.join} ./ :#{adjust_rsync_path(chef_path)}}

data/lib/chef/knife/solo_init.rb

@@ -23,8 +23,6 @@ class Chef
         end
       end
 
-      private
-
       def create_cupboards(base, dirs)
         dirs.each do |dir|
           cupboard_dir = File.join(base, dir)

data/lib/chef/knife/solo_prepare.rb

@@ -21,16 +21,16 @@ class Chef
       banner "knife solo prepare [USER@]HOSTNAME [JSON] (options)"
 
       option :omnibus_version,
-        :long => "--omnibus-version VERSION",
-        :description => "The version of Omnibus to install"
+        :long        => '--omnibus-version VERSION',
+        :description => 'The version of Omnibus to install'
 
       option :omnibus_url,
-        :long => "--omnibus-url URL",
-        :description => "URL to download install.sh from"
+        :long        => '--omnibus-url URL',
+        :description => 'URL to download install.sh from'
 
       option :omnibus_options,
-        :long => "--omnibus-options \"-r -n\"",
-        :description => "Pass options to the install.sh script"
+        :long        => '--omnibus-options "OPTIONS"',
+        :description => 'Pass options to the install.sh script'
 
       def run
         validate!

data/lib/knife-solo/bootstraps.rb

@@ -57,7 +57,7 @@ module KnifeSolo
 
       def http_client_get_url(url, file)
         stream_command <<-BASH
-          if which curl 2>/dev/null; then
+          if command -v curl >/dev/null 2>&1; then
             curl -L -o #{file} #{url}
           else
             wget -O #{file} #{url}
@@ -73,7 +73,7 @@ module KnifeSolo
         # `omnibus_version` is not provided.
         install_command = "sudo bash #{file}"
         install_command << " -v #{prepare.config[:omnibus_version]}" if prepare.config[:omnibus_version]
-        install_command << " #{prepare.config[:options]}" if prepare.config[:options]
+        install_command << " #{prepare.config[:omnibus_options]}" if prepare.config[:omnibus_options]
 
         stream_command(install_command)
       end
@@ -81,7 +81,7 @@ module KnifeSolo
       def yum_omnibus_install
         omnibus_install
         # Make sure we have rsync on builds that don't include it by default
-        # (for example Scientific Linux minimal)
+        # (for example Scientific Linux minimal, CentOS minimal)
         run_command("sudo yum -y install rsync")
       end
 

data/lib/knife-solo/bootstraps/linux.rb

@@ -2,7 +2,7 @@ module KnifeSolo::Bootstraps
   class Linux < Base
 
     def issue
-      prepare.run_command("cat /etc/issue").stdout.strip || perepare.run_command("lsb_release -d -s").stdout.strip
+      prepare.run_command("cat /etc/issue").stdout.strip || prepare.run_command("lsb_release -d -s").stdout.strip
     end
 
     def x86?
@@ -76,6 +76,8 @@ module KnifeSolo::Bootstraps
         {:type => if x86? then "debianoid_omnibus" else "debian_gem" end, :version => "lenny"}
       when %r{Debian GNU/Linux 6}
         {:type => if x86? then "debianoid_omnibus" else "debian_gem" end, :version => "squeeze"}
+      when %r{Debian GNU/Linux 7}
+        {:type => if x86? then "debianoid_omnibus" else "debian_gem" end, :version => "wheezy"}
       when %r{Debian GNU/Linux wheezy}
         {:type => "debian_gem", :version => "wheezy"}
       when %r{Ubuntu}i
@@ -85,21 +87,21 @@ module KnifeSolo::Bootstraps
         version = run_command("lsb_release -cs").stdout.strip
         {:type => "debian_gem", :version => version}
       when %r{CentOS.*? 5}
-        {:type => "omnibus", :version => "RHEL5"}
+        {:type => "yum_omnibus", :version => "RHEL5"}
       when %r{CentOS.*? 6}
-        {:type => "omnibus", :version => "RHEL6"}
+        {:type => "yum_omnibus", :version => "RHEL6"}
       when %r{Red Hat Enterprise.*? 5}
-        {:type => "omnibus", :version => "RHEL5"}
+        {:type => "yum_omnibus", :version => "RHEL5"}
       when %r{Red Hat Enterprise.*? 6}
-        {:type => "omnibus", :version => "RHEL6"}
+        {:type => "yum_omnibus", :version => "RHEL6"}
       when %r{Fedora release.*? 15}
-        {:type => "omnibus", :version => "FC15"}
+        {:type => "yum_omnibus", :version => "FC15"}
       when %r{Fedora release.*? 16}
-        {:type => "omnibus", :version => "FC16"}
+        {:type => "yum_omnibus", :version => "FC16"}
       when %r{Fedora release.*? 17}
-        {:type => "omnibus", :version => "FC17"}
+        {:type => "yum_omnibus", :version => "FC17"}
       when %r{Scientific Linux.*? 5}
-        {:type => "omnibus", :version => "RHEL5"}
+        {:type => "yum_omnibus", :version => "RHEL5"}
       when %r{Scientific Linux.*? 6}
         {:type => "yum_omnibus", :version => "RHEL6"}
       when %r{SUSE Linux Enterprise Server 1[12]}

data/lib/knife-solo/info.rb

@@ -1,5 +1,5 @@
 module KnifeSolo
   def self.version
-    '0.1.0.pre1'
+    '0.1.0'
   end
 end

data/lib/knife-solo/node_config_command.rb

@@ -12,23 +12,23 @@ module KnifeSolo
         deps { KnifeSolo::NodeConfigCommand.load_deps } unless @dependency_loader
 
         option :chef_node_name,
-          :short => "-N NAME",
-          :long => "--node-name NAME",
-          :description => "The Chef node name for your new node"
+          :short       => '-N NAME',
+          :long        => '--node-name NAME',
+          :description => 'The Chef node name for your new node'
 
         option :run_list,
-          :short => "-r RUN_LIST",
-          :long => "--run-list RUN_LIST",
-          :description => "Comma separated list of roles/recipes to put to node config (if it does not exist)",
-          :proc => lambda { |o| o.split(/[\s,]+/) },
-          :default => []
+          :short       => '-r RUN_LIST',
+          :long        => '--run-list RUN_LIST',
+          :description => 'Comma separated list of roles/recipes to put to node config (if it does not exist)',
+          :proc        => lambda { |o| o.split(/[\s,]+/) },
+          :default     => []
 
         option :first_boot_attributes,
-          :short => "-j JSON_ATTRIBS",
-          :long => "--json-attributes",
-          :description => "A JSON string to be added to node config (if it does not exist)",
-          :proc => lambda { |o| JSON.parse(o) },
-          :default => {}
+          :short       => '-j JSON_ATTRIBS',
+          :long        => '--json-attributes',
+          :description => 'A JSON string to be added to node config (if it does not exist)',
+          :proc        => lambda { |o| JSON.parse(o) },
+          :default     => {}
       end
     end
 

data/lib/knife-solo/ssh_command.rb

@@ -22,29 +22,29 @@ module KnifeSolo
         deps { KnifeSolo::SshCommand.load_deps } unless @dependency_loader
 
         option :ssh_config,
-          :short => "-F CONFIG_FILE",
-          :long => "--ssh-config-file CONFIG_FILE",
-          :description => "Alternate location for ssh config file"
+          :short       => '-F CONFIG_FILE',
+          :long        => '--ssh-config-file CONFIG_FILE',
+          :description => 'Alternate location for ssh config file'
 
         option :ssh_password,
-          :short => "-P PASSWORD",
-          :long => "--ssh-password PASSWORD",
-          :description => "The ssh password"
+          :short       => '-P PASSWORD',
+          :long        => '--ssh-password PASSWORD',
+          :description => 'The ssh password'
 
         option :ssh_identity,
-          :short => "-i FILE",
-          :long => "--ssh-identity FILE",
-          :description => "The ssh identity file"
+          :short       => '-i FILE',
+          :long        => '--ssh-identity FILE',
+          :description => 'The ssh identity file'
 
         option :ssh_port,
-          :short => "-p PORT",
-          :long => "--ssh-port PORT",
-          :description => "The ssh port"
+          :short       => '-p PORT',
+          :long        => '--ssh-port PORT',
+          :description => 'The ssh port'
 
         option :startup_script,
-          :short => "-s FILE",
-          :long => "--startup-script FILE",
-          :description => "The startup script on the remote server containing variable definitions"
+          :short       => '-s FILE',
+          :long        => '--startup-script FILE',
+          :description => 'The startup script on the remote server containing variable definitions'
       end
     end
 

data/test/integration/cases/apache2_bootstrap.rb

@@ -8,7 +8,6 @@ module Apache2Bootstrap
 
   def test_apache2
     write_cheffile
-    system "librarian-chef install >> #{log_file}"
     assert_subcommand "bootstrap --run-list=recipe[apache2]"
     assert_match default_apache_message, http_response
   end

data/test/integration/cases/apache2_cook.rb

@@ -11,16 +11,15 @@ module Apache2Cook
   end
 
   def http_response
-    Net::HTTP.get(URI.parse("http://"+server.public_ip_address))
+    Net::HTTP.get(URI.parse("http://#{server.public_ip_address}"))
   end
 
   def default_apache_message
-    /It works!/
+    /Apache Server/
   end
 
   def test_apache2
     write_cheffile
-    system "librarian-chef install >> #{log_file}"
     write_nodefile(run_list: ["recipe[apache2]"])
     assert_subcommand "cook"
     assert_match default_apache_message, http_response

data/test/integration/centos5_6_test.rb

@@ -9,10 +9,6 @@ class Centos5_6Test < IntegrationTest
     "ami-3fe42456"
   end
 
-  def default_apache_message
-    /Apache 2 Test Page/
-  end
-
   include EmptyCook
   include Apache2Cook
   include EncryptedDataBag

data/test/integration_helper.rb

@@ -1,9 +1,8 @@
 require 'rubygems'
-require 'bundler'
+require 'bundler/setup'
 
-Bundler.require
 require 'minitest/parallel'
-Bundler.require(:test)
+require 'minitest/autorun'
 
 require 'pathname'
 $base_dir = Pathname.new(__FILE__).dirname

data/test/solo_cook_test.rb

@@ -4,6 +4,7 @@ require 'support/validation_helper'
 
 require 'chef/cookbook/chefignore'
 require 'chef/knife/solo_cook'
+require 'librarian/action/install'
 
 class SuccessfulResult
   def success?
@@ -38,6 +39,21 @@ class SoloCookTest < TestCase
     end
   end
 
+  def test_does_not_run_librarian_if_no_cheffile
+    in_kitchen do
+      Librarian::Action::Install.any_instance.expects(:run).never
+      command.librarian_install
+    end
+  end
+
+  def test_runs_librarian_if_cheffile_found
+    in_kitchen do
+      File.open("Cheffile", 'w') {}
+      Librarian::Action::Install.any_instance.expects(:run)
+      command.librarian_install
+    end
+  end
+
   def test_passes_node_name_to_chef_solo
     assert_chef_solo_option "--node-name=mynode", "-N mynode"
   end

data/test/support/ec2_runner.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'fog'
 
 # A custom runner that serves as a common point for EC2 control
 class EC2Runner < MiniTest::Unit

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
-require 'bundler'
+require 'bundler/setup'
 
-Bundler.require
-Bundler.require(:test)
+require 'minitest/autorun'
+require 'mocha/setup'
 
 require 'support/test_case'

metadata

@@ -1,16 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre1
-  prerelease: 6
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Mat Schaffer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
+date: 2013-01-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -44,43 +60,101 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: chef
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.10.10
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.10.10
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-ssh
+  name: fog
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.3
-    - - <
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :runtime
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  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: 2.1.3
-    - - <
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        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: chef
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.12'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: librarian
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +184,7 @@ files:
 - lib/chef/knife/cook.rb
 - lib/chef/knife/kitchen.rb
 - lib/chef/knife/patches/parser.rb
-- lib/chef/knife/patches/search_patch.rb
+- lib/chef/knife/patches/search.rb
 - lib/chef/knife/prepare.rb
 - lib/chef/knife/solo_bootstrap.rb
 - lib/chef/knife/solo_clean.rb
@@ -184,9 +258,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -233,3 +307,4 @@ test_files:
 - test/support/test_case.rb
 - test/support/validation_helper.rb
 - test/test_helper.rb
+has_rdoc: 

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

@@ -1,81 +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
-    class Recipe
-      
-      # 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(bag_name, 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
-        if block_given?
-          pos = 0
-        else
-          result = []
-        end
-        data_bag(bag_name.to_s).each do |bag_item_id|
-          bag_item = data_bag_item(bag_name.to_s, bag_item_id)
-          if @_query.match(bag_item)
-            if block_given?
-              if (pos >= start and pos < (start + rows))
-                yield bag_item
-              end
-              pos += 1
-            else
-              result << bag_item
-            end
-          end
-        end
-        if !block_given?
-          return result.slice(start, rows)
-        end
-      end
-    end
-  end
-
-end