deployto 0.9.4 → 0.9.5

data/lib/deploytool/command.rb

@@ -82,7 +82,7 @@ class DeployTool::Command
         target.push(opts)
       rescue => e
         puts e
-        puts "\nPlease contact %s support: %s" % [EfficientCloud.cloud_name, EfficientCloud.support_email]
+        puts "\nPlease contact %s support: %s" % [DeployTool::Target::EfficientCloud.cloud_name, DeployTool::Target::EfficientCloud.support_email]
         exit 2
       end
       DeployTool::Config[args[0]] = target.to_h

data/lib/deploytool/target/efficientcloud.rb

@@ -1,6 +1,6 @@
 require 'highline'
 class DeployTool::Target::EfficientCloud < DeployTool::Target
-  SUPPORTED_API_VERSION = 3
+  SUPPORTED_API_VERSION = 4
   
   def self.cloud_name
     @cloud_name || 'Efficient Cloud'

data/lib/deploytool/target/efficientcloud/api_client.rb

@@ -1,4 +1,3 @@
-require 'rexml/document'
 require 'addressable/uri'
 require 'net/http'
 require 'net/http/post/multipart'
@@ -35,7 +34,8 @@ class DeployTool::Target::EfficientCloud
     end
     
     def call(method, method_name, data = {})
-      url = Addressable::URI.parse("http://#{@server}/api/cli/v1/apps/#{@app_name}/#{method_name}")
+      method_name = '/' + method_name unless method_name.nil?
+      url = Addressable::URI.parse("http://#{@server}/api/cli/v1/apps/#{@app_name}#{method_name}.json")
       client = OAuth2::Client.new(CLIENT_ID, CLIENT_SECRET, :site => "http://#{server}/", :token_url => '/oauth2/token', :raise_errors => false) do |builder|
         builder.use Faraday::Request::Multipart
         builder.use Faraday::Request::UrlEncoded
@@ -118,12 +118,14 @@ class DeployTool::Target::EfficientCloud
       @refresh_token = token.refresh_token
       @auth_method = :refresh_token
 
-      response = token.request(method, url.path, method==:post ? {:body => data} : {:params => data})
+      opts = method==:get ? {:params => data} : {:body => data}
+      opts.merge!({:headers => {'Accept' => 'application/json'}})
+      response = token.request(method, url.path, opts)
       if response.status != 200
         details = MultiJson.decode(response.body) rescue nil
         raise "#{response.status} #{details}"
       end
-      response
+      MultiJson.decode(response.body)
     end
 
     def to_h
@@ -131,12 +133,12 @@ class DeployTool::Target::EfficientCloud
     end
 
     def info
-      response = call :get, 'info'
+      response = call :get, nil
       return nil if not response
-      doc = REXML::Document.new response.body
       data = {}
-      doc.elements["app"].each_element do |el|
-        data[el.name.gsub('-','_').to_sym] = el.text
+      response["app"].each do |k,v|
+        next unless v === String
+        data[k.to_sym] = v
       end
       data
     end
@@ -171,16 +173,13 @@ class DeployTool::Target::EfficientCloud
       
       puts "-----> Uploading %s code tarball..." % human_filesize(tempfile.path)
       initial_response = call :post, 'upload', {:code => Faraday::UploadIO.new(tempfile, "application/zip")}
-      doc = REXML::Document.new initial_response.body
-      doc.elements["code/code-token"].text
+      initial_response["code_token"]
     end
 
     def deploy(code_token)
       initial_response = call :post, 'deploy', {:code_token => code_token}
       return nil if not initial_response
-      doc = REXML::Document.new initial_response.body
-      deploy_token = doc.elements["deploy/token"].text
-      deploy_token
+      initial_response["token"]
     end
 
     def save_timing_data(data)
@@ -198,19 +197,18 @@ class DeployTool::Target::EfficientCloud
       while true
         sleep 1
         resp = call :get, 'deploy_status', {:deploy_token => deploy_token}
-        doc = REXML::Document.new resp.body
         
-        if doc.elements["deploy/message"].nil?
+        if resp["message"].nil?
           puts resp
           puts "...possibly done."
           break
         end
-        if doc.elements["deploy/message"].text == 'finished'
+        if resp["message"] == 'finished'
           puts "\n-----> FINISHED after %d seconds!" % (Time.now-start)
           break
         end
         
-        status = doc.elements["deploy/message"].text.gsub('["', '').gsub('"]', '')
+        status = resp["message"].gsub('["', '').gsub('"]', '')
         if previous_status != status
           case status
           when "build"
@@ -225,7 +223,7 @@ class DeployTool::Target::EfficientCloud
           previous_status = status
         end
         
-        logs = doc.elements["deploy/logs"].text rescue nil
+        logs = resp["logs"]
         if logs
           puts "" if status != "build" # Add newline after the dots
           puts logs
@@ -255,4 +253,3 @@ class DeployTool::Target::EfficientCloud
     end
   end
 end
-

data/lib/deploytool/version.rb

@@ -1,3 +1,3 @@
 module DeployTool
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: deployto
 version: !ruby/object:Gem::Version 
-  hash: 51
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Efficient Cloud Ltd
@@ -15,17 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-28 00:00:00 Z
+date: 2011-10-20 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: inifile
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 0
         - 4
@@ -37,11 +35,9 @@ dependencies:
   name: addressable
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -51,11 +47,9 @@ dependencies:
   name: multipart-post
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -65,11 +59,9 @@ dependencies:
   name: highline
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 1
         - 6
@@ -81,11 +73,9 @@ dependencies:
   name: zip
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -95,11 +85,9 @@ dependencies:
   name: json_pure
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -109,17 +97,15 @@ dependencies:
   name: oauth2
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id007
-description: Deployment tool with support for multiple Platform-as-a-Service providers.
+description: Deployment tool for web application platforms powered by EFC.
 email: hello@platformdirectory.com
 executables: 
 - deploy
@@ -140,6 +126,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/target_spec.rb
+has_rdoc: true
 homepage: http://platformdirectory.com/
 licenses: []
 
@@ -149,27 +136,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Multi-platform deployment tool.