@@ -6,6 +6,7 @@ * Upgraded to RestClient 0.9.2 to remove a couple of bug workarounds * Changed the API to always shell out to the same version of Ruby it is running under +* Made a first pass at Ruby 1.9 support == 3.0.1 CHANGELOG @@ -1,7 +1,8 @@ #!/usr/bin/env ruby +# encoding: UTF-8 -$VERBOSE = true # -w -$KCODE = "u" # -Ku +$VERBOSE = true # -w +$KCODE = "u" if RUBY_VERSION < "1.9" # -Ku # load the agent $LOAD_PATH << File.join(File.expand_path(File.dirname(__FILE__)), *%w[.. lib]) bin/scout_agent @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 # require standard libraries require "etc" lib/scout_agent.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent class Agent lib/scout_agent/agent.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 # load agent extensions require "scout_agent/api" lib/scout_agent/agent/communication_agent.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 # load agent extensions require "scout_agent/mission" lib/scout_agent/agent/master_agent.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent class Assignment lib/scout_agent/assignment.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent class Assignment lib/scout_agent/assignment/configuration.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent class Assignment lib/scout_agent/assignment/identify.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 # require standard libraries require "io/wait" lib/scout_agent/assignment/queue.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent class Assignment lib/scout_agent/assignment/reset.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent class Assignment lib/scout_agent/assignment/snapshot.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent class Assignment @@ -47,9 +48,11 @@ module ScoutAgent Lifeline.new(agent, log) } %w[TERM INT].each do |signal| - trap(signal) do - lifelines.each { |line| line.terminate } - Process.waitall + trap(signal) do + Thread.new do + lifelines.each { |line| line.terminate } + Process.waitall + end end end lifelines.each { |line| line.launch_and_monitor } lib/scout_agent/assignment/start.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent class Assignment lib/scout_agent/assignment/status.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent class Assignment lib/scout_agent/assignment/stop.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 # require standard libraries require "tempfile" lib/scout_agent/assignment/upload_log.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent # @@ -62,13 +63,26 @@ module ScoutAgent # reason. # def require_lib_or_gem(name, version = nil) + # special case JSON, which became a standard library in Ruby 1.9 + if name == "json" and RUBY_VERSION >= "1.9" + no_warnings { return require(name) } + end + lock_gem_version(name, version) if version - require name + if %w[amalgalite rest_client].include?(name) and RUBY_VERSION >= "1.9" + no_warnings { require name } + else + require name + end rescue LoadError # library not found begin require "rubygems" lock_gem_version(name, version) if version - require name + if %w[amalgalite rest_client].include?(name) and RUBY_VERSION >= "1.9" + no_warnings { require name } + else + require name + end rescue LoadError # library not found v_str = version.to_s[/\d\.\d(?:\.\d)?/] v_str = "-v #{v_str}" if v_str @@ -275,6 +289,7 @@ end # load all core extensions ScoutAgent::CoreExtensions.constants.each do |name| + name = name.to_s # needed for Ruby 1.9 compatibility extension = ScoutAgent::CoreExtensions.const_get(name) mixer = name.sub!(/([a-z])(?:Module|Class)\z/, "\\1") ? :extend : :include core = Object.const_get(name) lib/scout_agent/core_extensions.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent # @@ -49,7 +50,7 @@ module ScoutAgent # def initialize(log = WireTap.new(nil)) @log = log - @sqlite = Amalgalite::Database.new(path) + @sqlite = Amalgalite::Database.new(path.to_s) @read_locked = false @write_locked = false end lib/scout_agent/database.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent class Database lib/scout_agent/database/mission_log.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent class Database lib/scout_agent/database/queue.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent class Database lib/scout_agent/database/snapshots.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent class Database lib/scout_agent/database/statuses.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent module Dispatcher @@ -117,7 +118,8 @@ module ScoutAgent def load_assignment(assignment) dir = LIB_DIR + "assignment" - matches = dir.entries.grep(/#{Regexp.escape(assignment)}\w*\.rb\z/) + matches = dir.entries.map { |path| path.to_s }. + grep(/#{Regexp.escape(assignment)}\w*\.rb\z/) if matches.size > 1 abort_with_ambiguous_assignment(assignment, matches) elsif matches.first and (code = dir + matches.first).exist? lib/scout_agent/dispatcher.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent # lib/scout_agent/id_card.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent class Lifeline @@ -228,7 +229,9 @@ module ScoutAgent close_writer if @code - @code.finish + Thread.new do + @code.finish + end else exit end @@ -236,7 +239,9 @@ module ScoutAgent def alert_code if @code - @code.notice_changes + Thread.new do + @code.notice_changes + end end end end lib/scout_agent/lifeline.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent class Mission lib/scout_agent/mission.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent class Order lib/scout_agent/order.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent class Order lib/scout_agent/order/check_in_order.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent class Order lib/scout_agent/order/snapshot_order.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent # @@ -211,7 +212,7 @@ module ScoutAgent # %w[os_config_path os_db_path os_pid_path os_log_path].each do |path| define_method(path) do - prefix_path + super + prefix_path + super() end end @@ -230,7 +231,7 @@ module ScoutAgent # %w[db pid log].each do |path| define_method("#{path}_dir") do - send("os_#{path}_path") + (super || ScoutAgent.agent_name) + send("os_#{path}_path") + (super() || ScoutAgent.agent_name) end end lib/scout_agent/plan.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent # lib/scout_agent/server.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent # lib/scout_agent/tracked.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -wKU +# encoding: UTF-8 module ScoutAgent # @@ -479,6 +480,7 @@ module ScoutAgent # Builds a Hash of all levels used. def levels @levels ||= Hash[ *Severity.constants. + map { |name| name.to_s }. # for Ruby 1.9 map { |name| [name, level_by_name(name)] }. flatten ] end lib/scout_agent/wire_tap.rb 046a7e1f9ed1164c23ec96033f144dc47c67bc4e James Edward Gray II james@graysoftinc.com http://github.com/highgroove/scout_agent/commit/6223681521e25934fbfdd214f0f5742004810e1e 6223681521e25934fbfdd214f0f5742004810e1e 2009-04-06T13:46:28-07:00 2009-04-06T13:46:28-07:00 A first pass at Ruby 1.9 support. b8795c7faabe9231d8ee76e8412c0505394631b1 James Edward Gray II james@graysoftinc.com