@@ -1,3 +1,5 @@ +== FeedUpdater 0.2.6 + * Updated for compatibility with RubyGems >= 1.0 == FeedUpdater 0.2.5 * fixed bug with redefinition of file searching system == FeedUpdater 0.2.4 CHANGELOG @@ -61,7 +61,7 @@ require 'feed_updater' if ARGV[0].nil? # Exit quickly if no command line arguments given. - + feed_updater_version = FeedTools::FEED_UPDATER_VERSION::STRING feed_tools_version = "<error: not loaded>" if defined?(FeedTools::FEED_TOOLS_VERSION::STRING) @@ -97,7 +97,7 @@ elsif ARGV[0] == "install" install_vendor_directory = nil install_config_directory = nil install_script_directory = nil - + current_directory = File.expand_path(".") loop do entries = Dir.entries(current_directory) @@ -118,12 +118,12 @@ elsif ARGV[0] == "install" install_vendor_directory = File.expand_path(rails_root + "/vendor") install_config_directory = File.expand_path(rails_root + "/config") install_script_directory = File.expand_path(rails_root + "/script") - + # Install FeedUpdater gem to application vendor directory system("rm -rf #{install_vendor_directory}/feedupdater") unpack_string = `gem unpack feedupdater` feed_updater_version = - unpack_string.scan(/\'feedupdater\-(.*)\'/).flatten[0] + unpack_string.scan(/feedupdater\-(.*)\'/).flatten[0] if feed_updater_version.nil? || feed_updater_version == "" puts "You need to have the feedupdater gem installed for the install" puts "subcommand to run correctly." @@ -131,11 +131,11 @@ elsif ARGV[0] == "install" end puts "Installing FeedUpdater #{feed_updater_version} " + "to vendor directory..." - + system("cp -rp feedupdater-#{feed_updater_version} " + "#{install_vendor_directory}") system("rm -rf feedupdater-#{feed_updater_version}") - system("mv #{install_vendor_directory}/" + + system("mv #{install_vendor_directory}/" + "feedupdater-#{feed_updater_version} " + "#{install_vendor_directory}/feedupdater") @@ -143,7 +143,7 @@ elsif ARGV[0] == "install" system("rm -rf #{install_vendor_directory}/feedtools") unpack_string = `gem unpack feedtools` feed_tools_version = - unpack_string.scan(/\'feedtools\-(.*)\'/).flatten[0] + unpack_string.scan(/feedtools\-(.*)\'/).flatten[0] if feed_tools_version.nil? || feed_tools_version == "" puts "You need to have the feedtools gem installed for the install" puts "subcommand to run correctly." @@ -154,7 +154,7 @@ elsif ARGV[0] == "install" system("cp -rp feedtools-#{feed_tools_version} " + "#{install_vendor_directory}") system("rm -rf feedtools-#{feed_tools_version}") - system("mv #{install_vendor_directory}/" + + system("mv #{install_vendor_directory}/" + "feedtools-#{feed_tools_version} " + "#{install_vendor_directory}/feedtools") @@ -174,7 +174,7 @@ elsif ARGV[0] == "install" system("rm -rf #{install_script_directory}/feed_updater") system("cp -p #{__FILE__} #{install_script_directory}") system("chmod +x #{install_script_directory}/feed_updater") - + puts "Use script/feed_updater to run FeedUpdater." end exit @@ -314,4 +314,4 @@ when "stop" updater.stop() when "restart" updater.restart() -end \ No newline at end of file +end bin/feed_updater @@ -57,7 +57,8 @@ require 'rubygems' if !defined?(Daemons) begin - require_gem('daemons', '>= 0.4.4') + gem('daemons', '>= 0.4.4') + require('daemons') rescue LoadError require 'daemons' end @@ -71,7 +72,8 @@ if !defined?(FeedTools::FEED_TOOLS_VERSION) File.dirname(__FILE__) + "/../../feedtools/lib")) require("feed_tools") else - require_gem('feedtools', '>= 0.2.23') + gem('feedtools', '>= 0.2.23') + require('feedtools') end rescue LoadError require 'feed_tools' @@ -84,7 +86,7 @@ require 'logger' class FeedUpdaterLogger < Logger attr_accessor :prefix - + alias_method :old_log, :log def log(level, message) if defined?(@prefix) && @prefix != nil @@ -155,29 +157,29 @@ module FeedTools @initial_directory = nil if !defined?(@initial_directory) return @initial_directory end - + # Returns the directory where the pid files are stored. def pid_file_dir() @pid_file_dir = nil if !defined?(@pid_file_dir) return @pid_file_dir end - + # Sets the directory where the pid files are stored. def pid_file_dir=(new_pid_file_dir) @pid_file_dir = new_pid_file_dir end - + # Returns the directory where the log files are stored. def log_file_dir() @log_file_dir = nil if !defined?(@log_file_dir) return @log_file_dir end - + # Sets the directory where the log files are stored. def log_file_dir=(new_log_file_dir) @log_file_dir = new_log_file_dir end - + # Returns the path to the log file. def log_file() if !defined?(@log_file) || @log_file.nil? @@ -190,7 +192,7 @@ module FeedTools end return @log_file end - + # Returns the logger object. def logger() if !defined?(@logger) || @logger.nil? @@ -202,7 +204,7 @@ module FeedTools end return @logger end - + # Restarts the logger object. This needs to be done after the program # forks. def restart_logger() @@ -216,7 +218,7 @@ module FeedTools @logger.progname = nil @logger.prefix = "FeedUpdater".ljust(20) end - + # Returns a list of feeds to be updated. def feed_href_list() if !defined?(@feed_href_list) || @feed_href_list.nil? @@ -231,20 +233,20 @@ module FeedTools end return @feed_href_list end - + # Sets a list of feeds to be updated. def feed_href_list=(new_feed_href_list) @feed_href_list_override = true @feed_href_list = new_feed_href_list end - + # Returns either :running or :stopped depending on the daemon's current # status. def status() @status = :stopped if @status.nil? return @status end - + # Returns a hash of the currently set updater options. def updater_options() if !defined?(@updater_options) || @updater_options.nil? @@ -257,7 +259,7 @@ module FeedTools end return @updater_options end - + # Returns a hash of the currently set daemon options. def daemon_options() if !defined?(@daemon_options) || @daemon_options.nil? @@ -272,13 +274,13 @@ module FeedTools @daemon_options[:dir] = self.pid_file_dir return @daemon_options end - + # Returns a reference to the daemon application. def application() @application = nil if !defined?(@application) return @application end - + # Returns the process id of the daemon. This should return nil if the # daemon is not running. def pid() @@ -299,7 +301,7 @@ module FeedTools end end end - + def cloaker(&blk) #:nodoc: (class << self; self; end).class_eval do define_method(:cloaker_, &blk) @@ -309,7 +311,7 @@ module FeedTools end end protected :cloaker - + # Starts the daemon. def start() self.logger.prefix = "FeedUpdater".ljust(20) @@ -336,7 +338,7 @@ module FeedTools self.restart_logger() self.logger.info("Using environment: #{FEED_TOOLS_ENV}") - + if FeedTools.configurations[:feed_cache].nil? FeedTools.configurations[:feed_cache] = "FeedTools::DatabaseFeedCache" @@ -399,7 +401,7 @@ module FeedTools end exit end - + # A random start delay is introduced so that we don't have multiple # feed updater daemons getting kicked off at the same time by # multiple users. @@ -408,7 +410,7 @@ module FeedTools self.logger.info("Startup delay set for #{delay} minutes.") sleep(delay.minutes) end - + # The main feed update loop. loop do result = nil @@ -468,7 +470,7 @@ module FeedTools @status = :running return self.pid end - + # Stops the daemon. def stop() if self.pid.nil? @@ -482,7 +484,7 @@ module FeedTools begin # No, really, I mean it. You need to die. system("kill #{self.pid} 2> /dev/null") - + # Perhaps I wasn't clear somehow? system("kill -9 #{self.pid} 2> /dev/null") rescue Exception @@ -508,13 +510,13 @@ module FeedTools end return nil end - + # Restarts the daemon. def restart() self.stop() self.start() end - + def progress_precentage() if !defined?(@remaining_href_list) || !defined?(@feed_href_list) return nil @@ -528,7 +530,7 @@ module FeedTools return 100.0 - (100.0 * (@remaining_href_list.size.to_f / @feed_href_list.size.to_f)) end - + # Updates all of the feeds. def update_feeds() self.logger.level = 0 @@ -564,7 +566,7 @@ module FeedTools end self.logger.info("Updating #{@feed_href_list.size} feed(s)...") self.logger.level = self.updater_options[:log_level] - + @threads = [] @remaining_href_list = @feed_href_list.dup @@ -573,14 +575,14 @@ module FeedTools begin_updating = false self.logger.info( "Starting up #{self.updater_options[:threads]} thread(s)...") - + mutex = Mutex.new for i in 0...self.updater_options[:threads] updater_thread = Thread.new do self.logger.level = self.updater_options[:log_level] self.logger.datetime_format = "%s" self.logger.progname = "FeedUpdater".ljust(20) - + while !Thread.current.respond_to?(:thread_id) && begin_updating == false Thread.pass @@ -589,7 +591,7 @@ module FeedTools self.logger.prefix = "Thread #{Thread.current.thread_id} ".ljust(20) self.logger.info("Thread started.") - + begin FeedTools.feed_cache.initialize_cache() if !FeedTools.feed_cache.set_up_correctly? @@ -599,7 +601,7 @@ module FeedTools self.logger.info(error) end end - + ObjectSpace.garbage_collect() Thread.pass @@ -622,7 +624,7 @@ module FeedTools unless @@on_update.nil? mutex.synchronize do progress = sprintf("%.2f", Thread.current.progress) - self.logger.prefix = + self.logger.prefix = ("Thread #{Thread.current.thread_id} (#{progress}%)" ).ljust(20) self.cloaker(&(@@on_update)).bind(self).call( @@ -632,7 +634,7 @@ module FeedTools else mutex.synchronize do progress = sprintf("%.2f", Thread.current.progress) - self.logger.prefix = + self.logger.prefix = ("Thread #{Thread.current.thread_id} (#{progress}%)" ).ljust(20) self.logger.info( @@ -643,7 +645,7 @@ module FeedTools rescue Exception => error mutex.synchronize do progress = sprintf("%.2f", Thread.current.progress) - self.logger.prefix = + self.logger.prefix = ("Thread #{Thread.current.thread_id} (#{progress}%)" ).ljust(20) if @@on_error != nil @@ -671,9 +673,9 @@ module FeedTools end ObjectSpace.garbage_collect() Thread.pass - end + end end - @threads << updater_thread + @threads << updater_thread class <<updater_thread attr_accessor :thread_id attr_accessor :progress @@ -689,7 +691,7 @@ module FeedTools begin_updating = true end Thread.pass - + ObjectSpace.garbage_collect() Thread.pass for i in 0...@threads.size @@ -702,7 +704,7 @@ module FeedTools end self.logger.prefix = "FeedUpdater".ljust(20) ObjectSpace.garbage_collect() - + self.logger.progname = nil unless @@on_complete.nil? self.cloaker(&(@@on_complete)).bind(self).call(@feed_href_list) @@ -712,4 +714,4 @@ module FeedTools self.logger.level = self.updater_options[:log_level] end end -end \ No newline at end of file +end lib/feed_updater.rb @@ -2,8 +2,8 @@ module FeedTools module FEED_UPDATER_VERSION #:nodoc: MAJOR = 0 MINOR = 2 - TINY = 5 + TINY = 6 STRING = [MAJOR, MINOR, TINY].join('.') end -end \ No newline at end of file +end lib/feed_updater/version.rb @@ -57,7 +57,6 @@ spec = Gem::Specification.new do |s| s.add_dependency('feedtools', '>= 0.2.24') s.require_path = 'lib' - s.autorequire = 'feed_updater' s.rdoc_options << '--exclude' << '.' s.has_rdoc = false @@ -118,4 +117,4 @@ task :release => [ :gem ] do "'REL #{PKG_VERSION}' pkg/#{PKG_NAME}-#{PKG_VERSION}.gem" puts release_command system(release_command) -end \ No newline at end of file +end rakefile 757631b3606efad8187fbe70811489cbe47dcd3d Avdi Grimm avdi@avdi.org http://github.com/avdi/feedupdater/commit/8e3da7b80f087b6e8ab36ab821618ea8bb86cb9b 8e3da7b80f087b6e8ab36ab821618ea8bb86cb9b 2008-10-09T19:00:55-07:00 2008-10-09T19:00:55-07:00 Updated to work with RubyGems >= 1.0 d6757a543648b0190eef182698ee636297463583 Avdi Grimm avdi@avdi.org