deployto 0.9.1 → 0.9.2

data/bin/deploy

@@ -10,7 +10,6 @@ require 'deploytool/command'
 
 $logger = Logger.new STDOUT
 $logger.formatter = proc do |severity, datetime, progname, msg|
-  next if severity == "DEBUG"
   if severity == "ERROR"
     "ERROR: #{msg}\n"
   else
@@ -23,4 +22,4 @@ args = ARGV.dup
 ARGV.clear
 command = args.shift.strip rescue 'help'
 
-DeployTool::Command.run(command, args)
+DeployTool::Command.run(command, args)

data/lib/deploytool/command.rb

@@ -1,12 +1,7 @@
 class DeployTool::Command
   COMMANDS = ["to", "logs", "import", "export", "config"]
   
-  def self.run(command, args)
-    change_to_toplevel_dir!
-    
-    DeployTool::Config.load(".deployrc")
-    
-    if command == "help"
+  def self.print_help
       puts "Deploytool Usage Instructions"
       puts ""
       puts "Add a target:"
@@ -16,6 +11,22 @@ class DeployTool::Command
       puts ""
       puts "Deploy the current directory to the target:"
       puts "  deploy to production"
+  end
+
+  def self.run(command, args)
+    if args.include?("--debug")
+      args.delete("--debug")
+      $logger.level = Logger::DEBUG
+    else
+      $logger.level = Logger::INFO
+    end
+
+    change_to_toplevel_dir!
+
+    DeployTool::Config.load(".deployrc")
+    
+    if command == "help"
+      print_help
     elsif command == "add"
       if args[0].nil?
         puts "ERROR: Missing target name."
@@ -35,6 +46,9 @@ class DeployTool::Command
         puts "Use \"deploy help\" if you're lost."
         exit
       end
+      if target.respond_to?(:verify)
+        target.verify
+      end
       DeployTool::Config[args[0]] = target.to_h
     elsif command == "list"
       puts "Registered Targets:"
@@ -47,9 +61,9 @@ class DeployTool::Command
       target_name = args[0]
       
       unless (target = DeployTool::Config[target_name]) && !target.nil? && target.size > 0
-        puts "ERROR: Couldn't find target: #{target_name}"
+        puts "ERROR: Target \"#{target_name}\" is not configured"
         puts ""
-        puts "Use \"deploy help\" if you're lost."
+        print_help
         exit
       end
       

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

@@ -8,16 +8,16 @@ require 'zip'
 
 class DeployTool::Target::EfficientCloud
   class ApiClient
-    attr_reader :server, :app_id, :email, :password
-    def initialize(server, app_id, email, password)
-      @app_id = app_id
+    attr_reader :server, :app_name, :email, :password
+    def initialize(server, app_name, email, password)
+      @app_name = app_name
       @server = server
       @email = email
       @password = password
     end
     
     def call(method, method_name, data = {})
-      url = Addressable::URI.parse("http://#{@server}/api/cli/v1/apps/#{@app_id}/#{method_name}")
+      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|
@@ -34,6 +34,16 @@ class DeployTool::Target::EfficientCloud
         res.error!
       end
     end
+
+    def info
+      response = call :get, 'info'
+      doc = REXML::Document.new response
+      data = {}
+      doc.elements["app"].each_element do |el|
+        data[el.name.gsub('-','_').to_sym] = el.text
+      end
+      data
+    end
     
     def upload
       puts "-----> Packing code tarball..."
@@ -70,16 +80,16 @@ class DeployTool::Target::EfficientCloud
     rescue Net::HTTPServerException => e
       case e.response
       when Net::HTTPNotFound
-        $logger.error "Application app%d.%s couldn't be found." % [@app_id, @server.gsub('api.', '')]
+        $logger.error "Application %s couldn't be found." % @app_name
       when Net::HTTPUnauthorized
-        $logger.error "You're not authorized to update app%d.%s." % [@app_id, @server.gsub('api.', '')]
+        $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
@@ -109,7 +119,7 @@ class DeployTool::Target::EfficientCloud
           puts "...possibly done."
           break
         end
-        if doc.elements["deploy/message"].text == 'nojob'
+        if doc.elements["deploy/message"].text == 'finished'
           puts "\n-----> FINISHED after %d seconds!" % (Time.now-start)
           break
         end

data/lib/deploytool/target/efficientcloud.rb

@@ -1,15 +1,15 @@
 require 'highline'
 
 class DeployTool::Target::EfficientCloud < DeployTool::Target
-  SUPPORTED_API_VERSION = 1
+  SUPPORTED_API_VERSION = 2
   def self.parse_target_spec(target_spec)
-    server, app_id = target_spec.split('@').reverse
-    if app_id.nil?
-      app_id = server.split('.', 2).first
+    server, app_name = target_spec.split('@').reverse
+    if app_name.nil?
+      app_name = server.split('.', 2).first
     end
     [server, 'api.' + server, 'api.' + server.split('.', 2).last].each do |api_server|
       begin
-        return [app_id.gsub('app', '').to_i, api_server] if check_version(api_server)
+        return [app_name, api_server] if check_version(api_server)
       rescue => e
         puts e
       end
@@ -22,16 +22,16 @@ class DeployTool::Target::EfficientCloud < DeployTool::Target
   end
   
   def to_h
-    {:type => "EfficientCloud", :api_server => @api_client.server, :app_id => @api_client.app_id, :email => @api_client.email, :password => @api_client.password}
+    {:type => "EfficientCloud", :api_server => @api_client.server, :app_name => @api_client.app_name, :email => @api_client.email, :password => @api_client.password}
   end
   
   def to_s
-    "app%s@%s (EFC-based platform)" % [@api_client.app_id, @api_client.server]
+    "%s@%s (EFC-based platform)" % [@api_client.app_name, @api_client.server]
   end
   
   def initialize(options)
     @api_server = options['api_server']
-    @api_client = ApiClient.new(options['api_server'], options['app_id'], options['email'], options['password'])
+    @api_client = ApiClient.new(options['api_server'], options['app_name'], options['email'], options['password'])
   end
 
   def self.check_version(api_server)
@@ -45,6 +45,7 @@ class DeployTool::Target::EfficientCloud < DeployTool::Target
 
     if info['api_version'] > SUPPORTED_API_VERSION
       $logger.error "This version of deploytool is outdated.\nThis server requires at least API Version #{info['api_version']}."
+      return false
     end
     return true
   end
@@ -53,12 +54,35 @@ class DeployTool::Target::EfficientCloud < DeployTool::Target
     $logger.info "Please specify your controlpanel login information"
     email =    HighLine.new.ask("E-mail:   ")
     password = HighLine.new.ask("Password: ") {|q| q.echo = "*" }
-    app_id, api_server = parse_target_spec(target_spec)
-    EfficientCloud.new('api_server' => api_server, 'app_id' => app_id, 'email' => email, 'password' => password)
+    app_name, api_server = parse_target_spec(target_spec)
+    EfficientCloud.new('api_server' => api_server, 'app_name' => app_name, 'email' => email, 'password' => password)
+  end
+
+  def verify
+    self.class.check_version(@api_server)
+    begin
+      info = @api_client.info
+      return true
+    rescue => e
+      $logger.debug "Exception: %s %s\n  %s" % [e.class.name, e.message, e.backtrace.join("\n  ")]
+      if e.message.include?("401 ")
+        $logger.error "Authentication failed (password wrong?)"
+      elsif e.message.include?("404 ")
+        $logger.error "Application does not exist"
+      else
+        $logger.error "Remote server said: %s" % [e.message]
+      end
+    end
+    exit 5
   end
   
   def push(opts)
     self.class.check_version(@api_server)
+    info = @api_client.info
+    if info[:blocking_deployment]
+      $logger.error info[:blocking_deployment]
+      exit 4
+    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

data/lib/deploytool/version.rb

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

data/lib/deploytool.rb

@@ -1,4 +1,4 @@
 module DeployTool; end
 
 require 'deploytool/config'
-require 'deploytool/target'
+require 'deploytool/target'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deployto
 version: !ruby/object:Gem::Version 
-  hash: 57
-  prerelease: 
+  hash: 63
+  prerelease: false
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Efficient Cloud Ltd
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 Z
+date: 2011-08-31 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: inifile
@@ -140,6 +141,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/target_spec.rb
+has_rdoc: true
 homepage: http://platformdirectory.com/
 licenses: []
 
@@ -169,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Multi-platform deployment tool.