af 0.3.18.4 → 0.3.18.5

data/lib/cli/commands/apps.rb

@@ -208,6 +208,14 @@ module VMC::Cli::Command
     rescue VMC::Client::NotFound, VMC::Client::TargetError
       err 'No such file or directory'
     end
+
+    def download(appname, path=nil)
+      path = File.expand_path(path || "#{appname}.zip" )
+      banner = "Downloading last pushed source code to #{path}: "
+      display banner, false      
+      client.app_download(appname, path)
+      display 'OK'.green
+    end
     
     def pull(appname, path=nil)
       path = File.expand_path(path || appname)
@@ -217,6 +225,78 @@ module VMC::Cli::Command
       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? 
+        dest_infra = @options[:infra] || client.infra_name_for_description(
+            ask("Select Infrastructure",:indexed => true, :choices => client.infra_descriptions))
+        client.infra = dest_infra
+      end
+
+      url_template = "#{dest_appname}.${target-base}"
+      url_resolved = url_template.dup
+      resolve_lexically(url_resolved)
+
+      url = @options[:url] || ask("Application Deployed URL", :default => url_resolved)
+
+      Dir.mktmpdir do |dir|
+        zip_path = File.join(dir,src_appname)
+        pull(src_appname,zip_path)
+
+        display "Cloning '#{src_appname}' to '#{dest_appname}': "
+        
+        manifest = {
+          :name => "#{dest_appname}",
+          :staging => app[:staging],
+          :uris => [ url ],
+          :instances => app[:instances],
+          :resources => app[:resources]
+        }
+        manifest[:staging][:command] = app[:staging][:command] if app[:staging][:command]
+        manifest[:infra] = { :provider => dest_infra } if dest_infra
+         
+        client.create_app(dest_appname, manifest)      
+        
+        # Stage and upload the app bits.
+        upload_app_bits(dest_appname, zip_path, dest_infra)
+
+        # Clone services
+        client.services.select { |s| app[:services].include?(s[:name])}.each do |service|
+          display "Exporting data from #{service[:name]}: ", false
+          export_info = client.export_service(service[:name])
+          if export_info
+            display 'OK'.green
+          else
+            err "Export data from '#{service}': failed"
+          end
+          cloned_service_name = generate_cloned_service_name(src_appname,dest_appname,service[:name],dest_infra)
+          display "Creating service #{cloned_service_name}: ", false
+          client.create_service(dest_infra, service[:vendor], cloned_service_name)
+          display 'OK'.green
+          display "Binding service #{cloned_service_name}: ", false
+          client.bind_service(cloned_service_name, dest_appname)
+          display 'OK'.green
+          display "Importing data to #{cloned_service_name}: ", false
+          import_info = client.import_service(cloned_service_name,export_info[:uri])
+          if import_info
+            display 'OK'.green
+          else
+            err "Import data into '#{service}' failed"
+          end          
+        end
+        
+        no_start = @options[:nostart]
+        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)
@@ -946,7 +1026,7 @@ module VMC::Cli::Command
       runtime = info(:runtime)
       infra = info(:infra)
 
-      if infra
+      if client.infra_supported? && infra
         err "Infra '#{infra}' is not valid" unless client.infra_valid?(infra)
       end
 

data/lib/cli/commands/services.rb

@@ -93,7 +93,28 @@ 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    
+      export_info = client.export_service(service)
+      if export_info
+        display 'OK'.green
+        puts export_info[:uri]
+      else
+        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)
+      if import_info
+        display 'OK'.green
+      else
+        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:"
@@ -128,12 +149,11 @@ module VMC::Cli::Command
 
       raise VMC::Client::AuthError unless client.logged_in?
 
-      infra_name = info[:infra] ? info[:infra][:name] : default_infra
-      
-      if infra_name
+      infra_name = nil
+      if client.infra_supported?
+        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)}'."

data/lib/cli/runner.rb

@@ -286,6 +286,14 @@ class VMC::Cli::Runner
         set_cmd(:apps, :files, 2)
       end
       
+    when 'download'
+      usage('af download <appname> [path]')
+      if @args.size == 1
+        set_cmd(:apps, :download, 1)
+      else
+        set_cmd(:apps, :download, 2)
+      end
+      
     when 'pull'
       usage('af pull <appname> [path]')
       if @args.size == 1
@@ -374,6 +382,19 @@ class VMC::Cli::Runner
       usage('af clone-services <src-app> <dest-app>')
       set_cmd(:services, :clone_services, 2)
 
+    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)

data/lib/cli/services_helper.rb

@@ -80,6 +80,19 @@ module VMC::Cli
       r = "%04x" % [rand(0x0100000)]
       "#{service.to_s}-#{r}"
     end
+    
+    def generate_cloned_service_name(src_appname,dest_appname,src_servicename,dest_infra)
+      r = "%04x" % [rand(0x0100000)]
+      dest_servicename = src_servicename.sub(src_appname,dest_appname).sub(/-\h{4,5}/,"-#{r}")
+      if src_servicename == dest_servicename
+        if dest_infra
+          dest_servicename = "#{dest_servicename}-#{dest_infra}"
+        else
+          dest_servicename = "#{dest_servicename}-#{r}"
+        end
+      end
+      dest_servicename
+    end
 
     def check_app_for_restart(appname)
       app = client.app_info(appname)

data/lib/cli/tunnel_helper.rb

@@ -101,7 +101,10 @@ module VMC::Cli
         begin
           response = RestClient.get(tunnel_url(infra) + "/" + VMC::Client.path("services", service), "Auth-Token" => token)
           break
-        rescue RestClient::Exception
+        rescue RestClient::Exception => e
+          puts "Error infra: #{infra}, url: #{tunnel_url(infra)}"
+          display tunnel_url(infra)
+          puts e.message.red
           sleep 1
         end
 

data/lib/cli/usage.rb

@@ -48,6 +48,7 @@ Currently available af commands are:
     stop  <appname>                              Stop the application
     restart <appname> [--debug [MODE]]           Restart the application
     delete <appname>                             Delete the application
+    clone <src-app> <dest-app> [infra]           Clone the application and services
 
   Application Updates
     update <appname> [--path,--debug [MODE]]     Update the application bits
@@ -66,6 +67,7 @@ Currently available af commands are:
     
   Application Download
     pull <appname> [path]                        Downloads last pushed source to <appname> or [path]
+    download <appname> [path]                    Downloads last pushed source to zipfile
 
   Application Environment
     env <appname>                                List application environment variables
@@ -75,13 +77,15 @@ 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> --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
     bind-service <servicename> <appname>         Bind a service to an application
     unbind-service <servicename> <appname>       Unbind service from the application
     clone-services <src-app> <dest-app>          Clone service bindings from <src-app> application to <dest-app>
+    export-service <service>                     Export the data from a service
+    import-service <service> <url>               Import data into a service
     tunnel <servicename> [--port]                Create a local tunnel to a service
     tunnel <servicename> <clientcmd>             Create a local tunnel to a service and start a local client
 

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.4'
+    VERSION = '0.3.18.5' 
   end
 end

data/lib/vmc/client.rb

@@ -159,11 +159,21 @@ class VMC::Client
     body
   end
   
+  def app_download(name,path)
+    check_login_status
+    url = path(VMC::APPS_PATH, name, "application")
+    status, body, headers = http_get(url,'application/octet-stream')
+    file = File.new(path,"wb")
+    file.write(body)
+    file.close
+  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.binmode
     file.write(body)
     file.close
     ::VMC::Cli::ZipUtil.unpack(file.path, dir)
@@ -237,6 +247,14 @@ 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
 
   ######################################################
   # Resources
@@ -360,9 +378,14 @@ class VMC::Client
 
   def base_for_infra(name)
     info = infras.detect { |i| i[:infra] == name }
-    info ? info[:base] : "aws.af.cm"
+    info ? info[:base] : default_base
   end
 
+  def default_base
+    return "vcap.me" if @target =~ /https?:\/\/api.vcap.me/
+    "aws.af.cm"
+  end
+  
   def infra_valid?(name) 
     infras.detect { |i| i[:infra] == name }
   end

data/lib/vmc/const.rb

@@ -19,5 +19,9 @@ module VMC
   APPS_PATH            = 'apps'
   SERVICES_PATH        = 'services'
   USERS_PATH           = 'users'
+  
+  # Service paths
+  SERVICE_EXPORT_PATH  = ['services','export']
+  SERVICE_IMPORT_PATH  = ['services','import']
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: af
 version: !ruby/object:Gem::Version
-  version: 0.3.18.4
+  version: 0.3.18.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-17 00:00:00.000000000 -07:00
-default_executable: 
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &2153196420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +24,18 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153196420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &2153195620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -36,10 +43,15 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *2153195620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.4
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2153195120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -50,10 +62,18 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153195120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &2153194380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -61,10 +81,15 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153194380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: interact
-  requirement: &2153193920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -72,10 +97,15 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153193920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &2153193440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -83,10 +113,15 @@ dependencies:
         version: 2.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *2153193440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.6
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &2153192940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -94,10 +129,15 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153192940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rb-readline
-  requirement: &2153192340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -105,10 +145,15 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153192340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153191840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -116,10 +161,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153191840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153191200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -127,10 +177,15 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *2153191200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2153190580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -138,7 +193,12 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *2153190580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 description: AppFog.com CLI
 email: support@appfog.com
 executables:
@@ -190,7 +250,6 @@ files:
 - caldecott_helper/Gemfile.lock
 - caldecott_helper/server.rb
 - bin/af
-has_rdoc: true
 homepage: http://appfog.com
 licenses: []
 post_install_message: 
@@ -211,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: AppFog.com CLI