af 0.3.18.3 → 0.3.18.4

data/README.md

@@ -29,6 +29,9 @@ MIT license, please see the LICENSE file.  All rights reserved._
       push [appname] --mem M                       Set the memory reservation for the application
       push [appname] --no-start                    Do not auto-start the application
 
+    Application Download
+      pull <appname> [path]                        Downloads last pushed source to <appname> or [path]
+
     Application Operations
       start <appname>                              Start the application
       stop  <appname>                              Stop the application

data/lib/cli.rb

@@ -27,7 +27,6 @@ module VMC
     autoload :TunnelHelper,   "#{ROOT}/cli/tunnel_helper"
     autoload :ManifestHelper, "#{ROOT}/cli/manifest_helper"
     autoload :ConsoleHelper,  "#{ROOT}/cli/console_helper"
-    autoload :InfraHelper,    "#{ROOT}/cli/infra_helper"
 
     module Command
       autoload :Base,         "#{ROOT}/cli/commands/base"

data/lib/cli/commands/apps.rb

@@ -291,14 +291,16 @@ module VMC::Cli::Command
         if @options[:canary]
           display "[--canary] is deprecated and will be removed in a future version".yellow
         end
-        upload_app_bits(appname, @path)
+        infra = app[:infra] ? app[:infra][:provider] : nil
+        upload_app_bits(appname, @path, infra)
         restart appname if app[:state] == 'STARTED'
       else
         each_app do |name|
           display "Updating application '#{name}'..."
 
           app = client.app_info(name)
-          upload_app_bits(name, @application)
+          infra = app[:infra] ? app[:infra][:provider] : nil
+          upload_app_bits(name, @application, infra)
           restart name if app[:state] == 'STARTED'
         end
       end
@@ -420,7 +422,7 @@ module VMC::Cli::Command
       files && files.select { |f| File.socket? f }
     end
 
-    def upload_app_bits(appname, path)
+    def upload_app_bits(appname, path, infra)
       display 'Uploading Application:'
 
       upload_file, file = "#{Dir.tmpdir}/#{appname}.zip", nil
@@ -480,7 +482,8 @@ module VMC::Cli::Command
         # Check to see if the resource check is worth the round trip
         if (total_size > (64*1024)) # 64k for now
           # Send resource fingerprints to the cloud controller
-          appcloud_resources = client.check_resources(fingerprints)
+          # FIXME  where do I get infra?
+          appcloud_resources = client.check_resources(fingerprints,infra)
         end
         display 'OK'.green
 
@@ -944,7 +947,7 @@ module VMC::Cli::Command
       infra = info(:infra)
 
       if infra
-        err "Infra '#{infra}' is not valid" unless VMC::Cli::InfraHelper.valid?(infra)
+        err "Infra '#{infra}' is not valid" unless client.infra_valid?(infra)
       end
 
       # Check app existing upfront if we have appname
@@ -992,7 +995,7 @@ module VMC::Cli::Command
       command = ask("Start Command") if !command && framework.require_start_command?
 
       default_url = "None"
-      default_url = "#{appname}.#{VMC::Cli::Config.suggest_url}" if framework.require_url?
+      default_url = "#{appname}.#{client.suggest_url(infra)}" if framework.require_url?
 
       unless no_prompt || url || !framework.require_url?
         url = ask(
@@ -1060,7 +1063,7 @@ module VMC::Cli::Command
       end
 
       # Stage and upload the app bits.
-      upload_app_bits(appname, @application)
+      upload_app_bits(appname, @application, infra)
 
       start(appname, true) unless no_start
     end

data/lib/cli/commands/base.rb

@@ -178,7 +178,7 @@ module VMC::Cli
       end
 
       def target_base(ctx = [])
-        VMC::Cli::Config.base_of(find_symbol("target", ctx) || "api.#{VMC::Cli::Config.suggest_url}")
+        VMC::Cli::Config.base_of(find_symbol("target", ctx) || "api.#{client.suggest_url}")
       end
 
       # Inject a client to help in testing.

data/lib/cli/commands/misc.rb

@@ -81,9 +81,11 @@ module VMC::Cli::Command
     end
 
     def infras
+      infras_info = client.infras
+      return display "Multiple infras not supported" if infras_info.empty?
       itable = table do |t|
         t.headings = [ 'Name','Description' ]
-        VMC::Cli::InfraHelper.list.each { |i| t << [i[:name], i[:description]] }
+        infras_info.each { |i| t << [i[:infra], i[:description]] }
       end
       display "\n"
       display itable

data/lib/cli/commands/services.rb

@@ -42,9 +42,9 @@ module VMC::Cli::Command
 
       if client.infra_supported?
         unless no_prompt || @options[:infra]
-          @options[:infra] = VMC::Cli::InfraHelper.name_for_description(
+          @options[:infra] = client.infra_name_for_description(
               ask("Select Infrastructure",
-                :indexed => true, :choices => VMC::Cli::InfraHelper.infra_descriptions))
+                :indexed => true, :choices => client.infra_descriptions))
         end
       end
       
@@ -131,7 +131,7 @@ module VMC::Cli::Command
       infra_name = info[:infra] ? info[:infra][:name] : default_infra
       
       if infra_name
-        err "Infra '#{infra_name}' is not valid" unless VMC::Cli::InfraHelper.valid?(infra_name)
+        err "Infra '#{infra_name}' is not valid" unless client.infra_valid?(infra_name)
       end
 
       

data/lib/cli/config.rb

@@ -42,10 +42,6 @@ module VMC::Cli
         url.sub(/^[^\.]+\./, "")
       end
 
-      def suggest_url
-        @suggest_url ||= VMC::Cli::InfraHelper.base_for_infra(@infra)
-      end
-
       def store_target(target_host)
         target_file = File.expand_path(TARGET_FILE)
         lock_and_write(target_file, target_host)

data/lib/cli/manifest_helper.rb

@@ -107,10 +107,10 @@ module VMC::Cli::ManifestHelper
 
     if client.infra_supported? 
       infra = @options[:infra] || manifest("infra") || 
-        VMC::Cli::InfraHelper.name_for_description(
-          ask("Select Infrastructure",:indexed => true, :choices => VMC::Cli::InfraHelper.infra_descriptions))
+        client.infra_name_for_description(
+          ask("Select Infrastructure",:indexed => true, :choices => client.infra_descriptions))
       set infra.dup, "infra"
-      VMC::Cli::Config.infra = infra   
+      client.infra = infra
     end
 
     url_template = manifest("url") || DEFAULTS["url"]

data/lib/cli/runner.rb

@@ -293,7 +293,7 @@ class VMC::Cli::Runner
       else
         set_cmd(:apps, :pull, 2)
       end
-    
+
     when 'logs'
       usage('af logs <appname> [--instance N] [--all] [--prefix]')
       set_cmd(:apps, :logs, 1)

data/lib/cli/tunnel_helper.rb

@@ -292,7 +292,7 @@ module VMC::Cli
       manifest = {
           :name => tunnel_appname(infra),
           :staging => {:framework => "sinatra", :runtime => "ruby18" },
-          :uris => ["#{tunnel_uniquename(infra)}.#{VMC::Cli::InfraHelper.base_for_infra(infra)}"],
+          :uris => ["#{tunnel_uniquename(infra)}.#{client.base_for_infra(infra)}"],
           :instances => 1,
           :resources => {:memory => 64},
           :env => ["CALDECOTT_AUTH=#{token}"]
@@ -304,7 +304,7 @@ module VMC::Cli
         manifest
       )
 
-      apps_cmd.send(:upload_app_bits, tunnel_appname(infra), HELPER_APP)
+      apps_cmd.send(:upload_app_bits, tunnel_appname(infra), HELPER_APP, infra)
 
       invalidate_tunnel_app_info(infra)
     end

data/lib/cli/usage.rb

@@ -43,9 +43,6 @@ Currently available af commands are:
     push [appname] --debug [MODE]                Push application and start in a debug mode
     push [appname] --no-start                    Do not auto-start the application
 
-  Application Download
-    pull <appname> [path]                        Downloads last pushed source to <appname> or [path]
-
   Application Operations
     start <appname> [--debug [MODE]]             Start the application
     stop  <appname>                              Stop the application
@@ -67,6 +64,9 @@ Currently available af commands are:
     stats <appname>                              Display resource usage for the application
     instances <appname>                          List application instances
     
+  Application Download
+    pull <appname> [path]                        Downloads last pushed source to <appname> or [path]
+
   Application Environment
     env <appname>                                List application environment variables
     env-add <appname> <variable[=]value>         Add an environment variable to an application

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.3'
+    VERSION = '0.3.18.4'
   end
 end

data/lib/vmc/client.rb

@@ -22,7 +22,7 @@ class VMC::Client
   end
 
   attr_reader   :target, :host, :user, :proxy, :auth_token
-  attr_accessor :trace
+  attr_accessor :trace, :infra
 
   # Error codes
   VMC_HTTP_ERROR_CODES = [ 400, 500 ]
@@ -247,9 +247,13 @@ class VMC::Client
   # indicating what is needed. This returned manifest should be
   # sent in with the upload if resources were removed.
   # E.g. [{:sha1 => xxx, :size => xxx, :fn => filename}]
-  def check_resources(resources)
+  def check_resources(resources,infra=nil)
     check_login_status
-    status, body, headers = json_post(VMC::RESOURCES_PATH, resources)
+    url = VMC::RESOURCES_PATH
+    unless infra.nil?
+      url += "?infra=#{infra}"
+    end
+    status, body, headers = json_post(url, resources)
     json_parse(body)
   end
 
@@ -341,12 +345,40 @@ class VMC::Client
   end
 
   ######################################################
-  
+  # Infrastructure
+  ######################################################
+
+  def infras
+    json_get(path(VMC::GLOBAL_INFRAS_PATH))
+  rescue
+    []
+  end
+
   def infra_supported?
-    # FIXME should get this from proxy
-    target.match /^https?:\/\/api.appfog.com$/
+    !infras.empty?
+  end
+
+  def base_for_infra(name)
+    info = infras.detect { |i| i[:infra] == name }
+    info ? info[:base] : "aws.af.cm"
+  end
+
+  def infra_valid?(name) 
+    infras.detect { |i| i[:infra] == name }
+  end
+
+  def infra_descriptions
+    infras.map { |i| i[:description] }
+  end
+  
+  def infra_name_for_description(desc) 
+    info = infras.detect { |i| i[:description] == desc }
+    info ? info[:infra] : ""
+  end
+
+  def suggest_url(infra=nil)
+    @suggest_url ||= base_for_infra(infra || @infra)
   end
-    
 
 
   private

data/lib/vmc/const.rb

@@ -12,6 +12,7 @@ module VMC
   INFO_PATH            = 'info'
   GLOBAL_SERVICES_PATH = ['info', 'services']
   GLOBAL_RUNTIMES_PATH = ['info', 'runtimes']
+  GLOBAL_INFRAS_PATH   = ['info', 'infras']
   RESOURCES_PATH       = 'resources'
 
   # User specific paths

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: af
 version: !ruby/object:Gem::Version
-  version: 0.3.18.3
+  version: 0.3.18.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000Z
+date: 2012-08-17 00:00:00.000000000 -07:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &70285973974440 !ruby/object:Gem::Requirement
+  requirement: &2153196420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +25,10 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70285973974440
+  version_requirements: *2153196420
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70285973973680 !ruby/object:Gem::Requirement
+  requirement: &2153195620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +36,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *70285973973680
+  version_requirements: *2153195620
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70285973973200 !ruby/object:Gem::Requirement
+  requirement: &2153195120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -49,10 +50,10 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70285973973200
+  version_requirements: *2153195120
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &70285973972480 !ruby/object:Gem::Requirement
+  requirement: &2153194380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +61,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70285973972480
+  version_requirements: *2153194380
 - !ruby/object:Gem::Dependency
   name: interact
-  requirement: &70285973972020 !ruby/object:Gem::Requirement
+  requirement: &2153193920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +72,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70285973972020
+  version_requirements: *2153193920
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70285973971560 !ruby/object:Gem::Requirement
+  requirement: &2153193440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +83,10 @@ dependencies:
         version: 2.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70285973971560
+  version_requirements: *2153193440
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70285973971100 !ruby/object:Gem::Requirement
+  requirement: &2153192940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -93,10 +94,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70285973971100
+  version_requirements: *2153192940
 - !ruby/object:Gem::Dependency
   name: rb-readline
-  requirement: &70285973970640 !ruby/object:Gem::Requirement
+  requirement: &2153192340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -104,10 +105,10 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70285973970640
+  version_requirements: *2153192340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70285973970260 !ruby/object:Gem::Requirement
+  requirement: &2153191840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -115,10 +116,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285973970260
+  version_requirements: *2153191840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70285973969720 !ruby/object:Gem::Requirement
+  requirement: &2153191200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -126,10 +127,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70285973969720
+  version_requirements: *2153191200
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70285973969220 !ruby/object:Gem::Requirement
+  requirement: &2153190580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,7 +138,7 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *70285973969220
+  version_requirements: *2153190580
 description: AppFog.com CLI
 email: support@appfog.com
 executables:
@@ -167,7 +168,6 @@ files:
 - lib/cli/core_ext.rb
 - lib/cli/errors.rb
 - lib/cli/frameworks.rb
-- lib/cli/infra_helper.rb
 - lib/cli/manifest_helper.rb
 - lib/cli/runner.rb
 - lib/cli/services_helper.rb
@@ -190,6 +190,7 @@ files:
 - caldecott_helper/Gemfile.lock
 - caldecott_helper/server.rb
 - bin/af
+has_rdoc: true
 homepage: http://appfog.com
 licenses: []
 post_install_message: 
@@ -210,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: AppFog.com CLI

data/lib/cli/infra_helper.rb

@@ -1,42 +0,0 @@
-
-
-module VMC::Cli
-  module InfraHelper
-
-    class << self 
-
-      def list
-        infras.values
-      end
-
-      def base_for_infra(infra)
-        infras.has_key?(infra) ?  infras[infra][:base] : "aws.af.cm"
-      end
-
-      def valid?(infra) 
-        infra && infras.has_key?(infra)
-      end
-
-      def infra_descriptions
-        infras.map { |k,v| v[:description] }
-      end
-      
-      def name_for_description(desc) 
-        name, info = infras.detect { |k,v| v[:description] == desc }
-        name
-      end
-      
-      private
-      def infras
-        { 
-          "ap-aws" => { :name => "ap-aws", :base => "ap01.aws.af.cm", :description => "AWS Asia SE - Singapore" },
-          "eu-aws" => { :name => "eu-aws", :base => "eu01.aws.af.cm", :description => "AWS EU West - Ireland" },
-          "rs"     => { :name => "rs", :base => "rs.af.cm", :description => "Rackspace AZ 1 - Dallas" },
-          "aws"    => { :name => "aws", :base => "aws.af.cm", :description => "AWS US East - Virginia" }
-        }
-      end
-
-    end
-
-  end
-end