td 0.11.11.2 → 0.11.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26f5b97452d9c2b2e182f523297732a43926bd12
-  data.tar.gz: 71b25c10c907cfb9e8d756d4d6f0f96946f117f3
+  metadata.gz: 36266b9c823ecc10de37fafc29ed07458a50a728
+  data.tar.gz: 92ec61eb2983e7b284565252729aaedadf1483f9
 SHA512:
-  metadata.gz: 3c01cc454f6bc85c5b681de45ba8d044b4357c483df4456cc7addfb34150d88cf9f751b539966929320fba405060e67b7d2010cfd2a72c25d1a0016d17acfc58
-  data.tar.gz: 3c6db98c68e5ec4bd46723709798e4f5936936f3eccfd18a72c85c49fbc6cdc085c17baa2870d578aa29cff9b2efb1ac0cb69771e69b697fb50f2109254a931d
+  metadata.gz: 545c05fd90e3577b175d732742182fca1bdd02dd9bf58666213006e89c0033e6ded3410cd610cc4f503b67db1f6e0f630d75249f33cd4f1ab56c326f0106b380
+  data.tar.gz: 92ff25f768e6a82dceb87fddb41e395624a2de9b0e8bd64160b584f709cf28bfaaa7790f8cd5bfc3fe2de7169cf3d7305d99024eaafc2afec7a2735d51eb70ae

data/ChangeLog

@@ -1,4 +1,13 @@
-== 2015-07-16 version 0.11.11.1
+== 2015-07-27 version 0.11.12
+
+* query command support msgpack.gz format save
+* fix `--format msgpack.gz` save gz format.
+  If you want the operation up to this, please use `--format msgpack`.
+* update td-client version.
+  This update is required in order to be able to save in gz format.
+  And, include update httpclient dependency version.
+
+== 2015-07-23 version 0.11.11.2
 
 * downgrade bundle ruby version for windows(2.2.2 -> 1.9.3).
 * downgrade dependency td-client version (0.8.71 -> 0.8.70).

data/lib/td/command/job.rb

@@ -415,7 +415,7 @@ private
         indicator = Command::SizeBasedDownloadProgressIndicator.new(
           "NOTE: the job result is being written to #{output} in msgpack.gz format",
           job.result_size, 0.1, 1)
-        job.result_format('msgpack.gz', f) {|compr_size|
+        job.result_raw('msgpack.gz', f) {|compr_size|
           indicator.update(compr_size)
         }
         indicator.finish

data/lib/td/command/options.rb

@@ -28,12 +28,6 @@ module Options
       opts[:output] = s
       opts[:format] ||= 'tsv'
     }
-    op.on('-f', '--format FORMAT', 'format of the result to write to the file (tsv, csv, json, msgpack, and msgpack.gz)') {|s|
-      unless ['tsv', 'csv', 'json', 'msgpack', 'msgpack.gz'].include?(s)
-        raise "Unknown format #{s.dump}. Supported formats are: tsv, csv, json, msgpack, and msgpack.gz"
-      end
-      opts[:format] = s
-    }
     op.on('-l', '--limit ROWS', 'limit the number of result rows shown when not outputting to file') {|s|
       unless s.to_i > 0
         raise "Invalid limit number. Must be a positive integer"
@@ -52,10 +46,22 @@ module Options
       opts[:render_opts][:null_expr] = s.to_s
     }
 
+    write_format_option(op) {|s| opts[:format] = s }
+
     # CAUTION: this opts is filled by op.cmd_parse
     opts
   end
 
+  def write_format_option(op)
+    op.on('-f', '--format FORMAT', 'format of the result to write to the file (tsv, csv, json, msgpack, and msgpack.gz)') {|s|
+      unless ['tsv', 'csv', 'json', 'msgpack', 'msgpack.gz'].include?(s)
+        raise "Unknown format #{s.dump}. Supported formats are: tsv, csv, json, msgpack, and msgpack.gz"
+      end
+
+      yield(s)
+    }
+  end
+  module_function :write_format_option
 end # module Options
 end # module Command
 end # module TreasureData

data/lib/td/command/query.rb

@@ -1,3 +1,5 @@
+require 'td/command/options'
+
 module TreasureData
 module Command
 
@@ -34,12 +36,9 @@ module Command
       output = s
       format = 'tsv' if format.nil?
     }
-    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"
-      end
-      format = s
-    }
+
+    TreasureData::Command::Options.write_format_option(op) {|s| format = s }
+
     op.on('-r', '--result RESULT_URL', 'write result to the URL (see also result:create subcommand)',
                                        ' It is suggested for this option to be used with the -x / --exclude option to suppress printing',
                                        ' of the query result to stdout or -o / --output to dump the query result into a file.') {|s|

data/lib/td/version.rb

@@ -1,3 +1,3 @@
 module TreasureData
-  TOOLBELT_VERSION = '0.11.11.2'
+  TOOLBELT_VERSION = '0.11.12'
 end

data/spec/td/command/job_spec.rb

@@ -22,7 +22,6 @@ module TreasureData::Command
           @result_size = 3
           @status = 'success'
         end
-        job.stub(:result_format) # for msgpack, msgpack.gz
         job
       end
 
@@ -73,6 +72,10 @@ module TreasureData::Command
         context "format: msgpack" do
           let(:format) { "msgpack" }
 
+          before do
+            job.stub(:result_format) # for msgpack
+          end
+
           it do
             FileUtils.should_receive(:mv).with(tempfile, file.path)
             subject
@@ -86,6 +89,10 @@ module TreasureData::Command
         context "format: msgpack.gz" do
           let(:format) { "msgpack.gz" }
 
+          before do
+            job.stub(:result_raw)    # for msgpack.gz
+          end
+
           it do
             FileUtils.should_receive(:mv).with(tempfile, file.path)
             subject

data/td.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "yajl-ruby", "~> 1.1"
   gem.add_dependency "hirb", ">= 0.4.5"
   gem.add_dependency "parallel", "~> 0.6.1"
-  gem.add_dependency "td-client", "~> 0.8.70"
+  gem.add_dependency "td-client", "~> 0.8.72"
   gem.add_dependency "td-logger", "~> 0.3.21"
   gem.add_dependency "rubyzip", "~> 1.1.7"
   gem.add_dependency "zip-zip", "~> 0.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.11.11.2
+  version: 0.11.12
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -102,14 +102,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.70
+        version: 0.8.72
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.70
+        version: 0.8.72
 - !ruby/object:Gem::Dependency
   name: td-logger
   requirement: !ruby/object:Gem::Requirement
@@ -330,3 +330,4 @@ test_files:
 - spec/td/helpers_spec.rb
 - spec/td/updater_spec.rb
 - spec/td/version_spec.rb
+has_rdoc: false