td 0.10.77 → 0.10.78

data/ChangeLog

@@ -1,3 +1,12 @@
+== 2013-05-27 version 0.10.78
+
+* Add -q(--query) option to sched:create command
+* Add -x option to job:show, exlude result from automatically being downloaded
+* Update parallel gem dependency to 0.6.1 or later
+* user:add now requires email and password
+* td-client v0.8.50
+
+
 == 2013-05-06 version 0.10.77
 
 * Fix 'invalid byte sequence in UTF-8' at job result writing to CSV

data/lib/td/command/job.rb

@@ -87,6 +87,7 @@ module Command
     output = nil
     format = 'tsv'
     render_opts = {}
+    exclude = false
 
     op.on('-v', '--verbose', 'show logs', TrueClass) {|b|
       verbose = b
@@ -106,6 +107,9 @@ module Command
       end
       format = s
     }
+    op.on('-x', '--exclude', 'do not automatically retrieve the job result', TrueClass) {|b|
+      exclude = b
+    }
 
     job_id = op.cmd_parse
 
@@ -126,13 +130,13 @@ module Command
 
     if wait && !job.finished?
       wait_job(job)
-      if job.success? && [:hive, :pig].include?(job.type)
+      if job.success? && [:hive, :pig].include?(job.type) && !exclude
         puts "Result       :"
         show_result(job, output, format, render_opts)
       end
 
     else
-      if job.success? && [:hive, :pig].include?(job.type)
+      if job.success? && [:hive, :pig].include?(job.type) && !exclude
         puts "Result       :"
         show_result(job, output, format, render_opts)
       end

data/lib/td/command/list.rb

@@ -259,7 +259,8 @@ module List
   add_list 'schema:remove', %w[db table columns_], 'Remove columns from a table', 'schema:remove example_db table1 user size'
 
   add_list 'sched:list', %w[], 'Show list of schedules', 'sched:list', 'scheds'
-  add_list 'sched:create', %w[name cron sql], 'Create a schedule', 'sched:create sched1 "0 * * * *" -d example_db "select count(*) from table1" -r rset1'
+  add_list 'sched:create', %w[name cron sql?], 'Create a schedule', 'sched:create sched1 "0 * * * *" -d example_db "select count(*) from table1" -r rset1',
+                                                                    'sched:create sched1 "0 * * * *" -d example_db -q query.txt -r rset2'
   add_list 'sched:delete', %w[name], 'Delete a schedule', 'sched:delete sched1'
   add_list 'sched:update', %w[name], 'Modify a schedule', 'sched:update sched1 -s "0 */2 * * *" -d my_db -t "Asia/Tokyo" -D 3600'
   add_list 'sched:history', %w[name max?], 'Show history of scheduled queries', 'sched sched1 --page 1'

data/lib/td/command/sched.rb

@@ -33,6 +33,7 @@ module Command
     result_user = nil
     result_ask_password = false
     priority = nil
+    query = nil
     retry_limit = nil
     type = nil
 
@@ -63,6 +64,9 @@ module Command
         raise "unknown priority #{s.inspect} should be -2 (very-low), -1 (low), 0 (normal), 1 (high) or 2 (very-high)"
       end
     }
+    op.on('-q', '--query PATH', 'use file instead of inline query') {|s|
+      query = File.open(s) { |f| f.read.strip }
+    }
     op.on('-R', '--retry COUNT', 'automatic retrying count', Integer) {|i|
       retry_limit = i
     }
@@ -77,6 +81,17 @@ module Command
       exit 1
     end
 
+    if sql == '-'
+      sql = STDIN.read
+    elsif sql.nil?
+      sql = query
+    end
+
+    unless sql
+      $stderr.puts "<sql> argument or -q,--query PATH option is required."
+      exit 1
+    end
+
     if result_url
       require 'td/command/result'
       result_url = build_result_url(result_url, result_user, result_ask_password)

data/lib/td/command/user.rb

@@ -135,11 +135,9 @@ module Command
 
     ok = false
     begin
-      client.add_user(name, org)
+      client.add_user(name, org, email, password)
 
       begin
-        client.change_email(name, email)
-        client.change_password(name, password)
         client.add_apikey(name)
         ok = true
 

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.10.77'
+VERSION = '0.10.78'
 
 end

data/td.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency "msgpack", "~> 0.4.4"
   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.49"
+  gem.add_dependency "parallel", "~> 0.6.1"
+  gem.add_dependency "td-client", "~> 0.8.50"
   gem.add_dependency "td-logger", "~> 0.3.16"
   gem.add_dependency "rubyzip", "~> 0.9.9"
   gem.add_development_dependency "rake", "~> 0.9"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.77
+  version: 0.10.78
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.19
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.19
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: td-client
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.49
+        version: 0.8.50
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.49
+        version: 0.8.50
 - !ruby/object:Gem::Dependency
   name: td-logger
   requirement: !ruby/object:Gem::Requirement
@@ -262,7 +262,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1119082453187569045
+      hash: 2134623419874142893
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1119082453187569045
+      hash: 2134623419874142893
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23