chef-solr 0.8.6 → 0.8.8

data/Rakefile

@@ -30,7 +30,7 @@ require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.spec_files = FileList['spec/**/*_spec.rb']
-  spec.spec_opts = %w{-fs --color}
+  spec.spec_opts = ['--options', File.expand_path(File.dirname(__FILE__) + '/spec/spec.opts')]
 end
 
 Spec::Rake::SpecTask.new(:rcov) do |spec|

data/VERSION

@@ -1 +1 @@
-0.8.6
+0.8.8

data/lib/chef/solr.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -34,6 +34,9 @@ require 'uri'
 
 class Chef
   class Solr
+
+    VERSION = "0.8.8"
+
     include Chef::Mixin::XMLEscape
 
     attr_accessor :solr_url, :http
@@ -73,7 +76,7 @@ class Chef
 
     def solr_add(data)
       data = [data] unless data.kind_of?(Array)
-      
+
       Chef::Log.debug("adding to SOLR: #{data.inspect}")
       xml_document = LibXML::XML::Document.new
       xml_add = LibXML::XML::Node.new("add")
@@ -97,19 +100,19 @@ class Chef
     def solr_commit(opts={})
       post_to_solr(generate_single_element("commit", opts))
     end
-    
+
     def solr_optimize(opts={})
       post_to_solr(generate_single_element("optimize", opts))
     end
-    
+
     def solr_rollback
       post_to_solr(generate_single_element("rollback"))
     end
-    
+
     def solr_delete_by_id(ids)
       post_to_solr(generate_delete_document("id", ids))
     end
-    
+
     def solr_delete_by_query(queries)
       post_to_solr(generate_delete_document("query", queries))
     end
@@ -117,20 +120,20 @@ class Chef
     def rebuild_index(url=Chef::Config[:couchdb_url], db=Chef::Config[:couchdb_database])
       solr_delete_by_query("X_CHEF_database_CHEF_X:#{db}")
       solr_commit
-      
+
       results = {}
-      [Chef::ApiClient, Chef::Node, Chef::OpenIDRegistration, Chef::Role, Chef::WebUIUser].each do |klass|
+      [Chef::ApiClient, Chef::Node, Chef::Role].each do |klass|
         results[klass.name] = reindex_all(klass) ? "success" : "failed"
       end
       databags = Chef::DataBag.cdb_list(true)
       Chef::Log.info("Reloading #{databags.size.to_s} #{Chef::DataBag} objects into the indexer")
-      databags.each { |i| i.add_to_index; i.list(true).each { |x| x.add_to_index } } 
-      results[Chef::DataBag.name] = "success" 
+      databags.each { |i| i.add_to_index; i.list(true).each { |x| x.add_to_index } }
+      results[Chef::DataBag.name] = "success"
       results
     end
 
     private
-    
+
     def reindex_all(klass, metadata={})
       begin
         items = klass.cdb_list(true)
@@ -204,7 +207,7 @@ class Chef
     def escape(s)
       s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/n) {
         '%'+$1.unpack('H2'*$1.size).join('%').upcase
-      }.tr(' ', '+') 
+      }.tr(' ', '+')
     end
 
   end

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

@@ -6,9 +6,9 @@
 # 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.
@@ -29,14 +29,14 @@ class Chef
   class Solr
     class Application
       class Indexer < Chef::Application
-  
-        option :config_file, 
+
+        option :config_file,
           :short => "-c CONFIG",
           :long  => "--config CONFIG",
           :default => "/etc/chef/solr.rb",
           :description => "The configuration file to use"
 
-        option :log_level, 
+        option :log_level,
           :short        => "-l LEVEL",
           :long         => "--log_level LEVEL",
           :description  => "Set the log level (debug, info, warn, error, fatal)",
@@ -48,6 +48,13 @@ class Chef
           :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",
@@ -94,7 +101,15 @@ class Chef
         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
@@ -102,15 +117,15 @@ class Chef
           end
           fatal!("SIGINT received, stopping", 2)
         end
-        
-        Kernel.trap("TERM") do 
+
+        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
 

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

@@ -6,9 +6,9 @@
 # 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.
@@ -26,14 +26,14 @@ class Chef
   class Solr
     class Application
       class Rebuild < Chef::Application
-  
-        option :config_file, 
+
+        option :config_file,
           :short => "-c CONFIG",
           :long  => "--config CONFIG",
           :default => "/etc/chef/solr.rb",
           :description => "The configuration file to use"
 
-        option :log_level, 
+        option :log_level,
           :short        => "-l LEVEL",
           :long         => "--log_level LEVEL",
           :description  => "Set the log level (debug, info, warn, error, fatal)",
@@ -64,6 +64,14 @@ class Chef
           :long => "--couchdb-url URL",
           :description => "The CouchDB URL"
 
+        option :version,
+          :short => "-v",
+          :long => "--version",
+          :description => "Show chef-solr-rebuild version",
+          :boolean => true,
+          :proc => lambda {|v| puts "chef-solr-rebuild: #{::Chef::Solr::VERSION}"},
+          :exit => 0
+
         def initialize
           super
 

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

@@ -6,9 +6,9 @@
 # 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.
@@ -21,19 +21,20 @@ require 'chef/config'
 require 'chef/application'
 require 'chef/daemon'
 require 'chef/client'
+require 'chef/solr'
 
 class Chef
   class Solr
     class Application
       class Solr < Chef::Application
-  
-        option :config_file, 
+
+        option :config_file,
           :short => "-c CONFIG",
           :long  => "--config CONFIG",
           :default => "/etc/chef/solr.rb",
           :description => "The configuration file to use"
 
-        option :log_level, 
+        option :log_level,
           :short        => "-l LEVEL",
           :long         => "--log_level LEVEL",
           :description  => "Set the log level (debug, info, warn, error, fatal)",
@@ -45,6 +46,12 @@ class Chef
           :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.pid",
+          :proc         => nil
+
         option :help,
           :short        => "-h",
           :long         => "--help",
@@ -95,11 +102,19 @@ class Chef
         option :solr_java_opts,
           :short => "-j OPTS",
           :long => "--java-opts OPTS",
-          :description => "Raw options passed to Java" 
+          :description => "Raw options passed to Java"
+
+        option :version,
+          :short => "-v",
+          :long => "--version",
+          :description => "Show chef-solr version",
+          :boolean => true,
+          :proc => lambda {|v| puts "chef-solr: #{::Chef::Solr::VERSION}"},
+          :exit => 0
 
         def initialize
           super
-          Chef::Log.level = Chef::Config[:log_level] 
+          Chef::Log.level = Chef::Config[:log_level]
         end
 
         def setup_application
@@ -113,7 +128,7 @@ class Chef
 
           # Create the Jetty container
           unless File.directory?(Chef::Config[:solr_jetty_path])
-            Chef::Log.warn("Initializing the Jetty container") 
+            Chef::Log.warn("Initializing the Jetty container")
             solr_jetty_dir = Chef::Resource::Directory.new(Chef::Config[:solr_jetty_path], nil, c.node)
             solr_jetty_dir.recursive(true)
             solr_jetty_dir.run_action(:create)
@@ -125,7 +140,7 @@ class Chef
 
           # Create the solr home
           unless File.directory?(Chef::Config[:solr_home_path])
-            Chef::Log.warn("Initializing Solr home directory") 
+            Chef::Log.warn("Initializing Solr home directory")
             solr_home_dir = Chef::Resource::Directory.new(Chef::Config[:solr_home_path], nil, c.node)
             solr_home_dir.recursive(true)
             solr_home_dir.run_action(:create)
@@ -135,7 +150,7 @@ class Chef
             solr_jetty_untar.run_action(:run)
           end
 
-          # Create the solr data path 
+          # Create the solr data path
           unless File.directory?(Chef::Config[:solr_data_path])
             Chef::Log.warn("Initializing Solr data directory")
             solr_data_dir = Chef::Resource::Directory.new(Chef::Config[:solr_data_path], nil, c.node)

data/spec/chef/solr_spec.rb

@@ -170,5 +170,69 @@ describe Chef::Solr do
       @solr.solr_delete_by_query([ "foo:bar", "baz:bum" ])
     end
   end
+  
+  describe "rebuilding the index" do
+    before do
+      Chef::Config[:couchdb_database] = "chunky_bacon"
+    end
+    
+    it "deletes the index and commits" do
+      @solr.should_receive(:solr_delete_by_query).with("X_CHEF_database_CHEF_X:chunky_bacon")
+      @solr.should_receive(:solr_commit)
+      @solr.stub!(:reindex_all)
+      Chef::DataBag.stub!(:cdb_list).and_return([])
+      @solr.rebuild_index
+    end
+    
+    it "reindexes Chef::ApiClient, Chef::Node, and Chef::Role objects, reporting the results as a hash" do
+      @solr.stub!(:solr_delete_by_query).with("X_CHEF_database_CHEF_X:chunky_bacon")
+      @solr.stub!(:solr_commit)
+      @solr.should_receive(:reindex_all).with(Chef::ApiClient).and_return(true)
+      @solr.should_receive(:reindex_all).with(Chef::Node).and_return(true)
+      @solr.should_receive(:reindex_all).with(Chef::Role).and_return(true)
+      Chef::DataBag.stub!(:cdb_list).and_return([])
+      
+      result = @solr.rebuild_index
+      result["Chef::ApiClient"].should == "success"
+      result["Chef::Node"].should == "success"
+      result["Chef::Role"].should == "success"
+    end
+    
+    it "does not reindex Chef::OpenIDRegistration or Chef::WebUIUser objects" do
+      # hi there. the reason we're specifying this behavior is because these objects
+      # are not properly indexed in the first place and trying to reindex them
+      # tickles a bug in our CamelCase to snake_case code. See CHEF-1009.
+      @solr.stub!(:solr_delete_by_query).with("X_CHEF_database_CHEF_X:chunky_bacon")
+      @solr.stub!(:solr_commit)
+      @solr.stub!(:reindex_all).with(Chef::ApiClient)
+      @solr.stub!(:reindex_all).with(Chef::Node)
+      @solr.stub!(:reindex_all).with(Chef::Role)
+      @solr.should_not_receive(:reindex_all).with(Chef::OpenIDRegistration)
+      @solr.should_not_receive(:reindex_all).with(Chef::WebUIUser)
+      Chef::DataBag.stub!(:cdb_list).and_return([])
+      
+      @solr.rebuild_index
+    end
+    
+    it "reindexes databags" do
+      one_data_item = Chef::DataBagItem.new
+      one_data_item.raw_data = {"maybe"=>"snakes actually are evil", "id" => "just_sayin"}
+      two_data_item = Chef::DataBagItem.new
+      two_data_item.raw_data = {"tone_depth"=>"rumble_fish", "id" => "eff_yes"}
+      data_bag = Chef::DataBag.new
+      data_bag.stub!(:list).and_return([one_data_item, two_data_item])
+      
+      @solr.stub!(:solr_delete_by_query).with("X_CHEF_database_CHEF_X:chunky_bacon")
+      @solr.stub!(:solr_commit)
+      @solr.stub!(:reindex_all)
+      Chef::DataBag.stub!(:cdb_list).and_return([data_bag])
+      
+      data_bag.should_receive(:add_to_index)
+      one_data_item.should_receive(:add_to_index)
+      two_data_item.should_receive(:add_to_index)
+      
+      @solr.rebuild_index["Chef::DataBag"].should == "success"
+    end
+  end
 
 end

data/spec/spec.opts

@@ -0,0 +1 @@
+-cbfs

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 6
-  version: 0.8.6
+  - 8
+  version: 0.8.8
 platform: ruby
 authors: 
 - Adam Jacob
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 -08:00
+date: 2010-03-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,8 +55,8 @@ dependencies:
         segments: 
         - 0
         - 8
-        - 6
-        version: 0.8.6
+        - 8
+        version: 0.8.8
   type: :runtime
   version_requirements: *id003
 description: 
@@ -89,6 +89,7 @@ files:
 - spec/chef/solr/index_spec.rb
 - spec/chef/solr/query_spec.rb
 - spec/chef/solr_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 - LICENSE
 has_rdoc: true