acts_as_solr 1.1.3 → 1.2.0

data/FORKED_CHANGES

@@ -1,6 +1,8 @@
+- installer executable
+- Fix config errors
 VERSION 1.1.3
 - improve memory usage (via amuino)
 VERSION 1.1.1
 - highlighting support (needs doc)
 - invalid chars in XML bug fix
-- Raise a specific Exception class on connection error
+- Raise a specific Exception class on connection error

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.2.0

data/acts_as_solr.gemspec

@@ -5,13 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_solr}
-  s.version = "1.1.3"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell"]
   s.date = %q{2010-03-02}
+  s.default_executable = %q{acts_as_solr}
   s.description = %q{Acts As Solr}
   s.email = %q{kyle@onemorecloud.com}
+  s.executables = ["acts_as_solr"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.markdown",
@@ -28,6 +30,7 @@ Gem::Specification.new do |s|
      "TESTING_THE_PLUGIN",
      "VERSION",
      "acts_as_solr.gemspec",
+     "bin/acts_as_solr",
      "config/solr.yml",
      "config/solr_environment.rb",
      "init.rb",

data/bin/acts_as_solr

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+def die(s); STDERR.puts(s); exit(1); end
+if ARGV[0] != "install"
+  die "Usage: #{$0} install"
+end
+
+require "fileutils"
+include FileUtils::Verbose
+
+die("Where's the config folder?") unless File.directory?("config")
+cp File.dirname(__FILE__) + "/../config/solr.yml", "config"

data/config/solr_environment.rb

@@ -1,6 +1,7 @@
 ENV['RAILS_ENV']  = (ENV['RAILS_ENV'] || 'development').dup
 # RAILS_ROOT isn't defined yet, so figure it out.
-rails_root_dir = "#{File.dirname(File.expand_path(__FILE__))}/../../../../"
+
+rails_root_dir = "#{File.expand_path('.')}"
 SOLR_PATH = "#{File.dirname(File.expand_path(__FILE__))}/../solr" unless defined? SOLR_PATH
 
 SOLR_LOGS_PATH = "#{rails_root_dir}/log" unless defined? SOLR_LOGS_PATH
@@ -10,10 +11,20 @@ SOLR_DATA_PATH = "#{rails_root_dir}/solr/#{ENV['RAILS_ENV']}" unless defined? SO
 unless defined? SOLR_PORT
   config = YAML::load_file(rails_root_dir+'/config/solr.yml')
   
-  SOLR_PORT = ENV['PORT'] || URI.parse(config[ENV['RAILS_ENV']]['url']).port
+  begin
+    SOLR_PORT = ENV['PORT'] || URI.parse(config[ENV['RAILS_ENV']]['url']).port
+  rescue
+    STDERR.puts "Couldn't set Solr port"
+    SOLR_PORT = 8982
+  end
 end
 
-SOLR_JVM_OPTIONS = config[ENV['RAILS_ENV']]['jvm_options'] unless defined? SOLR_JVM_OPTIONS
+begin
+  SOLR_JVM_OPTIONS = config[ENV['RAILS_ENV']]['jvm_options'] unless defined? SOLR_JVM_OPTIONS
+rescue 
+  STDERR.puts "Couldn't set JVM Options"
+  SOLR_JVM_OPTIONS = ""
+end
 
 if ENV['RAILS_ENV'] == 'test'
   DB = (ENV['DB'] ? ENV['DB'] : 'mysql') unless defined?(DB)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_solr
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -10,7 +10,7 @@ bindir: bin
 cert_chain: []
 
 date: 2010-03-02 00:00:00 -08:00
-default_executable: 
+default_executable: acts_as_solr
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
@@ -24,8 +24,8 @@ dependencies:
     version: 
 description: Acts As Solr
 email: kyle@onemorecloud.com
-executables: []
-
+executables: 
+- acts_as_solr
 extensions: []
 
 extra_rdoc_files: 
@@ -43,6 +43,7 @@ files:
 - TESTING_THE_PLUGIN
 - VERSION
 - acts_as_solr.gemspec
+- bin/acts_as_solr
 - config/solr.yml
 - config/solr_environment.rb
 - init.rb