knife-solo 0.0.3 → 0.0.4

data/lib/chef/knife/cook.rb

@@ -27,6 +27,8 @@ class Chef
 
         add_patches
 
+        check_chef_version
+
         logging_arg = "-l debug" if config[:verbosity] > 0
         stream_command <<-BASH
           sudo chef-solo -c #{chef_path}/solo.rb \
@@ -64,7 +66,6 @@ class Chef
         Array(Chef::Config.cookbook_path).first + "/chef_solo_patches/libraries"
       end
 
-      # TODO (mat): Let rsync write to /var/chef-solo with sudo somehow
       def rsync_kitchen
         system %Q{rsync -rlP --rsh="ssh #{ssh_args}" --delete --exclude '.*' ./ :#{chef_path}}
       end
@@ -75,6 +76,14 @@ class Chef
           system %Q{rsync -rlP --rsh="ssh #{ssh_args}" #{patch} :#{patch_path}}
         end
       end
+
+      def check_chef_version
+        constraint = "~>0.10.4"
+        result = run_command <<-BASH
+          ruby -rubygems -e "gem 'chef', '#{constraint}'"
+        BASH
+        raise "The chef gem on #{host} is out of date. Please run `#{$0} prepare #{ssh_args}` to upgrade Chef to #{constraint}." unless result.success?
+      end
     end
   end
 end

data/lib/chef/knife/kitchen.rb

@@ -16,11 +16,12 @@ class Chef
         mkdir name + "/site-cookbooks"
         mkdir name + "/cookbooks"
         File.open(name + "/solo.rb", 'w') do |f|
-          f << <<-RUBY.gsub(/^\s+/, '')
+          f << <<-RUBY.gsub(/^ {12}/, '')
             file_cache_path "/tmp/chef-solo"
             data_bag_path   "/tmp/chef-solo/data_bags"
             cookbook_path   [ "/tmp/chef-solo/site-cookbooks",
                               "/tmp/chef-solo/cookbooks" ]
+            role_path       "/tmp/chef-solo/roles"
           RUBY
         end
       end

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

@@ -0,0 +1,211 @@
+#
+# 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 'treetop'
+require 'chef/solr_query/query_transform'
+
+# mock QueryTransform such that we can access the location of the lucene grammar
+class Chef
+  class SolrQuery
+    class QueryTransform
+      def self.base_path
+        class_variable_get(:@@base_path)
+      end
+    end
+  end
+end
+
+def build_flat_hash(hsh, prefix="")
+  result = {}
+  hsh.each_pair do |key, value|
+    if value.kind_of?(Hash)
+      result.merge!(build_flat_hash(value, "#{prefix}#{key}_"))
+    else
+      result[prefix+key] = value
+    end
+  end
+  result
+end
+
+module Lucene
+
+  class Term < Treetop::Runtime::SyntaxNode
+    # compares a query value and a value, tailing '*'-wildcards are handled correctly.
+    # Value can either be a string or an array, all other objects are converted
+    # to a string and than checked.
+    def match( value )
+      if value.is_a?(Array)
+        value.any?{ |x| self.match(x) }
+      else
+        File.fnmatch(self.text_value, value.to_s)
+      end
+    end
+  end
+
+  class Field < Treetop::Runtime::SyntaxNode
+    # simple field -> value matches, supporting tailing '*'-wildcards in keys
+    # as well as in values
+    def match( item )
+      keys = self.elements[0].match(item)
+      if keys.nil?
+        false
+      else
+        keys.any?{ |key| self.elements[1].match(item[key]) }
+      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
+  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
+        item.merge!(build_flat_hash(item))
+      end
+      if self.text_value.end_with?("*")
+        part = self.text_value.chomp("*")
+        item.keys.collect{ |key| key.start_with?(part)? key: nil}.compact
+      else
+        if item.has_key?(self.text_value)
+          [self.text_value,]
+        else
+          nil
+        end
+      end
+    end
+  end
+
+  class Body < Treetop::Runtime::SyntaxNode
+    def match( item )
+      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(
+        self.elements[0].match(item),
+        self.elements[2].match(item)
+      )
+    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(
+        self.elements[1].match(item)
+      )
+    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 )
+      self.elements[0].match(value)
+    end
+  end
+end
+
+class Query
+  # initialize the parser by using the grammar shipped with chef
+  @@grammar = File.join(Chef::SolrQuery::QueryTransform.base_path, "lucene.treetop")
+  Treetop.load(@@grammar)
+  @@parser = LuceneParser.new
+
+  def self.parse(data)
+    # parse the query into a query tree
+    if data.nil?
+      data = "*:*"
+    end
+    tree = @@parser.parse(data)
+    if tree.nil?
+      msg = "Parse error at offset: #{@@parser.index}\n"
+      msg += "Reason: #{@@parser.failure_reason}"
+      raise "Query #{data} is not supported: #{msg}"
+    end
+    self.clean_tree(tree)
+    tree
+  end
+  
+  private
+
+  def self.clean_tree(root_node)
+    # remove all SyntaxNode elements from the tree, we don't need them as
+    # the related ruby class already knowns what to do.
+    return if root_node.elements.nil?
+    root_node.elements.delete_if do |node|
+      node.class.name == "Treetop::Runtime::SyntaxNode"
+    end
+    root_node.elements.each { |node| self.clean_tree(node) }
+  end
+end
+

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

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

data/lib/chef/knife/prepare.rb

@@ -30,7 +30,6 @@ class Chef
         @packages.join(' ')
       end
 
-      # TODO (mat): integration test this, not a gem install
       def emerge_gem_install
         ui.msg("Installing required packages...")
         run_command("sudo USE='-test' ACCEPT_KEYWORDS='~amd64' emerge -u chef")
@@ -51,7 +50,6 @@ class Chef
         raise result.stderr unless result.success? || result.stdout.match(installed)
       end
 
-      # TODO (mat): integration test this, will probably break without sudo
       def rpm_gem_install
         ui.msg("Installing required packages...")
         @packages = %w(ruby ruby-shadow gcc gcc-c++ ruby-devel wget rsync)

data/lib/knife-solo/info.rb

@@ -1,3 +1,5 @@
 module KnifeSolo
-  VERSION = '0.0.3'
+  def self.version
+    '0.0.4'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-01 00:00:00.000000000Z
+date: 2011-10-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70346489903680 !ruby/object:Gem::Requirement
+  requirement: &70138524107880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346489903680
+  version_requirements: *70138524107880
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70346489903000 !ruby/object:Gem::Requirement
+  requirement: &70138524105520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346489903000
+  version_requirements: *70138524105520
 - !ruby/object:Gem::Dependency
   name: virtualbox
-  requirement: &70346489902460 !ruby/object:Gem::Requirement
+  requirement: &70138524103420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346489902460
+  version_requirements: *70138524103420
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70346489901760 !ruby/object:Gem::Requirement
+  requirement: &70138524099600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70346489901760
+  version_requirements: *70138524099600
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70346489901160 !ruby/object:Gem::Requirement
+  requirement: &70138524098780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 2.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70346489901160
+  version_requirements: *70138524098780
 description: Handles bootstrapping, running chef solo, rsyncing cookbooks etc
 email: mat@schaffer.me
 executables: []
@@ -74,7 +74,8 @@ extra_rdoc_files: []
 files:
 - lib/chef/knife/cook.rb
 - lib/chef/knife/kitchen.rb
-- lib/chef/knife/patches/data_bags_patch.rb
+- lib/chef/knife/patches/parser.rb
+- lib/chef/knife/patches/search_patch.rb
 - lib/chef/knife/prepare.rb
 - lib/knife-solo/info.rb
 - lib/knife-solo/kitchen_command.rb
@@ -92,18 +93,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2883154116349428333
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2883154116349428333
 requirements: []
 rubyforge_project: nowarning
 rubygems_version: 1.8.6

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

@@ -1,42 +0,0 @@
-# Taken from Vagrant's patch: https://gist.github.com/867960
-# based on Brian Akins's patch: http://lists.opscode.com/sympa/arc/chef/2011-02/msg00000.html
-if Chef::Config[:solo]
-  class Chef
-    module Mixin
-      module Language
-        def data_bag(bag)
-          @solo_data_bags = {} if @solo_data_bags.nil?
-          unless @solo_data_bags[bag]
-            @solo_data_bags[bag] = {}
-            data_bag_path = Chef::Config[:data_bag_path]
-            Dir.glob(File.join(data_bag_path, bag, "*.json")).each do |f|
-              item = JSON.parse(IO.read(f))
-              @solo_data_bags[bag][item['id']] = item
-            end
-          end
-          @solo_data_bags[bag].keys
-        end
-
-        def data_bag_item(bag, item)
-          data_bag(bag) unless ( !@solo_data_bags.nil? && @solo_data_bags[bag])
-          @solo_data_bags[bag][item]
-        end
-
-      end
-    end
-  end
-
-  class Chef
-    class Recipe
-      def search(bag_name, query=nil)
-        Chef::Log.warn("Simplistic search patch, ignoring query of %s" % [query]) unless query.nil?
-        data_bag(bag_name.to_s).each do |bag_item_id|
-          bag_item = data_bag_item(bag_name.to_s, bag_item_id)
-          yield bag_item
-        end
-      end
-
-    end
-  end
-
-end