td 0.9.1 → 0.9.2

data/ChangeLog

@@ -1,4 +1,12 @@
 
+== 2011-09-08 version 0.9.2
+
+* Added job:kill subcommand
+* Added apikey:show and apikey:set subcommands
+* requires td-logger for Rails
+* Fixed command/account.rb file is missed
+
+
 == 2011-09-08 version 0.9.1
 
 * Accepts the 'TREASURE_DATA_API_KEY' environment variable to set API key

data/lib/td.rb

@@ -0,0 +1 @@
+require 'td-logger'

data/lib/td/command/account.rb

@@ -0,0 +1,91 @@
+
+module TreasureData
+module Command
+
+  def account(op)
+    op.banner << "\noptions:\n"
+
+    force = false
+    op.on('-f', '--force', 'overwrite current account setting', TrueClass) {|b|
+      force = true
+    }
+
+    user_name = op.cmd_parse
+
+    conf = nil
+    begin
+      conf = Config.read
+    rescue ConfigError
+    end
+    if conf && conf['account.apikey']
+      unless force
+        if conf['account.user']
+          $stderr.puts "Account is already configured with '#{conf['account.user']}' account."
+        else
+          $stderr.puts "Account is already configured."
+        end
+        $stderr.puts "Add '-f' option to overwrite."
+        exit 0
+      end
+    end
+
+    unless user_name
+      begin
+        print "User name: "
+        line = STDIN.gets || ""
+        user_name = line.strip
+      rescue Interrupt
+        $stderr.puts "\ncanceled."
+        exit 1
+      end
+    end
+
+    if user_name.empty?
+      $stderr.puts "canceled."
+      exit 0
+    end
+
+    client = nil
+
+    3.times do
+      begin
+        system "stty -echo"  # TODO termios
+        print "Password: "
+        password = STDIN.gets || ""
+        password = password[0..-2]  # strip \n
+      rescue Interrupt
+        $stderr.print "\ncanceled."
+        exit 1
+      ensure
+        system "stty echo"   # TODO termios
+        print "\n"
+      end
+
+      if password.empty?
+        $stderr.puts "canceled."
+        exit 0
+      end
+
+      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} db:create <db_name>' to create a database."
+  end
+
+end
+end
+

data/lib/td/command/apikey.rb

@@ -0,0 +1,59 @@
+
+module TreasureData
+module Command
+
+  def apikey_show(op)
+    conf = nil
+    begin
+      conf = Config.read
+    rescue ConfigError
+    end
+
+    if !conf || !conf['account.apikey']
+      $stderr.puts "Account is not configured yet."
+      $stderr.puts "Use '#{$prog} apikey:set' or '#{$prog} account' first."
+      exit 1
+    end
+
+    puts conf['account.apikey']
+  end
+
+  def apikey_set(op)
+    op.banner << "\noptions:\n"
+
+    force = false
+    op.on('-f', '--force', 'overwrite current account setting', TrueClass) {|b|
+      force = true
+    }
+
+    apikey = op.cmd_parse
+
+    conf = nil
+    begin
+      conf = Config.read
+    rescue ConfigError
+    end
+    if conf && conf['account.apikey']
+      unless force
+        if conf['account.user']
+          $stderr.puts "Account is already configured with '#{conf['account.user']}' account."
+        else
+          $stderr.puts "Account is already configured."
+        end
+        $stderr.puts "Add '-f' option to overwrite."
+        exit 0
+      end
+    end
+
+    conf ||= Config.new
+    conf.delete("account.user")
+    conf["account.apikey"] = apikey
+    conf.save
+
+    $stderr.puts "API key is set."
+
+    $stderr.puts "Use '#{$prog} db:create <db_name>' to create a database."
+  end
+
+end
+end

data/lib/td/command/db.rb

@@ -37,7 +37,7 @@ module Command
 
     if dbs.empty?
       $stderr.puts "There are no databases."
-      $stderr.puts "Use '#{$prog} create-database <db_name>' to create a database."
+      $stderr.puts "Use '#{$prog} db:create <db_name>' to create a database."
     end
   end
 
@@ -56,7 +56,7 @@ module Command
     end
 
     $stderr.puts "Database '#{db_name}' is created."
-    $stderr.puts "Use '#{$prog} create-log-table #{db_name} <table_name>' to create a table."
+    $stderr.puts "Use '#{$prog} table:create #{db_name} <table_name>' to create a table."
   end
 
   def db_delete(op)

data/lib/td/command/job.rb

@@ -126,8 +126,17 @@ module Command
 
     client = get_client
 
-    client.kill_job(job_id)
-    # TODO error
+    former_status = client.kill(job_id)
+    if TreasureData::Job::FINISHED_STATUS.include?(former_status)
+      $stderr.puts "Job #{job_id} is already finished (#{former_status})"
+      exit 0
+    end
+
+    if former_status == TreasureData::Job::STATUS_RUNNING
+      $stderr.puts "Job #{job_id} is killed."
+    else
+      $stderr.puts "Job #{job_id} is canceled."
+    end
   end
 
   private

data/lib/td/command/list.rb

@@ -194,9 +194,11 @@ module List
 
   add_list 'job:show', %w[job_id], 'Show status and result of a job'
   add_list 'job:list', %w[max?], 'Show list of jobs'
-  #add_list 'job:kill', %w[job_id], 'Kill a job'
+  add_list 'job:kill', %w[job_id], 'Kill or cancel a job'
 
-  add_list 'account', %w[], 'Setup a Treasure Data account'
+  add_list 'account', %w[user_name?], 'Setup a Treasure Data account'
+  add_list 'apikey:show', %w[], 'Show Treasure Data API key'
+  add_list 'apikey:set', %w[apikey], 'Set Treasure Data API key'
 
   add_list 'server:status', %w[], 'Show status of the Treasure Data server'
 
@@ -220,6 +222,9 @@ module List
 
   add_alias 'job', 'job:show'
   add_alias 'jobs', 'job:list'
+  add_alias 'kill', 'job:kill'
+
+  add_alias 'apikey', 'apikey:show'
 
   # backward compatibility
   add_alias 'show-databases',   'db:list'

data/lib/td/command/table.rb

@@ -15,7 +15,7 @@ module Command
     rescue NotFoundError
       cmd_debug_error $!
       $stderr.puts "Database '#{db_name}' does not exist."
-      $stderr.puts "Use '#{$prog} create-database #{db_name}' to create the database."
+      $stderr.puts "Use '#{$prog} db:create #{db_name}' to create the database."
       exit 1
     rescue AlreadyExistsError
       cmd_debug_error $!
@@ -76,7 +76,7 @@ module Command
         $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} database:create <db>' to create a database."
+        $stderr.puts "Use '#{$prog} db:create <db>' to create a database."
       else
         $stderr.puts "There are no tables."
         $stderr.puts "Use '#{$prog} table:create <db.table>' to create a table."

data/lib/td/config.rb

@@ -30,6 +30,10 @@ class Config
     @conf[cate_key] = val
   end
 
+  def delete(cate_key)
+    @conf.delete(cate_key)
+  end
+
   def read(path=@path)
     @path = path
     begin

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.9.1'
+VERSION = '0.9.2'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: td
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Sadayuki Furuhashi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-08 00:00:00 +09:00
+date: 2011-09-09 00:00:00 +09:00
 default_executable: td
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,12 +74,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 61
         segments: 
         - 0
         - 8
-        - 0
-        version: 0.8.0
+        - 1
+        version: 0.8.1
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -90,12 +90,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 0
         - 2
-        - 2
-        version: 0.2.2
+        - 3
+        version: 0.2.3
   type: :runtime
   version_requirements: *id005
 description: 
@@ -108,6 +108,9 @@ extra_rdoc_files:
 - ChangeLog
 - README.rdoc
 files: 
+- lib/td.rb
+- lib/td/command/account.rb
+- lib/td/command/apikey.rb
 - lib/td/command/common.rb
 - lib/td/command/db.rb
 - lib/td/command/help.rb