mongrel_service 0.4.beta3 → 0.4.0

data/History.txt

@@ -1,3 +1,14 @@
+=== 0.4.0 / 2010-11-16
+
+* Enhancements:
+  * Pass-through arguments during service install. Closes GH-4
+  * A bit more verbose messages at install / removal
+
+* Bugfixes:
+  * Quote service name. Closes GH-3
+  * Loose mongrel dependency a little bit for compatibility
+  * Service name is mandatory. Closes GH-10
+
 === 0.4.beta3 / 2010-03-07
 
 * Bugfixes:

data/README.txt

@@ -1,6 +1,6 @@
 = Mongrel Native Win32 Service Plugin
 
-* http://github.com/fauna/mongrel_service
+* http://github.com/luislavena/mongrel_service
 
 == DESCRIPTION
 
@@ -11,8 +11,8 @@ This replace mongrel_rails_service.
 
 Use the following commands to get more help:
 
-    service::install --help
-    service::remove --help
+    mongrel_rails service::install --help
+    mongrel_rails service::remove --help
 
 == AUTHOR
 

data/lib/mongrel_service/init.rb

@@ -8,7 +8,7 @@ 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],
@@ -29,17 +29,23 @@ module Service
           ['', '--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|
@@ -59,40 +65,29 @@ module Service
       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 + '"'
 
@@ -101,7 +96,7 @@ module 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,
@@ -109,15 +104,15 @@ module Service
         :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}\""
 
@@ -140,12 +135,16 @@ module Service
         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
@@ -159,7 +158,7 @@ module Service
         ['-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."
 
@@ -174,7 +173,7 @@ module Service
       return @valid
     end
   end
-  
+
   class Remove < GemPlugin::Plugin "/commands"
     include Mongrel::Command::Base
     include ServiceValidation
@@ -183,6 +182,7 @@ module Service
       display_name = ServiceManager.getdisplayname(@svc_name)
 
       begin
+        puts "Stopping #{display_name} if running..."
         ServiceManager.stop(@svc_name)
       rescue ServiceManager::ServiceError => e
       end

data/lib/mongrel_service/service_manager.rb

@@ -8,7 +8,7 @@ module ServiceManager
 
   def self.create(service_name, display_name, binary_path_name)
     cmd = ['create']
-    cmd << service_name
+    cmd << quote(service_name)
     cmd << "DisplayName=" << display_name.inspect
     cmd << "binPath=" << binary_path_name.inspect
     status, out = sc(*cmd)
@@ -18,12 +18,12 @@ module ServiceManager
   end
 
   def self.exist?(service_name)
-    status, out = sc('query', service_name)
+    status, out = sc('query', quote(service_name))
     out =~ /#{service_name}/i
   end
 
   def self.open(service_name)
-    status, out = sc('qc', service_name, 4096)
+    status, out = sc('qc', quote(service_name), 4096)
     raise ServiceNotFound.new(out) unless status == 0
 
     out =~ /BINARY\_PATH\_NAME.*\: (.*)$/
@@ -39,7 +39,7 @@ module ServiceManager
   end
 
   def self.getdisplayname(service_name)
-    status, out = sc('GetDisplayName', service_name)
+    status, out = sc('GetDisplayName', quote(service_name))
     raise ServiceNotFound.new(out) unless status == 0
 
     out =~ /\=(.*)$/
@@ -47,14 +47,14 @@ module ServiceManager
   end
 
   def self.stop(service_name)
-    status, out = net('stop', service_name)
+    status, out = net('stop', quote(service_name))
     raise ServiceError.new(out) unless status == 0
 
     return true
   end
 
   def self.delete(service_name)
-    status, out = sc('delete', service_name)
+    status, out = sc('delete', quote(service_name))
     raise ServiceError.new(out) unless status == 0
 
     return true
@@ -71,4 +71,8 @@ module ServiceManager
     output = `net #{args.join(' ')} 2>&1`
     return [$?.exitstatus, output]
   end
+
+  def self.quote(text)
+    text.inspect
+  end
 end

data/tasks/gem.rake

@@ -6,12 +6,12 @@ task :gem => [:compile]
 
 HOE = Hoe.spec 'mongrel_service' do
   self.rubyforge_name = "mongrel"
-  self.version = '0.4.beta3'
+  self.version = '0.4.0'
 
   developer 'Luis Lavena', 'luislavena@gmail.com'
 
   extra_deps << ['gem_plugin', '~> 0.2.3']
-  extra_deps << ['mongrel', '~> 1.1.5']
+  extra_deps << ['mongrel', '>= 1.1.5']
 
   self.need_tar = false
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongrel_service
 version: !ruby/object:Gem::Version 
-  version: 0.4.beta3
+  hash: 15
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Luis Lavena
@@ -9,59 +15,73 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-07 00:00:00 +01:00
+date: 2010-11-16 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gem_plugin
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 2
+        - 3
         version: 0.2.3
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mongrel
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 1
+        - 5
         version: 1.1.5
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rubyforge
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 0
+        - 4
         version: 2.0.4
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: gemcutter
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.4.1
-    version: 
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.0
-    version: 
+        hash: 19
+        segments: 
+        - 2
+        - 6
+        - 2
+        version: 2.6.2
+  type: :development
+  version_requirements: *id004
 description: |-
   This plugin offer native win32 services for rails.
   This replace mongrel_rails_service.
@@ -111,7 +131,7 @@ files:
 - TODO.txt
 - tools/freebasic.rb
 has_rdoc: true
-homepage: http://github.com/fauna/mongrel_service
+homepage: http://github.com/luislavena/mongrel_service
 licenses: []
 
 post_install_message: 
@@ -121,21 +141,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
-  version: 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: mongrel
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: This plugin offer native win32 services for rails