td 0.7.2 → 0.7.3

data/lib/td/client.rb

@@ -0,0 +1,337 @@
+require 'time'
+require 'td/api'
+
+module TreasureData
+
+class Client
+  def self.authenticate(user, password)
+    api = API.new(nil)
+    apikey = api.authenticate(user, password)
+    new(apikey)
+  end
+
+  def self.server_status
+    api = API.new(nil)
+    api.server_status
+  end
+
+  def initialize(apikey)
+    @api = API.new(apikey)
+  end
+
+  attr_reader :api
+
+  def apikey
+    @api.apikey
+  end
+
+  def server_status
+    @api.server_status
+  end
+
+  # => true
+  def create_database(db_name)
+    @api.create_database(db_name)
+  end
+
+  # => true
+  def delete_database(db_name)
+    @api.delete_database(db_name)
+  end
+
+  # => [Database]
+  def databases
+    names = @api.list_databases
+    names.map {|db_name|
+      Database.new(self, db_name)
+    }
+  end
+
+  # => Database
+  def database(db_name)
+    names = @api.list_databases
+    names.each {|n|
+      if n == db_name
+        return Database.new(self, db_name)
+      end
+    }
+    raise NotFoundError, "Database '#{db_name}' does not exist"
+  end
+
+  # => true
+  def create_table(db_name, table_name, type)
+    @api.create_table(db_name, table_name, type)
+  end
+
+  # => true
+  def create_log_table(db_name, table_name)
+    create_table(db_name, table_name, :log)
+  end
+
+  # => true
+  def create_item_table(db_name, table_name)
+    create_table(db_name, table_name, :item)
+  end
+
+  # => type:Symbol
+  def delete_table(db_name, table_name)
+    @api.delete_table(db_name, table_name)
+  end
+
+  # => [Table]
+  def tables(db_name)
+    m = @api.list_tables(db_name)
+    m.map {|table_name,(type,count)|
+      Table.new(self, db_name, table_name, type, count)
+    }
+  end
+
+  # => Table
+  def table(db_name, table_name)
+    m = @api.list_tables(db_name)
+    m.each_pair {|name,(type,count)|
+      if name == table_name
+        return Table.new(self, db_name, name, type, count)
+      end
+    }
+    raise NotFoundError, "Table '#{db_name}.#{table_name}' does not exist"
+  end
+
+  # => Job
+  def query(db_name, q)
+    job_id = @api.hive_query(q, db_name)
+    Job.new(self, job_id, :hive, q)  # TODO url
+  end
+
+  # => [Job=]
+  def jobs(from=nil, to=nil)
+    js = @api.list_jobs(from, to)
+    js.map {|job_id,type,status,query,start_at,end_at|
+      Job.new(self, job_id, type, query, status, nil, nil, start_at, end_at)
+    }
+  end
+
+  # => Job
+  def job(job_id)
+    job_id = job_id.to_s
+    type, query, status, url, debug, start_at, end_at = @api.show_job(job_id)
+    Job.new(self, job_id, type, query, status, url, debug, start_at, end_at)
+  end
+
+  # => type:Symbol, url:String
+  def job_status(job_id)
+    type, query, status, url, debug, start_at, end_at = @api.show_job(job_id)
+    return query, status, url, debug, start_at, end_at
+  end
+
+  # => result:[{column:String=>value:Object]
+  def job_result(job_id)
+    @api.job_result(job_id)
+  end
+
+  # => result:String
+  def job_result_format(job_id, format)
+    @api.job_result_format(job_id, format)
+  end
+
+  # => nil
+  def job_result_each(job_id, &block)
+    @api.job_result_each(job_id, &block)
+  end
+
+  # => time:Flaot
+  def import(db_name, table_name, format, stream, stream_size=stream.lstat.size)
+    @api.import(db_name, table_name, format, stream, stream_size)
+  end
+end
+
+
+class Model
+  def initialize(client)
+    @client = client
+  end
+end
+
+class Database < Model
+  def initialize(client, db_name, tables=nil)
+    super(client)
+    @db_name = db_name
+    @tables = tables
+  end
+
+  def name
+    @db_name
+  end
+
+  def tables
+    update_tables! unless @tables
+    @tables
+  end
+
+  def create_table(name, type)
+    @client.create_table(@db_name, name, type)
+  end
+
+  def create_log_table(name)
+    create_table(name, :log)
+  end
+
+  def create_item_table(name)
+    create_table(name, :item)
+  end
+
+  def table(table_name)
+    @client.table(@db_name, table_name)
+  end
+
+  def delete
+    @client.delete_database(@db_name)
+  end
+
+  def update_tables!
+    @tables = @client.tables(@db_name)
+  end
+end
+
+class Table < Model
+  def initialize(client, db_name, table_name, type, count)
+    super(client)
+    @db_name = db_name
+    @table_name = table_name
+    @type = type
+    @count = count
+  end
+
+  attr_reader :type, :count
+
+  def database_name
+    @db_name
+  end
+
+  def database
+    @client.database(@db_name)
+  end
+
+  def name
+    @table_name
+  end
+
+  def identifier
+    "#{@db_name}.#{@table_name}"
+  end
+
+  def delete
+    @client.delete_table(@db_name, @table_name)
+  end
+end
+
+class Job < Model
+  def initialize(client, job_id, type, query, status=nil, url=nil, debug=nil, start_at=nil, end_at=nil, result=nil)
+    super(client)
+    @job_id = job_id
+    @type = type
+    @url = url
+    @query = query
+    @status = status
+    @debug = debug
+    @start_at = start_at
+    @end_at = end_at
+    @result = result
+  end
+
+  attr_reader :job_id, :type
+
+  def wait(timeout=nil)
+    # TODO
+  end
+
+  def query
+    update_status! unless @query
+    @query
+  end
+
+  def status
+    update_status! unless @status
+    @status
+  end
+
+  def url
+    update_status! unless @url
+    @url
+  end
+
+  def debug
+    update_status! unless @debug
+    @debug
+  end
+
+  def start_at
+    update_status! unless @start_at
+    @start_at && !@start_at.empty? ? Time.parse(@start_at) : nil
+  end
+
+  def end_at
+    update_status! unless @end_at
+    @end_at && !@end_at.empty? ? Time.parse(@end_at) : nil
+  end
+
+  def result
+    unless @result
+      return nil unless finished?
+      @result = @client.job_result(@job_id)
+    end
+    @result
+  end
+
+  def result_format(format)
+    return nil unless finished?
+    @client.job_result_format(@job_id, format)
+  end
+
+  def result_each(&block)
+    if @result
+      @result.each(&block)
+    else
+      @client.job_result_each(@job_id, &block)
+    end
+    nil
+  end
+
+  def finished?
+    update_status! unless @status
+    if @status == "success" || @status == "error"
+      return true
+    else
+      return false
+    end
+  end
+
+  def running?
+    !finished?
+  end
+
+  def success?
+    update_status! unless @status
+    @status == "success"
+  end
+
+  def error?
+    update_status! unless @status
+    @status == "error"
+  end
+
+  def update_status!
+    query, status, url, debug, start_at, end_at = @client.job_status(@job_id)
+    @query = query
+    @status = status
+    @url = url
+    @debug = debug
+    @start_at = start_at
+    @end_at = end_at
+    self
+  end
+end
+
+
+end
+

data/lib/td/command/account.rb

@@ -1,5 +1,5 @@
 
-module TD
+module TreasureData
 module Command
 
   def account
@@ -39,7 +39,7 @@ module Command
       exit 0
     end
 
-    api = nil
+    client = nil
 
     2.times do
       begin
@@ -57,23 +57,23 @@ module Command
         exit 0
       end
 
-      require 'td/api'
+      require 'td/client'
 
       begin
-        api = API.authenticate(user_name, password)
-      rescue TD::AuthError
+        client = Client.authenticate(user_name, password)
+      rescue TreasureData::AuthError
         $stderr.puts "User name or password mismatched."
       end
 
-      break if api
+      break if client
     end
-    return unless api
+    return unless client
 
     $stderr.puts "Authenticated successfully."
 
     conf ||= Config.new
     conf["account.user"] = user_name
-    conf["account.apikey"] = api.apikey
+    conf["account.apikey"] = client.apikey
     conf.save
 
     $stderr.puts "Use '#{$prog} create-database <db_name>' to create a database."

data/lib/td/command/common.rb

@@ -1,5 +1,5 @@
 
-module TD
+module TreasureData
 module Command
   private
   def cmd_opt(name, *args)
@@ -56,13 +56,13 @@ EOF
     op
   end
 
-  def cmd_api
+  def get_client
     apikey = Config.apikey
     unless apikey
       raise ConfigError, "Account is not configured."
     end
-    require 'td/api'
-    api = API.new(apikey)
+    require 'td/client'
+    Client.new(apikey)
   end
 
   def cmd_render_table(rows, *opts)
@@ -85,9 +85,9 @@ EOF
     end
   end
 
-  def find_database(api, db_name)
+  def find_database(client, db_name)
     begin
-      return api.database(db_name)
+      return client.database(db_name)
     rescue
       cmd_debug_error $!
       $stderr.puts $!
@@ -97,8 +97,8 @@ EOF
     db
   end
 
-  def find_table(api, db_name, table_name, type=nil)
-    db = find_database(api, db_name)
+  def find_table(client, db_name, table_name, type=nil)
+    db = find_database(client, db_name)
     begin
       table = db.table(table_name)
     rescue

data/lib/td/command/database.rb

@@ -1,17 +1,17 @@
 
-module TD
+module TreasureData
 module Command
 
   def create_database
     op = cmd_opt 'create-database', :db_name
     db_name = op.cmd_parse
 
-    api = cmd_api
+    client = get_client
 
     API.validate_database_name(db_name)
 
     begin
-      api.create_database(db_name)
+      client.create_database(db_name)
     rescue AlreadyExistsError
       $stderr.puts "Database '#{db_name}' already exists."
       exit 1
@@ -33,10 +33,10 @@ module Command
 
     db_name = op.cmd_parse
 
-    api = cmd_api
+    client = get_client
 
     begin
-      db = api.database(db_name)
+      db = client.database(db_name)
 
       if !force && !db.tables.empty?
         $stderr.puts "Database '#{db_name}' is not empty. Use '-f' option or drop tables first."
@@ -56,9 +56,9 @@ module Command
     op = cmd_opt 'show-databases'
     op.cmd_parse
 
-    api = cmd_api
+    client = get_client
 
-    dbs = api.databases
+    dbs = client.databases
 
     rows = []
     dbs.each {|db|