td 0.10.88 → 0.10.89

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 859dbebbeac28faff62bccd70bfcdf7b801938a4
+  data.tar.gz: 93d6608077e158f2c1c045a1c1b4c1ad0c700b11
+SHA512:
+  metadata.gz: 648b54aa7f4c6a972af1bcd2973d05b43ce741f139b1ec23b6b77653c0b3c862bde7184a65ee9e8eaa15e44965abd3eed27a246fb39c5085bd8f0287ae7bab80
+  data.tar.gz: 4b1a51013e2e0db30aedf7e9b0859d729ba9999c35c50bbd5d8a604908c7f949398ce6b175231edc7b2436b5fb7b796c4b54c6b138794c70af1b821f9a97628e

data/ChangeLog

@@ -1,3 +1,9 @@
+== 2013-09-25 version 0.10.89
+
+* Update td-bulk-import.jar to 0.2.5
+* import command now support nested json format,
+
+
 == 2013-09-13 version 0.10.88
 
 * Update td-client-ruby to 0.8.55

data/build/update-td-bulk-import-java.sh

@@ -40,5 +40,5 @@ echo "$revname" > java/td-bulk-import-java.version
 
 echo ""
 echo "git commit ./java -m \"updated td-bulk-import-java $revname\""
-git commit ./java/td-bulk-import-${vername}.jar ./java/td-bulk-import-java.version -m "updated td-bulk-import-java $revname" || exit 1
+git commit ./java/td-bulk-import.jar ./java/td-bulk-import-java.version -m "updated td-bulk-import-java $revname" || exit 1
 

data/java/td-bulk-import-java.version

@@ -1 +1 @@
-7946ca2a469530c5fcadad412f6de21e495d0fbb Fri Sep 13 18:36:18 2013 +0900
+2c1688a7ea6c9185ac593832122c1b851c91ce63 Tue Sep 24 19:52:22 2013 +0900

data/lib/td/command/import.rb

@@ -5,9 +5,9 @@ module Command
   BASE_PATH = File.expand_path('../../..', File.dirname(__FILE__))
 
   JAVA_COMMAND = "java"
-  JAVA_COMMAND_CHECK = "#{JAVA_COMMAND} -version"
+  JAVA_COMMAND_CHECK = "#{JAVA_COMMAND} -version >/dev/null 2>&1"
   JAVA_MAIN_CLASS = "com.treasure_data.bulk_import.BulkImportMain"
-  JAVA_HEAP_MAX_SIZE = "-Xmx1024m" # TODO
+  JVM_OPTS = ["-Xmx1024m"] # TODO
 
   def import_list(op)
     require 'td/command/bulk_import'
@@ -73,71 +73,52 @@ module Command
 
   private
   def import_by_java(subcmd)
-    # has java runtime
+    # check java runtime exists or not
     check_java
 
-    # show help
+    # show help?
     show_help = ARGV.size == 0 || (ARGV.size == 1 || ARGV[0] =~ /^import:/)
 
-    # configure jvm options
-    jvm_opts = [ JAVA_HEAP_MAX_SIZE ]
-
-    # configure java options
-    java_opts = [ "-cp \"#{find_td_bulk_import_jar()}\"" ]
-
-    # configure system properties
-    sysprops = set_sysprops()
-
     # configure java command-line arguments
     java_args = []
+    java_args.concat build_sysprops
+    java_args.concat ["-cp", find_td_bulk_import_jar]
     java_args << JAVA_MAIN_CLASS
     java_args << subcmd
     if show_help
       java_args << "--help"
     else
-      java_args << ARGV
+      java_args.concat ARGV
     end
 
-    # TODO consider parameters including spaces; don't use join(' ')
-    cmd = "#{JAVA_COMMAND} #{jvm_opts.join(' ')} #{java_opts.join(' ')} #{sysprops.join(' ')} #{java_args.join(' ')}"
-    exec cmd
+    cmd = [JAVA_COMMAND] + JVM_OPTS + java_args
+    system(*cmd)
   end
 
   private
   def check_java
-    pid = do_fork(JAVA_COMMAND_CHECK)
-    pid, stat = Process.waitpid2(pid)
+    system(JAVA_COMMAND_CHECK)
 
-    if stat.exitstatus != 0
-      $stderr.puts "Java is not installed. 'td import' command requires Java (version 1.6 or later). If Java is not installed yet, please use 'bulk_import' commands instead of this command."
+    unless $?.success?
+      $stderr.puts "Java is not installed. 'td import' command requires Java (version 1.6 or later)."
+      $stderr.puts "Alternatively, you can use 'bulk_import' commands instead which is much slower."
       exit 1
     end
   end
 
-  def do_fork(cmd)
-    Process.fork do
-      begin
-        Process.exec(*cmd)
-      ensure
-        exit! 127
-      end
-    end
-  end
-
   private
   def find_td_bulk_import_jar
     libjars = Dir.glob("#{BASE_PATH}/java/**/*.jar")
     found = libjars.find { |path| File.basename(path) =~ /^td-bulk-import/ }
     if found.nil?
       $stderr.puts "td-bulk-import.jar is not found."
-      exit
+      exit 1
     end
-    td_bulk_import_jar = libjars.delete(found)
-    td_bulk_import_jar
+    found
   end
 
   private
-  def set_sysprops
+  def build_sysprops
     sysprops = []
 
     # set apiserver
@@ -147,7 +128,7 @@ module Command
     set_sysprops_http_proxy(sysprops)
 
     # set configuration file for logging
-    conf_file = find_logging_conf_file
+    conf_file = try_find_logging_conf_file
     if conf_file
       sysprops << "-Djava.util.logging.config.file=#{conf_file}"
     end
@@ -208,12 +189,9 @@ module Command
   end
 
   private
-  def find_logging_conf_file
+  def try_find_logging_conf_file
     libjars = Dir.glob("#{BASE_PATH}/java/**/*.properties")
-    found = libjars.find { |path| File.basename(path) =~ /^logging.properties/ }
-    return nil if found.nil?
-    logging_conf_file = libjars.delete(found)
-    logging_conf_file
+    libjars.find { |path| File.basename(path) =~ /^logging.properties/ }
   end
 
   private

data/lib/td/command/list.rb

@@ -371,6 +371,9 @@ module List
   add_alias 'scheds', 'sched:list'
   add_alias 'schedules', 'sched:list'
 
+  add_alias 'import',           'import:show'
+  add_alias 'imports',          'import:list'
+
   add_alias 'bulk_import', 'bulk_import:show'
   add_alias 'bulk_imports', 'bulk_import:list'
 

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.10.88'
+VERSION = '0.10.89'
 
 end

metadata

@@ -1,34 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.88
-  prerelease: 
+  version: 0.10.89
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.1
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.2
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.3
     - - <
@@ -37,21 +35,20 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.1
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.2
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.3
     - - <
@@ -60,7 +57,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -68,7 +64,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,23 +71,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hirb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -100,7 +92,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -108,7 +99,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: td-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -116,7 +106,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -124,7 +113,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: td-logger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -132,7 +120,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -140,7 +127,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -148,7 +134,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -156,7 +141,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -164,7 +148,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -172,7 +155,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -180,7 +162,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -188,7 +169,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -196,7 +176,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -282,33 +261,26 @@ files:
 - td.gemspec
 homepage: http://treasure-data.com/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3857310954122118624
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3857310954122118624
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing
 test_files:
 - spec/file_reader/filter_spec.rb