td 0.10.67 → 0.10.68

data/ChangeLog

@@ -1,4 +1,9 @@
 
+== 2013-01-22 version 0.10.68
+
+* Fixed cmdline argument handling problems of bulk_import:prepare_parts2 subcommand
+
+
 == 2013-01-18 version 0.10.67
 
 * Added bulk_import:prepare_parts2 subcommand which is faster and more reliable

data/README.rdoc

@@ -46,13 +46,15 @@ Install following binary packages:
   * MinGW with MSYS Basic System and using mingw-get-inst
   * Git for Windows, with Windows Command Prompt support
   * Ruby 1.9.2 using RubyInstaller for Windows, with PATH update
+  * Inno Setup 5
 
 Then run following commands on MinGW Shell:
 
     $ mingw-get install msys-vim
     $ mingw-get install msys-wget
     $ gem install bundler
-    $ bundle exec rake exe:build
+    $ bundle install  # don't use "--path" option
+    $ rake exe:build  # don't use "bundle exec"
 
 
 = Copyright

data/build/update-td.sh

@@ -21,7 +21,7 @@ fi
 revname="$(git show --pretty=format:'%H %ad' | head -n 1)"
 
 mvn package -Dmaven.test.skip=true || exit 1
-cp target/td-0.1.1-SNAPSHOT.jar ../../java/td-0.1.1-SNAPSHOT.jar
+cp target/td-0.1.1.jar ../../java/td-0.1.1.jar
 
 if [ -n "$chrev" ];then
     git checkout master
@@ -33,5 +33,5 @@ echo "$revname" > java/td_java.version
 
 echo ""
 echo "git commit ./java -m \"updated td-java $revname\""
-git commit ./java/td-0.1.1-SNAPSHOT.jar ./java/td_java.version -m "updated td-java $revname" || exit 1
+git commit ./java/td-0.1.1.jar ./java/td_java.version -m "updated td-java $revname" || exit 1
 

data/java/td_java.version

@@ -1 +1 @@
-a0bb26a737329cc3df9987c0f1a6ea7188d3b334 Fri Jan 18 15:03:20 2013 +0900
+19238aa12ef2b06cc07f4dc5cd008d35da1aa358 Tue Jan 22 21:46:12 2013 +0900

data/lib/td/command/bulk_import.rb

@@ -16,7 +16,7 @@ module Command
       has_org = true if bi.org_name
     }
 
-    puts cmd_render_table(rows, :fields => (has_org ? [:Organization] : [])+[:Name, :Table, :Status, :Frozen, :JobID, :"Valid Parts", :"Error Parts", :"Valid Records", :"Error Records"], :max_width=>200)
+    puts cmd_render_table(rows, :fields => gen_table_fields(has_org, [:Name, :Table, :Status, :Frozen, :JobID, :"Valid Parts", :"Error Parts", :"Valid Records", :"Error Records"]), :max_width=>200)
 
     if rows.empty?
       $stderr.puts "There are no bulk import sessions."
@@ -25,13 +25,21 @@ module Command
   end
 
   def bulk_import_create(op)
+    org = nil
+
+    op.on('-g', '--org ORGANIZATION', "create the database under this organization") {|s|
+      org = s
+    }
+
     name, db_name, table_name = op.cmd_parse
 
     client = get_client
 
     table = get_table(client, db_name, table_name)
 
-    client.create_bulk_import(name, db_name, table_name)
+    opts = {}
+    opts['organization'] = org if org
+    client.create_bulk_import(name, db_name, table_name, opts)
 
     $stderr.puts "Bulk import session '#{name}' is created."
   end
@@ -460,7 +468,7 @@ module Command
 
     # make application options
     app_opts = []
-    app_opts << "-cp .:#{td_command_jar}"
+    app_opts << "-cp \"#{td_command_jar}\""
 
     # make system properties
     sysprops = []
@@ -479,13 +487,10 @@ module Command
     app_args << 'prepare_parts'
     app_args << files
 
+    # TODO consider parameters including spaces; don't use join(' ')
     command = "#{javacmd} #{jvm_opts.join(' ')} #{app_opts.join(' ')} #{sysprops.join(' ')} #{app_args.join(' ')}"
 
-    begin
-      exec(command)
-    rescue
-      exit 1
-    end
+    exec command
   end
 
   private

data/lib/td/command/common.rb

@@ -33,6 +33,14 @@ module Command
     Hirb::Helpers::Table.render(rows, *opts)
   end
 
+  def gen_table_fields(has_org, fields)
+    if has_org
+      fields.unshift(:Organization)
+    else
+      fields
+    end
+  end
+
   #def cmd_render_tree(nodes, *opts)
   #  require 'hirb'
   #  Hirb::Helpers::Tree.render(nodes, *opts)

data/lib/td/command/db.rb

@@ -35,7 +35,7 @@ module Command
       rows << {:Name=>db.name, :Count=>db.count, :Organization=>db.org_name}
       has_org = true if db.org_name
     }
-    puts cmd_render_table(rows, :fields => (has_org ? [:Organization] : [])+[:Name, :Count])
+    puts cmd_render_table(rows, :fields => gen_table_fields(has_org, [:Name, :Count]))
 
     if dbs.empty?
       $stderr.puts "There are no databases."
@@ -44,14 +44,22 @@ module Command
   end
 
   def db_create(op)
+    org = nil
+
+    op.on('-g', '--org ORGANIZATION', "create the database under this organization") {|s|
+      org = s
+    }
+
     db_name = op.cmd_parse
 
     API.validate_database_name(db_name)
 
     client = get_client
 
+    opts = {}
+    opts['organization'] = org if org
     begin
-      client.create_database(db_name)
+      client.create_database(db_name, opts)
     rescue AlreadyExistsError
       $stderr.puts "Database '#{db_name}' already exists."
       exit 1

data/lib/td/command/export.rb

@@ -3,6 +3,7 @@ module TreasureData
 module Command
 
   def table_export(op)
+    org = nil
     from = nil
     to = nil
     s3_bucket = nil
@@ -10,6 +11,9 @@ module Command
     aws_secret_access_key = nil
     file_format = "json.gz"
 
+    op.on('-g', '--org ORGANIZATION', "export the data under this organization") {|s|
+      org = s
+    }
     op.on('-f', '--from TIME', 'export data which is newer than or same with the TIME') {|s|
       from = export_parse_time(s)
     }
@@ -50,6 +54,7 @@ module Command
     client = get_ssl_client
 
     s3_opts = {}
+    s3_opts['organization'] = org if org
     s3_opts['from'] = from.to_s if from
     s3_opts['to'] = to.to_s if to
     s3_opts['file_format'] = file_format

data/lib/td/command/job.rb

@@ -78,7 +78,7 @@ module Command
       has_org = true if job.org_name
     }
 
-    puts cmd_render_table(rows, :fields => (has_org ? [:Organization] : [])+[:JobID, :Status, :Start, :Elapsed, :Priority, :Result, :Type, :Database, :Query], :max_width => 140)
+    puts cmd_render_table(rows, :fields => gen_table_fields(has_org, [:JobID, :Status, :Start, :Elapsed, :Priority, :Result, :Type, :Database, :Query]), :max_width => 140)
   end
 
   def job_show(op)

data/lib/td/command/query.rb

@@ -3,6 +3,7 @@ module TreasureData
 module Command
 
   def query(op)
+    org = nil
     db_name = nil
     wait = false
     output = nil
@@ -14,6 +15,9 @@ module Command
     priority = nil
     retry_limit = nil
 
+    op.on('-g', '--org ORGANIZATION', "issue the query under this organization") {|s|
+      org = s
+    }
     op.on('-d', '--database DB_NAME', 'use the database (required)') {|s|
       db_name = s
     }
@@ -72,7 +76,9 @@ module Command
     # local existance check
     get_database(client, db_name)
 
-    job = client.query(db_name, sql, result_url, priority, retry_limit)
+    opts = {}
+    opts['organization'] = org if org
+    job = client.query(db_name, sql, result_url, priority, retry_limit, opts)
 
     $stderr.puts "Job #{job.job_id} is queued."
     $stderr.puts "Use '#{$prog} job:show #{job.job_id}' to show the status."

data/lib/td/command/result.rb

@@ -38,7 +38,7 @@ module Command
       map[:Name]
     }
 
-    puts cmd_render_table(rows, :fields => (has_org ? [:Organization] : [])+[:Name, :URL])
+    puts cmd_render_table(rows, :fields => gen_table_fields(has_org, [:Name, :URL]))
 
     if rs.empty?
       $stderr.puts "There are no result URLs."
@@ -47,9 +47,13 @@ module Command
   end
 
   def result_create(op)
+    org = nil
     result_user = nil
     result_ask_password = false
 
+    op.on('-g', '--org ORGANIZATION', "create the database under this organization") {|s|
+      org = s
+    }
     op.on('-u', '--user NAME', 'set user name for authentication') {|s|
       result_user = s
     }
@@ -65,8 +69,10 @@ module Command
 
     url = build_result_url(url, result_user, result_ask_password)
 
+    opts = {}
+    opts['organization'] = org if org
     begin
-      client.create_result(name, url)
+      client.create_result(name, url, opts)
     rescue AlreadyExistsError
       $stderr.puts "Result URL '#{name}' already exists."
       exit 1

data/lib/td/command/sched.rb

@@ -21,10 +21,11 @@ module Command
       map[:Name]
     }
 
-    puts cmd_render_table(rows, :fields => (has_org ? [:Organization] : [])+[:Name, :Cron, :Timezone, :"Next schedule", :Delay, :Priority, :Result, :Database, :Query], :max_width=>500)
+    puts cmd_render_table(rows, :fields => gen_table_fields(has_org, [:Name, :Cron, :Timezone, :"Next schedule", :Delay, :Priority, :Result, :Database, :Query]), :max_width=>500)
   end
 
   def sched_create(op)
+    org = nil
     db_name = nil
     timezone = nil
     delay = 0
@@ -34,6 +35,9 @@ module Command
     priority = nil
     retry_limit = nil
 
+    op.on('-g', '--org ORGANIZATION', "create the schedule under this organization") {|s|
+      org = s
+    }
     op.on('-d', '--database DB_NAME', 'use the database (required)') {|s|
       db_name = s
     }
@@ -80,7 +84,7 @@ module Command
     get_database(client, db_name)
 
     begin
-      first_time = client.create_schedule(name, :cron=>cron, :query=>sql, :database=>db_name, :result=>result_url, :timezone=>timezone, :delay=>delay, :priority=>priority, :retry_limit=>retry_limit)
+      first_time = client.create_schedule(name, :cron=>cron, :query=>sql, :database=>db_name, :result=>result_url, :timezone=>timezone, :delay=>delay, :priority=>priority, :retry_limit=>retry_limit, :organization=>org)
     rescue AlreadyExistsError
       cmd_debug_error $!
       $stderr.puts "Schedule '#{name}' already exists."

data/lib/td/command/table.rb

@@ -275,10 +275,14 @@ module Command
   end
 
   def table_partial_delete(op)
+    org = nil
     from = nil
     to = nil
     wait = false
 
+    op.on('-g', '--org ORGANIZATION', "delete data partially under this organization") {|s|
+      org = s
+    }
     op.on('-t', '--to TIME', 'end time of logs to delete') {|s|
       if s.to_i.to_s == s
         # UNIX time
@@ -321,7 +325,9 @@ module Command
 
     table = get_table(client, db_name, table_name)
 
-    job = client.partial_delete(db_name, table_name, to, from)
+    opts = {}
+    opts['organization'] = org if org
+    job = client.partial_delete(db_name, table_name, to, from, opts)
 
     $stderr.puts "Partial delete job #{job.job_id} is queued."
     $stderr.puts "Use '#{$prog} job:show #{job.job_id}' to show the status."

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.10.67'
+VERSION = '0.10.68'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.67
+  version: 0.10.68
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -181,7 +181,7 @@ files:
 - dist/resources/pkg/PackageInfo.erb
 - dist/resources/pkg/postinstall
 - dist/resources/pkg/td
-- java/td-0.1.1-SNAPSHOT.jar
+- java/td-0.1.1.jar
 - java/td_java.version
 - lib/td.rb
 - lib/td/command/account.rb