td 0.10.54 → 0.10.55

data/ChangeLog

@@ -1,8 +1,14 @@
 
+== 2012-10-09 version 0.10.55
+
+* Added table:swap subcommand
+* user:create supports -G option to create an organization at the same time
+
+
 == 2012-10-04 version 0.10.54
 
-* check invalid byte sequence in UTF-8 string before rendering results on
-console
+* job:result checks invalid byte sequence in UTF-8 string before rendering
+results on console
 
 
 == 2012-10-02 version 0.10.53

data/lib/td/command/job.rb

@@ -270,7 +270,7 @@ module Command
         #   b) to display multi-byte characters as it is
         #   c) encoding from UTF-8 to UTF-8 doesn't check/replace invalid chars
         #   d) UTF-16LE was slightly faster than UTF-16BE, UTF-32LE or UTF-32BE
-        s = s.encode('UTF-16LE', 'UTF-8', :invalid=>:replace, :undef=>:replace).encode('UTF-8') if s.respond_to?(:encode)
+        s = s.encode('UTF-16LE', 'UTF-8', :invalid=>:replace, :undef=>:replace).encode!('UTF-8') if s.respond_to?(:encode)
         s
       }
     }

data/lib/td/command/list.rb

@@ -225,6 +225,7 @@ module List
   add_list 'table:delete', %w[db table], 'Delete a table', 'table:delete example_db table1'
   add_list 'table:import', %w[db table files_], 'Parse and import files to a table', 'table:import example_db table1 --apache access.log', 'table:import example_db table1 --json -t time - < test.json'
   add_list 'table:export', %w[db table], 'Dump logs in a table to the specified storage', 'table:export example_db table1 --s3-bucket mybucket -k KEY_ID -s SECRET_KEY'
+  add_list 'table:swap', %w[db table1 table2], 'Swap names of two tables', 'table:swap example_db table1 table2'
   add_list 'table:tail', %w[db table], 'Get recently imported logs', 'table:tail example_db table1', 'table:tail example_db table1 -t "2011-01-02 03:04:05" -n 30'
   add_list 'table:partial_delete', %w[db table], 'Delete logs from the table within the specified time range', 'table:partial_delete example_db table1 --from 1341000000 --to 1341003600'
 

data/lib/td/command/table.rb

@@ -109,6 +109,19 @@ module Command
     end
   end
 
+  def table_swap(op)
+    db_name, table_name1, table_name2 = op.cmd_parse
+
+    client = get_client
+
+    table1 = get_table(client, db_name, table_name1)
+    table2 = get_table(client, db_name, table_name2)
+
+    client.swap_table(db_name, table_name1, table_name2)
+
+    $stderr.puts "'#{db_name}.#{table_name1}' and '#{db_name}.#{table_name2}' are swapped."
+  end
+
   def table_show(op)
     db_name, table_name = op.cmd_parse
 

data/lib/td/command/user.rb

@@ -45,11 +45,16 @@ module Command
     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
     }
@@ -123,21 +128,38 @@ module Command
 
     client = get_client(:ssl => true)
 
-    client.add_user(name, org)
+    if create_org
+      org ||= name
+      client.create_organization(org)
+    end
 
     ok = false
     begin
-      client.change_email(name, email)
-      client.change_password(name, password)
-      client.add_apikey(name)
-      ok = true
+      client.add_user(name, org)
+
+      begin
+        client.change_email(name, email)
+        client.change_password(name, password)
+        client.add_apikey(name)
+        ok = true
+
+      ensure
+        if !ok
+          client.remove_user(name)
+        end
+      end
+
     ensure
-      unless ok
-        client.remove_user(name)
+      if create_org && !ok
+        client.delete_organization(org)
       end
     end
 
-    $stderr.puts "User '#{name}' is created."
+    if create_org
+      $stderr.puts "Organization '#{org}' and user '#{name}' are created."
+    else
+      $stderr.puts "User '#{name}' is created."
+    end
     $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.54'
+VERSION = '0.10.55'
 
 end

data/td.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "msgpack", "~> 0.4.4"
   gem.add_dependency "json", ">= 1.4.3"
   gem.add_dependency "hirb", ">= 0.4.5"
-  gem.add_dependency "td-client", "~> 0.8.31"
+  gem.add_dependency "td-client", "~> 0.8.32"
   gem.add_dependency "td-logger", "~> 0.3.12"
   gem.add_development_dependency "rake", "~> 0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.54
+  version: 0.10.55
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.31
+        version: 0.8.32
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.31
+        version: 0.8.32
 - !ruby/object:Gem::Dependency
   name: td-logger
   requirement: !ruby/object:Gem::Requirement