td 0.10.37 → 0.10.38

data/ChangeLog

@@ -1,4 +1,9 @@
 
+== 2012-08-06 version 0.10.38
+
+* *:list and *:show: subcommands show organization name if it's set
+
+
 == 2012-08-06 version 0.10.37
 
 * Added access control

data/lib/td/command/bulk_import.rb

@@ -10,11 +10,13 @@ module Command
     bis = client.bulk_imports
 
     rows = []
+    has_org = false
     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, :Organization=>bi.org_name}
+      has_org = true if bi.org_name
     }
 
-    puts cmd_render_table(rows, :fields => [:Name, :Table, :Status, :Frozen, :JobID, :"Valid Parts", :"Error Parts", :"Valid Records", :"Error Records"], :max_width=>200)
+    puts cmd_render_table(rows, :fields => (has_org ? [:Organization] : [])+[: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."
@@ -63,6 +65,7 @@ module Command
       exit 1
     end
 
+    $stderr.puts "Organization : #{bi.org_name}"
     $stderr.puts "Name         : #{bi.name}"
     $stderr.puts "Database     : #{bi.database}"
     $stderr.puts "Table        : #{bi.table}"

data/lib/td/command/db.rb

@@ -30,10 +30,12 @@ module Command
     dbs = client.databases
 
     rows = []
+    has_org = false
     dbs.each {|db|
-      rows << {:Name=>db.name, :Count=>db.count}
+      rows << {:Name=>db.name, :Count=>db.count, :Organization=>db.org_name}
+      has_org = true if db.org_name
     }
-    puts cmd_render_table(rows, :fields => [:Name, :Count])
+    puts cmd_render_table(rows, :fields => (has_org ? [:Organization] : [])+[:Name, :Count])
 
     if dbs.empty?
       $stderr.puts "There are no databases."

data/lib/td/command/job.rb

@@ -59,14 +59,16 @@ module Command
     jobs = client.jobs(skip, skip+max-1, status)
 
     rows = []
+    has_org = false
     jobs.each {|job|
       start = job.start_at
       elapsed = cmd_format_elapsed(start, job.end_at)
       priority = job_priority_name_of(job.priority)
-      rows << {:JobID => job.job_id, :Status => job.status, :Type => job.type, :Query => job.query.to_s, :Start => (start ? start.localtime : ''), :Elapsed => elapsed, :Priority => priority, :Result => job.result_url}
+      rows << {:JobID => job.job_id, :Status => job.status, :Type => job.type, :Query => job.query.to_s, :Start => (start ? start.localtime : ''), :Elapsed => elapsed, :Priority => priority, :Result => job.result_url, :Organization => job.org_name}
+      has_org = true if job.org_name
     }
 
-    puts cmd_render_table(rows, :fields => [:JobID, :Status, :Start, :Elapsed, :Priority, :Result, :Type, :Query])
+    puts cmd_render_table(rows, :fields => (has_org ? [:Organization] : [])+[:JobID, :Status, :Start, :Elapsed, :Priority, :Result, :Type, :Query])
   end
 
   def job_show(op)
@@ -97,6 +99,7 @@ module Command
 
     job = client.job(job_id)
 
+    puts "Organization : #{job.org_name}"
     puts "JobID        : #{job.job_id}"
     #puts "URL          : #{job.url}"
     puts "Status       : #{job.status}"

data/lib/td/command/result.rb

@@ -16,6 +16,7 @@ module Command
       exit 1
     end
 
+    puts "Organization : #{r.org_name}"
     puts "Name         : #{r.name}"
     puts "URL          : #{r.url}"
   end
@@ -28,14 +29,16 @@ module Command
     rs = client.results
 
     rows = []
+    has_org = false
     rs.each {|r|
-      rows << {:Name => r.name, :URL => r.url}
+      rows << {:Name => r.name, :URL => r.url, :Organization => r.org_name}
+      has_org = true if r.org_name
     }
     rows = rows.sort_by {|map|
       map[:Name]
     }
 
-    puts cmd_render_table(rows, :fields => [:Name, :URL])
+    puts cmd_render_table(rows, :fields => (has_org ? [:Organization] : [])+[:Name, :URL])
 
     if rs.empty?
       $stderr.puts "There are no result URLs."

data/lib/td/command/role.rb

@@ -15,8 +15,8 @@ module Command
       exit 1
     end
 
-    $stderr.puts "Name         : #{role.name}"
     $stderr.puts "Organization : #{role.org_name}"
+    $stderr.puts "Name         : #{role.name}"
     $stderr.puts "Users        : #{role.user_names.join(', ')}"
   end
 

data/lib/td/command/sched.rb

@@ -12,14 +12,16 @@ module Command
     scheds = client.schedules
 
     rows = []
+    has_org = false
     scheds.each {|sched|
-      rows << {:Name => sched.name, :Cron => sched.cron, :Timezone => sched.timezone, :Delay => sched.delay, :Priority => job_priority_name_of(sched.priority), :Result => sched.result_url, :Database => sched.database, :Query => sched.query, :"Next schedule" => sched.next_time ? sched.next_time.localtime : nil }
+      rows << {:Name => sched.name, :Cron => sched.cron, :Timezone => sched.timezone, :Delay => sched.delay, :Priority => job_priority_name_of(sched.priority), :Result => sched.result_url, :Database => sched.database, :Query => sched.query, :"Next schedule" => sched.next_time ? sched.next_time.localtime : nil, :Organization => sched.org_name }
+      has_org = true if sched.org_name
     }
     rows = rows.sort_by {|map|
       map[:Name]
     }
 
-    puts cmd_render_table(rows, :fields => [:Name, :Cron, :Timezone, :"Next schedule", :Delay, :Priority, :Result, :Database, :Query], :max_width=>500)
+    puts cmd_render_table(rows, :fields => (has_org ? [:Organization] : [])+[:Name, :Cron, :Timezone, :"Next schedule", :Delay, :Priority, :Result, :Database, :Query], :max_width=>500)
   end
 
   def sched_create(op)
@@ -199,6 +201,7 @@ module Command
 
     scheds = client.schedules
     if s = scheds.find {|s| s.name == name }
+      puts "Organization : #{s.org_name}"
       puts "Name         : #{s.name}"
       puts "Cron         : #{s.cron}"
       puts "Timezone     : #{s.timezone}"

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.10.37'
+VERSION = '0.10.38'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.37
+  version: 0.10.38
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2012-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.21
+        version: 0.8.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.21
+        version: 0.8.22
 - !ruby/object:Gem::Dependency
   name: td-logger
   requirement: !ruby/object:Gem::Requirement