tyrantmanager 1.2.1 → 1.3.0

data/HISTORY.rdoc

@@ -1,4 +1,9 @@
 = Changelog
+== Version 1.3.0 2009-10-04
+
+* become ruby 1.9 compatible
+* clean up stale pid files whenever possible (Martin Sarsale)
+
 == Version 1.2.1 2009-09-14
 
 * fix bug where preexisting instance configuration does not work with 1.2.0

data/gemspec.rb

@@ -22,12 +22,13 @@ TyrantManager::GEM_SPEC = Gem::Specification.new do |spec|
   # add dependencies here
   spec.add_dependency( "loquacious", "~> 1.3.0")
   spec.add_dependency( "rufus-tokyo", "~> 1.0.0")
-  spec.add_dependency( "logging", "~> 1.1.4" )
-  spec.add_dependency( "main", "~> 2.8.4" )
+  spec.add_dependency( "logging", "~> 1.2.2" )
+  spec.add_dependency( "main", "~> 2.9.3" )
 
   # development dependencies
-  spec.add_development_dependency("configuration", ">= 0.0.5")
+  spec.add_development_dependency("configuration", "~> 1.1.0")
   spec.add_development_dependency( "rake", "~> 0.8.3")
+  spec.add_development_dependency( "gemcutter", "~> 0.1.4")
 
   if ext_conf = Configuration.for_if_exist?("extension") then
     spec.extensions << ext_conf.configs

data/lib/tyrant_manager/cli.rb

@@ -19,7 +19,7 @@ class TyrantManager
       argument( :home ) {
         description "The home directory of the tyrant manager"
         required
-        default TyrantManager.default_or_home_directory
+        default ::TyrantManager.default_or_home_directory
       }
 
       run { 
@@ -44,7 +44,7 @@ class TyrantManager
       mixin :option_home
       mixin :option_log_level
 
-      run { Cli.run_command_with_params( "create-instance", params ) }
+      run { ::TyrantManager::Cli.run_command_with_params( "create-instance", params ) }
     }
 
     mode( 'start' ) {
@@ -57,7 +57,7 @@ class TyrantManager
         default false
       }
 
-      run { Cli.run_command_with_params( 'start', params ) }
+      run { ::TyrantManager::Cli.run_command_with_params( 'start', params ) }
     }
 
 
@@ -67,7 +67,7 @@ class TyrantManager
       mixin :option_log_level
       mixin :argument_instances
 
-      run { Cli.run_command_with_params( 'stop', params ) }
+      run { ::TyrantManager::Cli.run_command_with_params( 'stop', params ) }
     }
 
     mode('replication-status') {
@@ -75,7 +75,7 @@ class TyrantManager
       mixin :option_home
       mixin :option_log_level
       mixin :argument_instances
-      run { Cli.run_command_with_params( 'replication-status', params ) }
+      run { ::TyrantManager::Cli.run_command_with_params( 'replication-status', params ) }
     }
 
     mode('process-status') {
@@ -85,7 +85,7 @@ class TyrantManager
 
       mixin :argument_instances
 
-      run { Cli.run_command_with_params( 'process-status', params ) }
+      run { ::TyrantManager::Cli.run_command_with_params( 'process-status', params ) }
     }
 
     mode( 'stats' ) {
@@ -95,7 +95,7 @@ class TyrantManager
 
       mixin :argument_instances
 
-      run { Cli.run_command_with_params( 'stats', params ) }
+      run { ::TyrantManager::Cli.run_command_with_params( 'stats', params ) }
     }
 
 
@@ -104,7 +104,7 @@ class TyrantManager
       mixin :option_home
       mixin :option_log_level
       mixin :argument_instances
-      run { Cli.run_command_with_params( 'list', params ) }
+      run { ::TyrantManager::Cli.run_command_with_params( 'list', params ) }
     }
 
     #--- Mixins ---
@@ -113,7 +113,7 @@ class TyrantManager
         description "The home directory of the tyrant manager"
         argument :required
         validate { |v| ::File.directory?( v ) }
-        default TyrantManager.default_or_home_directory
+        default ::TyrantManager.default_or_home_directory
       end
     end
 

data/lib/tyrant_manager/tyrant_instance.rb

@@ -289,7 +289,16 @@ class TyrantManager
     #
     def start
       o = %x[ #{start_command} ]
-      logger.info o
+      o.strip!
+      logger.info o if o.length > 0 
+      3.times do |x|
+        if self.running? then
+          logger.info "#{self.name} is running as pid #{self.pid}"
+          break
+        else
+          sleep 0.25
+        end
+      end
     end
 
     # 
@@ -304,7 +313,8 @@ class TyrantManager
         logger.info "Process #{_pid} is beyond my control"
       rescue Errno::ESRCH
         logger.info "Process #{_pid} is dead"
-      rescue => e
+        cleanup_pid_file
+     rescue => e
         logger.error "Problem sending kill(TERM, #{_pid}) : #{e}"
       end
     end
@@ -326,6 +336,7 @@ class TyrantManager
         logger.info "Process #{_pid} is beyond my control"
       rescue Errno::ESRCH
         logger.info "Process #{_pid} is dead"
+        cleanup_pid_file
         return false
       rescue => e
         logger.error "Problem sending kill(0, #{_pid}) : #{e}"
@@ -380,6 +391,20 @@ class TyrantManager
  
     private
 
+    def cleanup_pid_file
+      if File.exist?( self.pid_file ) then
+        logger.warn "Pid file #{self.pid_file} still exists."
+        logger.warn "The tyrant server may have exited with a failure."
+        logger.warn "Here are the last few lines of the log file (#{self.log_file}):"
+        lines = %x[ tail -10 #{self.log_file} ]
+        lines.split("\n").each do |l|
+          logger.warn "   #{l.strip}"
+        end
+        logger.warn "Cleaning up stale pid file for #{self.pid}"
+        File.unlink( self.pid_file )
+      end
+    end
+
     #
     # take the given path, and if it is not an absolute path append it 
     # to the home directory of the instance.

data/lib/tyrant_manager/version.rb

@@ -6,8 +6,8 @@
 class TyrantManager
   module Version
     MAJOR   = 1
-    MINOR   = 2
-    BUILD   = 1
+    MINOR   = 3
+    BUILD   = 0
 
     def to_a 
       [MAJOR, MINOR, BUILD]

data/tasks/distribution.rake

@@ -34,5 +34,12 @@ if pkg_config = Configuration.for_if_exist?("packaging") then
     desc "reinstall gem"
     task :reinstall => [:uninstall, :repackage, :install]
 
- end
+    desc "distribute copiously"
+    task :copious => [:clean, :package ] do
+      Rake::SshFilePublisher.new('jeremy@copiousfreetime.org',
+                                 '/var/www/vhosts/www.copiousfreetime.org/htdocs/gems/gems',
+                                 'pkg', "#{TyrantManager::GEM_SPEC.full_name}.gem").upload
+      sh "ssh jeremy@copiousfreetime.org rake -f /var/www/vhosts/www.copiousfreetime.org/htdocs/gems/Rakefile"
+    end 
+  end
 end

data/tasks/gemcutter.rake

@@ -0,0 +1,18 @@
+
+require 'tasks/config'    
+gem 'gemcutter'
+require 'rake/gemcutter_pushtask'
+
+#-----------------------------------------------------------------------
+# Gemcutter additions to the task library
+#-----------------------------------------------------------------------
+namespace :dist do
+  desc "Release files to gemcutter"
+
+  GemCutter::Rake::PushTask.new do |t|
+    t.gem_file = File.expand_path( File.join( "pkg", "#{TyrantManager::GEM_SPEC.full_name}.gem" ) )
+  end
+
+  task :push => :gem
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tyrantmanager
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors: 
 - Jeremy Hinegardner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-14 00:00:00 -06:00
+date: 2009-10-04 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.4
+        version: 1.2.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: main
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.8.4
+        version: 2.9.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: configuration
@@ -58,9 +58,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.0.5
+        version: 1.1.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -72,6 +72,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.8.3
     version: 
+- !ruby/object:Gem::Dependency 
+  name: gemcutter
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.1.4
+    version: 
 description: |-
   A command line tool for managing Tokyo Tyrant instances.  It allows for the
   creation, starting, stopping, listing, stating of many tokyo tyrant instances
@@ -134,13 +144,14 @@ files:
 - tasks/announce.rake
 - tasks/distribution.rake
 - tasks/documentation.rake
+- tasks/gemcutter.rake
 - tasks/rspec.rake
 - tasks/rubyforge.rake
 - tasks/config.rb
 - tasks/utils.rb
 - gemspec.rb
 has_rdoc: true
-homepage: http://tyrant-manager.rubyforge.org/
+homepage: http://copiousfreetime.rubyforge.org/tyrantmanager
 licenses: []
 
 post_install_message: 
@@ -164,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: copiousfreetime
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A command line tool for managing Tokyo Tyrant instances