muck-raker 0.3.1 → 0.3.2

data/.gitignore

@@ -0,0 +1,29 @@
+**/*.pid
+log/*.log
+log/*.pid
+tmp
+.DS_Store
+public/cache/**/*
+public/system/**/*
+doc/**/*
+db/*.sqlite3
+.project
+.loadpath
+nbproject/
+.idea
+testjour.log
+*.so
+*.o
+Makefile
+mkmf.log
+*.bundle
+conftest
+content/
+.idea
+*.sw?
+.DS_Store
+coverage
+rdoc
+pkg
+pkg/*
+log/*

data/Rakefile

@@ -35,10 +35,10 @@ begin
     gemspec.files.exclude "test/*"
     gemspec.test_files.exclude 'test/feed_archive/**'
   end
+  Jeweler::RubyforgeTasks.new do |rubyforge|
+    rubyforge.doc_task = "rdoc"
+  end
   Jeweler::GemcutterTasks.new
-  # Jeweler::RubyforgeTasks.new do |rubyforge|
-  #   rubyforge.doc_task = "rdoc"
-  # end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/config/muck_raker_environment.rb

@@ -1,6 +1,4 @@
 ENV['RAILS_ENV'] = (ENV['RAILS_ENV'] || 'development').dup
-dir = File.dirname(__FILE__)
-SOLR_PATH = File.expand_path("#{dir}/../solr") unless defined? SOLR_PATH
 
 unless defined? SOLR_LOGS_PATH
   SOLR_LOGS_PATH = ENV["SOLR_LOGS_PATH"] || "#{RAILS_ROOT}/log"
@@ -9,32 +7,36 @@ unless defined? SOLR_PIDS_PATH
   SOLR_PIDS_PATH = ENV["SOLR_PIDS_PATH"] || "#{RAILS_ROOT}/tmp/pids/solr"
 end
 unless defined? SOLR_DATA_PATH
-  SOLR_DATA_PATH = ENV["SOLR_DATA_PATH"] || "#{RAILS_ROOT}/solr/#{ENV['RAILS_ENV']}"
+  SOLR_DATA_PATH = ENV["SOLR_DATA_PATH"] || "#{RAILS_ROOT}/solr_indexes/#{ENV['RAILS_ENV']}"
 end
 unless defined? SOLR_CONFIG_PATH
-  SOLR_CONFIG_PATH = ENV["SOLR_CONFIG_PATH"] || SOLR_PATH
+  SOLR_CONFIG_PATH = ENV["SOLR_CONFIG_PATH"] || File.join(RAILS_ROOT, 'config', 'solr')
 end
 
+unless defined? RAKER_LOGS_PATH
+  RAKER_LOGS_PATH = File.join(RAILS_ROOT, 'log')
+end
 unless defined? RAKER_PIDS_PATH
   RAKER_PIDS_PATH = ENV["RAKER_PIDS_PATH"] || "#{RAILS_ROOT}/tmp/pids/raker"
 end
-
-unless defined? RAILS_DB_CONFIG
+unless defined? RAKER_FEED_ARCHIVE_PATH
+  if ENV['RAILS_ENV'] == 'production'
+    RAKER_FEED_ARCHIVE_PATH = File.join(RAILS_ROOT, '..', '..', 'shared', 'feed_archive')
+  else
+    RAKER_FEED_ARCHIVE_PATH = File.join(RAILS_ROOT, '..', 'feed_archive')
+  end
+end
+unless defined? RAKER_DATABASE_CONFIG
   if ENV['RAILS_ENV'] == 'production'
-    RAILS_DB_CONFIG = File.join(RAILS_ROOT, '..', '..', 'shared', 'config', 'database.yml')
+    RAKER_DATABASE_CONFIG = File.join(RAILS_ROOT, '..', '..', 'shared', 'config', 'database.yml')
   else
-    RAILS_DB_CONFIG = File.join(RAILS_ROOT, 'config', 'database.yml')
+    RAKER_DATABASE_CONFIG = File.join(RAILS_ROOT, 'config', 'database.yml')
   end
 end
-unless defined? FEED_ARCHIVE_PATH
+unless defined? RAKER_LOG_TO_CONSOLE
   if ENV['RAILS_ENV'] == 'production'
-    FEED_ARCHIVE_PATH = File.join(RAILS_ROOT, '..', '..', 'shared', 'feed_archive')
-  elsif ENV['RAILS_ENV'] == 'development'
-    FEED_ARCHIVE_PATH = File.join(RAILS_ROOT, '..', 'feed_archive')
+    RAKER_LOG_TO_CONSOLE = 'false'
   else
-    FEED_ARCHIVE_PATH = File.join(RAILS_ROOT, '..', 'feed_archive')
+    RAKER_LOG_TO_CONSOLE = 'true'
   end
 end
-unless defined? LOG_FILE_PREFIX
-  LOG_FILE_PREFIX = File.join(RAILS_ROOT, 'log', 'muck-raker')
-end

data/lib/muck_raker/tasks.rb

@@ -75,7 +75,6 @@ module MuckRaker
               Service.delete_all
               yml = File.join(File.dirname(__FILE__), '..', '..', 'db', 'bootstrap',"services")
               Fixtures.new(Service.connection,"services",Service,yml).insert_fixtures
-
             end
             
           end
@@ -87,22 +86,31 @@ module MuckRaker
             system "rsync -ruv #{path}/public ."
             system "rsync -ruv #{path}/config/solr ./config"
           end
-          
-          desc "Harvest without recommending"
-          task :harvest => :environment do
-            FileUtils.mkdir_p(RAKER_PIDS_PATH)
+
+          def pid_file
+            "#{RAKER_PIDS_PATH}/#{ENV['RAILS_ENV']}_pid"
+          end
+
+          def raker_task task = 'daemon', param = ''
             require File.expand_path("#{File.dirname(__FILE__)}/../../config/muck_raker_environment")
+            show_options
+            FileUtils.mkdir_p(RAKER_PIDS_PATH)
+            FileUtils.mkdir_p(RAKER_LOGS_PATH)
             separator = (RUBY_PLATFORM =~ /(win|w)32$/ ? ';' : ':')
             puts "RAILS_ENV=" + ENV['RAILS_ENV']
             Dir.chdir(File.join(File.dirname(__FILE__), '../../', 'raker', 'lib')) do
-              jars = Dir['**','*.jar'].join(separator)
-              options = "-Dsolr.solr.home=\"#{SOLR_CONFIG_PATH}\" -Dsolr.data.dir=\"#{SOLR_DATA_PATH}\" -DRAILS_ENV=#{ENV['RAILS_ENV']} -DRAILS_DB_CONFIG=\"#{RAILS_DB_CONFIG}\" -DLOG_FILE_PREFIX=\"#{LOG_FILE_PREFIX}\" "
-              options << "-DDEBUG=true " unless ENV['DEBUG'] == 'false'
-              options << "-DLOG_TO_CONSOLE=true " unless ENV['DEBUG'] == 'false'
-              options << "-DFEED_ARCHIVE_PATH=\"#{FEED_ARCHIVE_PATH}\" "
+              jars = Dir['*.jar','solr/*.jar'].join(separator)
+              options = "-DRAILS_ENV=#{ENV['RAILS_ENV']} "
+              options << "-Dsolr.solr.home=\"#{SOLR_CONFIG_PATH}\" "
+              options << "-Dsolr.data.dir=\"#{SOLR_DATA_PATH}\" "
+              options << "-Draker.database.config=\"#{RAKER_DATABASE_CONFIG}\" " 
+              options << "-Draker.log.dir=\"#{RAKER_LOGS_PATH}\" "
+              options << "-Draker.feed_archive_dir=\"#{RAKER_FEED_ARCHIVE_PATH}\" "
+              options << "-Draker.log_to_console=\"#{RAKER_LOG_TO_CONSOLE}\" "
               classpath = "-classpath #{jars}#{separator}. "
-              javaclass = "edu.usu.cosl.aggregatord.Harvester"
-              cmd = "java " + options + classpath + javaclass
+              memory_options = "-Xms32m -Xmx128m "
+              javaclass = "edu.usu.cosl.recommenderd.Recommenderd "
+              cmd = "java " + options + classpath + memory_options + javaclass + task + " " + param
               puts ("Executing: " + cmd)
               windows = RUBY_PLATFORM =~ /(win|w)32$/
               if windows
@@ -113,277 +121,87 @@ module MuckRaker
                 end
               end
               sleep(5)
-              File.open("#{RAKER_PIDS_PATH}/#{ENV['RAILS_ENV']}_pid", "w"){ |f| f << pid} unless windows
+              File.open(pid_file, "w"){ |f| f << pid} unless windows
               puts "#{ENV['RAILS_ENV']} Muck raker harvest command started successfully, pid: #{pid}."
             end
           end
+          
+          def show_options
+            puts "RAILS_ENV=#{ENV['RAILS_ENV']} "
+            puts "solr.solr.home=\"#{SOLR_CONFIG_PATH}\" "
+            puts "solr.data.dir=\"#{SOLR_DATA_PATH}\" "
+            puts "raker.db.config=\"#{RAKER_DATABASE_CONFIG}\" " 
+            puts "raker.log.dir=\"#{RAKER_LOGS_PATH}\" "
+            puts "raker.feed_archive_dir=\"#{RAKER_FEED_ARCHIVE_PATH}\" "
+            puts "raker.log_to_console=\"#{RAKER_LOG_TO_CONSOLE}\" "
+          end
+          
+          desc "Print out muck raker dependent environment variables"
+          task :show_options => :environment do
+            require File.expand_path("#{File.dirname(__FILE__)}/../../config/muck_raker_environment")
+            show_options
+          end
 
           desc "Start the recommender daemon process"
           task :start => :environment do
-            FileUtils.mkdir_p(RAKER_PIDS_PATH)
-            require File.expand_path("#{File.dirname(__FILE__)}/../../config/muck_raker_environment")
-            separator = (RUBY_PLATFORM =~ /(win|w)32$/ ? ';' : ':')
-            puts "RAILS_ENV=" + ENV['RAILS_ENV']
-            Dir.chdir(File.join(File.dirname(__FILE__), '../../', 'raker', 'lib')) do
-              jars = Dir['**','*.jar'].join(separator)
-              puts Dir['**','*.jar']
-              options = "-Dsolr.solr.home=\"#{SOLR_CONFIG_PATH}\" -Dsolr.data.dir=\"#{SOLR_DATA_PATH}\" -DRAILS_ENV=#{ENV['RAILS_ENV']} -DRAILS_DB_CONFIG=\"#{RAILS_DB_CONFIG}\" -DLOG_FILE_PREFIX=\"#{LOG_FILE_PREFIX}\" "
-              options << "-DDEBUG=true " unless ENV['DEBUG'] == 'false'
-              options << "-DLOG_TO_CONSOLE=true " unless ENV['DEBUG'] == 'false'
-              options << "-DFEED_ARCHIVE_PATH=\"#{FEED_ARCHIVE_PATH}\" "
-              classpath = "-classpath #{jars}#{separator}. "
-              javaclass = "edu.usu.cosl.recommenderd.Recommenderd"
-              cmd = "java " + options + classpath + javaclass
-              puts ("Executing: " + cmd)
-              windows = RUBY_PLATFORM =~ /(win|w)32$/
-              if windows
-                exec cmd
-              else
-                pid = fork do
-                  exec cmd
-                end
-              end
-              sleep(5)
-              File.open("#{RAKER_PIDS_PATH}/#{ENV['RAILS_ENV']}_pid", "w"){ |f| f << pid} unless windows
-              puts "#{ENV['RAILS_ENV']} Muck raker start command started successfully, pid: #{pid}."
-            end
+            raker_task
           end
 
-          desc "Reindex records"
-          task :reindex => :environment do
-            FileUtils.mkdir_p(RAKER_PIDS_PATH)
-            require File.expand_path("#{File.dirname(__FILE__)}/../../config/muck_raker_environment")
-            separator = (RUBY_PLATFORM =~ /(win|w)32$/ ? ';' : ':')
-            puts "RAILS_ENV=" + ENV['RAILS_ENV']
-            Dir.chdir(File.join(File.dirname(__FILE__), '../../', 'raker', 'lib')) do
-              jars = Dir['**','*.jar'].join(separator)
-              options = "-Dsolr.solr.home=\"#{SOLR_CONFIG_PATH}\" -Dsolr.data.dir=\"#{SOLR_DATA_PATH}\" -DRAILS_ENV=#{ENV['RAILS_ENV']} -DRAILS_DB_CONFIG=\"#{RAILS_DB_CONFIG}\" -DLOG_FILE_PREFIX=\"#{LOG_FILE_PREFIX}\" "
-              options << "-DDEBUG=true " unless ENV['DEBUG'] == 'false'
-              options << "-DLOG_TO_CONSOLE=true " unless ENV['DEBUG'] == 'false'
-              options << "-DFEED_ARCHIVE_PATH=\"#{FEED_ARCHIVE_PATH}\" "
-              classpath = "-classpath #{jars}#{separator}. "
-              memory_options = "-Xms32m -Xmx128m "
-              javaclass = "edu.usu.cosl.indexer.Indexer "
-              cmdlineoption = "all "
-              cmd = "java " + options + classpath + memory_options + javaclass + cmdlineoption
-              puts ("Executing: " + cmd)
-              windows = RUBY_PLATFORM =~ /(win|w)32$/
-              if windows
-                exec cmd
-              else
-                pid = fork do
-                  exec cmd
-                end
-              end
-              sleep(5)
-              File.open("#{RAKER_PIDS_PATH}/#{ENV['RAILS_ENV']}_pid", "w"){ |f| f << pid} unless windows
-              puts "#{ENV['RAILS_ENV']} Muck raker reindex command started successfully, pid: #{pid}."
-            end
+          desc "Redo everything (re-index, redo autogenerated subjects, rebuild tag clouds re-recommend)"
+          task :rebuild => :environment do
+            raker_task 'daemon', 'full'
           end
 
-          desc "Autogenerate subjects"
-          task :gen_subjects => :environment do
-            FileUtils.mkdir_p(RAKER_PIDS_PATH)
-            require File.expand_path("#{File.dirname(__FILE__)}/../../config/muck_raker_environment")
-            separator = (RUBY_PLATFORM =~ /(win|w)32$/ ? ';' : ':')
-            puts "RAILS_ENV=" + ENV['RAILS_ENV']
-            Dir.chdir(File.join(File.dirname(__FILE__), '../../', 'raker', 'lib')) do
-              jars = Dir['**','*.jar'].join(separator)
-              options = "-Dsolr.solr.home=\"#{SOLR_CONFIG_PATH}\" -Dsolr.data.dir=\"#{SOLR_DATA_PATH}\" -DRAILS_ENV=#{ENV['RAILS_ENV']} -DRAILS_DB_CONFIG=\"#{RAILS_DB_CONFIG}\" -DLOG_FILE_PREFIX=\"#{LOG_FILE_PREFIX}\" "
-              options << "-DDEBUG=true " unless ENV['DEBUG'] == 'false'
-              options << "-DLOG_TO_CONSOLE=true " unless ENV['DEBUG'] == 'false'
-              options << "-DFEED_ARCHIVE_PATH=\"#{FEED_ARCHIVE_PATH}\" "
-              classpath = "-classpath #{jars}#{separator}. "
-              javaclass = "edu.usu.cosl.tagclouds.SubjectAutoGenerator "
-              cmd = "java " + options + classpath + javaclass
-              puts ("Executing: " + cmd)
-              windows = RUBY_PLATFORM =~ /(win|w)32$/
-              if windows
-                exec cmd
-              else
-                pid = fork do
-                  exec cmd
-                end
-              end
-              sleep(5)
-              File.open("#{RAKER_PIDS_PATH}/#{ENV['RAILS_ENV']}_pid", "w"){ |f| f << pid} unless windows
-              puts "#{ENV['RAILS_ENV']} Muck raker gen_subjects command started successfully, pid: #{pid}."
-            end
+          desc "Get some data into the recommender system"
+          task :bootstrap => :environment do
+            raker_task 'bootstrap'
           end
 
-          desc "Generate tag clouds"
-          task :gen_clouds => :environment do
-            FileUtils.mkdir_p(RAKER_PIDS_PATH)
-            require File.expand_path("#{File.dirname(__FILE__)}/../../config/muck_raker_environment")
-            separator = (RUBY_PLATFORM =~ /(win|w)32$/ ? ';' : ':')
-            puts "RAILS_ENV=" + ENV['RAILS_ENV']
-            Dir.chdir(File.join(File.dirname(__FILE__), '../../', 'raker', 'lib')) do
-              jars = Dir['**','*.jar'].join(separator)
-              options = "-DRAILS_ENV=#{ENV['RAILS_ENV']} -DRAILS_DB_CONFIG=\"#{RAILS_DB_CONFIG}\" -DLOG_FILE_PREFIX=\"#{LOG_FILE_PREFIX}\" "
-              options << "-DDEBUG=true " unless ENV['DEBUG'] == 'false'
-              options << "-DLOG_TO_CONSOLE=true " unless ENV['DEBUG'] == 'false'
-              options << "-DFEED_ARCHIVE_PATH=\"#{FEED_ARCHIVE_PATH}\" "
-              classpath = "-classpath #{jars}#{separator}. "
-              javaclass = "edu.usu.cosl.tagclouds.TagCloud"
-              cmd = "java " + options + classpath + javaclass
-              puts ("Executing: " + cmd)
-              windows = RUBY_PLATFORM =~ /(win|w)32$/
-              if windows
-                exec cmd
-              else
-                pid = fork do
-                  exec cmd
-                end
-              end
-              sleep(5)
-              File.open("#{RAKER_PIDS_PATH}/#{ENV['RAILS_ENV']}_pid", "w"){ |f| f << pid} unless windows
-              puts "#{ENV['RAILS_ENV']} Muck raker get_clouds command started successfully, pid: #{pid}."
-            end
+          desc "Harvest without recommending"
+          task :harvest => :environment do
+            raker_task 'harvest'
           end
 
-          desc "Recommend without harvesting"
-          task :recommend => :environment do
-            FileUtils.mkdir_p(RAKER_PIDS_PATH)
-            require File.expand_path("#{File.dirname(__FILE__)}/../../config/muck_raker_environment")
-            separator = (RUBY_PLATFORM =~ /(win|w)32$/ ? ';' : ':')
-            puts "RAILS_ENV=" + ENV['RAILS_ENV']
-            Dir.chdir(File.join(File.dirname(__FILE__), '../../', 'raker', 'lib')) do
-              jars = Dir['**','*.jar'].join(separator)
-              options = "-Dsolr.solr.home=\"#{SOLR_CONFIG_PATH}\" -Dsolr.data.dir=\"#{SOLR_DATA_PATH}\" -DRAILS_ENV=#{ENV['RAILS_ENV']} -DRAILS_DB_CONFIG=\"#{RAILS_DB_CONFIG}\" -DLOG_FILE_PREFIX=\"#{LOG_FILE_PREFIX}\" "
-              options << "-DDEBUG=true " unless ENV['DEBUG'] == 'false'
-              options << "-DLOG_TO_CONSOLE=true " unless ENV['DEBUG'] == 'false'
-              options << "-DFEED_ARCHIVE_PATH=\"#{FEED_ARCHIVE_PATH}\" "
-              classpath = "-classpath #{jars}#{separator}. "
-              javaclass = "edu.usu.cosl.recommenderd.Recommenderd "
-              cmdlineoption = "skip_harvest "
-              cmd = "java " + options + classpath + javaclass + cmdlineoption
-              puts ("Executing: " + cmd)
-              windows = RUBY_PLATFORM =~ /(win|w)32$/
-              if windows
-                exec cmd
-              else
-                pid = fork do
-                  exec cmd
-                end
-              end
-              sleep(5)
-              File.open("#{RAKER_PIDS_PATH}/#{ENV['RAILS_ENV']}_pid", "w"){ |f| f << pid} unless windows
-              puts "#{ENV['RAILS_ENV']} Muck raker recommend command started successfully, pid: #{pid}."
-            end
+          desc "Update solr index to changes made to recommender database"
+          task :index => :environment do
+            raker_task 'index'
           end
 
-          desc "Rebuild entry recommendation caches"
-          task :rebuild_recommendation_cache => :environment do
-            FileUtils.mkdir_p(RAKER_PIDS_PATH)
-            require File.expand_path("#{File.dirname(__FILE__)}/../../config/muck_raker_environment")
-            separator = (RUBY_PLATFORM =~ /(win|w)32$/ ? ';' : ':')
-            puts "RAILS_ENV=" + ENV['RAILS_ENV']
-            Dir.chdir(File.join(File.dirname(__FILE__), '../../', 'raker', 'lib')) do
-              jars = Dir['**','*.jar'].join(separator)
-              options = "-Dsolr.solr.home=\"#{SOLR_CONFIG_PATH}\" -Dsolr.data.dir=\"#{SOLR_DATA_PATH}\" -DRAILS_ENV=#{ENV['RAILS_ENV']} -DRAILS_DB_CONFIG=\"#{RAILS_DB_CONFIG}\" -DLOG_FILE_PREFIX=\"#{LOG_FILE_PREFIX}\" "
-              options << "-DDEBUG=true " unless ENV['DEBUG'] == 'false'
-              options << "-DLOG_TO_CONSOLE=true " unless ENV['DEBUG'] == 'false'
-              options << "-DFEED_ARCHIVE_PATH=\"#{FEED_ARCHIVE_PATH}\" "
-              classpath = "-classpath #{jars}#{separator}. "
-              javaclass = "edu.usu.cosl.recommender.Recommender "
-              cmdlineoption = "rebuild_cache "
-              cmd = "java " + options + classpath + javaclass + cmdlineoption
-              puts ("Executing: " + cmd)
-              windows = RUBY_PLATFORM =~ /(win|w)32$/
-              if windows
-                exec cmd
-              else
-                pid = fork do
-                  exec cmd
-                end
-              end
-              sleep(5)
-              File.open("#{RAKER_PIDS_PATH}/#{ENV['RAILS_ENV']}_pid", "w"){ |f| f << pid} unless windows
-              puts "#{ENV['RAILS_ENV']} Muck raker rebuild_recommendation_cache command started successfully, pid: #{pid}."
-            end
+          desc "Recommend without harvesting"
+          task :recommend => :environment do
+            raker_task 'recommend'
           end
 
           desc "Redo recommendations only"
           task :redo_recommendations => :environment do
-            FileUtils.mkdir_p(RAKER_PIDS_PATH)
-            require File.expand_path("#{File.dirname(__FILE__)}/../../config/muck_raker_environment")
-            separator = (RUBY_PLATFORM =~ /(win|w)32$/ ? ';' : ':')
-            puts "RAILS_ENV=" + ENV['RAILS_ENV']
-            Dir.chdir(File.join(File.dirname(__FILE__), '../../', 'raker', 'lib')) do
-              jars = Dir['**','*.jar'].join(separator)
-              options = "-Dsolr.solr.home=\"#{SOLR_CONFIG_PATH}\" -Dsolr.data.dir=\"#{SOLR_DATA_PATH}\" -DRAILS_ENV=#{ENV['RAILS_ENV']} -DRAILS_DB_CONFIG=\"#{RAILS_DB_CONFIG}\" -DLOG_FILE_PREFIX=\"#{LOG_FILE_PREFIX}\" "
-              options << "-DDEBUG=true " unless ENV['DEBUG'] == 'false'
-              options << "-DLOG_TO_CONSOLE=true " unless ENV['DEBUG'] == 'false'
-              options << "-DFEED_ARCHIVE_PATH=\"#{FEED_ARCHIVE_PATH}\" "
-              classpath = "-classpath #{jars}#{separator}. "
-              javaclass = "edu.usu.cosl.recommender.Recommender "
-              cmd = "java " + options + classpath + javaclass
-              puts ("Executing: " + cmd)
-              windows = RUBY_PLATFORM =~ /(win|w)32$/
-              if windows
-                exec cmd
-              else
-                pid = fork do
-                  exec cmd
-                end
-              end
-              sleep(5)
-              File.open("#{RAKER_PIDS_PATH}/#{ENV['RAILS_ENV']}_pid", "w"){ |f| f << pid} unless windows
-              puts "#{ENV['RAILS_ENV']} Muck raker redo_recommendations command started successfully, pid: #{pid}."
-            end
+            raker_task 'recommend', 'full'
           end
 
-          desc "Redo everything (re-index, redo autogenerated subjects, rebuild tag clouds re-recommend)"
-          task :rebuild => :environment do
-            FileUtils.mkdir_p(RAKER_PIDS_PATH)
-            require File.expand_path("#{File.dirname(__FILE__)}/../../config/muck_raker_environment")
-            separator = (RUBY_PLATFORM =~ /(win|w)32$/ ? ';' : ':')
-            puts "RAILS_ENV=" + ENV['RAILS_ENV']
-            Dir.chdir(File.join(File.dirname(__FILE__), '../../', 'raker', 'lib')) do
-              jars = Dir['**','*.jar'].join(separator)
-              options = "-Dsolr.solr.home=\"#{SOLR_CONFIG_PATH}\" -Dsolr.data.dir=\"#{SOLR_DATA_PATH}\" -DRAILS_ENV=#{ENV['RAILS_ENV']} -DRAILS_DB_CONFIG=\"#{RAILS_DB_CONFIG}\" -DLOG_FILE_PREFIX=\"#{LOG_FILE_PREFIX}\" "
-              options << "-DDEBUG=true " unless ENV['DEBUG'] == 'false'
-              options << "-DLOG_TO_CONSOLE=true " unless ENV['DEBUG'] == 'false'
-              options << "-DFEED_ARCHIVE_PATH=\"#{FEED_ARCHIVE_PATH}\" "
-              classpath = "-classpath #{jars}#{separator}. "
-              javaclass = "edu.usu.cosl.recommenderd.Recommenderd "
-              cmdlineoption = "rebuild "
-              cmd = "java " + options + classpath + javaclass + cmdlineoption
-              puts ("Executing: " + cmd)
-              windows = RUBY_PLATFORM =~ /(win|w)32$/
-              if windows
-                exec cmd
-              else
-                pid = fork do
-                  exec cmd
-                end
-              end
-              sleep(5)
-              File.open("#{RAKER_PIDS_PATH}/#{ENV['RAILS_ENV']}_pid", "w"){ |f| f << pid} unless windows
-              puts "#{ENV['RAILS_ENV']} Muck raker rebuild command started successfully, pid: #{pid}."
-            end
+          desc "Autogenerate subjects"
+          task :subjects => :environment do
+            raker_task 'auto_generate_subjects'
+          end
+
+          desc "Generate tag clouds"
+          task :tag_clouds => :environment do
+            raker_task 'tag_clouds'
           end
 
           desc "Stop a raker daemon process"
           task :stop => :environment do
-            file_path = "#{RAKER_PIDS_PATH}/#{ENV['RAILS_ENV']}_pid"
+            file_path = pid_file 
             if File.exists?(file_path)
               File.open(file_path, "r") do |f|
                 pid = f.readline
                 Process.kill('TERM', pid.to_i)
               end
               File.unlink(file_path)
-              puts "Raker shutdown successfully."
+              puts "Raker task successfully."
             else
               puts "PID file not found at #{file_path}. Either Raker is not running or no PID file was written."
             end
           end
 
-          desc "Restart the recommender daemon process"
-          task :restart do
-            system "java"
-          end
-
         end  
 
       end

data/muck-raker.gemspec

@@ -5,18 +5,19 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-raker}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Duffin Justin Ball"]
-  s.date = %q{2009-11-04}
+  s.date = %q{2009-11-05}
   s.description = %q{The aggregation and recommendation daemons for the muck system.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
-    "MIT-LICENSE",
+    ".gitignore",
+     "MIT-LICENSE",
      "README.rdoc",
      "Rakefile",
      "VERSION",

data/rails/init.rb

@@ -1,3 +1 @@
 ActiveSupport::Dependencies.load_once_paths << lib_path
-
-require 'muck_raker'

data/raker/lib/recommenderd.properties

@@ -1,68 +1,68 @@
-# number of worker threads to spawn
-#threads=20
-
-# size of the queue
-#stale_feed_queue_size=100
-
-# seconds to wait before timing out a HTTP request
-#request_timeout=30
-
-# seconds to wait before querying the database for stale feeds
-#stale_thread_poll_interval=5
-
-# minutes to wait before checking to see if a feed has new entries
-#feed_refresh_interval=60
-
-# whether or not to log to file
-#log_file_prefix=recommender
-
-# pairs to consider when calculating recommendations; default is 200
-#pairs_to_consider=200
-
-# maximum number of recommendations to calculate; default is 20
-#max_recommendations=20
-
-# smtp server to use to email admin of results
-#smtp_server=
-
-# email address to send reports to
-#admin_email=
-
-# harvest before running recommendations (default is true)
-#harvest=true
-
-# redo all recommendations (default is false)
-#redo_recommendations=false
-
-# reindex all of the entries in the DB (default is false)
-#reindex_all=false
-
-# solr home directory (default is config/solr)
-#solr_dir=c:/projects/oerrecommender/config/solr/
-#solr_config_filename=../../projects/muck/config/solr/solr.xml
-#solr_dir=../muck/config/solr
-
-# rails environment (default is development)
-#rails_env=development
-
-# path to database.yml (default is config/database.yml)
-db_yml=../../projects/muck/config/database.yml 
-
-# logging
-log4j.rootLogger=trace, stdout, R
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-
-# Pattern to output the caller's file name and line number.
-log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
-
-log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=log/recommenderd.log
-
-log4j.appender.R.MaxFileSize=100KB
-# Keep one backup file
-log4j.appender.R.MaxBackupIndex=1
-
-log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n
+# number of worker threads to spawn
+#threads=20
+
+# size of the queue
+#stale_feed_queue_size=100
+
+# seconds to wait before timing out a HTTP request
+#request_timeout=30
+
+# seconds to wait before querying the database for stale feeds
+#stale_thread_poll_interval=5
+
+# minutes to wait before checking to see if a feed has new entries
+#feed_refresh_interval=60
+
+# whether or not to log to file
+#log_file_prefix=recommender
+
+# pairs to consider when calculating recommendations; default is 200
+#pairs_to_consider=200
+
+# maximum number of recommendations to calculate; default is 20
+#max_recommendations=20
+
+# smtp server to use to email admin of results
+#smtp_server=
+
+# email address to send reports to
+#admin_email=
+
+# harvest before running recommendations (default is true)
+#harvest=true
+
+# redo all recommendations (default is false)
+#redo_recommendations=false
+
+# reindex all of the entries in the DB (default is false)
+#reindex_all=false
+
+# solr home directory (default is config/solr)
+#solr_dir=c:/projects/oerrecommender/config/solr/
+#solr_config_filename=../../projects/muck/config/solr/solr.xml
+#solr_dir=../muck/config/solr
+
+# rails environment (default is development)
+#rails_env=development
+
+# path to database.yml (default is config/database.yml)
+db_yml=../../projects/muck/config/database.yml 
+
+# logging
+log4j.rootLogger=trace, stdout, R
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+
+# Pattern to output the caller's file name and line number.
+log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
+
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=log/recommenderd.log
+
+log4j.appender.R.MaxFileSize=100KB
+# Keep one backup file
+log4j.appender.R.MaxBackupIndex=1
+
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-raker
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Joel Duffin Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 -07:00
+date: 2009-11-05 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -22,6 +22,7 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- .gitignore
 - MIT-LICENSE
 - README.rdoc
 - Rakefile