chef-solr 0.8.16 → 0.9.0.a3

data/Rakefile

@@ -16,35 +16,56 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+require File.dirname(__FILE__) + '/lib/chef/solr/version'
 
 require 'rubygems'
 require 'rake'
+require 'rake/gempackagetask'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "chef-solr"
-    gem.summary = %Q{Search indexing for Chef}
-    gem.email = "adam@opscode.com"
-    gem.homepage = "http://wiki.opscode.com/display/chef"
-    gem.authors = ["Adam Jacob"]
-    gem.add_dependency "libxml-ruby", ">=1.1.3"
-    gem.add_dependency "uuidtools", ">=2.0.0"
-    gem.add_dependency "chef", IO.read("VERSION").strip
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-    gem.executables = [ 'chef-solr', 'chef-solr-indexer', 'chef-solr-rebuild' ]
-    gem.files = [
-      "README.rdoc",
-      "Rakefile",
-      "VERSION"
-    ]
-    gem.files.include %w{ README.rdoc Rakefile VERSION bin/* lib/**/* solr/* spec/**/* }
-  end
+GEM_NAME = "chef-solr"
 
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it from gemcutter with: sudo gem install gemcutter jeweler"
+spec = Gem::Specification.new do |gem|
+  gem.name = "chef-solr"
+  gem.version = Chef::Solr::VERSION
+  gem.summary = %Q{Search indexing for Chef}
+  gem.email = "adam@opscode.com"
+  gem.homepage = "http://wiki.opscode.com/display/chef"
+  gem.authors = ["Adam Jacob"]
+  gem.add_dependency "libxml-ruby", ">=1.1.3"
+  gem.add_dependency "uuidtools", ">=2.0.0"
+  gem.add_dependency "chef", Chef::Solr::VERSION
+  # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  gem.executables = [ 'chef-solr', 'chef-solr-indexer', 'chef-solr-rebuild' ]
+  gem.files = [
+    "README.rdoc",
+    "Rakefile"
+  ]
+  gem.files = %w{ README.rdoc Rakefile LICENSE} + Dir.glob("{bin,lib,solr,spec}/**/*")
+end
+
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.gem_spec = spec
+end
+
+desc "Install the gem"
+task :install => :package do
+  sh %{gem install pkg/#{GEM_NAME}-#{Chef::Solr::VERSION} --no-rdoc --no-ri}
 end
 
+desc "Uninstall the gem"
+task :uninstall do
+  sh %{gem uninstall #{GEM_NAME} -x -v #{Chef::Solr::VERSION} }
+end
+
+desc "Create a gemspec file"
+task :gemspec do
+  File.open("#{GEM_NAME}.gemspec", "w") do |file|
+    file.puts spec.to_ruby
+  end
+end
+
+
+
 begin
   require 'spec/rake/spectask'
   Spec::Rake::SpecTask.new(:spec) do |spec|
@@ -79,7 +100,7 @@ Rake::RDocTask.new do |rdoc|
     config = YAML.load(File.read('VERSION.yml'))
     version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
   else
-    version = ""
+    version = Chef::Solr::VERSION
   end
 
   rdoc.rdoc_dir = 'rdoc'

data/lib/chef/solr.rb

@@ -34,8 +34,6 @@ require 'uri'
 class Chef
   class Solr
 
-    VERSION = "0.8.16"
-
     include Chef::Mixin::XMLEscape
 
     attr_accessor :solr_url, :http
@@ -58,7 +56,11 @@ class Chef
       Chef::Log.debug("Sending #{select_url} to Solr")
       req = Net::HTTP::Get.new(select_url)
       res = @http.request(req)
-      res.error! unless res.kind_of?(Net::HTTPSuccess)
+      unless res.kind_of?(Net::HTTPSuccess)
+        Chef::Log.fatal("Search Query to Solr '#{select_url}' failed")
+        res.error!
+      end
+      Chef::Log.debug("Parsing Solr result set:\n#{res.body}")
       eval(res.body)
     end
 
@@ -211,4 +213,3 @@ class Chef
 
   end
 end
-

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

@@ -126,7 +126,8 @@ class Chef
             @logfile = File.new(Chef::Config[:log_location], "a")
           end
 
-          Chef::Log.level = Chef::Config[:log_level]
+          #Chef::Log.level = Chef::Config[:log_level]
+          Chef::Log.level = :debug
 
           # Build up a client
           node = Chef::Node.new
@@ -137,13 +138,14 @@ class Chef
 
           solr_base = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..", "solr"))
 
+          run_context = Chef::RunContext.new(node, {})
           # Create the Jetty container
           unless File.directory?(Chef::Config[:solr_jetty_path])
             Chef::Log.warn("Initializing the Jetty container")
-            solr_jetty_dir = Chef::Resource::Directory.new(Chef::Config[:solr_jetty_path], nil, node)
+            solr_jetty_dir = Chef::Resource::Directory.new(Chef::Config[:solr_jetty_path], run_context)
             solr_jetty_dir.recursive(true)
             solr_jetty_dir.run_action(:create)
-            solr_jetty_untar = Chef::Resource::Execute.new("untar_jetty", nil, node)
+            solr_jetty_untar = Chef::Resource::Execute.new("untar_jetty", run_context)
             solr_jetty_untar.command("tar zxvf #{File.join(solr_base, 'solr-jetty.tar.gz')}")
             solr_jetty_untar.cwd(Chef::Config[:solr_jetty_path])
             solr_jetty_untar.run_action(:run)
@@ -152,10 +154,10 @@ class Chef
           # Create the solr home
           unless File.directory?(Chef::Config[:solr_home_path])
             Chef::Log.warn("Initializing Solr home directory")
-            solr_home_dir = Chef::Resource::Directory.new(Chef::Config[:solr_home_path], nil, node)
+            solr_home_dir = Chef::Resource::Directory.new(Chef::Config[:solr_home_path], run_context)
             solr_home_dir.recursive(true)
             solr_home_dir.run_action(:create)
-            solr_jetty_untar = Chef::Resource::Execute.new("untar_solr_home", nil, node)
+            solr_jetty_untar = Chef::Resource::Execute.new("untar_solr_home", run_context)
             solr_jetty_untar.command("tar zxvf #{File.join(solr_base, 'solr-home.tar.gz')}")
             solr_jetty_untar.cwd(Chef::Config[:solr_home_path])
             solr_jetty_untar.run_action(:run)
@@ -164,7 +166,7 @@ class Chef
           # 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, node)
+            solr_data_dir = Chef::Resource::Directory.new(Chef::Config[:solr_data_path], run_context)
             solr_data_dir.recursive(true)
             solr_data_dir.run_action(:create)
           end
@@ -201,3 +203,4 @@ class Chef
     end
   end
 end
+

data/lib/chef/solr/index_queue_consumer.rb

@@ -40,14 +40,15 @@ class Chef
         index = Chef::Solr::Index.new
         Chef::Log.debug("Dequeued item for indexing: #{payload.inspect}")
 
-        response = begin
-                     pitem = payload["item"].to_hash                  
-                     generate_response { index.add(payload["id"], payload["database"], payload["type"], pitem) }                  
-                   rescue NoMethodError
-                     generate_response() { raise ArgumentError, "Payload item does not respond to :keys or :to_hash, cannot index!" }
-                   end
+        begin
+          pitem = payload["item"].to_hash                  
+          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
         
-        Chef::Log.info("Indexing #{payload["type"]} #{payload["id"]} from #{payload["database"]} status #{response[:status]}#{response[:status] == :error ? ' ' + response[:error] : ''}")
+        msg = "Indexing #{payload["type"]} #{payload["id"]} from #{payload["database"]} status #{status_message(response)}}"
+        Chef::Log.info(msg)
         response 
       end
 
@@ -58,18 +59,25 @@ class Chef
       end
       
       private
-        def generate_response(&block)
-          response = {}
-          begin
-            block.call
-          rescue
-            response[:status] = :error
-            response[:error] = $!
-          else
-            response[:status] = :ok
-          end
-          response
+
+      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

data/lib/chef/solr/query.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Nuo Yan (<nuo@opscode.com>)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,11 +31,22 @@ class Chef
     class Query < Chef::Solr
       
       # Create a new Query object - takes the solr_url and optional
-      # couchdb_database to inflate objects into.
-      def initialize(solr_url=Chef::Config[:solr_url], database=Chef::Config[:couchdb_database])
+      # Chef::CouchDB object to inflate objects into.
+      def initialize(solr_url=Chef::Config[:solr_url], couchdb = nil)
         super(solr_url)
-        @database = database
-        @couchdb = Chef::CouchDB.new(nil, database)
+        if couchdb.nil?
+          @database = Chef::Config[:couchdb_database]
+          @couchdb = Chef::CouchDB.new(nil, Chef::Config[:couchdb_database])
+        else
+          unless couchdb.kind_of?(Chef::CouchDB)
+            Chef::Log.warn("Passing the database name to Chef::Solr::Query initialization is deprecated. Please pass in the Chef::CouchDB object instead.")
+            @database = couchdb
+            @couchdb = Chef::CouchDB.new(nil, couchdb)
+          else
+            @database = couchdb.couchdb_database
+            @couchdb = couchdb
+          end
+        end 
       end
 
       # A raw query against CouchDB - takes the type of object to find, and raw

data/lib/chef/solr/version.rb

@@ -0,0 +1,5 @@
+class Chef
+  class Solr
+    VERSION = '0.9.0.a3'
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chef-solr
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
-  - 8
-  - 16
-  version: 0.8.16
+  - 9
+  - 0
+  - a3
+  version: 0.9.0.a3
 platform: ruby
 authors: 
 - Adam Jacob
@@ -14,13 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-11 00:00:00 -07:00
+date: 2010-06-04 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 
@@ -35,6 +37,7 @@ dependencies:
   name: uuidtools
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -49,14 +52,16 @@ dependencies:
   name: chef
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 8
-        - 16
-        version: 0.8.16
+        - 9
+        - 0
+        - a3
+        version: 0.9.0.a3
   type: :runtime
   version_requirements: *id003
 description: 
@@ -67,23 +72,23 @@ executables:
 - chef-solr-rebuild
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - README.rdoc
 - Rakefile
-- VERSION
+- LICENSE
 - bin/chef-solr
 - bin/chef-solr-indexer
 - bin/chef-solr-rebuild
-- lib/chef/solr.rb
 - 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/version.rb
+- lib/chef/solr.rb
 - solr/solr-home.tar.gz
 - solr/solr-jetty.tar.gz
 - spec/chef/solr/index_spec.rb
@@ -91,17 +96,17 @@ files:
 - spec/chef/solr_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- LICENSE
 has_rdoc: true
 homepage: http://wiki.opscode.com/display/chef
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -109,16 +114,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Search indexing for Chef

data/VERSION

@@ -1 +0,0 @@
-0.8.16