td 0.10.56 → 0.10.57

data/ChangeLog

@@ -1,4 +1,10 @@
 
+== 2012-10-30 version 0.10.57
+
+* job:show and query subcommands support --format 'msgpack.gz' option
+* query subcommand reads SQL from STDIN if the first argument is '-'
+
+
 == 2012-10-11 version 0.10.56
 
 * Updated td-client v0.8.33 which supports deflate and gzip compressed data

data/README.rdoc

@@ -33,7 +33,10 @@ You need to authorize the account, before executing any other commands.
 
 == Mac OS X
 
-    $ gem install bundler
+Disable RVM and enable system ruby (/usr/bin/ruby) first.
+And then run following commands:
+
+    $ sudo gem install bundler
     $ rake pkg:build
 
 == Windows

data/Rakefile

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
@@ -24,16 +25,15 @@ def install_use_gems(target_dir)
     puts "**"
     puts "** WARNING"
     puts "**"
-    puts "** GEM_HOME is already set. Created package may be broken."
+    puts "** GEM_HOME is already set. Created package might be broken."
     puts "** RVM surely breaks the package. Use rbenv instead."
     puts "**"
   end
-  env = {
-    'GEM_HOME' => target_dir,
-    'GEM_PATH' => '',
-  }
+  # system(env, cmd) doesn't work with ruby 1.8
+  ENV['GEM_HOME'] = target_dir
+  ENV['GEM_PATH'] = ''
   USE_GEMS.each {|gem|
-    system env, "gem install '#{gem}' --no-rdoc --no-ri"
+    system "gem install '#{gem}' --no-rdoc --no-ri"
   }
 end
 
@@ -52,7 +52,10 @@ def install_erb_resource(resource_name, target_path, mode, variables)
   erb_raw = File.read resource_path(resource_name)
 
   ctx = Object.new
-  variables.each_pair {|k,v| ctx.define_singleton_method(k) { v } }
+  variables.each_pair {|k,v|
+    # ctx.define_singleton_method(k) { v } doesn't work with ruby 1.8
+    (class<<ctx;self;end).send(:define_method, k) { v }
+  }
   data = ERB.new(erb_raw).result(ctx.instance_eval("binding"))
 
   File.open(target_path, "w") do |f|

data/lib/td/command/job.rb

@@ -91,8 +91,8 @@ module Command
       output = s
     }
     op.on('-f', '--format FORMAT', 'format of the result to write to the file (tsv, csv, json or msgpack)') {|s|
-      unless ['tsv', 'csv', 'json', 'msgpack'].include?(s)
-        raise "Unknown format #{s.dump}. Supported format: tsv, csv, json, msgpack"
+      unless ['tsv', 'csv', 'json', 'msgpack', 'msgpack.gz'].include?(s)
+        raise "Unknown format #{s.dump}. Supported format: tsv, csv, json, msgpack, msgpack.gz"
       end
       format = s
     }
@@ -223,6 +223,11 @@ module Command
         job.result_format('msgpack', f)
       }
 
+    when 'msgpack.gz'
+      File.open(output, "wb") {|f|
+        job.result_format('msgpack.gz', f)
+      }
+
     when 'csv'
       require 'json'
       require 'csv'

data/lib/td/command/query.rb

@@ -54,6 +54,10 @@ module Command
       exit 1
     end
 
+    if sql == '-'
+      sql = STDIN.read
+    end
+
     if result_url
       require 'td/command/result'
       result_url = build_result_url(result_url, result_user, result_ask_password)

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.10.56'
+VERSION = '0.10.57'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.56
+  version: 0.10.57
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack