af 0.3.18.11 → 0.3.18.12

data/README.md

@@ -4,6 +4,20 @@ The AppFog CLI. This is the command line interface to AppFog.com
 
 af is based on vmc but will have features specific to the AppFog service as well as having the default target set to AppFog's service
 
+## Installation
+
+There are two ways to install af. Most users should install the RubyGem.
+
+    $ sudo gem install af
+
+You can also check out the source for development. You will need [Bundler](http://gembundler.com/) to build af.
+
+    $ git clone https://github.com/appfog/af.git
+    $ cd af
+    $ bundle install
+
+## Usage
+
 _Copyright 2010-2012, VMware, Inc. Licensed under the
 MIT license, please see the LICENSE file.  All rights reserved._
 
@@ -102,7 +116,35 @@ MIT license, please see the LICENSE file.  All rights reserved._
       help [command]                               Get general help or help on a specific command
       help options                                 Get help on available options
 
-## Simple Story (for PHP apps)
-
-    af login
-    af push
+## Sample Usage (for PHP apps)
+
+    $ af login developer@example.com
+    Attempting login to [https://api.appfog.com]
+    Password: *********
+    Successfully logged into [https://api.appfog.com]
+    
+    $ af push
+    Would you like to deploy from the current directory? [Yn]: Y
+    Application Name: myapp
+    Detected a PHP Application, is this correct? [Yn]: 
+    1: AWS US East - Virginia
+    2: AWS EU West - Ireland
+    3: AWS Asia SE - Singapore
+    4: Rackspace AZ 1 - Dallas
+    5: HP AZ 2 - Las Vegas
+    Select Infrastructure: 1
+    Application Deployed URL [myapp.aws.af.cm]: 
+    Memory reservation (128M, 256M, 512M, 1G, 2G) [128M]: 
+    How many instances? [1]: 
+    Bind existing services to 'myapp'? [yN]: 
+    Create services to bind to 'myapp'? [yN]: 
+    Would you like to save this configuration? [yN]: 
+    Creating Application: OK
+    Uploading Application:
+      Checking for available resources: OK
+      Processing resources: OK
+      Packing application: OK
+      Uploading (6K): OK   
+    Push Status: OK
+    Staging Application 'myapp': OK                                          
+    Starting Application 'myapp': OK

data/lib/cli/commands/apps.rb

@@ -463,6 +463,20 @@ module VMC::Cli::Command
       end
     end
 
+    def rename(oldname, newname)
+      # Check if new app name is taken
+      if newname
+        err "Application '#{newname}' already exists" if app_exists?(newname)
+      else
+        raise VMC::Client::AuthError unless client.logged_in?
+      end
+
+      app = client.app_info(oldname)
+      app[:name] = newname
+      client.update_app(oldname, app)
+      display "Successfully updated app name to #{newname}".green
+    end
+
     private
 
     def app_exists?(appname)

data/lib/cli/runner.rb

@@ -355,6 +355,10 @@ class VMC::Cli::Runner
       usage('af env-del <appname> <variable>')
       set_cmd(:apps, :environment_del, 2)
 
+    when 'rename'
+      usage('af rename <curname> <newname>')
+      set_cmd(:apps, :rename, 2)
+
     when 'create-service', 'create_service'
       usage('af create-service [service] [servicename] [appname] [--name servicename] [--bind appname] [--infra infraname]')
       set_cmd(:services, :create_service) if @args.size == 0

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.11' 
+    VERSION = '0.3.18.12' 
   end
 end

data/lib/vmc/client.rb

@@ -382,8 +382,13 @@ class VMC::Client
   end
 
   def default_base
-    return "vcap.me" if @target =~ /https?:\/\/api.vcap.me/
-    "aws.af.cm"
+    # remove the protocol, and the first component of the url, which is normally api
+    pattern = /https?:\/\/[^.]+\./
+    if @target =~ pattern
+      @target.sub(pattern,'')
+    else
+      "aws.af.cm"
+    end
   end
   
   def infra_valid?(name) 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: af
 version: !ruby/object:Gem::Version
-  version: 0.3.18.11
+  version: 0.3.18.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure