td 0.10.25 → 0.10.26

data/ChangeLog

@@ -1,4 +1,9 @@
 
+== 2012-06-11 version 0.10.26
+
+* Updated job:list --running, --success and --error options to proceed them on the server
+
+
 == 2012-05-31 version 0.10.25
 
 * Updated dependency: td-logger-0.3.12

data/lib/td/command/bulk_import.rb

@@ -11,10 +11,10 @@ module Command
 
     rows = []
     bis.each {|bi|
-      rows << {:Name=>bi.name, :Table=>"#{bi.database}.#{bi.table}", :Status=>bi.status.to_s.capitalize, :Frozen=>bi.upload_frozen? ? 'frozen' : '', :JobID=>bi.job_id, :"Valid Parts"=>bi.valid_parts, :"Error Parts"=>bi.error_parts, :"Valid Records"=>bi.valid_records, :"Error Records"=>bi.error_records}
+      rows << {:Name=>bi.name, :Table=>"#{bi.database}.#{bi.table}", :Status=>bi.status.to_s.capitalize, :Frozen=>bi.upload_frozen? ? 'Frozen' : '', :JobID=>bi.job_id, :"Valid Parts"=>bi.valid_parts, :"Error Parts"=>bi.error_parts, :"Valid Records"=>bi.valid_records, :"Error Records"=>bi.error_records}
     }
 
-    puts cmd_render_table(rows, :fields => [:Name, :Table, :Status, :Frozen, :JobID, :"Valid Parts", :"Error Parts", :"Valid Records", :"Error Records"])
+    puts cmd_render_table(rows, :fields => [:Name, :Table, :Status, :Frozen, :JobID, :"Valid Parts", :"Error Parts", :"Valid Records", :"Error Records"], :max_width=>200)
 
     if rows.empty?
       $stderr.puts "There are no bulk import sessions."

data/lib/td/command/job.rb

@@ -5,8 +5,7 @@ module Command
   def job_list(op)
     page = 0
     skip = 0
-    running = false
-    error = false
+    status = nil
 
     op.on('-p', '--page PAGE', 'skip N pages', Integer) {|i|
       page = i
@@ -15,10 +14,13 @@ module Command
       skip = i
     }
     op.on('-R', '--running', 'show only running jobs', TrueClass) {|b|
-      running = b
+      status = 'running'
     }
-    op.on('-E', '--error', 'show only error jobs', TrueClass) {|b|
-      error = b
+    op.on('-S', '--success', 'show only succeeded jobs', TrueClass) {|b|
+      status = 'success'
+    }
+    op.on('-E', '--error', 'show only failed jobs', TrueClass) {|b|
+      status = 'error'
     }
 
     max = op.cmd_parse
@@ -30,12 +32,10 @@ module Command
     if page
       skip += max * page
     end
-    jobs = client.jobs(skip, skip+max-1)
+    jobs = client.jobs(skip, skip+max-1, status)
 
     rows = []
     jobs.each {|job|
-      next if running && !job.running?
-      next if error && !job.error?
       start = job.start_at
       elapsed = cmd_format_elapsed(start, job.end_at)
       rows << {:JobID => job.job_id, :Status => job.status, :Query => job.query.to_s, :Start => (start ? start.localtime : ''), :Elapsed => elapsed, :Result => job.result_url}
@@ -80,13 +80,13 @@ module Command
 
     if wait && !job.finished?
       wait_job(job)
-      if job.success?
+      if job.success? && job.type == :hive
         puts "Result       :"
         show_result(job, output, format)
       end
 
     else
-      if job.success?
+      if job.success? && job.type == :hive
         puts "Result       :"
         show_result(job, output, format)
       end

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.10.25'
+VERSION = '0.10.26'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.25
+  version: 0.10.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000Z
+date: 2012-06-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70101207467200 !ruby/object:Gem::Requirement
+  requirement: &70214482043320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70101207467200
+  version_requirements: *70214482043320
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70101207466560 !ruby/object:Gem::Requirement
+  requirement: &70214482035240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70101207466560
+  version_requirements: *70214482035240
 - !ruby/object:Gem::Dependency
   name: hirb
-  requirement: &70101207465800 !ruby/object:Gem::Requirement
+  requirement: &70214482029820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +43,21 @@ dependencies:
         version: 0.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *70101207465800
+  version_requirements: *70214482029820
 - !ruby/object:Gem::Dependency
   name: td-client
-  requirement: &70101207465180 !ruby/object:Gem::Requirement
+  requirement: &70214482025720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.16
+        version: 0.8.17
   type: :runtime
   prerelease: false
-  version_requirements: *70101207465180
+  version_requirements: *70214482025720
 - !ruby/object:Gem::Dependency
   name: td-logger
-  requirement: &70101207464620 !ruby/object:Gem::Requirement
+  requirement: &70214482013200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 0.3.12
   type: :runtime
   prerelease: false
-  version_requirements: *70101207464620
+  version_requirements: *70214482013200
 description: 
 email: 
 executables: