td 0.10.69 → 0.10.70

data/ChangeLog

@@ -1,3 +1,9 @@
+== 2013-01-25 version 0.10.70
+
+* Add status to job subcommand, td job:status job_id
+* td-client v0.8.45
+
+
 == 2013-01-23 version 0.10.69
 
 * Fixed the undefined local variable problem of table:list when no databases

data/lib/td/command/job.rb

@@ -154,6 +154,13 @@ module Command
     $stderr.puts "Use '-v' option to show detailed messages." unless verbose
   end
 
+  def job_status(op)
+    job_id = op.cmd_parse
+    client = get_client
+
+    puts client.job_status(job_id)
+  end
+
   def job_kill(op)
     job_id = op.cmd_parse
 

data/lib/td/command/list.rb

@@ -106,7 +106,7 @@ module List
       op.summary_indent = "  "
 
       if msg = @override_message
-        (class<<op;self;end).module_eval do
+        (class << op;self;end).module_eval do
           define_method(:to_s) { msg }
         end
       end
@@ -267,6 +267,7 @@ module List
   add_list 'query', %w[sql], 'Issue a query', 'query -d example_db -w -r rset1 "select count(*) from table1"'
 
   add_list 'job:show', %w[job_id], 'Show status and result of a job', 'job 1461'
+  add_list 'job:status', %w[job_id], 'Show status progress of a job', 'job:status 1461'
   add_list 'job:list', %w[max?], 'Show list of jobs', 'jobs', 'jobs --page 1'
   add_list 'job:kill', %w[job_id], 'Kill or cancel a job', 'job:kill 1461'
 

data/lib/td/command/runner.rb

@@ -29,7 +29,7 @@ EOF
 
     op.summary_indent = "  "
 
-    (class<<self;self;end).module_eval do
+    (class << self;self;end).module_eval do
       define_method(:usage) do |errmsg|
         require 'td/command/list'
         puts op.to_s

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.10.69'
+VERSION = '0.10.70'
 
 end

data/spec/spec_helper.rb

@@ -14,3 +14,30 @@ if ENV['SIMPLE_COV']
     add_filter 'vendor/'
   end
 end
+
+require 'td/command/runner'
+
+def execute_td(command_line)
+  args = command_line.split(" ")
+  original_stdin, original_stderr, original_stdout = $stdin, $stderr, $stdout
+
+  $stdin  = captured_stdin  = StringIO.new
+  $stderr = captured_stderr = StringIO.new
+  $stdout = captured_stdout = StringIO.new
+  class << captured_stdout
+    def tty?
+      true
+    end
+  end
+
+  begin
+    runner = TreasureData::Command::Runner.new
+    $0 = 'td'
+    runner.run(args)
+  rescue SystemExit
+  ensure
+    $stdin, $stderr, $stdout = original_stdin, original_stderr, original_stdout
+  end
+
+  [captured_stderr.string, captured_stdout.string]
+end

data/spec/td/version_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+module TreasureData::Command
+  describe '--version' do
+    it "shows version" do
+      stderr, stdout = execute_td("--version")
+      stderr.should == ""
+      stdout.should == <<-STDOUT
+td #{TreasureData::VERSION}
+STDOUT
+    end
+  end
+end

data/td.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "yajl-ruby", "~> 1.1.0"
   gem.add_dependency "hirb", ">= 0.4.5"
   gem.add_dependency "parallel", "~> 0.5.19"
-  gem.add_dependency "td-client", "~> 0.8.43"
+  gem.add_dependency "td-client", "~> 0.8.45"
   gem.add_dependency "td-logger", "~> 0.3.16"
   gem.add_development_dependency "rake", "~> 0.9"
   gem.add_development_dependency "rspec", "~> 2.10.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.69
+  version: 0.10.70
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.43
+        version: 0.8.45
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.43
+        version: 0.8.45
 - !ruby/object:Gem::Dependency
   name: td-logger
   requirement: !ruby/object:Gem::Requirement
@@ -222,6 +222,7 @@ files:
 - spec/file_reader/shared_context.rb
 - spec/file_reader_spec.rb
 - spec/spec_helper.rb
+- spec/td/version_spec.rb
 - td.gemspec
 homepage: http://treasure-data.com/
 licenses: []
@@ -237,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4306529652895121788
+      hash: -3004606412038514569
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -246,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4306529652895121788
+      hash: -3004606412038514569
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -261,3 +262,4 @@ test_files:
 - spec/file_reader/shared_context.rb
 - spec/file_reader_spec.rb
 - spec/spec_helper.rb
+- spec/td/version_spec.rb