thin_service 0.0.4 → 0.0.5

data/CHANGELOG.md

@@ -1,2 +1,6 @@
+
+# 0.0.5
+ * Add ability to run any rake task as a service
+ 
 # 0.0.3 
  * Use ruby path from service install instead of global Path

data/bin/thin_service

@@ -10,6 +10,18 @@ if ARGV.first == "start"
   # use same ruby for bundle exec, in case global path is different
   ENV["Path"] = RbConfig::CONFIG['bindir'] + ';' + ENV["Path"]
   
+  version = "> 0"
+  gem 'bundler', version
+  load Gem.bin_path('bundler', 'bundle', version)
+elsif ARGV.first == "daemon"
+  ARGV.shift
+  ARGV.shift
+  Dir.chdir( ARGV.shift )
+  ARGV = ["exec"] + ARGV
+ 
+  # use same ruby for bundle exec, in case global path is different
+  ENV["Path"] = RbConfig::CONFIG['bindir'] + ';' + ENV["Path"]
+  
   version = "> 0"
   gem 'bundler', version
   load Gem.bin_path('bundler', 'bundle', version)
@@ -18,3 +30,5 @@ else
   ThinService::Service.new(ARGV).run!
 end
 
+
+

data/lib/thin_service/command.rb

@@ -16,7 +16,7 @@ module ThinService
   module Command
 
     BANNER = "Usage: thin_service <command> [options]"
-    COMMANDS = ['start', 'install', 'remove']
+    COMMANDS = ['start', 'install', "installdaemon", 'remove']
 
     class Base
 
@@ -112,7 +112,45 @@ module ThinService
     end
 
     module Commands
+
+      module ServiceInstall
+        def validate_thin_service_exe
+          # check if thin_service.exe is in ruby bindir.
+          gem_root = File.join(File.dirname(__FILE__), "..", "..")
+          gem_executable = File.join(gem_root, "resource/thin_service_wrapper.exe")
+          bindir_executable = File.join(RbConfig::CONFIG['bindir'], '/thin_service_wrapper.exe')
+
+          unless File.exist?(bindir_executable)
+            STDERR.puts "** Copying native thin_service executable..."
+            FileUtils.cp gem_executable, bindir_executable rescue nil
+          end
+
+          unless FileUtils.compare_file(bindir_executable, gem_executable)
+            STDERR.puts "** Updating native thin_service executable..."
+            FileUtils.rm_f bindir_executable rescue nil
+            FileUtils.cp gem_executable, bindir_executable rescue nil
+          end
+
+          bindir_executable
+        end
+
+        def add_service( svc_name, svc_display, 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
+      end
+
       class Install < ThinService::Command::Base
+        include ServiceInstall
 
         def configure
             options [
@@ -167,20 +205,7 @@ module ThinService
 
         def run
           # check if thin_service.exe is in ruby bindir.
-          gem_root = File.join(File.dirname(__FILE__), "..", "..")
-          gem_executable = File.join(gem_root, "resource/thin_service_wrapper.exe")
-          bindir_executable = File.join(RbConfig::CONFIG['bindir'], '/thin_service_wrapper.exe')
-
-          unless File.exist?(bindir_executable)
-            STDERR.puts "** Copying native thin_service executable..."
-            FileUtils.cp gem_executable, bindir_executable rescue nil
-          end
-
-          unless FileUtils.compare_file(bindir_executable, gem_executable)
-            STDERR.puts "** Updating native thin_service executable..."
-            FileUtils.rm_f bindir_executable rescue nil
-            FileUtils.cp gem_executable, bindir_executable rescue nil
-          end
+          bindir_executable = validate_thin_service_exe
 
           # build the command line
           argv = []
@@ -208,20 +233,76 @@ module ThinService
           # 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
+          add_service( @svc_name, @svc_display, argv)
+
+         end
+      end
+
+
+      class Installdaemon   < ThinService::Command::Base
+        include ServiceInstall
+        
+        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],
+              ['-t', '--task TASK', "Which task to run", :@command, "rake tm:background:start"],
+              ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, Dir.pwd],   
+             ]
+        end
+
+        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
+              break
+            end
           end
+
+          valid? app_exist == true, "The path you specified isn't a valid Rails application."
+
+          return @valid
+        end
+
+        def run
+          bindir_executable = validate_thin_service_exe
+
+          # build the command line
+          argv = []
+
+          # start using the native executable
+          argv << '"' + bindir_executable + '"'
+
+          # force indication of daemon mode
+          argv << "daemon"
+
+          # now the options
+          argv << "-c \"#{@cwd}\"" 
+          argv << "\"#{@command}\""  
+
+
+          # concat remaining non-parsed ARGV
+          argv.concat(ARGV)
+
+          add_service( @svc_name, @svc_display, argv)
         end
       end
 
+
       module ServiceValidation
         def configure
           options [

data/lib/thin_service/version.rb

@@ -1,3 +1,3 @@
 module ThinService
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thin_service
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000 Z
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &22044540 !ruby/object:Gem::Requirement
+  requirement: &25651368 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22044540
+  version_requirements: *25651368
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &22044144 !ruby/object:Gem::Requirement
+  requirement: &25650372 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22044144
+  version_requirements: *25650372
 description: Runs Thin as a Windows Service - based on mongrel_service
 email:
 - gsmedley@kanayo.com