td 0.11.8.1 → 0.11.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3acbc09262773106c3a2635cf158f204d130b645
-  data.tar.gz: 7827d370f2da079c98f41e88956c9714303dece5
+  metadata.gz: 3254397bd4682922aecaf0d08242c2219e16f76e
+  data.tar.gz: ac9686878f407ad6c950a9907f85b695ffadef04
 SHA512:
-  metadata.gz: 26334fe3feb928becaeff73400504d27e8c92b7655b3a04c0eed21a054620ca8cf0a3cacf422242dab8f1c85395d9a9e503f1bfb764aed28e2699ce192609b95
-  data.tar.gz: 8801b5016d6eb543c5c5382b9bb6ea5076674619a72f85f7a1c1871412f73483b75d0b3b1e79e1c7af817505acbf1fe561e2cc519d068d0474c85d1bb04400f8
+  metadata.gz: 881fdc4e2dcdc2a72c545ff7520e88ed507a348932e58996058d865b9e070d59efbbf93ee7d13fe97ffe0f0af65a1047ae5644c1ed0ef8371f3ba2d7c44ab5f9
+  data.tar.gz: ee2a8080e1b490981a23dd2ce50314817c2abf1552cd8f09acf3d798485a5b8c872379eff7bda7edd3c84f126b7c410ad9df5fec063aa073230a3df46c9b7916

data/ChangeLog

@@ -1,3 +1,7 @@
+== 2015-03-24 version 0.11.8.2
+
+* Experimental: table:export with tsv.gz option.
+
 == 2015-03-19 version 0.11.8.1
 
 * Fix: exclude dist directory from gem package.

data/lib/td/command/export.rb

@@ -1,16 +1,21 @@
 
 module TreasureData
 module Command
-  SUPPORTED_FORMATS = %W[json.gz line-json.gz]
+  SUPPORTED_FORMATS = %W[json.gz line-json.gz tsv.gz]
 
   def table_export(op)
     from = nil
     to = nil
     s3_bucket = nil
+    wait = false
     aws_access_key_id = nil
     aws_secret_access_key = nil
+    file_prefix = nil
     file_format = "json.gz" # default
 
+    op.on('-w', '--wait', 'wait until the job is completed', TrueClass) {|b|
+      wait = b
+    }
     op.on('-f', '--from TIME', 'export data which is newer than or same with the TIME') {|s|
       from = export_parse_time(s)
     }
@@ -20,6 +25,9 @@ module Command
     op.on('-b', '--s3-bucket NAME', 'name of the destination S3 bucket (required)') {|s|
       s3_bucket = s
     }
+    op.on('-p', '--prefix PATH', 'path prefix of the file on S3') {|s|
+      file_prefix = s
+    }
     op.on('-k', '--aws-key-id KEY_ID', 'AWS access key id to export data (required)') {|s|
       aws_access_key_id = s
     }
@@ -57,6 +65,7 @@ module Command
     s3_opts = {}
     s3_opts['from'] = from.to_s if from
     s3_opts['to'] = to.to_s if to
+    s3_opts['file_prefix'] = file_prefix if file_prefix
     s3_opts['file_format'] = file_format
     s3_opts['bucket'] = s3_bucket
     s3_opts['access_key_id'] = aws_access_key_id
@@ -66,6 +75,11 @@ module Command
 
     $stderr.puts "Export job #{job.job_id} is queued."
     $stderr.puts "Use '#{$prog} " + Config.cl_options_string + "job:show #{job.job_id}' to show the status."
+
+    if wait && !job.finished?
+      wait_job(job)
+      puts "Status     : #{job.status}"
+    end
   end
 
   private

data/lib/td/command/table.rb

@@ -286,64 +286,6 @@ module Command
     end
   end
 
-  def table_export(op)
-    from = nil
-    to = nil
-    s3_bucket = nil
-    wait = false
-
-    ## TODO
-    #op.on('-t', '--to TIME', 'end time of logs to get') {|s|
-    #  if s.to_i.to_s == s
-    #    to = s
-    #  else
-    #    require 'time'
-    #    to = Time.parse(s).to_i
-    #  end
-    #}
-    #op.on('-f', '--from TIME', 'start time of logs to get') {|s|
-    #  if s.to_i.to_s == s
-    #    from = s
-    #  else
-    #    require 'time'
-    #    from = Time.parse(s).to_i
-    #  end
-    #}
-    op.on('-w', '--wait', 'wait until the job is completed', TrueClass) {|b|
-      wait = b
-    }
-    op.on('--s3-bucket NAME', 'name of the s3 bucket to output') {|s|
-      s3_bucket = s
-    }
-
-    db_name, table_name = op.cmd_parse
-
-    unless s3_bucket
-      $stderr.puts "--s3-bucket NAME option is required"
-      exit 1
-    end
-
-    client = get_client
-
-    table = get_table(client, db_name, table_name)
-
-    opts = {}
-    opts['s3_bucket'] = s3_bucket
-    opts['s3_file_format'] ='json.gz'
-    opts['from'] = from.to_s if from
-    opts['to']   = to.to_s if to
-
-    job = table.export('s3', opts)
-
-    $stderr.puts "Export job #{job.job_id} is queued."
-    $stderr.puts "Use '#{$prog} " + Config.cl_options_string + "job:show #{job.job_id}' to show the status."
-
-    if wait && !job.finished?
-      wait_job(job)
-      puts "Status     : #{job.status}"
-    end
-  end
-
   def table_partial_delete(op)
     from = nil
     to = nil

data/lib/td/version.rb

@@ -1,3 +1,3 @@
 module TreasureData
-  TOOLBELT_VERSION = '0.11.8.1'
+  TOOLBELT_VERSION = '0.11.8.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.11.8.1
+  version: 0.11.8.2
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack