kanamei-keystone 0.0.15 → 0.0.16

data/lib/keystone.rb

@@ -11,7 +11,7 @@ autoload :Moji          , 'moji'
 
 module Keystone
 
-  VERSION = '0.0.15'
+  VERSION = '0.0.16'
 
   autoload :StringUtil , 'keystone/string_util'
   autoload :Batch      , 'keystone/batch'

data/lib/keystone/batch/base.rb

@@ -43,7 +43,21 @@ module Keystone::Batch
     #     info "batch process01"
     #   end
     #
+    # railsのscript/runnerで使用する場合はscript/runnerを以下の感じでいじってから使用してください
+    #
+    #   #!/usr/bin/env ruby
+    # 
+    #   #original add start
+    #   ARGV_ORIGINAL = ARGV.clone
+    #   ARGV.delete("-h")
+    #   ARGV.delete("--help")
+    #   #original add end
+    # 
+    #   require File.dirname(__FILE__) + '/../config/boot'
+    #   require 'commands/runner'
+    #
     def execute(options={},&process)
+      
       options[:error_mail_to] = nil unless options.key?(:error_mail_to)
       options[:error_mail_from] = nil unless options.key?(:error_mail_from)
       options[:error_mail_smtp_addr] = "127.0.0.1" unless options.key?(:error_mail_smtp_addr)
@@ -53,28 +67,48 @@ module Keystone::Batch
 
       double_process_check = options[:double_process_check]
       auto_recover         = options[:auto_recover]
-      
-      debug "caller=#{caller}"
-      pg_path = if File.expand_path(caller[0]) =~ /(.*):\d*\z/
-        $1
+
+      opts = option_parser()
+      pg_path = nil
+      if Module.constants.include?("ARGV_ORIGINAL")
+        
+        debug "ARGV_ORIGINAL found!!"
+        
+        ARGV << "-h" if ARGV_ORIGINAL.include?("-h")
+        ARGV << "--help" if ARGV_ORIGINAL.include?("--help")
+        script_name = File.basename(ARGV_ORIGINAL[0])
+        pg_path = File.expand_path(script_name)
+        opts.banner = "Usage: script/runner #{script_name} [options]"
+        
+        debug "pg_path=#{pg_path}"
+        
       else
-        raise "must not happen!! can not get caller value"
+        debug "caller=#{caller}"
+        pg_path = if File.expand_path(caller[0]) =~ /(.*):\d*\z/
+          $1
+        else
+          raise "must not happen!! can not get caller value"
+        end
       end
+
       pid_file = nil
-      opts = option_parser()
-      opts.on("--lockfile LOCK_FILE_PATH") do |v|
+      opts.on("--lockfile LOCK_FILE_PATH","set lock file path") do |v|
         double_process_check = true unless double_process_check
         pid_file = v 
       end
-
-      opts.on("--error_mail_to ADDRESS") do |v|
+      opts.on("--double_process_check_off","disable double process check") do |v|
+        double_process_check = false
+      end
+      opts.on("--auto_recover_off","disable auto recover mode") do |v|
+        auto_recover = false
+      end
+      opts.on("--error_mail_to MAIL_ADDR") do |v|
         options[:error_mail_to] = v
       end
-      
-      opts.on("--error_mail_from ADDREDD") do |v|
+      opts.on("--error_mail_from MAIL_ADDR") do |v|
         options[:error_mail_from] = v
       end
-      opts.on("--error_mail_smtp_addr ADDRESS") do |v|
+      opts.on("--error_mail_smtp_addr IP_ADDR") do |v|
         options[:error_mail_smtp_addr] = v
       end
       opts.on("--error_mail_smtp_port PORT") do |v|

data/lib/keystone/string_util.rb

@@ -83,10 +83,3 @@ module Keystone
     end
   end
 end
-
-p "t!!est".gsub(/[^0-9A-Za-z_\-\.]/,"_")
-p "日_本.-語t!!est".gsub(/[^0-9A-Za-z_\-\.]/,"_")
-p "日本語t!!est".gsub(/[^0-9A-Za-z_\-\.]/,"_")
-p "日本語t!!est".gsub(/[^0-9A-Za-z_\-\.]/,"_")
-p "日本語t!!est".gsub(/[^0-9A-Za-z_\-\.]/,"_")
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kanamei-keystone
 version: !ruby/object:Gem::Version 
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors: 
 - kanamei
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-01 00:00:00 -07:00
+date: 2009-04-08 00:00:00 -07:00
 default_executable: 
 dependencies: []