solrizer 1.0.1 → 1.0.2

data/Gemfile

@@ -4,6 +4,8 @@ gem "nokogiri"
 gem "xml-simple"
 gem "om", ">= 1.0.0"  # only required by xml/terminology_based_solrizer ...
 gem "mediashelf-loggable"
+gem "stomp"
+gem "daemons"
 
 group :development, :test do
   gem "jeweler"
@@ -11,4 +13,4 @@ group :development, :test do
   gem 'ruby-debug-base'
   gem 'rspec', '<2.0.0'
   gem 'mocha'
-end
+end

data/Gemfile.lock

@@ -2,21 +2,19 @@ GEM
   remote: http://rubygems.org/
   specs:
     columnize (0.3.2)
-    facets (2.9.1)
+    daemons (1.1.2)
     git (1.2.5)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
     linecache (0.43)
-    mediashelf-loggable (0.4.0)
+    mediashelf-loggable (0.4.2)
     mocha (0.9.12)
     nokogiri (1.4.4)
-    om (1.0.2)
-      facets
-      facets
-      nokogiri
+    om (1.2.2)
       nokogiri (>= 1.4.2)
+      om
     rake (0.8.7)
     rspec (1.3.1)
     ruby-debug (0.10.4)
@@ -24,12 +22,14 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    xml-simple (1.0.14)
+    stomp (1.1.8)
+    xml-simple (1.0.15)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  daemons
   jeweler
   mediashelf-loggable
   mocha
@@ -38,4 +38,5 @@ DEPENDENCIES
   rspec (< 2.0.0)
   ruby-debug
   ruby-debug-base
+  stomp
   xml-simple

data/Rakefile

@@ -10,6 +10,7 @@ begin
     gem.email = "matt.zumwalt@yourmediashelf.com"
     gem.homepage = "http://github.com/projecthydra/solrizer"
     gem.authors = ["Matt Zumwalt"]
+    gem.executables = ["solrizer","solrizerd"]
     gem.add_dependency "nokogiri"
     gem.add_dependency "om"
     gem.add_dependency "nokogiri"
@@ -19,6 +20,7 @@ begin
     gem.add_development_dependency 'ruby-debug-base'
     gem.add_development_dependency 'rspec', '<2.0.0'
     gem.add_development_dependency 'mocha'
+    
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/bin/solrizer

@@ -0,0 +1,106 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'optparse'
+require 'stomp'
+
+options = {}
+
+optparse = OptionParser.new do|opts|
+  opts.banner = "Usage: solrizer [options]"
+
+  options[:hydra_home] = nil
+  opts.on( '--hydra_home PATH', 'Load the Hydra instance  at this path' ) do |path|
+    if File.exist?(File.join(path,"config","environment.rb"))
+      options[:hydra_home] = path
+    else 
+      puts "#{path} does not appear to be a valid rails home"
+      exit
+    end
+  end
+
+  options[:port] = 61613
+  opts.on('-p','--port NUM', 'Stomp port') do |port|
+    options[:port] = port
+  end
+
+  options[:host] = 'localhost'
+  opts.on('-o','--host HOSTNAME', 'Host to connect to') do |host|
+    options[:host] = host
+  end
+
+  options[:user] = 'fedoraStomper'
+  opts.on('-u', '--user USERNAME', 'User name for stomp listener') do |user|
+    options[:user] = user
+  end
+
+  options[:password] = 'fedoraStomper'
+  opts.on('-w', '--password PASSWORD', 'Password for stomp listener') do |password|
+    options[:password] = password
+  end
+
+  options[:destination] = '/topic/fedora.apim.update'
+  opts.on('-d','--destination TOPIC', 'Topic to listen to') do |destination|
+    options[:destination] = destination
+  end
+
+  opts.on('-h', '--help', 'Display this screen') do
+    puts opts
+    exit
+  end
+end
+
+optparse.parse!
+
+begin; require 'rubygems'; rescue; end
+
+if options[:hydra_home]
+  puts "Loading app..."
+  Dir.chdir(options[:hydra_home])
+  require File.join(options[:hydra_home],"config","environment.rb")
+
+  puts "app loaded"
+else
+   "The --hydra_home PATH option is mandatory. Please provide the path to the root of a valid Hydra instance."
+  exit 1
+end
+
+puts "loading listener"
+
+begin
+  @port = options[:port] 
+  @host = options[:host]
+  @user = options[:user]
+  @password = options[:password]
+  @reliable = true
+  @clientid = "fedora_stomper"
+  @destination = options[:destination]
+
+
+  $stderr.print "Connecting to stomp://#{@host}:#{@port} as #{@user}\n"
+  @conn = Stomp::Connection.open(@user, @password, @host, @port, @reliable, 5, {"client-id" => @clientid} )
+  $stderr.print "Getting output from #{@destination}\n"
+  
+  @conn.subscribe(@destination, {"activemq.subscriptionName" => @clientid, :ack =>"client" })
+  while true
+      @msg = @conn.receive
+      pid = @msg.headers["pid"]
+      method = @msg.headers["methodName"]
+
+      puts @msg.headers.inspect
+      puts "\nPID: #{@msg.headers["pid"]}\n"
+      if ["addDatastream", "addRelationship","ingest","modifyDatastream","modifyObject","purgeDatastream","urgeRelationship"].include? method
+        solrizer = Solrizer::Fedora::Solrizer.new
+        solrizer.solrize @msg.headers["pid"]
+      elsif method == "purgeObject"
+        ActiveFedora::SolrService.instance.conn.delete(pid)
+      end
+      puts  "updated solr index for #{@msg.headers["pid"]}\n"
+      @conn.ack @msg.headers["message-id"]
+  end
+  @conn.join
+
+rescue Exception => e
+p e
+end
+

data/bin/solrizerd

@@ -0,0 +1,68 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'daemons'
+require 'stomp'
+
+banner=<<-EOC
+Usage: solrizerd command --hydra_home PATH [options]
+        PATH must point to a valid hydra application
+Commands:
+        start         start an instance of the application
+        stop          stop all instances of the application
+        restart       stop all instances and restart them afterwards
+        status        show status (PID) of application instances
+Options:
+        --hydra_home PATH          Load the hydra instance at this path
+        -p, --port NUM             Stomp port (default 61613)
+        -o, --host HOSTNAME        Host to connect to
+        -u, --user USERNAME        User name for stomp listener
+        -w, --password PASSWORD    Password for stomp listener
+        -d, --destination TOPIC    Topic to listen to (default: /topic/fedora.apim.update)
+        -h, --help                 Display this screen
+EOC
+
+
+# check for a valid command
+unless ['start','stop','restart','status'].include? ARGV[0]
+  puts banner
+  exit 7
+end
+
+if ARGV.include?('-h') || ARGV.include?('--help')
+  puts banner
+  exit 0
+end
+
+# Make sure --hydra_home was set for the start and restart commands
+if ARGV[0] == 'start' || ARGV[0] == 'restart'
+  unless ARGV[1] == '--hydra_home'
+    puts "ERROR: You must --hydra_home to specify the path to a valid hydra application"
+    exit 8
+  end
+
+# make sure valid path was set for hydra_home
+  unless ARGV[2] && File.exist?(File.join(ARGV[2],"config","environment.rb"))
+    puts "ERROR: the path entered does not appear to be a valid hydra instance"
+    exit 9
+  end
+end
+
+
+options = {
+  :multiple=>false,
+  :dir_mode=>:normal,
+  :dir=>'/tmp',
+  :backtrace=>true
+}
+argv_array = []
+argv_array << ARGV[0]
+argv_array << '--'
+ARGV[1..-1].each {|ele| argv_array << ele }
+options[:ARGV] = argv_array
+
+version = '>=0'
+app = Gem.bin_path('solrizer','solrizer',version)
+
+Daemons.run(app,options)
+

data/solrizer.gemspec

@@ -5,13 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{solrizer}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zumwalt"]
-  s.date = %q{2011-03-03}
+  s.date = %q{2011-03-31}
   s.description = %q{Use solrizer to populate solr indexes from Fedora repository content or from other sources.  You can run solrizer from within your apps, using the provided rake tasks, or as a JMS listener}
   s.email = %q{matt.zumwalt@yourmediashelf.com}
+  s.executables = ["solrizer", "solrizerd"]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.textile"
@@ -24,6 +25,8 @@ Gem::Specification.new do |s|
     "README.textile",
     "Rakefile",
     "VERSION",
+    "bin/solrizer",
+    "bin/solrizerd",
     "config/fedora.yml",
     "config/hydra_types.yml",
     "config/solr.yml",
@@ -78,6 +81,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<xml-simple>, [">= 0"])
       s.add_runtime_dependency(%q<om>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<mediashelf-loggable>, [">= 0"])
+      s.add_runtime_dependency(%q<stomp>, [">= 0"])
+      s.add_runtime_dependency(%q<daemons>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug-base>, [">= 0"])
@@ -97,6 +102,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<xml-simple>, [">= 0"])
       s.add_dependency(%q<om>, [">= 1.0.0"])
       s.add_dependency(%q<mediashelf-loggable>, [">= 0"])
+      s.add_dependency(%q<stomp>, [">= 0"])
+      s.add_dependency(%q<daemons>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<ruby-debug-base>, [">= 0"])
@@ -117,6 +124,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<xml-simple>, [">= 0"])
     s.add_dependency(%q<om>, [">= 1.0.0"])
     s.add_dependency(%q<mediashelf-loggable>, [">= 0"])
+    s.add_dependency(%q<stomp>, [">= 0"])
+    s.add_dependency(%q<daemons>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<ruby-debug-base>, [">= 0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: solrizer
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -15,12 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 -06:00
+date: 2011-03-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
+  type: :runtime
   name: nokogiri
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -33,8 +33,8 @@ dependencies:
         version: "0"
   requirement: *id001
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
+  type: :runtime
   name: xml-simple
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -47,8 +47,8 @@ dependencies:
         version: "0"
   requirement: *id002
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
+  type: :runtime
   name: om
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -63,8 +63,8 @@ dependencies:
         version: 1.0.0
   requirement: *id003
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
+  type: :runtime
   name: mediashelf-loggable
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -77,9 +77,9 @@ dependencies:
         version: "0"
   requirement: *id004
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: jeweler
+  type: :runtime
+  name: stomp
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -91,9 +91,9 @@ dependencies:
         version: "0"
   requirement: *id005
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: ruby-debug
+  type: :runtime
+  name: daemons
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -105,9 +105,9 @@ dependencies:
         version: "0"
   requirement: *id006
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: ruby-debug-base
+  type: :development
+  name: jeweler
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -119,25 +119,23 @@ dependencies:
         version: "0"
   requirement: *id007
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: rspec
+  type: :development
+  name: ruby-debug
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 2
         - 0
-        - 0
-        version: 2.0.0
+        version: "0"
   requirement: *id008
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: mocha
+  type: :development
+  name: ruby-debug-base
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -149,23 +147,25 @@ dependencies:
         version: "0"
   requirement: *id009
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: nokogiri
+  type: :development
+  name: rspec
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - <
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 2
         - 0
-        version: "0"
+        - 0
+        version: 2.0.0
   requirement: *id010
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: om
+  type: :development
+  name: mocha
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -177,8 +177,8 @@ dependencies:
         version: "0"
   requirement: *id011
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
+  type: :runtime
   name: nokogiri
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
@@ -191,9 +191,9 @@ dependencies:
         version: "0"
   requirement: *id012
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: mediashelf-loggable
+  type: :runtime
+  name: om
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -205,9 +205,9 @@ dependencies:
         version: "0"
   requirement: *id013
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: jeweler
+  type: :runtime
+  name: nokogiri
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -219,9 +219,9 @@ dependencies:
         version: "0"
   requirement: *id014
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: ruby-debug
+  type: :runtime
+  name: mediashelf-loggable
   version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -233,9 +233,9 @@ dependencies:
         version: "0"
   requirement: *id015
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: ruby-debug-base
+  type: :development
+  name: jeweler
   version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -247,10 +247,38 @@ dependencies:
         version: "0"
   requirement: *id016
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: ruby-debug
+  version_requirements: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id017
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
+  name: ruby-debug-base
+  version_requirements: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id018
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  type: :development
   name: rspec
-  version_requirements: &id017 !ruby/object:Gem::Requirement 
+  version_requirements: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
@@ -261,12 +289,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  requirement: *id017
+  requirement: *id019
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
+  type: :development
   name: mocha
-  version_requirements: &id018 !ruby/object:Gem::Requirement 
+  version_requirements: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -275,11 +303,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id018
+  requirement: *id020
 description: Use solrizer to populate solr indexes from Fedora repository content or from other sources.  You can run solrizer from within your apps, using the provided rake tasks, or as a JMS listener
 email: matt.zumwalt@yourmediashelf.com
-executables: []
-
+executables: 
+- solrizer
+- solrizerd
 extensions: []
 
 extra_rdoc_files: 
@@ -293,6 +322,8 @@ files:
 - README.textile
 - Rakefile
 - VERSION
+- bin/solrizer
+- bin/solrizerd
 - config/fedora.yml
 - config/hydra_types.yml
 - config/solr.yml