af 0.3.18.2 → 0.3.18.3

data/README.md

@@ -22,6 +22,7 @@ MIT license, please see the LICENSE file.  All rights reserved._
 
     Application Creation
       push [appname]                               Create, push, map, and start a new application
+      push [appname] --infra                       Push application to specified infrastructure
       push [appname] --path                        Push application from specified path
       push [appname] --url                         Set the url for the application
       push [appname] --instances <N>               Set the expected number <N> of instances
@@ -57,6 +58,7 @@ MIT license, please see the LICENSE file.  All rights reserved._
     Services
       services                                     Lists of services available and provisioned
       create-service <service> [--name,--bind]     Create a provisioned service
+      create-service <service> --infra     		   Create a provisioned service on a specified infrastructure
       create-service <service> <name>              Create a provisioned service and assign it <name>
       create-service <service> <name> <app>        Create a provisioned service and assign it <name>, and bind to <app>
       delete-service [servicename]                 Delete a provisioned service
@@ -76,6 +78,7 @@ MIT license, please see the LICENSE file.  All rights reserved._
     System
       runtimes                                     Display the supported runtimes of the target system
       frameworks                                   Display the recognized frameworks of the target system
+      infras                                       Display the available infrastructures
 
     Micro Cloud Foundry
       micro status                                 Display Micro Cloud Foundry VM status

data/lib/cli/commands/apps.rb

@@ -208,7 +208,15 @@ module VMC::Cli::Command
     rescue VMC::Client::NotFound, VMC::Client::TargetError
       err 'No such file or directory'
     end
-
+    
+    def pull(appname, path=nil)
+      path = File.expand_path(path || appname)
+      banner = "Pulling last pushed source code: "
+      display banner, false      
+      client.app_pull(appname, path)
+      display 'OK'.green
+    end
+    
     def logs(appname)
       # Check if we have an app before progressing further
       client.app_info(appname)

data/lib/cli/commands/misc.rb

@@ -80,6 +80,15 @@ module VMC::Cli::Command
       display rtable
     end
 
+    def infras
+      itable = table do |t|
+        t.headings = [ 'Name','Description' ]
+        VMC::Cli::InfraHelper.list.each { |i| t << [i[:name], i[:description]] }
+      end
+      display "\n"
+      display itable
+    end
+
     def frameworks
       raise VMC::Client::AuthError unless client.logged_in?
       return display JSON.pretty_generate(frameworks_info) if @options[:json]

data/lib/cli/commands/services.rb

@@ -20,6 +20,7 @@ module VMC::Cli::Command
     end
 
     def create_service(service=nil, name=nil, appname=nil)
+
       unless no_prompt || service
         services = client.services_info
         err 'No services available to provision' if services.empty?
@@ -38,6 +39,15 @@ module VMC::Cli::Command
         name = random_service_name(service)
         picked_name = true
       end
+
+      if client.infra_supported?
+        unless no_prompt || @options[:infra]
+          @options[:infra] = VMC::Cli::InfraHelper.name_for_description(
+              ask("Select Infrastructure",
+                :indexed => true, :choices => VMC::Cli::InfraHelper.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

data/lib/cli/infra_helper.rb

@@ -5,6 +5,10 @@ module VMC::Cli
 
     class << self 
 
+      def list
+        infras.values
+      end
+
       def base_for_infra(infra)
         infras.has_key?(infra) ?  infras[infra][:base] : "aws.af.cm"
       end
@@ -13,13 +17,22 @@ module VMC::Cli
         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" => { :base => "ap01.aws.af.cm" },
-          "eu-aws" => { :base => "eu01.aws.af.cm" },
-          "rs"     => { :base => "rs.af.cm" },
-          "aws"    => { :base => "aws.af.cm" }
+          "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
 

data/lib/cli/manifest_helper.rb

@@ -82,8 +82,6 @@ module VMC::Cli::ManifestHelper
     name = manifest("name") ||
       set(ask("Application Name", :default => manifest("name")), "name")
 
-
-
     if manifest "framework"
       framework = VMC::Cli::Framework.lookup_by_framework manifest("framework","name")
     else
@@ -107,6 +105,14 @@ module VMC::Cli::ManifestHelper
     default_command = manifest "command"
     set ask("Start Command", :default => default_command), "command" if framework.require_start_command?
 
+    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))
+      set infra.dup, "infra"
+      VMC::Cli::Config.infra = infra   
+    end
+
     url_template = manifest("url") || DEFAULTS["url"]
     url_resolved = url_template.dup
     resolve_lexically(url_resolved)
@@ -147,7 +153,7 @@ module VMC::Cli::ManifestHelper
     ), "instances"
 
     unless manifest "services"
-      user_services = client.services
+      user_services = services_for_infra(manifest("infra"))
       user_services.sort! {|a, b| a[:name] <=> b[:name] }
 
       unless user_services.empty?
@@ -263,6 +269,14 @@ module VMC::Cli::ManifestHelper
   end
 
   private
+    def services_for_infra(infra)
+      if client.infra_supported?
+        client.services.select { |s| s[:infra] && s[:infra][:provider] == manifest("infra") }
+      else
+        client.services
+      end
+    end
+    
     def ordered_by_deps(apps, abspaths = nil, processed = Set[])
       unless abspaths
         abspaths = {}

data/lib/cli/runner.rb

@@ -186,6 +186,10 @@ class VMC::Cli::Runner
       usage('af frameworks')
       set_cmd(:misc, :frameworks)
 
+    when 'infras'
+      usage('af infras')
+      set_cmd(:misc, :infras)
+
     when 'user'
       usage('af user')
       set_cmd(:user, :info)
@@ -281,7 +285,15 @@ class VMC::Cli::Runner
       else
         set_cmd(:apps, :files, 2)
       end
-
+      
+    when 'pull'
+      usage('af pull <appname> [path]')
+      if @args.size == 1
+        set_cmd(:apps, :pull, 1)
+      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/usage.rb

@@ -34,6 +34,7 @@ Currently available af commands are:
 
   Application Creation
     push [appname]                               Create, push, map, and start a new application
+    push [appname] --infra                       Push application to specified infrastructure
     push [appname] --path                        Push application from specified path
     push [appname] --url                         Set the url for the application
     push [appname] --instances <N>               Set the expected number <N> of instances
@@ -42,6 +43,9 @@ 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
@@ -62,7 +66,7 @@ Currently available af commands are:
     files <appname> [path] [--all]               Display directory listing or file download for [path]
     stats <appname>                              Display resource usage for the application
     instances <appname>                          List application instances
-
+    
   Application Environment
     env <appname>                                List application environment variables
     env-add <appname> <variable[=]value>         Add an environment variable to an application
@@ -71,6 +75,7 @@ Currently available af commands are:
   Services
     services                                     Lists of services available and provisioned
     create-service <service> [--name,--bind]     Create a provisioned service
+    create-service <service> --infra     		 Create a provisioned service on a specified infrastructure
     create-service <service> <name>              Create a provisioned service and assign it <name>
     create-service <service> <name> <app>        Create a provisioned service and assign it <name>, and bind to <app>
     delete-service [servicename]                 Delete a provisioned service
@@ -90,6 +95,7 @@ Currently available af commands are:
   System
     runtimes                                     Display the supported runtimes of the target system
     frameworks                                   Display the recognized frameworks of the target system
+    infras                                       Display the available infrastructures
 
   Micro Cloud Foundry
     micro status                                 Display Micro Cloud Foundry VM status

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.2'
+    VERSION = '0.3.18.3'
   end
 end

data/lib/vmc/client.rb

@@ -158,6 +158,17 @@ class VMC::Client
     _, body, headers = http_get(url)
     body
   end
+  
+  def app_pull(name, dir)
+    check_login_status
+    url = path(VMC::APPS_PATH, name, "application")
+    status, body, headers = http_get(url,'application/octet-stream')
+    file = Tempfile.new(name)
+    file.write(body)
+    file.close
+    ::VMC::Cli::ZipUtil.unpack(file.path, dir)
+    file.unlink
+  end
 
   ######################################################
   # Services
@@ -208,7 +219,11 @@ class VMC::Client
 
   def bind_service(service, appname)
     check_login_status
+    svc = services.detect { |s| s[:name] == service }
     app = app_info(appname)
+    if infra_supported? && ! infras_match?(app,svc)
+      raise TargetError, "Service #{service} and App #{appname} are not on the same infra"
+    end
     services = app[:services] || []
     app[:services] = services << service
     update_app(appname, app)
@@ -325,6 +340,15 @@ class VMC::Client
     }.join("/")
   end
 
+  ######################################################
+  
+  def infra_supported?
+    # FIXME should get this from proxy
+    target.match /^https?:\/\/api.appfog.com$/
+  end
+    
+
+
   private
 
   def path(*args, &blk)
@@ -472,4 +496,8 @@ class VMC::Client
     raise AuthError unless @user || logged_in?
   end
 
+  def infras_match?(o1,o2)
+    o1 && o2 && ( o1[:infra] == o2[:infra])
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: af
 version: !ruby/object:Gem::Version
-  version: 0.3.18.2
+  version: 0.3.18.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 -07:00
-default_executable: 
+date: 2012-08-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &2156374040 !ruby/object:Gem::Requirement
+  requirement: &70285973974440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +24,10 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156374040
+  version_requirements: *70285973974440
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &2156373200 !ruby/object:Gem::Requirement
+  requirement: &70285973973680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -36,10 +35,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *2156373200
+  version_requirements: *70285973973680
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2156372660 !ruby/object:Gem::Requirement
+  requirement: &70285973973200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -50,10 +49,10 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156372660
+  version_requirements: *70285973973200
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &2156371880 !ruby/object:Gem::Requirement
+  requirement: &70285973972480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -61,10 +60,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156371880
+  version_requirements: *70285973972480
 - !ruby/object:Gem::Dependency
   name: interact
-  requirement: &2156371400 !ruby/object:Gem::Requirement
+  requirement: &70285973972020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -72,10 +71,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156371400
+  version_requirements: *70285973972020
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &2156370940 !ruby/object:Gem::Requirement
+  requirement: &70285973971560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -83,10 +82,10 @@ dependencies:
         version: 2.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *2156370940
+  version_requirements: *70285973971560
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &2156370440 !ruby/object:Gem::Requirement
+  requirement: &70285973971100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -94,10 +93,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156370440
+  version_requirements: *70285973971100
 - !ruby/object:Gem::Dependency
   name: rb-readline
-  requirement: &2156358900 !ruby/object:Gem::Requirement
+  requirement: &70285973970640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -105,10 +104,10 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156358900
+  version_requirements: *70285973970640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156358520 !ruby/object:Gem::Requirement
+  requirement: &70285973970260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -116,10 +115,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156358520
+  version_requirements: *70285973970260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156357960 !ruby/object:Gem::Requirement
+  requirement: &70285973969720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -127,10 +126,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *2156357960
+  version_requirements: *70285973969720
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2156357420 !ruby/object:Gem::Requirement
+  requirement: &70285973969220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -138,7 +137,7 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *2156357420
+  version_requirements: *70285973969220
 description: AppFog.com CLI
 email: support@appfog.com
 executables:
@@ -191,7 +190,6 @@ files:
 - caldecott_helper/Gemfile.lock
 - caldecott_helper/server.rb
 - bin/af
-has_rdoc: true
 homepage: http://appfog.com
 licenses: []
 post_install_message: 
@@ -212,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: AppFog.com CLI