init.rb in mongrel_service-0.4.0

- old
+ new

@@ -6,11 +6,11 @@
 require 'mongrel_service/service_manager'
 
 module Service
   class Install < GemPlugin::Plugin "/commands"
     include Mongrel::Command::Base
-  
+
     def configure
         options [
           ['-N', '--name SVC_NAME', "Required name for the service to be registered/installed.", :@svc_name, nil],
           ['-D', '--display SVC_DISPLAY', "Adjust the display name of the service.", :@svc_display, nil],
           ["-e", "--environment ENV", "Rails environment to run as", :@environment, ENV['RAILS_ENV'] || "development"],
@@ -27,21 +27,27 @@
           ['-C', '--config PATH', "Use a config file", :@config_file, nil],
           ['-S', '--script PATH', "Load the given file as an extra config script.", :@config_script, nil],
           ['', '--prefix PATH', "URL prefix for Rails app", :@prefix, nil]
         ]
     end
-    
+
     # When we validate the options, we need to make sure the --root is actually RAILS_ROOT
-    # of the rails application we wanted to serve, because later "as service" no error 
+    # of the rails application we wanted to serve, because later "as service" no error
     # show to trace this.
     def validate
       @cwd = File.expand_path(@cwd)
       valid_dir? @cwd, "Invalid path to change to: #@cwd"
-  
+
       # change there to start, then we'll have to come back after daemonize
       Dir.chdir(@cwd)
-  
+
+      valid? @svc_name != nil, "A service name is mandatory."
+      valid? !ServiceManager.exist?(@svc_name), "The service already exist, please remove it first."
+
+      # default service display to service name
+      @svc_display = @svc_name if !@svc_display
+
       # start with the premise of app really exist.
       app_exist = true
       %w{app config log}.each do |path|
         if !File.directory?(File.join(@cwd, path))
           app_exist = false
@@ -57,69 +63,58 @@
       valid_dir? File.dirname(@pid_file), "Path to pid file not valid: #@pid_file"
       valid_dir? @docroot, "Path to docroot not valid: #@docroot"
       valid_exists? @mime_map, "MIME mapping file does not exist: #@mime_map" if @mime_map
       valid_exists? @config_file, "Config file not there: #@config_file" if @config_file
 
-      # We should validate service existance here, right Zed?
-      begin
-        valid? !ServiceManager.exist?(@svc_name), "The service already exist, please remove it first."
-      rescue
-      end
-
-      valid? @svc_name != nil, "A service name is mandatory."
-      
-      # default service display to service name
-      @svc_display = @svc_name if !@svc_display
-
       return @valid
     end
-    
+
     def run
       # check if mongrel_service.exe is in ruby bindir.
       gem_root = File.join(File.dirname(__FILE__), "..", "..")
       gem_executable = File.join(gem_root, "resources/mongrel_service.exe")
       bindir_executable = File.join(Config::CONFIG['bindir'], '/mongrel_service.exe')
-      
+
       unless File.exist?(bindir_executable)
         STDERR.puts "** Copying native mongrel_service executable..."
         FileUtils.cp gem_executable, bindir_executable rescue nil
       end
-      
+
       unless FileUtils.compare_file(bindir_executable, gem_executable)
         STDERR.puts "** Updating native mongrel_service executable..."
         FileUtils.rm_f bindir_executable rescue nil
         FileUtils.cp gem_executable, bindir_executable rescue nil
       end
-      
+
       # build the command line
       argv = []
-      
+
       # start using the native executable
       argv << '"' + bindir_executable + '"'
 
       # force indication of service mode (workaround Windows 2008 psapi issue)
       argv << "service"
 
       # use the 'single' service for now
       argv << "single"
-      
+
       # command line setting override config file settings
       @options = { :host => @address,  :port => @port, :cwd => @cwd,
         :log_file => @log_file, :pid_file => @pid_file, :environment => @environment,
         :docroot => @docroot, :mime_map => @mime_map,
         :debug => @debug, :includes => ["mongrel"], :config_script => @config_script,
         :num_procs => @num_procs, :timeout => @timeout, :cpu => @cpu, :prefix => @prefix
       }
-      
+
       # if we are using a config file, pass -c and -C to the service instead of each start parameter.
       if @config_file
         STDERR.puts "** Using #{@config_file} instead of command line parameters."
         conf = YAML.load_file(@config_file)
-        
+
         # add the root folder (-c)
         argv << "-c \"#{conf[:cwd]}\""
-        
+
         # use the config file
         argv << "-C \"#{@config_file}\""
 
       else
         # use the command line instead
@@ -138,16 +133,20 @@
         argv << "-S \"#{@options[:config_script]}\"" if @options[:config_script]
         argv << "-u #{@options[:cpu.to_i]}" if @options[:cpu]
         argv << "--prefix \"#{@options[:prefix]}\"" if @options[:prefix]
       end
 
+      # concat remaining non-parsed ARGV
+      argv.concat(ARGV)
+
       begin
         ServiceManager.create(
           @svc_name,
           @svc_display,
           argv.join(' ')
         )
+        puts "#{@svc_display} service created."
       rescue ServiceManager::CreateError => e
         puts "There was a problem installing the service:"
         puts e
       end
     end
@@ -157,11 +156,11 @@
     def configure
       options [
         ['-N', '--name SVC_NAME', "Required name for the service to be registered/installed.", :@svc_name, nil],
       ]
     end
-    
+
     def validate
       valid? @svc_name != nil, "A service name is mandatory."
 
       # Validate that the service exists
       valid? ServiceManager.exist?(@svc_name), "There is no service with that name, cannot proceed."
@@ -172,18 +171,19 @@
       end
 
       return @valid
     end
   end
-  
+
   class Remove < GemPlugin::Plugin "/commands"
     include Mongrel::Command::Base
     include ServiceValidation
 
     def run
       display_name = ServiceManager.getdisplayname(@svc_name)
 
       begin
+        puts "Stopping #{display_name} if running..."
         ServiceManager.stop(@svc_name)
       rescue ServiceManager::ServiceError => e
       end
 
       begin