td 0.8.0 → 0.9.0

data/lib/td/command/schema.rb

@@ -0,0 +1,96 @@
+
+module TreasureData
+module Command
+
+  def schema_show(op)
+    db_name, table_name = op.cmd_parse
+
+    client = get_client
+    table = get_table(client, db_name, table_name)
+
+    puts "#{db_name}.#{table_name} ("
+    table.schema.fields.each {|f|
+      puts "  #{f.name}:#{f.type}"
+    }
+    puts ")"
+  end
+
+  def schema_set(op)
+    db_name, table_name, *columns = op.cmd_parse
+    schema = parse_columns(columns)
+
+    client = get_client
+    table = get_table(client, db_name, table_name)
+
+    client.update_schema(table.db_name, table.name, schema)
+
+    $stderr.puts "Schema is updated on #{db_name}.#{table_name} table."
+  end
+
+  def schema_add(op)
+    db_name, table_name, *columns = op.cmd_parse
+    schema = parse_columns(columns)
+
+    client = get_client
+    table = get_table(client, db_name, table_name)
+
+    schema = table.schema.merge(schema)
+
+    client.update_schema(table.db_name, table.name, schema)
+
+    $stderr.puts "Schema is updated on #{db_name}.#{table_name} table."
+  end
+
+  def schema_remove(op)
+    db_name, table_name, *columns = op.cmd_parse
+
+    client = get_client
+    table = get_table(client, db_name, table_name)
+
+    schema = table.schema
+
+    columns.each {|col|
+      deleted = false
+      schema.fields.delete_if {|f|
+        f.name == col && deleted = true
+      }
+      unless deleted
+        $stderr.puts "Column name '#{col}' does not exist."
+        exit 1
+      end
+    }
+
+    client.update_schema(table.db_name, table.name, schema)
+
+    $stderr.puts "Schema is updated on #{db_name}.#{table_name} table."
+  end
+
+  private
+  def parse_columns(columns)
+    schema = Schema.new
+
+    columns.each {|column|
+      name, type = column.split(':',2)
+      name = name.to_s
+      type = type.to_s
+
+      API.validate_column_name(name)
+      type = API.normalize_type_name(type)
+
+      if schema.fields.find {|f| f.name == name }
+        $stderr.puts "Column name '#{name}' is duplicated."
+        exit 1
+      end
+      schema.add_field(name, type)
+
+      if name == 'v' || name == 'time'
+        $stderr.puts "Column name '#{name}' is reserved."
+        exit 1
+      end
+    }
+
+    schema
+  end
+end
+end
+

data/lib/td/command/server.rb

@@ -2,11 +2,9 @@
 module TreasureData
 module Command
 
-  def server_status
-    op = cmd_opt 'server-status'
+  def server_status(op)
     op.cmd_parse
 
-    require 'td/client'
     puts Client.server_status
   end
 

data/lib/td/command/table.rb

@@ -2,17 +2,16 @@
 module TreasureData
 module Command
 
-  def create_log_or_item_table(mode_log, db_name, table_name)
-    client = get_client
+  def table_create(op)
+    db_name, table_name = op.cmd_parse
 
+    #API.validate_database_name(db_name)
     API.validate_table_name(table_name)
 
+    client = get_client
+
     begin
-      if mode_log
-        client.create_log_table(db_name, table_name)
-      else
-        client.create_item_table(db_name, table_name)
-      end
+      client.create_log_table(db_name, table_name)
     rescue NotFoundError
       cmd_debug_error $!
       $stderr.puts "Database '#{db_name}' does not exist."
@@ -26,24 +25,8 @@ module Command
 
     $stderr.puts "Table '#{db_name}.#{table_name}' is created."
   end
-  private :create_log_or_item_table
 
-  def create_log_table
-    op = cmd_opt 'create-log-table', :db_name, :table_name
-    db_name, table_name = op.cmd_parse
-
-    create_log_or_item_table(true, db_name, table_name)
-  end
-
-  def create_item_table
-    op = cmd_opt 'create-item-table', :db_name, :table_name
-    db_name, table_name = op.cmd_parse
-
-    create_log_or_item_table(false, db_name, table_name)
-  end
-
-  def drop_table
-    op = cmd_opt 'drop-table', :db_name, :table_name
+  def table_delete(op)
     db_name, table_name = op.cmd_parse
 
     client = get_client
@@ -53,81 +36,20 @@ module Command
     rescue NotFoundError
       cmd_debug_error $!
       $stderr.puts "Table '#{db_name}.#{table_name}' does not exist."
-      $stderr.puts "Use '#{$prog} show-tables #{db_name}' to show list of the tables."
+      $stderr.puts "Use '#{$prog} table:list #{db_name}' to show list of the tables."
       exit 1
     end
 
     $stderr.puts "Table '#{db_name}.#{table_name}' is deleted."
   end
 
-  def set_schema
-    op = cmd_opt 'set-schema', :db_name, :table_name, :columns_?
-
-    op.banner << "\noptions:\n"
-
-    reset = nil
-    op.on('-R', '--reset', "Reset all columns", TrueClass) {|b|
-      reset = b
-    }
-
-    db_name, table_name, *columns = op.cmd_parse
-
-    if !reset && columns.empty?
-      puts op.to_s
-      exit 1
-    end
-
-    rmcols = []
-
-    schema = Schema.new
-    columns.each {|column|
-      name, type = column.split(':',2)
-      name = name.to_s
-      type = type.to_s
-
-      if name.empty?
-        rmcols << type
-        next
-      end
-
-      API.validate_column_name(name)
-      type = API.normalize_type_name(type)
-
-      if schema.fields.find {|f| f.name == name }
-        $stderr.puts "Column name '#{name}' is duplicated."
-        exit 1
-      end
-      schema.add_field(name, type)
-
-      if name == 'v' || name == 'time'
-        $stderr.puts "Column name '#{name}' is reserved."
-        exit 1
-      end
-    }
-
-    client = get_client
-
-    table = find_table(client, db_name, table_name)
-
-    unless reset
-      schema = table.schema.merge(schema)
-      schema.fields.delete_if {|f| rmcols.include?(f.name) }
-    end
-
-    client.update_schema(db_name, table_name, schema)
-
-    $stderr.puts "Schema is updated on #{db_name}.#{table_name} table."
-    $stderr.puts "Use '#{$prog} describe-table #{db_name} #{table_name}' to confirm the schema."
-  end
-
-  def show_tables
-    op = cmd_opt 'show-tables', :db_name?
+  def table_list(op)
     db_name = op.cmd_parse
 
     client = get_client
 
     if db_name
-      db = find_database(client, db_name)
+      db = get_database(client, db_name)
       dbs = [db]
     else
       dbs = client.databases
@@ -151,25 +73,23 @@ module Command
     if rows.empty?
       if db_name
         $stderr.puts "Database '#{db_name}' has no tables."
-        $stderr.puts "Use '#{$prog} create-log-table #{db_name} <table_name>' to create a table."
+        $stderr.puts "Use '#{$prog} table:create <db.table>' to create a table."
       elsif dbs.empty?
         $stderr.puts "There are no databases."
-        $stderr.puts "Use '#{$prog} create-database <db_name>' to create a database."
+        $stderr.puts "Use '#{$prog} database:create <db>' to create a database."
       else
         $stderr.puts "There are no tables."
-        $stderr.puts "Use '#{$prog} create-log-table <db_name> <table_name>' to create a table."
+        $stderr.puts "Use '#{$prog} table:create <db.table>' to create a table."
       end
     end
   end
 
-  def describe_table
-    op = cmd_opt 'describe-table', :db_name, :table_name
-
+  def table_show(op)
     db_name, table_name = op.cmd_parse
 
     client = get_client
 
-    table = find_table(client, db_name, table_name)
+    table = get_table(client, db_name, table_name)
 
     puts "Name      : #{table.db_name}.#{table.name}"
     puts "Type      : #{table.type}"
@@ -180,6 +100,8 @@ module Command
     }
     puts ")"
   end
+
+  require 'td/command/import'  # table:import
 end
 end
 

data/lib/td/command/td.rb

@@ -20,7 +20,7 @@ op.summary_indent = "  "
     puts op.to_s
     puts ""
     puts "commands:"
-    puts TreasureData::Command::List.help(op.summary_indent)
+    TreasureData::Command::List.show_help(op.summary_indent)
     puts ""
     puts "Type 'td help COMMAND' for more information on a specific command."
     if errmsg

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.8.0'
+VERSION = '0.9.0'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: td
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 59
   prerelease: false
   segments: 
   - 0
-  - 8
+  - 9
   - 0
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Sadayuki Furuhashi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-21 00:00:00 +09:00
+date: 2011-09-08 00:00:00 +09:00
 default_executable: td
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,22 @@ dependencies:
         version: 0.8.0
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: td-logger
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 2
+        - 2
+        version: 0.2.2
+  type: :runtime
+  version_requirements: *id005
 description: 
 email: 
 executables: 
@@ -92,12 +108,14 @@ extra_rdoc_files:
 - ChangeLog
 - README.rdoc
 files: 
-- lib/td/command/account.rb
 - lib/td/command/common.rb
-- lib/td/command/database.rb
+- lib/td/command/db.rb
+- lib/td/command/help.rb
 - lib/td/command/import.rb
+- lib/td/command/job.rb
 - lib/td/command/list.rb
 - lib/td/command/query.rb
+- lib/td/command/schema.rb
 - lib/td/command/server.rb
 - lib/td/command/table.rb
 - lib/td/command/td.rb

data/lib/td/command/account.rb

@@ -1,84 +0,0 @@
-
-module TreasureData
-module Command
-
-  def account
-    op = cmd_opt 'account', :user_name?
-
-    op.banner << "\noptions:\n"
-
-    force = false
-    op.on('-f', '--force', 'overwrite current setting', TrueClass) {|b|
-      force = true
-    }
-
-    user_name = op.cmd_parse
-
-    require 'td/config'
-    conf = nil
-    begin
-      conf = Config.read
-    rescue ConfigError
-    end
-    if conf && conf['account.user']
-      unless force
-        $stderr.puts "TreasureData account is already configured with '#{conf['account.user']}' account."
-        $stderr.puts "Add '-f' option to overwrite this setting."
-        exit 0
-      end
-    end
-
-    unless user_name
-      print "User name: "
-      line = STDIN.gets || ""
-      user_name = line.strip
-    end
-
-    if user_name.empty?
-      $stderr.puts "Canceled."
-      exit 0
-    end
-
-    client = nil
-
-    2.times do
-      begin
-        system "stty -echo"  # TODO termios
-        print "Password: "
-        password = STDIN.gets || ""
-        password = password[0..-2]  # strip \n
-      ensure
-        system "stty echo"   # TODO termios
-        print "\n"
-      end
-
-      if password.empty?
-        $stderr.puts "Canceled."
-        exit 0
-      end
-
-      require 'td/client'
-
-      begin
-        client = Client.authenticate(user_name, password)
-      rescue TreasureData::AuthError
-        $stderr.puts "User name or password mismatched."
-      end
-
-      break if client
-    end
-    return unless client
-
-    $stderr.puts "Authenticated successfully."
-
-    conf ||= Config.new
-    conf["account.user"] = user_name
-    conf["account.apikey"] = client.apikey
-    conf.save
-
-    $stderr.puts "Use '#{$prog} create-database <db_name>' to create a database."
-  end
-
-end
-end
-