chef-solr 0.10.4 → 0.10.6.beta.1

data/Rakefile

@@ -20,13 +20,23 @@ require File.dirname(__FILE__) + '/lib/chef/solr/version'
 
 require 'rubygems'
 require 'rake'
-require 'rake/gempackagetask'
+#require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 GEM_NAME = "chef-solr"
 
-spec = eval(File.read("chef-solr.gemspec"))
+spec = eval(File.read(File.dirname(__FILE__) + "/chef-solr.gemspec"))
 
-Rake::GemPackageTask.new(spec) do |pkg|
+desc "Create solr archives"
+task :tar_solr do
+  %w{solr-home solr-jetty}.each do |tar|
+    Dir.chdir(File.dirname(__FILE__) + "/solr/#{tar}") { sh "tar cvzf ../#{tar}.tar.gz *" }
+  end
+end
+
+task :gem => :tar_solr
+
+Gem::PackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 

data/lib/chef/solr/version.rb

@@ -1,6 +1,6 @@
 class Chef
   class Solr
-    VERSION = '0.10.4'
+    VERSION = '0.10.6.beta.1'
 
     # Solr Schema. Used to detect incompatibilities between installed solr and
     # chef-solr versions.

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: chef-solr
 version: !ruby/object:Gem::Version 
-  hash: 63
-  prerelease: 
-  segments: 
-  - 0
-  - 10
-  - 4
-  version: 0.10.4
+  prerelease: 7
+  version: 0.10.6.beta.1
 platform: ruby
 authors: 
 - Adam Jacob
@@ -15,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-11 00:00:00 Z
+date: 2011-10-31 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -25,12 +21,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 10
-        - 4
-        version: 0.10.4
+        version: 0.10.6.beta.1
   type: :runtime
   version_requirements: *id001
 description: 
@@ -38,7 +29,6 @@ email: adam@opscode.com
 executables: 
 - chef-solr
 - chef-solr-installer
-- chef-solr-rebuild
 extensions: []
 
 extra_rdoc_files: []
@@ -48,15 +38,14 @@ files:
 - Rakefile
 - LICENSE
 - bin/chef-solr
-- bin/chef-solr-rebuild
 - bin/chef-solr-installer
+- lib/chef/solr/application/solr.rb
 - lib/chef/solr/solr_installer.rb
 - lib/chef/solr/version.rb
-- lib/chef/solr/application/solr.rb
-- lib/chef/solr/application/rebuild.rb
 - lib/chef/solr.rb
-- solr/solr-jetty.tar.gz
 - solr/solr-home.tar.gz
+- solr/solr-jetty.tar.gz
+has_rdoc: true
 homepage: http://wiki.opscode.com/display/chef
 licenses: []
 
@@ -70,23 +59,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Search indexing for Chef

data/bin/chef-solr-rebuild

@@ -1,27 +0,0 @@
-#!/usr/bin/env ruby
-#
-# 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.
-#
-
-$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
-$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "chef", "lib")))
-
-require 'rubygems'
-require 'chef/solr/application/rebuild'
-
-Chef::Solr::Application::Rebuild.new.run
-

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

@@ -1,101 +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'
-
-class Chef
-  class Solr
-    class Application
-      class Rebuild < 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 :help,
-          :short        => "-h",
-          :long         => "--help",
-          :description  => "Show this message",
-          :on           => :tail,
-          :boolean      => true,
-          :show_options => true,
-          :exit         => 0
-
-        option :couchdb_database,
-          :short => "-d DB",
-          :long => "--couchdb-database DB",
-          :description => "The CouchDB Database to re-index"
-
-        option :couchdb_url,
-          :short => "-u URL",
-          :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
-
-          @index = Chef::Solr::Index.new
-        end
-
-        def setup_application
-          Chef::Log.level = Chef::Config[:log_level]
-          Chef::Log.warn("This operation is destructive!")
-          Chef::Log.warn("I'm going to count to 10, and then delete your Solr index and rebuild it.")
-          Chef::Log.warn("CTRL-C will, of course, stop this disaster.")
-          0.upto(10) do |num|
-            Chef::Log.warn("... #{num}")
-            sleep 1
-          end
-          Chef::Log.warn("... Bombs away!")
-        end
-
-        def run_application
-          s = Chef::Solr.new(Chef::Config[:solr_url])
-          Chef::Log.info("Destroying the index")
-          s.rebuild_index
-        end
-      end
-    end
-  end
-end