td 0.10.91 → 0.10.92

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 54ab5db5f823601ee978f163a00352c436d0636a
+  data.tar.gz: b3c3d90f2a273a47d97b904b96a5ba28a2c8ec1d
+SHA512:
+  metadata.gz: ac9469809cba499a0d9148694bba56a8c732510716885e1d0c63db39e0fe32afdd8c01a001c945ac33e7e4af1701a8c424b54c28b093af4906241634eef28713
+  data.tar.gz: 48d57829a410364a275be6863970293281aa28646be116eb98c425e6b2bc67329d06b5b2bf2a911ccc02a862dcccb7c679d51e05ec39d9b5088939daa598921c

data/.gitignore

@@ -1,5 +1,5 @@
 .bundle
-build/td-bulk-import-java
+build/td-import-java
 Gemfile.lock
 vendor/*
 *~

data/ChangeLog

@@ -1,3 +1,12 @@
+== 2013-11-05 version 0.10.92
+
+* Improves import commands. It can parse string values of 'HH:mm:ss' time format automatically without specifying '%T' and transfer into long unix timestamp.
+* Improves import commands. It can parse string values of 'yyyy/MM/dd HH:mm:ss' time format automatically without specifying 'time-format' and transfer into long unix timestamp.
+* Improves import commands. It can parse string values of 'yyyy/MM/dd HH:mm:ss Z' time format automatically without specifying 'time-format' and transfer into long unix timestamp.
+* Adds 'regex' to source file format option of import:prepare command.
+* Fix import:upload command. NullPointerException often occurrs when data files are uploaded.
+
+
 == 2013-10-04 version 0.10.91
 
 * Fix import command doesn't work on Windows

data/Rakefile

@@ -15,7 +15,7 @@ def version
 end
 
 task "jar" do
-  system('./build/update-td-bulk-import-java.sh')
+  system('./build/update-td-import-java.sh')
 end
 
 def project_root_path(path)

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

@@ -0,0 +1,44 @@
+#!/bin/bash
+cd "$(dirname $0)"
+chrev="$1"
+
+if [ -d td-import-java/.git ];then
+    rm -rf td-import-java/*
+    cd td-import-java
+    git checkout . || exit 1
+    git pull || exit 1
+else
+    rm -rf td-import-java/
+    git clone git@github.com:treasure-data/td-import-java.git td-import-java || exit 1
+    cd td-import-java
+fi
+git checkout master
+
+if [ -n "$chrev" ];then
+    git checkout $chrev
+fi
+
+revname="$(git show --pretty=format:'%H %ad' | head -n 1)"
+vername="0.3.1-SNAPSHOT"
+
+mvn package -Dmaven.test.skip=true || exit 1
+echo "copy td-import-${vername}.jar"
+cp target/td-import-${vername}.jar ../../java/td-import.jar
+echo "copy logging.properties"
+cp src/test/resources/java/logging.properties ../../java/logging.properties
+echo "create VERSION file"
+echo "${vername}" > VERSION
+mv VERSION ../../java/VERSION
+
+if [ -n "$chrev" ];then
+    git checkout master
+fi
+
+cd ../../
+
+echo "$revname" > java/td-import-java.version
+
+echo ""
+echo "git commit ./java -m \"updated td-import-java $revname\""
+git commit ./java/td-import.jar ./java/td-import-java.version -m "updated td-import-java $revname" || exit 1
+

data/java/VERSION

@@ -1 +1 @@
-0.2.4-SNAPSHOT
+0.3.1-SNAPSHOT

data/java/td-import-java.version

@@ -0,0 +1 @@
+d8f0fb80d14729cc8881a7e1aa074a51fdc34407 Tue Nov 5 14:08:52 2013 +0900

data/lib/td/command/common.rb

@@ -25,6 +25,10 @@ module Command
       raise ConfigError, "Account is not configured."
     end
     opts[:user_agent] = "TD: #{TreasureData::VERSION}"
+    if h = ENV['TD_API_HEADERS']
+      pairs = h.split("\n")
+      opts[:headers] = Hash[pairs.map {|pair| pair.split('=', 2) }]
+    end
     Client.new(apikey, opts)
   end
 

data/lib/td/command/import.rb

@@ -5,7 +5,7 @@ module Command
   BASE_PATH = File.expand_path('../../..', File.dirname(__FILE__))
 
   JAVA_COMMAND = "java"
-  JAVA_MAIN_CLASS = "com.treasure_data.bulk_import.BulkImportMain"
+  JAVA_MAIN_CLASS = "com.treasure_data.td_import.BulkImportCommand"
   JVM_OPTS = ["-Xmx1024m"] # TODO
 
   def import_list(op)
@@ -25,7 +25,7 @@ module Command
 
   def import_java_version(op)
     vfile = find_version_file[0]
-    puts "td-bulk-import-java #{File.open(vfile, 'r').read}"
+    puts "td-import-java #{File.open(vfile, 'r').read}"
   end
 
   def import_prepare(op)
@@ -81,7 +81,7 @@ module Command
     # configure java command-line arguments
     java_args = []
     java_args.concat build_sysprops
-    java_args.concat ["-cp", find_td_bulk_import_jar]
+    java_args.concat ["-cp", find_td_import_jar]
     java_args << JAVA_MAIN_CLASS
     java_args << subcmd
     if show_help
@@ -112,11 +112,11 @@ module Command
   end
 
   private
-  def find_td_bulk_import_jar
+  def find_td_import_jar
     libjars = Dir.glob("#{BASE_PATH}/java/**/*.jar")
-    found = libjars.find { |path| File.basename(path) =~ /^td-bulk-import/ }
+    found = libjars.find { |path| File.basename(path) =~ /^td-import/ }
     if found.nil?
-      $stderr.puts "td-bulk-import.jar is not found."
+      $stderr.puts "td-import.jar is not found."
       exit 1
     end
     found

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.10.91'
+VERSION = '0.10.92'
 
 end

metadata

@@ -1,34 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.91
-  prerelease: 
+  version: 0.10.92
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-11-05 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
@@ -214,7 +193,7 @@ files:
 - README.rdoc
 - Rakefile
 - bin/td
-- build/update-td-bulk-import-java.sh
+- build/update-td-import-java.sh
 - contrib/completion/_td
 - contrib/completion/td-comletion.bash
 - data/sample_apache.json
@@ -232,8 +211,8 @@ files:
 - dist/resources/pkg/td
 - java/VERSION
 - java/logging.properties
-- java/td-bulk-import-java.version
-- java/td-bulk-import.jar
+- java/td-import-java.version
+- java/td-import.jar
 - lib/td.rb
 - lib/td/command/account.rb
 - lib/td/command/acl.rb
@@ -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: 3403017301161628743
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3403017301161628743
 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

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

@@ -1,44 +0,0 @@
-#!/bin/bash
-cd "$(dirname $0)"
-chrev="$1"
-
-if [ -d td-bulk-import-java/.git ];then
-    rm -rf td-bulk-import-java/*
-    cd td-bulk-import-java
-    git checkout . || exit 1
-    git pull || exit 1
-else
-    rm -rf td-bulk-import-java/
-    git clone git@github.com:treasure-data/td-bulk-import-java.git td-bulk-import-java || exit 1
-    cd td-bulk-import-java
-fi
-git checkout master
-
-if [ -n "$chrev" ];then
-    git checkout $chrev
-fi
-
-revname="$(git show --pretty=format:'%H %ad' | head -n 1)"
-vername="0.2.4-SNAPSHOT"
-
-mvn package -Dmaven.test.skip=true || exit 1
-echo "copy td-bulk-import-${vername}.jar"
-cp target/td-bulk-import-${vername}.jar ../../java/td-bulk-import.jar
-echo "copy logging.properties"
-cp src/test/resources/java/logging.properties ../../java/logging.properties
-echo "create VERSION file"
-echo "${vername}" > VERSION
-mv VERSION ../../java/VERSION
-
-if [ -n "$chrev" ];then
-    git checkout master
-fi
-
-cd ../../
-
-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.jar ./java/td-bulk-import-java.version -m "updated td-bulk-import-java $revname" || exit 1
-

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

@@ -1 +0,0 @@
-2252f77e1a64c6a2b34e7be2ed3302665604c433 Thu Sep 26 12:15:16 2013 +0900