td 0.9.5 → 0.9.6

data/ChangeLog

@@ -1,4 +1,10 @@
 
+== 2011-09-13 version 0.9.6
+
+* Implement main routine on TreasureData::Command::Runner to support heroku-td
+* Fixed help message to show options
+
+
 == 2011-09-13 version 0.9.5
 
 * Supports scheduled queries

data/bin/td

@@ -4,4 +4,7 @@ require 'rubygems' unless defined?(gem)
 gem 'td-client'
 here = File.dirname(__FILE__)
 $LOAD_PATH << File.expand_path(File.join(here, '..', 'lib'))
-require 'td/command/td'
+
+require 'td/command/runner'
+TreasureData::Command::Runner.new.run ARGV
+

data/lib/td/command/list.rb

@@ -40,12 +40,13 @@ module List
       self.banner = banner
 
       @message = nil
+      @argv = nil
     end
 
-    attr_accessor :message
+    attr_accessor :message, :argv
 
     def message
-      @message || banner
+      @message || to_s
     end
 
     def banner
@@ -62,9 +63,9 @@ module List
       "%-40s   # %s" % [@usage_args, @description]
     end
 
-    def cmd_parse(argv=ARGV)
+    def cmd_parse(argv=@argv||ARGV)
       parse!(argv)
-      if argv.length < @req_args.length || (!@varlen && argv.length > @args.length)
+      if argv.length < @req_args.length || (!@varlen && argv.length > @argv.length)
         cmd_usage nil
       end
       if argv.length <= 1
@@ -89,11 +90,17 @@ module List
       name.split(':', 2).first
     end
 
-    def on(*args)
+    def on(*argv)
       @has_options = true
       super
     end
 
+    def with_args(argv)
+      d = dup
+      d.argv = argv
+      d
+    end
+
     attr_reader :name
     attr_reader :description
   end
@@ -123,7 +130,7 @@ module List
       require "td/command/#{group}"
       cmd = name.gsub(':', '_')
       m = Object.new.extend(Command).method(cmd)
-      return Proc.new { m.call(op) }
+      return Proc.new {|args| m.call(op.with_args(args)) }
     end
     nil
   end

data/lib/td/command/runner.rb

@@ -0,0 +1,114 @@
+
+module TreasureData
+module Command
+
+
+class Runner
+  def initialize
+    @config_path = nil
+    @apikey = nil
+    @prog_name = nil
+  end
+
+  attr_accessor :apikey, :config_path, :prog_name
+
+  def run(argv=ARGV)
+    require 'td/version'
+    require 'optparse'
+
+    $prog = @prog_name || File.basename($0)
+
+    op = OptionParser.new
+    op.version = TreasureData::VERSION
+    op.banner = <<EOF
+usage: #{$prog} [options] COMMAND [args]
+
+options:
+EOF
+
+    op.summary_indent = "  "
+
+    (class<<self;self;end).module_eval do
+      define_method(:usage) do |errmsg|
+        require 'td/command/list'
+        puts op.to_s
+        puts ""
+        puts "commands:"
+        TreasureData::Command::List.show_help(op.summary_indent)
+        puts ""
+        puts "Type '#{$prog} help COMMAND' for more information on a specific command."
+        if errmsg
+          puts "error: #{errmsg}"
+          exit 1
+        else
+          exit 0
+        end
+      end
+    end
+
+    config_path = @config_path
+    apikey = @apikey
+    $verbose = false
+    #$debug = false
+
+    op.on('-c', '--config PATH', "path to config file (~/.td/td.conf)") {|s|
+      config_path = s
+    }
+
+    op.on('-k', '--apikey KEY', "use this API key instead of reading the config file") {|s|
+      apikey = s
+    }
+
+    op.on('-v', '--verbose', "verbose mode", TrueClass) {|b|
+      $verbose = b
+    }
+
+    #op.on('-d', '--debug', "debug mode", TrueClass) {|b|
+    #	$debug = b
+    #}
+
+    begin
+      op.order!(argv)
+      usage nil if argv.empty?
+      cmd = argv.shift
+
+      require 'td/config'
+      if config_path
+        TreasureData::Config.path = config_path
+      end
+      if apikey
+        TreasureData::Config.apikey = apikey
+      end
+    rescue
+      usage $!.to_s
+    end
+
+    require 'td/command/list'
+
+    method = TreasureData::Command::List.get_method(cmd)
+    unless method
+      $stderr.puts "'#{cmd}' is not a td command. Run '#{$prog}' to show the list."
+      TreasureData::Command::List.show_guess(cmd)
+      exit 1
+    end
+
+    begin
+      method.call(argv)
+    rescue TreasureData::ConfigError
+      $stderr.puts "TreasureData account is not configured yet."
+      $stderr.puts "Run '#{$prog} account' first."
+    rescue
+      $stderr.puts "error #{$!.class}: backtrace:"
+      $!.backtrace.each {|b|
+        $stderr.puts "  #{b}"
+      }
+      puts ""
+      puts $!
+    end
+  end
+end
+
+
+end
+end
+

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.9.5'
+VERSION = '0.9.6'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: td
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Sadayuki Furuhashi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-13 00:00:00 +09:00
+date: 2011-09-20 00:00:00 +09:00
 default_executable: td
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,11 +118,11 @@ files:
 - lib/td/command/job.rb
 - lib/td/command/list.rb
 - lib/td/command/query.rb
+- lib/td/command/runner.rb
 - lib/td/command/sched.rb
 - lib/td/command/schema.rb
 - lib/td/command/server.rb
 - lib/td/command/table.rb
-- lib/td/command/td.rb
 - lib/td/config.rb
 - lib/td/version.rb
 - ChangeLog

data/lib/td/command/td.rb

@@ -1,94 +0,0 @@
-
-require 'optparse'
-require 'td/version'
-
-$prog = File.basename($0)
-
-op = OptionParser.new
-op.version = TreasureData::VERSION
-op.banner = <<EOF
-usage: #{$prog} [options] COMMAND [args]
-
-options:
-EOF
-
-op.summary_indent = "  "
-
-(class<<self;self;end).module_eval do
-  define_method(:usage) do |errmsg|
-    require 'td/command/list'
-    puts op.to_s
-    puts ""
-    puts "commands:"
-    TreasureData::Command::List.show_help(op.summary_indent)
-    puts ""
-    puts "Type 'td help COMMAND' for more information on a specific command."
-    if errmsg
-      puts "error: #{errmsg}"
-      exit 1
-    else
-      exit 0
-    end
-  end
-end
-
-config_path = nil
-apikey = nil
-$verbose = false
-#$debug = false
-
-op.on('-c', '--config PATH', "path to config file (~/.td/td.conf)") {|s|
-  config_path = s
-}
-
-op.on('-k', '--apikey KEY', "use this API key instead of reading the config file") {|s|
-  apikey = s
-}
-
-op.on('-v', '--verbose', "verbose mode", TrueClass) {|b|
-  $verbose = b
-}
-
-#op.on('-d', '--debug', "debug mode", TrueClass) {|b|
-#	$debug = b
-#}
-
-begin
-  op.order!(ARGV)
-  usage nil if ARGV.empty?
-  cmd = ARGV.shift
-
-  require 'td/config'
-  if config_path
-    TreasureData::Config.path = config_path
-  end
-  if apikey
-    TreasureData::Config.apikey = apikey
-  end
-rescue
-  usage $!.to_s
-end
-
-require 'td/command/list'
-
-method = TreasureData::Command::List.get_method(cmd)
-unless method
-  $stderr.puts "'#{cmd}' is not a td command. Run '#{$prog}' to show the list."
-  TreasureData::Command::List.show_guess(cmd)
-  exit 1
-end
-
-begin
-  method.call
-rescue TreasureData::ConfigError
-  $stderr.puts "TreasureData account is not configured yet."
-  $stderr.puts "Run '#{$prog} account' first."
-rescue
-  $stderr.puts "error #{$!.class}: backtrace:"
-  $!.backtrace.each {|b|
-    $stderr.puts "  #{b}"
-  }
-  puts ""
-  puts $!
-end
-