chef 0.7.16 → 0.8.2

data/lib/chef/search.rb

@@ -1,88 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# 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 'chef/search/result'
-require 'ferret'
-
-class Chef
-  class Search
-    
-    attr_reader :index
-    
-    def initialize
-      @index = Ferret::Index::Index.new(:path => Chef::Config[:search_index_path])
-    end
-    
-    def search(type, query="*", attributes=[], &block)
-      search_query = build_search_query(type, query)
-      start_time = Time.now
-      results = []
-      block ||= lambda { |b| b }
-      
-      @index.search_each(search_query, :limit => :all) do |id, score|
-        results << block.call(build_hash(@index.doc(id)))
-      end
-      
-      Chef::Log.debug("Search #{search_query} complete in #{Time.now - start_time} seconds")
-      
-      attributes.empty? ? results : filter_by_attributes(results,attributes)
-    end
-    
-    def filter_by_attributes(results, attributes)
-      results.collect do |r|
-        nr = Hash.new
-        nr[:index_name] = r[:index_name]
-        nr[:id] = r[:id]
-        attributes.each do |attrib|
-          if r.has_key?(attrib)
-            nr[attrib] = r[attrib]
-          end
-        end
-        nr
-      end
-    end
-    
-    private :filter_by_attributes
-    
-    def list_indexes
-      indexes = Hash.new
-      @index.search_each("index_name:*", :limit => :all) do |id, score|
-        indexes[@index.doc(id)["index_name"]] = true
-      end
-      indexes.keys
-    end
-    
-    def has_index?(index)
-      list_indexes.detect { |i| i == index }
-    end
-    
-    private
-      def build_search_query(type, query)
-        query = "id:*" if query == '*'
-        "index_name:#{type} AND (#{query})"
-      end
-    
-      def build_hash(doc)
-        result = Chef::Search::Result.new
-        doc.fields.each do |f|
-          result[f] = doc[f]
-        end
-        result
-      end
-  end
-end

data/lib/chef/search/result.rb

@@ -1,64 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# 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 'extlib'
-
-class Chef
-  class Search
-    class Result
-
-      def initialize
-        proc = lambda do |h,k| 
-            newhash = Mash.new(&proc)
-            h.each do |pk, pv| 
-              rx = /^#{k.to_s}_/ 
-              if pk =~ rx 
-                newhash[ pk.gsub(rx,'') ] = pv 
-              end 
-            end 
-            newhash 
-          end 
-        @internal = Mash.new(&proc) 
-      end
-
-      def method_missing(symbol, *args, &block)
-        @internal.send(symbol, *args, &block)
-      end
-
-      # Serialize this object as a hash 
-      def to_json(*a)
-        result = {
-          'json_class' => self.class.name,
-          'results' => @internal
-        }
-        result.to_json(*a)
-      end
-      
-      # Create a Chef::Search::Result from JSON
-      def self.json_create(o)
-        result = self.new
-        o['results'].each do |k,v|
-          result[k] = v
-        end
-        result
-      end
-    end
-  end
-end
-
-

data/lib/chef/search_index.rb

@@ -1,77 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# 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 'ferret'
-
-class Chef
-  class SearchIndex
-    
-    attr_reader :index
-    
-    def initialize
-      @index = Ferret::Index::Index.new(
-        :path => Chef::Config[:search_index_path],
-        :key => [ :id ]
-      )
-    end
-    
-    def add(new_object)
-      index_hash = create_index_object(new_object)
-      Chef::Log.debug("Indexing #{index_hash[:index_name]} with #{index_hash.inspect}")
-      @index.add_document(index_hash)
-    end
-    
-    def create_index_object(new_object)
-      index_hash = nil
-      
-      if new_object.respond_to?(:to_index)
-        index_hash = new_object.to_index
-      elsif new_object.kind_of?(Hash)
-        index_hash = new_object
-      else
-        raise Chef::Exceptions::SearchIndex, "Cannot transform argument to a Hash!" 
-      end
-      
-      unless index_hash.has_key?(:index_name) || index_hash.has_key?("index_name")
-        raise Chef::Exceptions::SearchIndex, "Cannot index without an index_name key: #{index_hash.inspect}"
-      end
-      
-      unless index_hash.has_key?(:id) || index_hash.has_key?("id")
-        raise Chef::Exceptions::SearchIndex, "Cannot index without an id key: #{index_hash.inspect}"
-      end
-     
-      sanitized_hash = Hash.new
-      index_hash.each do |k,v|
-        sanitized_hash[k.to_sym] = v
-      end
-    
-      sanitized_hash
-    end
-        
-    def delete(index_obj)
-      to_delete = create_index_object(index_obj)
-      Chef::Log.debug("Removing #{to_delete.inspect} from the #{to_delete[:index_name]} index")
-      @index.delete(to_delete[:id])
-    end
-    
-    def commit
-      @index.commit
-    end
-    
-  end
-end

data/lib/chef/util/fileedit.rb

@@ -1,121 +0,0 @@
-#
-# Author:: Nuo Yan (<nuo@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# 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 'ftools'
-require 'fileutils'
-require 'tempfile'
-
-class FileEdit
-
-  private
-  
-  attr_accessor :original_pathname, :contents, :file_edited
-
-  public
-  
-  def initialize(filepath)
-    @original_pathname = filepath
-    @file_edited = false
-    
-    raise ArgumentError, "File doesn't exist" unless File.exist? @original_pathname
-    raise ArgumentError, "File is blank" unless (@contents = File.new(@original_pathname).readlines).length > 0
-  end
-  
-  #search the file line by line and match each line with the given regex
-  #if matched, replace the whole line with newline.
-  def search_file_replace_line(regex, newline)
-    search_match(regex, newline, 'r', 1)
-  end
-
-  #search the file line by line and match each line with the given regex
-  #if matched, replace the match (all occurances)  with the replace parameter
-  def search_file_replace(regex, replace)
-    search_match(regex, replace, 'r', 2)
-  end
-  
-  #search the file line by line and match each line with the given regex
-  #if matched, delete the line
-  def search_file_delete_line(regex)
-    search_match(regex, " ", 'd', 1)
-  end
-  
-  #search the file line by line and match each line with the given regex
-  #if matched, delete the match (all occurances) from the line
-  def search_file_delete(regex)
-    search_match(regex, " ", 'd', 2)
-  end
-
-  #search the file line by line and match each line with the given regex
-  #if matched, insert newline after each matching line
-  def insert_line_after_match(regex, newline)
-    search_match(regex, newline, 'i', 0)
-  end
-   
-  #Make a copy of old_file and write new file out (only if file changed)
-  def write_file
-    
-    # file_edited is false when there was no match in the whole file and thus no contents have changed.
-    if file_edited
-      backup_pathname = original_pathname + ".old"
-      File.copy(original_pathname, backup_pathname)
-      Tempfile.open("w") do |newfile|
-        contents.each do |line|
-          newfile.puts(line)
-        end
-        newfile.flush
-        FileUtils.mv(newfile.path, original_pathname)
-      end
-    end
-    self.file_edited = false
-
-  end
-  
-  private
-  
-  #helper method to do the match, replace, delete, and insert operations
-  #command is the switch of delete, replace, and insert ('d', 'r', 'i')
-  #method is to control operation on whole line or only the match (1 for line, 2 for match)
-  def search_match(regex, replace, command, method)
-    
-    #convert regex to a Regexp object (if not already is one) and store it in exp.
-    exp = Regexp.new(regex)
-
-    #loop through contents and do the appropriate operation depending on 'command' and 'method'
-    new_contents = []
-    
-    contents.each do |line|
-      if line.match(exp) 
-        self.file_edited = true
-        case
-        when command == 'r'
-          new_contents << ((method == 1) ? replace : line.gsub!(exp, replace))
-        when command == 'd'
-          if method == 2
-            new_contents << line.gsub!(exp, "")
-          end
-        when command == 'i'
-          new_contents << line
-          new_contents << replace
-        end
-      else
-        new_contents << line
-      end
-    end
-
-    self.contents = new_contents
-  end
-end