af 0.3.18.12 → 0.3.19.beta.1

data/README.md

@@ -58,6 +58,7 @@ MIT license, please see the LICENSE file.  All rights reserved._
       map <appname> <url>                          Register the application to the url
       unmap <appname> <url>                        Unregister the application from the url
       instances <appname> <num|delta>              Scale the application instances up or down
+      rename <curname> <newname>                   Change the application's name
 
     Application Information
       crashes <appname>                            List recent application crashes

data/lib/cli/commands/apps.rb

@@ -23,7 +23,7 @@ module VMC::Cli::Command
 
       display "\n"
       return display "No Applications" if apps.nil? || apps.empty?
-      
+
       infra_supported = !apps.detect { |a| a[:infra] }.nil?
 
       apps_table = table do |t|
@@ -34,7 +34,7 @@ module VMC::Cli::Command
           if infra_supported
             a << ( app[:infra] ? app[:infra][:provider] : "   " )
           end
-          t << a  
+          t << a
         end
       end
       display apps_table
@@ -58,7 +58,7 @@ module VMC::Cli::Command
     def console(appname, interactive=true)
 
       app = client.app_info(appname)
-      infra_name = app[:infra] ? app[:infra][:name] : 'aws' # FIXME 
+      infra_name = app[:infra] ? app[:infra][:name] : 'aws' # FIXME
 
       unless defined? Caldecott
         display "To use `vmc rails-console', you must first install Caldecott:"
@@ -213,28 +213,28 @@ module VMC::Cli::Command
     def download(appname, path=nil)
       path = File.expand_path(path || "#{appname}.zip" )
       banner = "Downloading last pushed source code to #{path}: "
-      display banner, false      
+      display banner, false
       client.app_download(appname, path)
       display 'OK'.green
     end
-    
+
     def pull(appname, path=nil)
       path = File.expand_path(path || appname)
       banner = "Pulling last pushed source code: "
-      display banner, false      
+      display banner, false
       client.app_pull(appname, path)
       display 'OK'.green
     end
-    
+
     def clone(src_appname, dest_appname, dest_infra=nil)
-      
+
       # FIXME need to ask for dest_appname if nil
-      
+
       err "Application '#{dest_appname}' already exists" if app_exists?(dest_appname)
 
       app = client.app_info(src_appname)
 
-      if client.infra_supported? 
+      if client.infra_supported?
         dest_infra = @options[:infra] || client.infra_name_for_description(
             ask("Select Infrastructure",:indexed => true, :choices => client.infra_descriptions))
         client.infra = dest_infra
@@ -251,7 +251,7 @@ module VMC::Cli::Command
         pull(src_appname,zip_path)
 
         display "Cloning '#{src_appname}' to '#{dest_appname}': "
-        
+
         manifest = {
           :name => "#{dest_appname}",
           :staging => app[:staging],
@@ -261,9 +261,9 @@ module VMC::Cli::Command
         }
         manifest[:staging][:command] = app[:staging][:command] if app[:staging][:command]
         manifest[:infra] = { :provider => dest_infra } if dest_infra
-         
-        client.create_app(dest_appname, manifest)      
-        
+
+        client.create_app(dest_appname, manifest)
+
         # Stage and upload the app bits.
         upload_app_bits(dest_appname, zip_path, dest_infra)
 
@@ -289,15 +289,15 @@ module VMC::Cli::Command
             display 'OK'.green
           else
             err "Import data into '#{service}' failed"
-          end          
+          end
         end
-        
+
         no_start = @options[:nostart]
-        start(dest_appname, true) unless no_start  
-        
+        start(dest_appname, true) unless no_start
+
       end
     end
-    
+
     def logs(appname)
       # Check if we have an app before progressing further
       client.app_info(appname)
@@ -524,7 +524,7 @@ module VMC::Cli::Command
             check_unreachable_links(path,afi.included_files(files))
 
             copy_files( path, ignore_sockets( afi.included_files(files)), explode_dir )
-            
+
           end
         end
       end
@@ -735,9 +735,17 @@ module VMC::Cli::Command
         health = format("%.3f", healthy_instances.to_f / expected_instance).to_f
       end
 
-      return 'RUNNING' if health && health == 1.0
-      return "#{(health * 100).round}%" if health
-      return 'N/A'
+      if health
+        if health == 1.0
+          return "RUNNING"
+        else
+          return "#{(health * 100).round}%"
+        end
+      elsif d[:state] == "STARTED"
+        return 'N/A' # unstarted instances
+      else
+        return d[:state]
+      end
     end
 
     def app_started_properly(appname, error_on_health)
@@ -1111,12 +1119,12 @@ module VMC::Cli::Command
       }
       manifest[:staging][:command] = command if command
       manifest[:infra] = { :provider => infra } if infra
-      
+
       # Send the manifest to the cloud controller
       client.create_app(appname, manifest)
       display 'OK'.green
 
-      
+
       existing = Set.new(client.services.collect { |s| s[:name] })
 
       if @app_info && services = @app_info["services"]

data/lib/cli/commands/base.rb

@@ -27,7 +27,7 @@ module VMC::Cli
 
         load_manifest manifest_file if manifest_file
       end
-      
+
       def manifest_file
         return @options[:manifest] if @options[:manifest]
         return @manifest_file if @manifest_file

data/lib/cli/commands/misc.rb

@@ -83,9 +83,16 @@ module VMC::Cli::Command
     def infras
       infras_info = client.infras
       return display "Multiple infras not supported" if infras_info.empty?
-      itable = table do |t|
-        t.headings = [ 'Name','Description' ]
-        infras_info.each { |i| t << [i[:infra], i[:description]] }
+      if infras_info.detect {|i| i.has_key?(:available) && i[:available] == false } # If one or more infras is unavailable
+        itable = table do |t|
+          t.headings = [ 'Name','Description','Message' ]
+          infras_info.each { |i| t << [i[:infra], i[:description], i[:available] ? '' : 'Unavailable - ' + i[:unavail_message]] }
+        end
+      else # All infras are available
+        itable = table do |t|
+          t.headings = [ 'Name','Description' ] 
+          infras_info.each { |i| t << [i[:infra], i[:description]] }
+        end
       end
       display "\n"
       display itable

data/lib/cli/commands/services.rb

@@ -47,7 +47,7 @@ module VMC::Cli::Command
                 :indexed => true, :choices => client.infra_descriptions))
         end
       end
-      
+
       create_service_banner(service, name, picked_name, @options[:infra])
       appname = @options[:bind] unless appname
       bind_service_banner(name, appname) if appname
@@ -93,9 +93,9 @@ module VMC::Cli::Command
       services.each { |service| bind_service_banner(service, dest_app, false) }
       check_app_for_restart(dest_app)
     end
-    
+
     def export_service(service)
-      display "Exporting data from '#{service}': ", false    
+      display "Exporting data from '#{service}': ", false
       export_info = client.export_service(service)
       if export_info
         display 'OK'.green
@@ -104,7 +104,7 @@ module VMC::Cli::Command
         err "Export data from '#{service}': failed"
       end
     end
-    
+
     def import_service(service,url)
       display "Importing data into '#{service}': ", false
       import_info = client.import_service(service,url)
@@ -114,7 +114,7 @@ module VMC::Cli::Command
         err "Import data into '#{service}' failed"
       end
     end
-    
+
     def tunnel(service=nil, client_name=nil)
       unless defined? Caldecott
         display "To use `af tunnel', you must first install Caldecott:"
@@ -154,7 +154,7 @@ module VMC::Cli::Command
         infra_name = info[:infra] ? info[:infra][:name] : default_infra
         err "Infra '#{infra_name}' is not valid" unless client.infra_valid?(infra_name)
       end
-      
+
       if not tunnel_pushed?(infra_name)
         display "Deploying tunnel application '#{tunnel_appname(infra_name)}'."
         auth = UUIDTools::UUID.random_create.to_s

data/lib/cli/commands/user.rb

@@ -2,6 +2,9 @@ module VMC::Cli::Command
 
   class User < Base
 
+    # Errors
+    class InvalidLogin < VMC::Client::TargetError; end
+
     def info
       info = client_info
       username = info[:user] || 'N/A'
@@ -10,27 +13,28 @@ module VMC::Cli::Command
     end
 
     def login(email=nil)
-      email    = @options[:email] unless email
-      password = @options[:password]
-      tries ||= 0
+      display "Attempting login to [#{target_url}]" if target_url
+      begin
+        email    = @options[:email] unless email
+        password = @options[:password]
+        tries ||= 0
 
-      unless no_prompt
-        display "Attempting login to [#{target_url}]" if target_url
-        email ||= ask("Email")
-        password ||= ask("Password", :echo => "*")
-      end
+        unless no_prompt
+          email ||= ask("Email")
+          password ||= ask("Password", :echo => "*")
+        end
 
-      err "Need a valid email" unless email
-      err "Need a password" unless password
-      login_and_save_token(email, password)
-      say "Successfully logged into [#{target_url}]".green
-    rescue VMC::Client::TargetError
-      display "Problem with login, invalid account or password when attempting to login to '#{target_url}'".red
-      retry if (tries += 1) < 3 && prompt_ok && !@options[:password]
-      exit 1
-    rescue => e
-      display "Problem with login to '#{target_url}', #{e}, try again or register for an account.".red
-      exit 1
+        err "Need a valid email" unless email
+        err "Need a password" unless password
+        login_and_save_token(email, password)
+        say "Successfully logged into [#{target_url}]".green
+      rescue VMC::Client::TargetError
+        if (tries += 1) < 3 && prompt_ok && !@options[:password]
+          display "Problem with login, invalid account or password when attempting to login to '#{target_url}'".red
+          retry
+        end
+        raise InvalidLogin, "Problem with login, invalid account or password when attempting to login to '#{target_url}'"
+      end
     end
 
     def logout

data/lib/cli/config.rb

@@ -15,6 +15,7 @@ module VMC::Cli
     ALIASES_FILE   = '~/.af_aliases'
     CLIENTS_FILE   = '~/.af_clients'
     MICRO_FILE     = '~/.af_micro'
+    CRASH_FILE     = '~/.af_crash'
 
     STOCK_CLIENTS = File.expand_path("../../../config/clients.yml", __FILE__)
 
@@ -47,6 +48,11 @@ module VMC::Cli
         lock_and_write(target_file, target_host)
       end
 
+      def store_crash(log)
+        crash_file = File.expand_path(CRASH_FILE)
+        lock_and_write(crash_file, log)
+      end
+
       def all_tokens(token_file_path=nil)
         token_file = File.expand_path(token_file_path || TOKEN_FILE)
         return nil unless File.exists? token_file

data/lib/cli/frameworks.rb

@@ -18,7 +18,7 @@ module VMC::Cli
       'Erlang/OTP Rebar' => ['otp_rebar',  { :mem => '64M',  :description => 'Erlang/OTP Rebar Application'}],
       'WSGI'     => ['wsgi',    { :mem => '64M',  :description => 'Python WSGI Application'}],
       'Django'   => ['django',  { :mem => '128M', :description => 'Python Django Application'}],
-      'dotNet'   => ['dotNet',  { :mem => '128M', :description => '.Net Web Application'}],
+      'aspdotnet'   => ['aspdotnet',  { :mem => '128M', :description => 'ASP.NET Application'}],
       'Rack'     => ['rack', { :mem => '128M', :description => 'Rack Application'}],
       'Play'     => ['play',  { :mem => '256M', :description => 'Play Framework Application'}]
     }
@@ -114,8 +114,8 @@ module VMC::Cli
             return Framework.lookup('WSGI')
 
           # .Net
-          elsif !Dir.glob('web.config').empty?
-            return Framework.lookup('dotNet')
+          elsif !Dir.glob('web.config', File::FNM_CASEFOLD).empty?
+            return Framework.lookup('aspdotnet')
 
           # Node.js
           elsif !Dir.glob('*.js').empty?

data/lib/cli/runner.rb

@@ -48,6 +48,7 @@ class VMC::Cli::Runner
       # generic tracing and debugging
       opts.on('-t [TKEY]')         { |tkey|  @options[:trace] = tkey || true }
       opts.on('--trace [TKEY]')    { |tkey|  @options[:trace] = tkey || true }
+      opts.on('--crash')           {         @options[:crash] = true }
 
       # start application in debug mode
       opts.on('-d [MODE]')         { |mode|  @options[:debug] = mode || "run" }
@@ -98,7 +99,7 @@ class VMC::Cli::Runner
 
       # Proxying for another user, requires admin privileges
       opts.on('-u PROXY')          { |proxy| @options[:proxy] = proxy }
-      
+
       # Select infrastructure
       opts.on('--infra INFRA')     { |infra| @options[:infra] = infra }
 
@@ -285,7 +286,7 @@ class VMC::Cli::Runner
       else
         set_cmd(:apps, :files, 2)
       end
-      
+
     when 'download'
       usage('af download <appname> [path]')
       if @args.size == 1
@@ -293,7 +294,7 @@ class VMC::Cli::Runner
       else
         set_cmd(:apps, :download, 2)
       end
-      
+
     when 'pull'
       usage('af pull <appname> [path]')
       if @args.size == 1
@@ -389,16 +390,16 @@ class VMC::Cli::Runner
     when 'export-service'
       usage('af export-service <service-name>')
       set_cmd(:services, :export_service, 1)
-      
+
     when 'import-service'
       usage('af import-service <service-name> <url>')
       set_cmd(:services, :import_service, 2)
-      
+
     when 'clone'
       usage('af clone <src-app> <dest-app> [<infra>]')
       set_cmd(:apps, :clone, 2) if @args.size == 2
       set_cmd(:apps, :clone, 3) if @args.size == 3
-      
+
     when 'aliases'
       usage('af aliases')
       set_cmd(:misc, :aliases)
@@ -484,7 +485,45 @@ class VMC::Cli::Runner
     @usage_error
   end
 
+  def crash_log(e, message = nil)
+    @finish_time = Time.now
+    diff = @finish_time - @start_time
+
+    if message != nil
+      message = "#{message} (#{e.message})"
+    else
+      message = e.message
+    end
+
+    say message.red
+
+    @options[:password] = "".rjust(@options[:password].length, '*') if @options[:password]
+
+    log = ""
+    log += "Action: #{@action}\n"
+    log += "Arguments: #{@args.join(' ')}\n" if "#{@action}" != 'environment_add'
+    log += "Options: #{@options.to_json}\n"
+    log += "Execution Time: %.2fs\n" % diff
+    log += "Target: #{VMC::Cli::Config.target_url}\n"
+    log += "Client: v#{VMC::Cli::VERSION}\n"
+    log += "Platform: #{RUBY_PLATFORM} - Ruby:#{RUBY_VERSION}-#{RUBY_PATCHLEVEL}\n"
+    log += "Type: #{e.class}\n"
+    log += "Message: #{e.message}\n"
+    log += "Stack Trace:\n"
+    e.backtrace.each do |trace|
+      log += "  #{trace}\n"
+    end
+
+    if @options[:crash] == true
+      say "--- #{File.expand_path(VMC::Cli::Config::CRASH_FILE)} ---"
+      say log
+    end
+
+    VMC::Cli::Config.store_crash(log)
+  end
+
   def run
+    @start_time = Time.now
 
     trap('TERM') { print "\nTerminated\n"; exit(false)}
 
@@ -512,15 +551,21 @@ class VMC::Cli::Runner
     end
 
   rescue OptionParser::InvalidOption => e
-    puts(e.message.red)
+    crash_log(e)
     puts("\n")
     puts(basic_usage)
     @exit_status = false
   rescue OptionParser::AmbiguousOption => e
-    puts(e.message.red)
+    crash_log(e)
     puts("\n")
     puts(basic_usage)
     @exit_status = false
+  rescue VMC::Cli::Command::User::InvalidLogin => e
+    crash_log(e)
+    @exit_status = false
+  rescue VMC::Client::BadTarget => e
+    crash_log(e, "Problem with login to '#{VMC::Cli::Config.target_url}', try again or register for an account.")
+    @exit_status = false
   rescue VMC::Client::AuthError => e
     if VMC::Cli::Config.auth_token.nil?
       puts "Login Required".red
@@ -529,31 +574,29 @@ class VMC::Cli::Runner
     end
     @exit_status = false
   rescue VMC::Client::TargetError, VMC::Client::NotFound, VMC::Client::BadTarget  => e
-    puts e.message.red
+    crash_log(e)
     @exit_status = false
   rescue VMC::Client::HTTPException => e
-    puts e.message.red
+    crash_log(e, "There was a problem connecting to the target. Please try again in a few moments.")
     @exit_status = false
   rescue VMC::Cli::GracefulExit => e
     # Redirected commands end up generating this exception (kind of goto)
   rescue VMC::Cli::CliExit => e
-    puts e.message.red
+    crash_log(e)
     @exit_status = false
   rescue VMC::Cli::CliError => e
-    say("Error #{e.error_code}: #{e.message}".red)
+    crash_log(e, "Error #{e.error_code}: #{e.message}")
     @exit_status = false
   rescue SystemExit => e
     @exit_status = e.success?
   rescue SyntaxError => e
-    puts e.message.red
-    puts e.backtrace
+    crash_log(e)
     @exit_status = false
   rescue Interrupt => e
-    say("\nInterrupted".red)
+    crash_log(e, "Interrupted")
     @exit_status = false
   rescue Exception => e
-    puts e.message.red
-    puts e.backtrace
+    crash_log(e)
     @exit_status = false
   ensure
     say("\n")

data/lib/cli/version.rb

@@ -2,6 +2,6 @@ module VMC
   module Cli
     # This version number is used as the RubyGem release version.
     # The internal VMC version number is VMC::VERSION.
-    VERSION = '0.3.18.12' 
+    VERSION = '0.3.19.beta.1'
   end
 end

data/lib/vmc/client.rb

@@ -28,7 +28,7 @@ class VMC::Client
   VMC_HTTP_ERROR_CODES = [ 400, 500 ]
 
   HTTP_TIMEOUT = ENV['TIMEOUT'] ? ENV['TIMEOUT'].to_i : 10*60
-  
+
   # Errors
   class BadTarget <  RuntimeError; end
   class AuthError <  RuntimeError; end
@@ -158,7 +158,7 @@ class VMC::Client
     _, body, headers = http_get(url)
     body
   end
-  
+
   def app_download(name,path)
     check_login_status
     url = path(VMC::APPS_PATH, name, "application")
@@ -167,7 +167,7 @@ class VMC::Client
     file.write(body)
     file.close
   end
-  
+
   def app_pull(name, dir)
     check_login_status
     url = path(VMC::APPS_PATH, name, "application")
@@ -247,11 +247,11 @@ class VMC::Client
     app[:services] = services
     update_app(appname, app)
   end
-  
+
   def export_service(service)
     json_get(path(VMC::SERVICE_EXPORT_PATH, service))
   end
-  
+
   def import_service(service,uri)
     json_post(path(VMC::SERVICE_IMPORT_PATH, service),{:uri => uri})
   end
@@ -390,16 +390,16 @@ class VMC::Client
       "aws.af.cm"
     end
   end
-  
-  def infra_valid?(name) 
+
+  def infra_valid?(name)
     infras.detect { |i| i[:infra] == name }
   end
 
   def infra_descriptions
-    infras.map { |i| i[:description] }
+    infras.select{|i| !i.has_key?(:available) || i[:available] == true}.map { |i| i[:description] }
   end
-  
-  def infra_name_for_description(desc) 
+
+  def infra_name_for_description(desc)
     info = infras.detect { |i| i[:description] == desc }
     info ? info[:infra] : ""
   end
@@ -559,5 +559,5 @@ class VMC::Client
   def infras_match?(o1,o2)
     o1 && o2 && ( o1[:infra] == o2[:infra])
   end
-  
+
 end

metadata

@@ -1,213 +1,225 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: af
-version: !ruby/object:Gem::Version
-  version: 0.3.18.12
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 62196233
+  prerelease: 7
+  segments: 
+  - 0
+  - 3
+  - 19
+  - beta
+  - 1
+  version: 0.3.19.beta.1
 platform: ruby
-authors:
+authors: 
 - AppFog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-09-18 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json_pure
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 5
+        - 1
         version: 1.5.1
     - - <
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 7
+        - 0
         version: 1.7.0
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.4
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rubyzip
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 9
+        - 4
         version: 0.9.4
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.1
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.7.0
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rest-client
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 6
+        - 1
         version: 1.6.1
     - - <
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 7
+        - 0
         version: 1.7.0
-- !ruby/object:Gem::Dependency
-  name: terminal-table
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.2
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: terminal-table
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 4
+        - 2
         version: 1.4.2
-- !ruby/object:Gem::Dependency
-  name: interact
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.0
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: interact
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 4
+        - 0
         version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: addressable
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.6
   type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: addressable
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 2
+        - 6
         version: 2.2.6
-- !ruby/object:Gem::Dependency
-  name: uuidtools
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.1.0
   type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: uuidtools
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 1
+        - 0
         version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: rb-readline
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.2
   type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rb-readline
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 4
+        - 2
         version: 0.4.2
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.0
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.0
   type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: webmock
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
         version: 1.5.0
+  type: :development
+  version_requirements: *id011
 description: AppFog.com CLI
 email: support@appfog.com
-executables:
+executables: 
 - af
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.md
 - LICENSE
-files:
+files: 
 - LICENSE
 - README.md
 - Rakefile
@@ -251,28 +263,41 @@ files:
 - caldecott_helper/Gemfile.lock
 - caldecott_helper/server.rb
 - bin/af
+has_rdoc: true
 homepage: http://appfog.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  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
-      version: '0'
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: AppFog.com CLI
 test_files: []
+