service_manager 0.6.2 → 0.6.3

data/lib/service_manager/service.rb

@@ -4,7 +4,7 @@ class ServiceManager::Service
   CHDIR_SEMAPHORE = Mutex.new
   ANSI_COLOR_RESET = 0
 
-  attr_accessor :name, :host, :port, :cwd, :reload_uri, :start_cmd, :process, :loaded_cue, :timeout, :color, :pid_file
+  attr_accessor :name, :host, :port, :cwd, :reload_uri, :start_cmd, :process, :loaded_cue, :timeout, :color, :pid_file, :manage_pid_file
 
   class ServiceDidntStart < Exception; end
 
@@ -53,8 +53,8 @@ class ServiceManager::Service
       return false
     end
 
-    puts "Starting #{colorized_service_name} in #{cwd} with '#{start_cmd}'"
     CHDIR_SEMAPHORE.synchronize do
+      puts "Starting #{colorized_service_name} in #{cwd} with '#{start_cmd}'\n"
       Dir.chdir(cwd) do
         without_bundler_env do
           # system("bash -c set")
@@ -65,6 +65,7 @@ class ServiceManager::Service
     at_exit { stop }
     wait
     puts "Server #{colorized_service_name} is up."
+    File.open(pid_file, "wb") { |f| f << process.pid } if manage_pid_file
   end
 
   # stop the service.  If we didn't start it, do nothing.
@@ -79,6 +80,7 @@ class ServiceManager::Service
     end
     puts "Server #{colorized_service_name} (#{process.pid}) is shut down"
     self.process = nil
+    FileUtils.rm(pid_file) if manage_pid_file && File.exist?(pid_file)
     true
   end
 
@@ -93,10 +95,12 @@ class ServiceManager::Service
 
   # detects if the service is running on the configured host and port (will return true if we weren't the ones who started it)
   def running?
-    if pid_file
+    case
+    when pid_file
       running_via_pid_file?
-    else
-      TCPSocket.listening_service?(:port => port, :host => host)
+    when port
+      TCPSocket.listening_service?(:port => port, :host => host || "127.0.0.1")
+    else raise "Service Manager needs to be able to tell if the service is already running or not. You'll need to specify a pid file or a TCP port to check."
     end
   end
 
@@ -109,7 +113,8 @@ protected
   end
 
   def colorize(output)
-    "\e[0;#{color}m#{output}\e[0;#{ANSI_COLOR_RESET}m"
+    no_color = output.gsub(/\e\[(\d*\;|)\d*m\d*/, "")
+    "\e[0;#{color}m#{no_color}\e[0;#{ANSI_COLOR_RESET}m"
   end
 
   def colorized_service_name

metadata

@@ -1,106 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: service_manager
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 0.6.3
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 2
-  version: 0.6.2
 platform: ruby
-authors: 
+authors:
 - Tim Harper
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-28 00:00:00 -06:00
-default_executable: start_services
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-05 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: background_process
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2168700740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: tcpsocket-wait
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2168700740
+- !ruby/object:Gem::Dependency
+  name: tcpsocket-wait
+  requirement: &2168700340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-description: |
-  It launches and interacts with a set of services from a single terminal window.
-  
+  prerelease: false
+  version_requirements: *2168700340
+description: ! 'It launches and interacts with a set of services from a single terminal
+  window.
+
+
   * Colorizes output for each process to help distinguish them.
-  * Useful for integration-test applications where you need to start up several processes and test them all.
-  * Built because servolux wasn't working very well for me.
-  * Can detect exactly when a service is successfully launched by watching the output of the process.
 
-email: 
+  * Useful for integration-test applications where you need to start up several processes
+  and test them all.
+
+  * Built because servolux wasn''t working very well for me.
+
+  * Can detect exactly when a service is successfully launched by watching the output
+  of the process.
+
+'
+email:
 - tim@leadtune.com
-executables: 
+executables:
 - start_services
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - MIT-LICENSE
-files: 
+files:
 - MIT-LICENSE
 - lib/service_manager/service.rb
 - lib/service_manager.rb
 - bin/start_services
-has_rdoc: true
 homepage: http://github.com/leadtune/service_manager
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: service_manager
 test_files: []
-
+has_rdoc: