ubalo 0.0.14 → 0.0.15

data/bin/ubalo

@@ -417,11 +417,11 @@ command :login do |c|
     login    = hl.ask("     login: "){|q| q.echo = true}
     password = hl.ask("  password: "){|q| q.echo = false}
 
-    response = ubalo.get_api_token(login, password)
-    ubalo.token = response.fetch('api_token')
+    response = ubalo.get_authorization(login, password)
+    ubalo.authorization = response.fetch('authorization')
     username = response.fetch('username')
 
-    Ubalo.write_config(ubalo.base_url => {'token' => ubalo.token, 'username' => username})
+    Ubalo.write_config(ubalo.base_url => {'authorization' => ubalo.authorization, 'username' => username})
     puts "Success! Ready to use as #{username}."
   end
 end
@@ -464,15 +464,15 @@ pre do |global,command,options,args|
   config = Ubalo.config
   connect_url = global['connect-url'] || config['connect-url'] || "https://ubalo.com/api"
 
-  # When logging in, don't use the token:
+  # When logging in, don't use the authorization:
   unless command && command.name == :login
     if host_config = config[connect_url]
       @local_username = host_config['username']
-      token = host_config['token']
+      authorization = host_config['authorization']
     end
   end
 
-  unless token or (command && command.name == :login)
+  unless authorization or (command && command.name == :login)
     raise UbaloMessage, "No credentials found. Please run 'ubalo login'."
   end
 
@@ -482,7 +482,7 @@ pre do |global,command,options,args|
     @local_config = YAML.load_file(full_path)
   end
 
-  @ubalo ||= Ubalo.login(token, connect_url)
+  @ubalo ||= Ubalo.login(authorization, connect_url)
 
   true
 end

data/lib/ubalo.rb

@@ -66,14 +66,14 @@ class Ubalo
   end
 
   attr_reader :base_url
-  attr_accessor :token
+  attr_accessor :authorization
 
-  def self.login token, base_url
-    new(token, base_url)
+  def self.login authorization, base_url
+    new(authorization, base_url)
   end
 
-  def initialize token, base_url
-    @token = token
+  def initialize authorization, base_url
+    @authorization = authorization
     @base_url = base_url
   end
 
@@ -83,10 +83,7 @@ class Ubalo
   end
 
   def url_get url, params={}
-    if token
-      params.merge!({:auth_token => token})
-    end
-    response = RestClient.get url, :params => params
+    response = RestClient.get url, add_authorization(:params => params)
     parse(response)
   end
 
@@ -96,7 +93,7 @@ class Ubalo
   end
 
   def url_post(url, params={})
-    response = RestClient.post url, {:auth_token => token}.merge(params)
+    response = RestClient.post url, params, add_authorization({})
     parse(response)
   end
 
@@ -120,7 +117,7 @@ class Ubalo
   def wait_task(label, silent=false)
     60.times do
       h = check_task(label)
-      if %w{complete failed}.include?(h['state'])
+      if h['state'] == 'exited'
         unless silent
           $stderr.puts " done."
         end
@@ -209,8 +206,8 @@ class Ubalo
     end
   end
 
-  def get_api_token login, password
-    post(:get_api_token, :user => {:login => login, :password => password})
+  def get_authorization login, password
+    post(:get_authorization, :user => {:login => login, :password => password})
   end
 
   def available_templates
@@ -246,6 +243,15 @@ class Ubalo
   end
 
   private
+
+  def add_authorization(headers)
+    if authorization
+      headers.merge(:authorization => authorization)
+    else
+      headers
+    end
+  end
+
   def parse(result)
     JSON.load(result)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000Z
+date: 2011-12-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70363591242100 !ruby/object:Gem::Requirement
+  requirement: &70291514610660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70363591242100
+  version_requirements: *70291514610660
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70363591241600 !ruby/object:Gem::Requirement
+  requirement: &70291514610200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70363591241600
+  version_requirements: *70291514610200
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70363591241140 !ruby/object:Gem::Requirement
+  requirement: &70291514609780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70363591241140
+  version_requirements: *70291514609780
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70363591240620 !ruby/object:Gem::Requirement
+  requirement: &70291514609280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70363591240620
+  version_requirements: *70291514609280
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables: