deployto 0.9.2 → 0.9.4

data/README.md

@@ -2,18 +2,10 @@
 
 Deployment tool for Platform-as-a-Service providers, with special support for multi-stage deploys (e.g. for staging environments).
 
-Platforms currently supported:
-* Efficient Cloud Platforms
-
-Platform support planned:
-* Heroku
-* Cloud Foundry Platforms
-
 ## Deploying a Ruby on Rails app
 
-    gem install deploytool
-    deploy add production portfolio.heroku.com
-    deploy add staging portfolio.vcap.me
+    gem install deployto
+    deploy add production young-samurai-4@example.org
     deploy production
 
 ## Config file
@@ -22,6 +14,6 @@ deploy keeps a local config file .deployrc within the top-level sourcecode direc
 
 ## Legalese
 
-_Copyright 2011, Efficient Cloud Ltd.
+Copyright 2011, Efficient Cloud Ltd.
 
 Released under the [MIT license](http://www.opensource.org/licenses/mit-license.php).

data/lib/deploytool/command.rb

@@ -1,22 +1,29 @@
+require 'deploytool/version'
+
 class DeployTool::Command
   COMMANDS = ["to", "logs", "import", "export", "config"]
   
   def self.print_help
-      puts "Deploytool Usage Instructions"
+      puts "Deploytool Version #{DeployTool::VERSION} Usage Instructions"
       puts ""
       puts "Add a target:"
-      puts "  deploy add production app1@demo.efficientcloud.com"
-      puts "  deploy add staging myapp.heroku.com"
-      puts "  deploy add failover api.cloudfoundry.com"
+      puts "  deploy add production young-samurai-4@example.org"
+      puts "  deploy add staging green-flower-2@example.org"
       puts ""
       puts "Deploy the current directory to the target:"
-      puts "  deploy to production"
+      puts "  deploy production"
   end
 
   def self.run(command, args)
     if args.include?("--debug")
       args.delete("--debug")
       $logger.level = Logger::DEBUG
+    elsif args.include?("-d")
+      args.delete("-d")
+      $logger.level = Logger::DEBUG
+    elsif args.include?("-v")
+      args.delete("-v")
+      $logger.level = Logger::DEBUG
     else
       $logger.level = Logger::INFO
     end
@@ -75,8 +82,10 @@ class DeployTool::Command
         target.push(opts)
       rescue => e
         puts e
+        puts "\nPlease contact %s support: %s" % [EfficientCloud.cloud_name, EfficientCloud.support_email]
         exit 2
       end
+      DeployTool::Config[args[0]] = target.to_h
     end
     
     DeployTool::Config.save

data/lib/deploytool/target.rb

@@ -51,6 +51,7 @@ class DeployTool::Target
       $logger.debug "Calling '%s' took longer than 5s, skipping" % [url, res.code, res.body]
       return nil
     end
+    return nil if res.nil?
     if res.code != '200'
       $logger.debug "Calling '%s' returned %s, skipping" % [url, res.code, res.body]
       return nil

data/lib/deploytool/target/efficientcloud.rb

@@ -1,7 +1,15 @@
 require 'highline'
-
 class DeployTool::Target::EfficientCloud < DeployTool::Target
-  SUPPORTED_API_VERSION = 2
+  SUPPORTED_API_VERSION = 3
+  
+  def self.cloud_name
+    @cloud_name || 'Efficient Cloud'
+  end
+  
+  def self.support_email
+    @support_email || 'team@efficientcloud.com'
+  end
+  
   def self.parse_target_spec(target_spec)
     server, app_name = target_spec.split('@').reverse
     if app_name.nil?
@@ -22,7 +30,12 @@ class DeployTool::Target::EfficientCloud < DeployTool::Target
   end
   
   def to_h
-    {:type => "EfficientCloud", :api_server => @api_client.server, :app_name => @api_client.app_name, :email => @api_client.email, :password => @api_client.password}
+    x = {:type => "EfficientCloud", :api_server => @api_client.server, :app_name => @api_client.app_name,}
+    if @api_client.auth_method == :refresh_token
+      x.merge({:refresh_token => @api_client.refresh_token})
+    else
+      x
+    end
   end
   
   def to_s
@@ -31,7 +44,8 @@ class DeployTool::Target::EfficientCloud < DeployTool::Target
   
   def initialize(options)
     @api_server = options['api_server']
-    @api_client = ApiClient.new(options['api_server'], options['app_name'], options['email'], options['password'])
+    auth = options.has_key?('refresh_token') ? {:refresh_token => options['refresh_token']} : {:email => options['email'], :password => options['password']}
+    @api_client = ApiClient.new(options['api_server'], options['app_name'], auth)
   end
 
   def self.check_version(api_server)
@@ -47,15 +61,13 @@ class DeployTool::Target::EfficientCloud < DeployTool::Target
       $logger.error "This version of deploytool is outdated.\nThis server requires at least API Version #{info['api_version']}."
       return false
     end
+    @cloud_name = info['cloud_name']
     return true
   end
 
   def self.create(target_spec)
-    $logger.info "Please specify your controlpanel login information"
-    email =    HighLine.new.ask("E-mail:   ")
-    password = HighLine.new.ask("Password: ") {|q| q.echo = "*" }
     app_name, api_server = parse_target_spec(target_spec)
-    EfficientCloud.new('api_server' => api_server, 'app_name' => app_name, 'email' => email, 'password' => password)
+    EfficientCloud.new('api_server' => api_server, 'app_name' => app_name)
   end
 
   def verify
@@ -69,8 +81,12 @@ class DeployTool::Target::EfficientCloud < DeployTool::Target
         $logger.error "Authentication failed (password wrong?)"
       elsif e.message.include?("404 ")
         $logger.error "Application does not exist"
+      elsif e.message.start_with?("ERROR ")
+        puts e.message
+        $logger.info "\nPlease contact %s support and include the above output: %s" % [EfficientCloud.cloud_name, EfficientCloud.support_email]
       else
         $logger.error "Remote server said: %s" % [e.message]
+        $logger.info "\nPlease contact %s support and include the above output: %s" % [EfficientCloud.cloud_name, EfficientCloud.support_email]
       end
     end
     exit 5
@@ -83,9 +99,22 @@ class DeployTool::Target::EfficientCloud < DeployTool::Target
       $logger.error info[:blocking_deployment]
       exit 4
     end
+    if info[:warn_deployment]
+      $logger.info info[:warn_deployment]
+      exit 5 if HighLine.new.ask("Deploy anyway? (y/N)").downcase.strip != 'y'
+    end
+
     code_token = @api_client.upload
     deploy_token = @api_client.deploy(code_token)
-    @api_client.deploy_status(deploy_token, opts) # Blocks till deploy is done
+    begin
+      @api_client.deploy_status(deploy_token, opts) # Blocks till deploy is done
+    rescue => e
+      if e.message.start_with?("ERROR ")
+        puts e.message
+      else
+        puts "some error happened, sorry!"
+      end
+    end
   end
 end
 

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

@@ -5,39 +5,135 @@ require 'net/http/post/multipart'
 require 'fileutils'
 require 'tempfile'
 require 'zip'
+require 'oauth2'
+require 'multi_json'
+require 'highline'
+
+CLIENT_ID = 'com.efficientcloud.api.deploytool'
+CLIENT_SECRET = '11d6b5cc70e4bc9563a3b8dd50dd34f6'
 
 class DeployTool::Target::EfficientCloud
   class ApiClient
-    attr_reader :server, :app_name, :email, :password
-    def initialize(server, app_name, email, password)
+    attr_reader :server, :app_name, :email, :password, :refresh_token, :auth_method
+    def initialize(server, app_name, auth)
       @app_name = app_name
       @server = server
-      @email = email
-      @password = password
+      if auth.has_key? :refresh_token
+        @refresh_token = auth[:refresh_token]
+        @auth_method = :refresh_token
+      elsif auth.has_key? :email
+        @auth_method = :password
+        @email = auth[:email]
+        @password = auth[:password]
+      else
+        @auth_method = :password
+      end
+    end
+
+    def re_auth
+      @auth_method = :password
     end
     
     def call(method, method_name, data = {})
       url = Addressable::URI.parse("http://#{@server}/api/cli/v1/apps/#{@app_name}/#{method_name}")
-      data = data.merge(:email => @email, :password => @password)
-      if method == :post
-        res = Net::HTTP.start(url.host, url.port) do |http|
-          http.request Net::HTTP::Post::Multipart.new(url.path, data)
+      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
+        builder.adapter :net_http
+      end
+      auth = false
+      tries = 0
+      while not auth
+        token = nil
+        handled_error = false
+        begin
+          if @auth_method == :password
+            if tries != 0 && HighLine.new.ask("Would you like to try again? (y/n): ") != 'y'
+              return
+            end
+            if !@email.nil? && !@password.nil?
+              # Upgrade from previous configuration file
+              print "Logging in..."
+              begin
+                token = client.password.get_token(@email, @password, :raise_errors => true)
+                token = token.refresh!
+                @email = nil
+                @password = nil
+              rescue StandardError => e
+                @email = nil
+                @password = nil
+                tries = 0
+                retry
+              ensure
+                print "\r"
+              end
+            else
+              tries += 1
+              $logger.info "Please specify your %s login data" % [DeployTool::Target::EfficientCloud.cloud_name]
+              email =    HighLine.new.ask("E-mail:   ")
+              password = HighLine.new.ask("Password: ") {|q| q.echo = "*" }
+              print "Authorizing..."
+              begin
+                token = client.password.get_token(email, password, :raise_errors => true)
+                token = token.refresh!
+              ensure
+                print "\r"
+              end
+              puts "Authorization succeeded."
+            end
+          else
+            params = {:client_id      => client.id,
+                      :client_secret  => client.secret,
+                      :grant_type     => 'refresh_token',
+                      :refresh_token  => @refresh_token
+                      }
+            token = client.get_token(params)
+          end
+        rescue OAuth2::Error => e
+          handled_error = true
+          print "Authorization failed"
+          token = nil
+          details = MultiJson.decode(e.response.body) rescue nil
+          if details
+            puts ": #{details['error_description']}"
+            re_auth if details['error']
+          else
+            puts "."
+          end
+        rescue EOFError
+          exit 1
+        rescue Interrupt
+          exit 1
+        rescue StandardError => e
+          puts "ERROR: #{e.inspect}"
+          puts "\nPlease contact %s support: %s" % [EfficientCloud.cloud_name, EfficientCloud.support_email]
+          puts ""
+        end
+        auth = token
+        if not token and not handled_error
+          puts "Authorization failed."
         end
-      else
-        url.query_values = data
-        res = Net::HTTP.get_response(url)
       end
-      case res
-      when Net::HTTPSuccess, Net::HTTPRedirection
-        res.body
-      else  
-        res.error!
+      
+      @refresh_token = token.refresh_token
+      @auth_method = :refresh_token
+
+      response = token.request(method, url.path, method==:post ? {:body => data} : {:params => data})
+      if response.status != 200
+        details = MultiJson.decode(response.body) rescue nil
+        raise "#{response.status} #{details}"
       end
+      response
+    end
+
+    def to_h
+      {:server => @server, :app_name => @app_name, :email => email, :password => @password, :refresh_token => @refresh_token, :auth_method => @auth_method}
     end
 
     def info
       response = call :get, 'info'
-      doc = REXML::Document.new response
+      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
@@ -74,25 +170,15 @@ class DeployTool::Target::EfficientCloud
       end
       
       puts "-----> Uploading %s code tarball..." % human_filesize(tempfile.path)
-      initial_response = call :post, 'upload', {:code => UploadIO.new(tempfile, "application/zip", "ecli-upload.zip")}
-      doc = REXML::Document.new initial_response
+      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
-    rescue Net::HTTPServerException => e
-      case e.response
-      when Net::HTTPNotFound
-        $logger.error "Application %s couldn't be found." % @app_name
-      when Net::HTTPUnauthorized
-        $logger.error "You're not authorized to update %s." % @app_name
-      else
-        raise e
-      end
-      $logger.info "\nPlease check the controlpanel for update instructions."
-      exit 2
     end
 
     def deploy(code_token)
       initial_response = call :post, 'deploy', {:code_token => code_token}
-      doc = REXML::Document.new initial_response
+      return nil if not initial_response
+      doc = REXML::Document.new initial_response.body
       deploy_token = doc.elements["deploy/token"].text
       deploy_token
     end
@@ -112,7 +198,7 @@ class DeployTool::Target::EfficientCloud
       while true
         sleep 1
         resp = call :get, 'deploy_status', {:deploy_token => deploy_token}
-        doc = REXML::Document.new resp
+        doc = REXML::Document.new resp.body
         
         if doc.elements["deploy/message"].nil?
           puts resp

data/lib/deploytool/version.rb

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

data/spec/target_spec.rb

@@ -15,29 +15,17 @@ describe DeployTool::Target do
       
       # TODO: Mock HTTP get method
     end
-    
-    ["api.cloudfoundry.com", "cloudfoundry.com", "awesomeapp.cloudfoundry.com"].each do |target_spec| #, "api.cloud.1and1.com", "cloud.1and1.com", "awesomeapp.cloud.1and1.com"].each do
-      it "should detect #{target_spec} as a CloudFoundry target" do
-        DeployTool::Target.find(target_spec).class.should == DeployTool::Target::CloudFoundry
-      end
-    end
-    
-    ["app10000@api.srv.io", "app10000@srv.io", "app10000@app123.srv.io", "app10000.srv.io"].each do |target_spec|
+
+    ["app10000@api.hostingstack.com", "app10000@hostingstack.com", "app10000@app123.hostingstack.com", "app10000.hostingstack.com"].each do |target_spec|
       it "should detect #{target_spec} as an Efficient Cloud target" do
         DeployTool::Target.find(target_spec).class.should == DeployTool::Target::EfficientCloud
       end
     end
-    
-    ["heroku.com", "awesomeapp.heroku.com"].each do |target_spec|
-      it "should detect #{target_spec} as an Heroku target" do
-        DeployTool::Target.find(target_spec).class.should == DeployTool::Target::Heroku
-      end
-    end
-    
+
     ["gandi.net", "1and1.com"].each do |target_spec|
       it "should return an error with #{target_spec} as target" do
         DeployTool::Target.find(target_spec).class.should == NilClass
       end
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deployto
 version: !ruby/object:Gem::Version 
-  hash: 63
-  prerelease: false
+  hash: 51
+  prerelease: 
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Efficient Cloud Ltd
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 +02:00
-default_executable: 
+date: 2011-09-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: inifile
@@ -70,10 +69,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 11
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 6
+        - 2
+        version: 1.6.2
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -91,7 +92,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: heroku
+  name: json_pure
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -105,7 +106,7 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: json_pure
+  name: oauth2
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -133,15 +134,12 @@ files:
 - lib/deploytool/command.rb
 - lib/deploytool/config.rb
 - lib/deploytool/target.rb
-- lib/deploytool/target/cloudfoundry.rb
 - lib/deploytool/target/efficientcloud.rb
 - lib/deploytool/target/efficientcloud/api_client.rb
-- lib/deploytool/target/heroku.rb
 - lib/deploytool/version.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/target_spec.rb
-has_rdoc: true
 homepage: http://platformdirectory.com/
 licenses: []
 
@@ -171,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Multi-platform deployment tool.

data/lib/deploytool/target/cloudfoundry.rb

@@ -1,31 +0,0 @@
-class DeployTool::Target::CloudFoundry < DeployTool::Target
-  def self.parse_target_spec(target_spec)
-    app_name, server = target_spec.split('.', 2)
-    return false if server.nil? or app_name.nil?
-    # Test through multiple versions of API server URLs
-    [target_spec, 'api.' + target_spec, 'api.' + server].each do |api_server|
-      begin
-        if get_json_resource("http://%s/info" % api_server)['name'] == "vcap"
-          app_name = nil if server.gsub('api.') == api_server.gsub('api.')
-          return [app_name, api_server]
-        end
-      rescue => e
-        $logger.debug "Exception: %s\n%s" % [e.message, e.backtrace.join("\n")]
-      end
-    end
-    false
-  end
-  
-  def self.matches?(target_spec)
-    return true if parse_target_spec(target_spec)
-  end
-  
-  def initialize(options)
-    # FIXME
-  end
-  
-  def self.create(target_spec)
-    app_name, api_server = parse_target_spec(target_spec)
-    CloudFoundry.new('api_server' => api_server, 'app_name' => app_name)
-  end
-end

data/lib/deploytool/target/heroku.rb

@@ -1,30 +0,0 @@
-class DeployTool::Target::Heroku < DeployTool::Target
-  def self.matches?(target_spec)
-    target_spec[/(^|\.)heroku\.com$/]
-  end
-  
-  def to_h
-    {:type => "Heroku", :app_name => @app_name}
-  end
-  
-  def to_s
-    "%s.heroku.com (Heroku)" % [@app_name]
-  end
-  
-  def initialize(options)
-    @app_name = options['app_name']
-  end
-  
-  def self.create(target_name)
-    app_name = target_name.gsub('.heroku.com', '')
-    # TODO: Require current directory to be a git repository
-    # TODO: Ask for app name if app name is nil or www
-    puts `heroku create #{app_name}`
-    Heroku.new('app_name' => app_name)
-  end
-  
-  def push(opts)
-    puts `git push -f git@heroku.com:#{@app_name}.git master`
-    $?.exitstatus
-  end
-end