td 0.10.92 → 0.10.93

data/ChangeLog

@@ -1,10 +1,21 @@
+== 2013-11-14 version 0.10.93
+
+* Improve import:prepare command. 'all-string' option is added.
+* Fix import:prepare command. NumberFormatException often occurs. (When sample method in CSVFileReader class is executed. SimpleDateFormat objects are used in non synchronized block.)
+* Fix import:prepare command. There are incompatibility with bulk_import command regarding 'NULL' string.
+* Fix import:prepare command. NullPointerException occurs when unknown column type is specified as 'column-types' option.
+* Support item type in table:create
+* Remove organization, role and ip_limit subcommands
+* Enable query result download even if job status is error
+
+
 == 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.
+* Improve import commands. It can parse string values of 'HH:mm:ss' time format automatically without specifying '%T' and transfer into long unix timestamp.
+* Improve 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.
+* Improve 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.
+* Add 'regex' to source file format option of import:prepare command.
+* Fix import:upload command. NullPointerException often occurs when data files are uploaded.
 
 
 == 2013-10-04 version 0.10.91

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

@@ -19,11 +19,11 @@ if [ -n "$chrev" ];then
 fi
 
 revname="$(git show --pretty=format:'%H %ad' | head -n 1)"
-vername="0.3.1-SNAPSHOT"
+vername="0.4.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
+cp target/td-import-${vername}-jar-with-dependencies.jar ../../java/td-import.jar
 echo "copy logging.properties"
 cp src/test/resources/java/logging.properties ../../java/logging.properties
 echo "create VERSION file"

data/java/VERSION

@@ -1 +1 @@
-0.3.1-SNAPSHOT
+0.4.1-SNAPSHOT

data/java/td-import-java.version

@@ -1 +1 @@
-d8f0fb80d14729cc8881a7e1aa074a51fdc34407 Tue Nov 5 14:08:52 2013 +0900
+466a09aef2fb634defffbe117cec80777772d7a2 Thu Nov 14 15:35:00 2013 +0900

data/lib/td/command/bulk_import.rb

@@ -10,13 +10,11 @@ module Command
     bis = client.bulk_imports
 
     rows = []
-    has_org = false
     bis.each {|bi|
-      rows << {:Name=>bi.name, :Table=>"#{bi.database}.#{bi.table}", :Status=>bi.status.to_s.capitalize, :Frozen=>bi.upload_frozen? ? 'Frozen' : '', :JobID=>bi.job_id, :"Valid Parts"=>bi.valid_parts, :"Error Parts"=>bi.error_parts, :"Valid Records"=>bi.valid_records, :"Error Records"=>bi.error_records, :Organization=>bi.org_name}
-      has_org = true if bi.org_name
+      rows << {:Name=>bi.name, :Table=>"#{bi.database}.#{bi.table}", :Status=>bi.status.to_s.capitalize, :Frozen=>bi.upload_frozen? ? 'Frozen' : '', :JobID=>bi.job_id, :"Valid Parts"=>bi.valid_parts, :"Error Parts"=>bi.error_parts, :"Valid Records"=>bi.valid_records, :"Error Records"=>bi.error_records}
     }
 
-    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)
+    puts cmd_render_table(rows, :fields => [: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,12 +23,6 @@ module Command
   end
 
   def bulk_import_create(op)
-    org = nil
-
-    op.on('-g', '--org ORGANIZATION', "create the bulk import session under this organization") {|s|
-      org = s
-    }
-
     name, db_name, table_name = op.cmd_parse
 
     client = get_client
@@ -38,7 +30,6 @@ module Command
     table = get_table(client, 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."
@@ -73,7 +64,6 @@ module Command
       exit 1
     end
 
-    $stderr.puts "Organization : #{bi.org_name}"
     $stderr.puts "Name         : #{bi.name}"
     $stderr.puts "Database     : #{bi.database}"
     $stderr.puts "Table        : #{bi.table}"

data/lib/td/command/common.rb

@@ -42,14 +42,6 @@ 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 normalized_message
     <<EOS
 Your event has large number larger than 2^64.

data/lib/td/command/db.rb

@@ -30,12 +30,10 @@ module Command
     dbs = client.databases
 
     rows = []
-    has_org = false
     dbs.each {|db|
-      rows << {:Name=>db.name, :Count=>db.count, :Organization=>db.org_name}
-      has_org = true if db.org_name
+      rows << {:Name=>db.name, :Count=>db.count}
     }
-    puts cmd_render_table(rows, :fields => gen_table_fields(has_org, [:Name, :Count]))
+    puts cmd_render_table(rows, :fields => [:Name, :Count])
 
     if dbs.empty?
       $stderr.puts "There are no databases."
@@ -44,12 +42,6 @@ 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)
@@ -57,7 +49,6 @@ module Command
     client = get_client
 
     opts = {}
-    opts['organization'] = org if org
     begin
       client.create_database(db_name, opts)
     rescue AlreadyExistsError

data/lib/td/command/export.rb

@@ -4,7 +4,6 @@ module Command
   SUPPORTED_FORMATS = %W[json.gz line-json.gz]
 
   def table_export(op)
-    org = nil
     from = nil
     to = nil
     s3_bucket = nil
@@ -12,9 +11,6 @@ module Command
     aws_secret_access_key = nil
     file_format = nil
 
-    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)
     }
@@ -59,7 +55,6 @@ 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

@@ -69,16 +69,14 @@ module Command
     jobs = client.jobs(skip, skip+max-1, status, conditions)
 
     rows = []
-    has_org = false
     jobs.each {|job|
       start = job.start_at
       elapsed = cmd_format_elapsed(start, job.end_at)
       priority = job_priority_name_of(job.priority)
-      rows << {:JobID => job.job_id, :Database => job.db_name, :Status => job.status, :Type => job.type, :Query => job.query.to_s, :Start => (start ? start.localtime : ''), :Elapsed => elapsed, :Priority => priority, :Result => job.result_url, :Organization => job.org_name}
-      has_org = true if job.org_name
+      rows << {:JobID => job.job_id, :Database => job.db_name, :Status => job.status, :Type => job.type, :Query => job.query.to_s, :Start => (start ? start.localtime : ''), :Elapsed => elapsed, :Priority => priority, :Result => job.result_url}
     }
 
-    puts cmd_render_table(rows, :fields => gen_table_fields(has_org, [:JobID, :Status, :Start, :Elapsed, :Priority, :Result, :Type, :Database, :Query]), :max_width => 140)
+    puts cmd_render_table(rows, :fields => [:JobID, :Status, :Start, :Elapsed, :Priority, :Result, :Type, :Database, :Query], :max_width => 140)
   end
 
   def job_show(op)
@@ -117,28 +115,34 @@ module Command
 
     job = client.job(job_id)
 
-    puts "Organization : #{job.org_name}"
-    puts "JobID        : #{job.job_id}"
-    #puts "URL          : #{job.url}"
-    puts "Status       : #{job.status}"
-    puts "Type         : #{job.type}"
-    puts "Priority     : #{job_priority_name_of(job.priority)}"
-    puts "Retry limit  : #{job.retry_limit}"
-    puts "Result       : #{job.result_url}"
-    puts "Database     : #{job.db_name}"
-    puts "Query        : #{job.query}"
+    puts "JobID       : #{job.job_id}"
+    #puts "URL         : #{job.url}"
+    puts "Status      : #{job.status}"
+    puts "Type        : #{job.type}"
+    puts "Priority    : #{job_priority_name_of(job.priority)}"
+    puts "Retry limit : #{job.retry_limit}"
+    puts "Result      : #{job.result_url}"
+    puts "Database    : #{job.db_name}"
+    puts "Query       : #{job.query}"
 
     if wait && !job.finished?
       wait_job(job)
-      if job.success? && [:hive, :pig, :impala].include?(job.type) && !exclude
-        puts "Result       :"
-        show_result(job, output, format, render_opts)
+      if [:hive, :pig, :impala].include?(job.type) && !exclude
+        puts "Result      :"
+        begin
+          show_result(job, output, format, render_opts)
+        rescue TreasureData::NotFoundError => e
+          # Got 404 because result not found.
+        end
       end
 
     else
-      if job.success? && [:hive, :pig, :impala].include?(job.type) && !exclude
-        puts "Result       :"
-        show_result(job, output, format, render_opts)
+      if [:hive, :pig, :impala].include?(job.type) && !exclude
+        puts "Result      :"
+        begin
+          show_result(job, output, format, render_opts)
+        rescue TreasureData::NotFoundError => e
+        end
       end
 
       if verbose

data/lib/td/command/list.rb

@@ -127,7 +127,7 @@ module List
   LIST = []
   COMMAND = {}
   GUESS = {}
-  HELP_EXCLUDE = [/^help/, /^account/, /^aggr/, /^update/, /^user/, /^ip_limit/, /^role/, /^org/, /^acl/]
+  HELP_EXCLUDE = [/^help/, /^account/, /^aggr/, /^update/, /^user/, /^acl/]
   USAGE_EXCLUDE = [/bulk_import:upload_part\z/, /bulk_import:delete_part\z/]
 
   def self.add_list(name, args, description, *examples)
@@ -302,28 +302,11 @@ module List
   add_list 'user:apikey:remove', %w[name apikey], 'Remove an API key from an user'
   add_list 'user:password:change', %w[name], 'Change password'
 
-  add_list 'role:list', %w[], 'Show list of roles'
-  add_list 'role:show', %w[name], 'Show a role'
-  add_list 'role:create', %w[name], 'Create a role'
-  add_list 'role:delete', %w[name], 'Delete a role'
-  add_list 'role:grant', %w[name user], 'Grant role to an user'
-  add_list 'role:revoke', %w[name user], 'Revoke role from an user'
-
-  add_list 'org:list', %w[], 'Show list of organizations'
-  add_list 'org:show', %w[name], 'Show an organizations'
-  add_list 'org:create', %w[name], 'Create an organizations'
-  add_list 'org:delete', %w[name], 'Delete an organizations'
-
   add_list 'acl:list', %w[], 'Show list of access controls'
   add_list 'acl:grant', %w[subject action scope], 'Grant an access control'
   add_list 'acl:revoke', %w[subject action scope], 'Revoke an access control'
   # TODO acl:test
 
-  add_list 'ip_limit:list', %w[], 'Show list of all IP range limitations'
-  add_list 'ip_limit:show', %w[org], "Show list of org's IP range limitations"
-  add_list 'ip_limit:set', %w[org ip_range_], 'Set an IP range limitation'
-  add_list 'ip_limit:delete', %w[org], 'Delete an IP range limitation'
-
   add_list 'aggr:list', %w[], 'Show list of aggregation schemas'
   add_list 'aggr:show', %w[name], 'Describe a aggregation schema'
   add_list 'aggr:create', %w[name relation_key], 'Create a aggregation schema'
@@ -388,20 +371,9 @@ module List
   add_alias 'user:apikey', 'user:apikey:list'
   add_alias 'user:apikeys', 'user:apikey:list'
 
-  add_alias 'role', 'role:show'
-  add_alias 'roles', 'role:list'
-
-  add_alias 'org', 'org:show'
-  add_alias 'orgs', 'org:list'
-  add_alias 'organization', 'org:create'
-  add_alias 'organization', 'org:delete'
-  add_alias 'organization', 'org:list'
-
   add_alias 'acl', 'acl:list'
   add_alias 'acls', 'acl:list'
 
-  add_alias 'ip_limits', 'ip_limit:list'
-
   add_alias 'aggr', 'aggr:show'
   add_alias 'aggrs', 'aggr:list'
 

data/lib/td/command/query.rb

@@ -3,7 +3,6 @@ module TreasureData
 module Command
 
   def query(op)
-    org = nil
     db_name = nil
     wait = false
     output = nil
@@ -19,9 +18,6 @@ module Command
     type = nil
     exclude = false
 
-    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
     }
@@ -100,7 +96,6 @@ module Command
     get_database(client, db_name)
 
     opts = {}
-    opts['organization'] = org if org
     opts['sampling_all'] = sampling_all if sampling_all
     opts['type'] = type if type
     job = client.query(db_name, sql, result_url, priority, retry_limit, opts)
@@ -114,7 +109,10 @@ module Command
       puts "Status     : #{job.status}"
       if job.success? && !exclude
         puts "Result     :"
-        show_result(job, output, format, render_opts)
+        begin
+          show_result(job, output, format, render_opts)
+        rescue TreasureData::NotFoundError => e
+        end
       end
     end
   end

data/lib/td/command/result.rb

@@ -16,9 +16,8 @@ module Command
       exit 1
     end
 
-    puts "Organization : #{r.org_name}"
-    puts "Name         : #{r.name}"
-    puts "URL          : #{r.url}"
+    puts "Name : #{r.name}"
+    puts "URL  : #{r.url}"
   end
 
   def result_list(op)
@@ -29,16 +28,14 @@ module Command
     rs = client.results
 
     rows = []
-    has_org = false
     rs.each {|r|
-      rows << {:Name => r.name, :URL => r.url, :Organization => r.org_name}
-      has_org = true if r.org_name
+      rows << {:Name => r.name, :URL => r.url}
     }
     rows = rows.sort_by {|map|
       map[:Name]
     }
 
-    puts cmd_render_table(rows, :fields => gen_table_fields(has_org, [:Name, :URL]))
+    puts cmd_render_table(rows, :fields => [:Name, :URL])
 
     if rs.empty?
       $stderr.puts "There are no result URLs."
@@ -47,13 +44,9 @@ module Command
   end
 
   def result_create(op)
-    org = nil
     result_user = nil
     result_ask_password = false
 
-    op.on('-g', '--org ORGANIZATION', "create the result under this organization") {|s|
-      org = s
-    }
     op.on('-u', '--user NAME', 'set user name for authentication') {|s|
       result_user = s
     }
@@ -70,7 +63,6 @@ module Command
     url = build_result_url(url, result_user, result_ask_password)
 
     opts = {}
-    opts['organization'] = org if org
     begin
       client.create_result(name, url, opts)
     rescue AlreadyExistsError

data/lib/td/command/sched.rb

@@ -12,22 +12,19 @@ module Command
     scheds = client.schedules
 
     rows = []
-    has_org = false
     scheds.each {|sched|
-      rows << {:Name => sched.name, :Cron => sched.cron, :Timezone => sched.timezone, :Delay => sched.delay, :Priority => job_priority_name_of(sched.priority), :Result => sched.result_url, :Database => sched.database, :Query => sched.query, :"Next schedule" => sched.next_time ? sched.next_time.localtime : nil, :Organization => sched.org_name }
-      has_org = true if sched.org_name
+      rows << {:Name => sched.name, :Cron => sched.cron, :Timezone => sched.timezone, :Delay => sched.delay, :Priority => job_priority_name_of(sched.priority), :Result => sched.result_url, :Database => sched.database, :Query => sched.query, :"Next schedule" => sched.next_time ? sched.next_time.localtime : nil}
     }
     rows = rows.sort_by {|map|
       map[:Name]
     }
 
-    puts cmd_render_table(rows, :fields => gen_table_fields(has_org, [:Name, :Cron, :Timezone, :"Next schedule", :Delay, :Priority, :Result, :Database, :Query]), :max_width=>500)
+    puts cmd_render_table(rows, :fields => [:Name, :Cron, :Timezone, :"Next schedule", :Delay, :Priority, :Result, :Database, :Query], :max_width=>500)
   end
 
   def sched_create(op)
     require 'td/command/job'  # job_priority_id_of
 
-    org = nil
     db_name = nil
     timezone = nil
     delay = 0
@@ -39,9 +36,6 @@ module Command
     retry_limit = nil
     type = 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
     }
@@ -105,7 +99,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, :organization=>org, :type=>type)
+      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, :type=>type)
     rescue AlreadyExistsError
       cmd_debug_error $!
       $stderr.puts "Schedule '#{name}' already exists."
@@ -243,17 +237,16 @@ module Command
 
     scheds = client.schedules
     if s = scheds.find {|s| s.name == name }
-      puts "Organization : #{s.org_name}"
-      puts "Name         : #{s.name}"
-      puts "Cron         : #{s.cron}"
-      puts "Timezone     : #{s.timezone}"
-      puts "Delay        : #{s.delay} sec"
-      puts "Next         : #{s.next_time}"
-      puts "Result       : #{s.result_url}"
-      puts "Priority     : #{job_priority_name_of(s.priority)}"
-      puts "Retry limit  : #{s.retry_limit}"
-      puts "Database     : #{s.database}"
-      puts "Query        : #{s.query}"
+      puts "Name        : #{s.name}"
+      puts "Cron        : #{s.cron}"
+      puts "Timezone    : #{s.timezone}"
+      puts "Delay       : #{s.delay} sec"
+      puts "Next        : #{s.next_time}"
+      puts "Result      : #{s.result_url}"
+      puts "Priority    : #{job_priority_name_of(s.priority)}"
+      puts "Retry limit : #{s.retry_limit}"
+      puts "Database    : #{s.database}"
+      puts "Query       : #{s.query}"
     end
 
     rows = []

data/lib/td/command/table.rb

@@ -13,6 +13,31 @@ module Command
   ]
 
   def table_create(op)
+    type = nil
+    primary_key = nil
+    primary_key_type = nil
+
+    op.on('-T', '--type TYPE', 'set table type (log or item)') {|s|
+      unless ['item', 'log'].include?(s)
+        raise "Unknown table type #{s.dump}. Supported types: log and item"
+      end
+      type = s.to_sym
+    }
+    op.on('--primary-key PRIMARY_KEY_AND_TYPE', '[primary key]:[primary key type]') {|s|
+      unless /\A[\w]+:(string|int)\z/ =~ s
+        $stderr.puts "--primary-key PRIMARY_KEY_AND_TYPE is required, and should be in the format [primary key]:[primary key type]"
+        exit 1
+      end
+
+      args = s.split(':')
+      if args.length != 2
+        # this really shouldn't happen with the above regex
+        exit 1
+      end
+      primary_key = args[0]
+      primary_key_type = args[1]
+    }
+
     db_name, table_name = op.cmd_parse
 
     #API.validate_database_name(db_name)
@@ -24,10 +49,19 @@ module Command
       $stderr.puts "  For a list of all reserved keywords, see our FAQ: http://docs.treasure-data.com/articles/faq"
     end
 
+    if type == :item && (primary_key.nil? || primary_key_type.nil?)
+      $stderr.puts "for TYPE 'item', the primary-key is required"
+      exit 1
+    end
+
     client = get_client
 
     begin
-      client.create_log_table(db_name, table_name)
+      if type == :item
+        client.create_item_table(db_name, table_name, primary_key, primary_key_type)
+      else
+        client.create_log_table(db_name, table_name)
+      end
     rescue NotFoundError
       cmd_debug_error $!
       $stderr.puts "Database '#{db_name}' does not exist."
@@ -294,14 +328,10 @@ 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
@@ -345,7 +375,6 @@ module Command
     table = get_table(client, db_name, table_name)
 
     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."

data/lib/td/command/user.rb

@@ -15,10 +15,8 @@ module Command
       exit 1
     end
 
-    $stderr.puts "Name         : #{user.name}"
-    $stderr.puts "Organization : #{user.org_name}"
-    $stderr.puts "Email        : #{user.email}"
-    $stderr.puts "Roles        : #{user.role_names.join(', ')}"
+    $stderr.puts "Name  : #{user.name}"
+    $stderr.puts "Email : #{user.email}"
   end
 
   def user_list(op)
@@ -30,10 +28,10 @@ module Command
 
     rows = []
     users.each {|user|
-      rows << {:Name => user.name, :Organization => user.org_name, :Email => user.email, :Roles => user.role_names.join(',')}
+      rows << {:Name => user.name, :Email => user.email}
     }
 
-    puts cmd_render_table(rows, :fields => [:Name, :Organization, :Email, :Roles])
+    puts cmd_render_table(rows, :fields => [:Name, :Email])
 
     if rows.empty?
       $stderr.puts "There are no users."
@@ -42,18 +40,8 @@ module Command
   end
 
   def user_create(op)
-    org = nil
     email = nil
     random_password = false
-    create_org = nil
-
-    op.on('-g', '--org ORGANIZATION', "create the user under this organization") {|s|
-      org = s
-    }
-
-    op.on('-G', "create the user under the a new organization", TrueClass) {|b|
-      create_org = b
-    }
 
     op.on('-e', '--email EMAIL', "Use this email address to identify the user") {|s|
       email = s
@@ -127,25 +115,9 @@ module Command
     end
 
     client = get_client(:ssl => true)
+    client.add_user(name, nil, email, password)
 
-    if create_org
-      org ||= name
-      client.create_organization(org)
-    end
-
-    begin
-      client.add_user(name, org, email, password)
-    ensure
-      if create_org
-        client.delete_organization(org)
-      end
-    end
-
-    if create_org
-      $stderr.puts "Organization '#{org}' and user '#{name}' are created."
-    else
-      $stderr.puts "User '#{name}' is created."
-    end
+    $stderr.puts "User '#{name}' is created."
     $stderr.puts "Use '#{$prog} user:apikeys #{name}' to show the API key."
   end
 

data/lib/td/version.rb

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

metadata

@@ -1,32 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.92
+  version: 0.10.93
+  prerelease: 
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-14 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
     - - <
@@ -35,20 +37,21 @@ 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
     - - <
@@ -57,6 +60,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -64,6 +68,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -71,20 +76,23 @@ 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
@@ -92,6 +100,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -99,6 +108,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: td-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -106,6 +116,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -113,6 +124,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: td-logger
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -120,6 +132,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -127,6 +140,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,6 +148,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -141,6 +156,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -148,6 +164,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -155,6 +172,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -162,6 +180,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -169,6 +188,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -176,6 +196,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -224,14 +245,11 @@ files:
 - lib/td/command/export.rb
 - lib/td/command/help.rb
 - lib/td/command/import.rb
-- lib/td/command/ip_limit.rb
 - lib/td/command/job.rb
 - lib/td/command/list.rb
-- lib/td/command/org.rb
 - lib/td/command/password.rb
 - lib/td/command/query.rb
 - lib/td/command/result.rb
-- lib/td/command/role.rb
 - lib/td/command/runner.rb
 - lib/td/command/sample.rb
 - lib/td/command/sched.rb
@@ -261,26 +279,33 @@ 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: 2341272974152018852
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2341272974152018852
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing
 test_files:
 - spec/file_reader/filter_spec.rb

checksums.yaml

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

data/lib/td/command/ip_limit.rb

@@ -1,53 +0,0 @@
-
-module TreasureData
-module Command
-  def ip_limit_list(op)
-    op.cmd_parse
-
-    client = get_client
-
-    ip_limits = client.ip_limits
-    rows = ip_limits.map { |ip_limit|
-      {:Organization => ip_limit.org, 'IP Range' => ip_limit.ip_range}
-    }
-
-    puts cmd_render_table(rows, :fields => [:Organization, 'IP Range'])
-
-    if rows.empty?
-      $stderr.puts "There are no IP range limitations."
-      $stderr.puts "Use '#{$prog} ip_limit:set <organization> <ip_range>' to create IP range limitation."
-    end
-  end
-
-  def ip_limit_show(op)
-    organization = op.cmd_parse
-
-    client = get_client
-
-    ip_limits = client.ip_limits
-    rows = ip_limits.select { |ip_limit|
-      ip_limit.org == organization
-    }.map { |ip_limit| {'IP Range' => ip_limit.ip_range} }
-
-    puts cmd_render_table(rows, :fields => ['IP Range'])
-  end
-
-  def ip_limit_set(op)
-    organization, *ip_ranges = op.cmd_parse
-
-    client = get_client
-    client.set_ip_limit(organization, ip_ranges)
-
-    $stderr.puts "IP range limitations [#{ip_ranges.join(' ')}] are set to #{organization}"
-  end
-
-  def ip_limit_delete(op)
-    organization = op.cmd_parse
-
-    client = get_client
-    client.delete_ip_limit(organization)
-
-    $stderr.puts "All IP range limitations are deleted from #{organization}"
-  end
-end
-end

data/lib/td/command/org.rb

@@ -1,63 +0,0 @@
-
-module TreasureData
-module Command
-
-  def org_show(op)
-    name = op.cmd_parse
-
-    client = get_client
-
-    orgs = client.organizations
-    org = orgs.find {|org| name == org.name }
-    unless org
-      $stderr.puts "Organization '#{name}' does not exist."
-      $stderr.puts "Use '#{$prog} org:create <name>' to create an organization."
-      exit 1
-    end
-
-    $stderr.puts "Name         : #{org.name}"
-  end
-
-  def org_list(op)
-    op.cmd_parse
-
-    client = get_client
-
-    orgs = client.organizations
-
-    rows = []
-    orgs.each {|org|
-      rows << {:Name => org.name}
-    }
-
-    puts cmd_render_table(rows, :fields => [:Name])
-
-    if rows.empty?
-      $stderr.puts "There are no organizations."
-      $stderr.puts "Use '#{$prog} org:create <name>' to create an organization."
-    end
-  end
-
-  def org_create(op)
-    name = op.cmd_parse
-
-    client = get_client
-
-    client.create_organization(name)
-
-    $stderr.puts "Organization '#{name}' is created."
-  end
-
-  def org_delete(op)
-    name = op.cmd_parse
-
-    client = get_client
-
-    client.delete_organization(name)
-
-    $stderr.puts "Organization '#{name}' is deleted."
-  end
-
-end
-end
-

data/lib/td/command/role.rb

@@ -1,91 +0,0 @@
-
-module TreasureData
-module Command
-
-  def role_show(op)
-    name = op.cmd_parse
-
-    client = get_client
-
-    roles = client.roles
-    role = roles.find {|role| name == role.name }
-    unless role
-      $stderr.puts "Role '#{name}' does not exist."
-      $stderr.puts "Use '#{$prog} role:create <name>' to create a role."
-      exit 1
-    end
-
-    $stderr.puts "Organization : #{role.org_name}"
-    $stderr.puts "Name         : #{role.name}"
-    $stderr.puts "Users        : #{role.user_names.join(', ')}"
-  end
-
-  def role_list(op)
-    op.cmd_parse
-
-    client = get_client
-
-    roles = client.roles
-
-    rows = []
-    roles.each {|role|
-      rows << {:Name => role.name, :Organization => role.org_name, :Users => role.user_names.join(',')}
-    }
-
-    puts cmd_render_table(rows, :fields => [:Name, :Organization, :Users])
-
-    if rows.empty?
-      $stderr.puts "There are no roles."
-      $stderr.puts "Use '#{$prog} org:create <name>' to create a role."
-    end
-  end
-
-  def role_create(op)
-    org = nil
-
-    op.on('-g', '--org ORGANIZATION', "create the role under this organization") {|s|
-      org = s
-    }
-
-    name = op.cmd_parse
-
-    client = get_client
-
-    client.create_role(name, org)
-
-    $stderr.puts "Role '#{name}' is created."
-  end
-
-  def role_delete(op)
-    name = op.cmd_parse
-
-    client = get_client
-
-    client.delete_role(name)
-
-    $stderr.puts "Role '#{name}' is deleted."
-  end
-
-  def role_grant(op)
-    name, user = op.cmd_parse
-
-    client = get_client
-
-    client.grant_role(name, user)
-
-    $stderr.puts "Role '#{name}' is granted to user '#{user}'."
-  end
-
-  def role_revoke(op)
-    name, user = op.cmd_parse
-
-    client = get_client
-
-    client.revoke_role(name, user)
-
-    $stderr.puts "Role '#{name}' is revoked from user '#{user}'."
-  end
-
-end
-end
-