Merge branch 'CHEF-1018' of git://github.com/jtimberman/chef into jtimberman/CHEF-1018

Author: adamhjk

chef-solr/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 @@
 
 class Chef
   class Solr
+
+    VERSION = "0.8.6"
+
     include Chef::Mixin::XMLEscape
 
     attr_accessor :solr_url, :http
@@ -73,7 +76,7 @@ def post_to_solr(doc)
 
     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,40 +100,40 @@ def solr_add(data)
     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
 
     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|
         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 @@ def to_params(params_hash)
     def escape(s)
       s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/n) {
         '%'+$1.unpack('H2'*$1.size).join('%').upcase
-      }.tr(' ', '+') 
+      }.tr(' ', '+')
     end
 
   end

chef-solr/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)",
@@ -101,23 +101,31 @@ class Indexer < Chef::Application
         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 
+
+        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
 

chef-solr/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 Rebuild < Chef::Application
           :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
 

chef-solr/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/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)",
@@ -101,11 +102,19 @@ class Solr < Chef::Application
         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
@@ -119,7 +128,7 @@ def setup_application
 
           # 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)
@@ -131,7 +140,7 @@ def setup_application
 
           # 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)
@@ -141,7 +150,7 @@ def setup_application
             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)