chef-solr 0.9.18 → 0.10.0.beta.0

data/lib/chef/solr/version.rb

@@ -1,5 +1,11 @@
 class Chef
   class Solr
-    VERSION = '0.9.18'
+    VERSION = '0.10.0.beta.0'
+
+    # Solr Schema. Used to detect incompatibilities between installed solr and
+    # chef-solr versions.
+    SCHEMA_NAME = "chef"
+    SCHEMA_VERSION = '1.2'
+
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: chef-solr
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.9.18
+  prerelease: 7
+  version: 0.10.0.beta.0
 platform: ruby
 authors: 
 - Adam Jacob
@@ -10,47 +10,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-29 00:00:00 -07:00
+date: 2011-03-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: libxml-ruby
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.3
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: uuidtools
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.0
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: chef
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.18
+        version: 0.10.0.beta.0
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id001
 description: 
 email: adam@opscode.com
 executables: 
 - chef-solr
-- chef-solr-indexer
+- chef-solr-installer
 - chef-solr-rebuild
 extensions: []
 
@@ -61,23 +39,15 @@ files:
 - Rakefile
 - LICENSE
 - bin/chef-solr
-- bin/chef-solr-indexer
+- bin/chef-solr-installer
 - bin/chef-solr-rebuild
-- lib/chef/solr/application/indexer.rb
 - lib/chef/solr/application/rebuild.rb
 - lib/chef/solr/application/solr.rb
-- lib/chef/solr/index.rb
-- lib/chef/solr/index_queue_consumer.rb
-- lib/chef/solr/query.rb
+- lib/chef/solr/solr_installer.rb
 - lib/chef/solr/version.rb
 - lib/chef/solr.rb
 - solr/solr-home.tar.gz
 - solr/solr-jetty.tar.gz
-- spec/chef/solr/index_spec.rb
-- spec/chef/solr/query_spec.rb
-- spec/chef/solr_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://wiki.opscode.com/display/chef
 licenses: []
@@ -96,9 +66,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 

data/lib/chef/solr/application/indexer.rb

@@ -1,148 +0,0 @@
-#
-# Author:: AJ Christensen (<aj@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'
-require 'chef/log'
-require 'chef/config'
-require 'chef/application'
-require 'chef/solr'
-require 'chef/solr/index'
-require 'chef/solr/index_queue_consumer'
-require 'chef/daemon'
-require 'chef/webui_user'
-
-class Chef
-  class Solr
-    class Application
-      class Indexer < Chef::Application
-
-        option :config_file,
-          :short => "-c CONFIG",
-          :long  => "--config CONFIG",
-          :default => "/etc/chef/solr.rb",
-          :description => "The configuration file to use"
-
-        option :log_level,
-          :short        => "-l LEVEL",
-          :long         => "--log_level LEVEL",
-          :description  => "Set the log level (debug, info, warn, error, fatal)",
-          :proc         => lambda { |l| l.to_sym }
-
-        option :log_location,
-          :short        => "-L LOGLOCATION",
-          :long         => "--logfile LOGLOCATION",
-          :description  => "Set the log file location, defaults to STDOUT - recommended for daemonizing",
-          :proc         => nil
-
-        option :pid_file,
-          :short        => "-P PID_FILE",
-          :long         => "--pid PIDFILE",
-          :description  => "Set the PID file location, defaults to /tmp/chef-solr-indexer.pid",
-          :proc         => nil
-
-
-        option :help,
-          :short        => "-h",
-          :long         => "--help",
-          :description  => "Show this message",
-          :on           => :tail,
-          :boolean      => true,
-          :show_options => true,
-          :exit         => 0
-
-        option :user,
-          :short => "-u USER",
-          :long => "--user USER",
-          :description => "User to set privilege to",
-          :proc => nil
-
-        option :group,
-          :short => "-g GROUP",
-          :long => "--group GROUP",
-          :description => "Group to set privilege to",
-          :proc => nil
-
-        option :daemonize,
-          :short => "-d",
-          :long => "--daemonize",
-          :description => "Daemonize the process",
-          :proc => lambda { |p| true }
-
-        option :amqp_host,
-          :long => "--amqp-host HOST",
-          :description => "The amqp host"
-
-        option :amqp_port,
-          :long => "--amqp-port PORT",
-          :description => "The amqp port"
-
-        option :amqp_user,
-          :long => "--amqp-user USER",
-          :description => "The amqp user"
-
-        option :amqp_pass,
-          :long => "--amqp-pass PASS",
-          :description => "The amqp password"
-
-        option :amqp_vhost,
-          :long => "--amqp-vhost VHOST",
-          :description => "The amqp vhost"
-
-        option :version,
-          :short => "-v",
-          :long => "--version",
-          :description => "Show chef-solr-indexer version",
-          :boolean => true,
-          :proc => lambda {|v| puts "chef-solr-indexer: #{::Chef::Solr::VERSION}"},
-          :exit => 0
-
-        Signal.trap("INT") do
-          begin
-            AmqpClient.instance.stop
-          rescue Bunny::ProtocolError, Bunny::ConnectionError, Bunny::UnsubscribeError
-          end
-          fatal!("SIGINT received, stopping", 2)
-        end
-
-        Kernel.trap("TERM") do
-          begin
-            AmqpClient.instance.stop
-          rescue Bunny::ProtocolError, Bunny::ConnectionError, Bunny::UnsubscribeError
-          end
-          fatal!("SIGTERM received, stopping", 1)
-        end
-
-        def initialize
-          super
-
-          @index = Chef::Solr::Index.new
-          @consumer = Chef::Solr::IndexQueueConsumer.new
-        end
-
-        def setup_application
-          Chef::Daemon.change_privilege
-          Chef::Log.level = Chef::Config[:log_level]
-        end
-
-        def run_application
-          Chef::Daemon.daemonize("chef-solr-indexer") if Chef::Config[:daemonize]
-          @consumer.start
-        end
-      end
-    end
-  end
-end

data/lib/chef/solr/index.rb

@@ -1,103 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@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 'chef/log'
-require 'chef/config'
-require 'chef/solr'
-require 'libxml'
-require 'net/http'
-
-class Chef
-  class Solr
-    class Index < Solr
-
-      UNDERSCORE              = '_'
-      X                       = 'X'
-
-      X_CHEF_id_CHEF_X        = 'X_CHEF_id_CHEF_X'
-      X_CHEF_database_CHEF_X  = 'X_CHEF_database_CHEF_X'
-      X_CHEF_type_CHEF_X      = 'X_CHEF_type_CHEF_X'
-
-      def add(id, database, type, item)
-        unless item.respond_to?(:keys)
-          raise ArgumentError, "#{self.class.name} can only index Hash-like objects. You gave #{item.inspect}"
-        end
-
-        to_index = flatten_and_expand(item)
-
-        to_index[X_CHEF_id_CHEF_X]        = [id]
-        to_index[X_CHEF_database_CHEF_X]  = [database]
-        to_index[X_CHEF_type_CHEF_X]      = [type]
-
-        solr_add(to_index)
-        to_index
-      end
-
-      def delete(id)
-        solr_delete_by_id(id)
-      end
-
-      def delete_by_query(query)
-        solr_delete_by_query(query)
-      end
-
-      def flatten_and_expand(item)
-        @flattened_item = Hash.new {|hash, key| hash[key] = []}
-
-        item.each do |key, value|
-          flatten_each([key.to_s], value)
-        end
-
-        @flattened_item.each_value { |values| values.uniq! }
-        @flattened_item
-      end
-
-      def flatten_each(keys, values)
-        case values
-        when Hash
-          values.each do |child_key, child_value|
-            add_field_value(keys, child_key)
-            flatten_each(keys + [child_key.to_s], child_value)
-          end
-        when Array
-          values.each { |child_value| flatten_each(keys, child_value) }
-        else
-          add_field_value(keys, values)
-        end
-      end
-
-      def add_field_value(keys, value)
-        value = value.to_s
-        each_expando_field(keys) { |expando_field| @flattened_item[expando_field] << value }
-        @flattened_item[keys.join(UNDERSCORE)] << value
-        @flattened_item[keys.last] << value
-      end
-
-      def each_expando_field(keys)
-        return if keys.size == 1
-        0.upto(keys.size - 1) do |index|
-          original = keys[index]
-          keys[index] = X
-          yield keys.join(UNDERSCORE)
-          keys[index] = original
-        end
-      end
-
-    end
-  end
-end

data/lib/chef/solr/index_queue_consumer.rb

@@ -1,82 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@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 'chef/log'
-require 'chef/config'
-require 'chef/solr'
-require 'chef/solr/index'
-require 'chef/couchdb'
-require 'chef/index_queue'
-
-class Chef
-  class Solr
-    class IndexQueueConsumer
-      include Chef::IndexQueue::Consumer
-
-      expose :add, :delete
-      
-      def add(payload)
-        index = Chef::Solr::Index.new
-        Chef::Log.debug("Dequeued item for indexing: #{payload.inspect}")
-
-        begin
-          # older producers will send the raw item, and we no longer inflate it
-          # to an object.
-          pitem = payload["item"].to_hash
-          pitem.delete("json_class")
-          response = generate_response { index.add(payload["id"], payload["database"], payload["type"], pitem) }                  
-        rescue NoMethodError
-          response = generate_response() { raise ArgumentError, "Payload item does not respond to :keys or :to_hash, cannot index!" }
-        end
-        
-        msg = "Indexing #{payload["type"]} #{payload["id"]} from #{payload["database"]} status #{status_message(response)}}"
-        Chef::Log.info(msg)
-        response 
-      end
-
-      def delete(payload)
-        response = generate_response { Chef::Solr::Index.new.delete(payload["id"]) }
-        Chef::Log.info("Removed #{payload["id"]} from the index")
-        response
-      end
-      
-      private
-
-      def generate_response(&block)
-        response = {}
-        begin
-          block.call
-        rescue => e
-          response[:status] = :error
-          response[:error] = e
-        else
-          response[:status] = :ok
-        end
-        response
-      end
-
-      def status_message(response)
-        msg = response[:status].to_s
-        msg << ' ' + response[:error].to_s if response[:status] == :error
-        msg
-      end
-
-    end
-  end
-end
-