rhc 1.21.3 → 1.22.5

data/autocomplete/rhc_bash

@@ -10,9 +10,9 @@ _rhc()
     if [[ "$cur" == -* ]]; then
       opts="--always-prefix --clean --config --debug --insecure --limit --mock --noprompt --password --raw --rhlogin --server --ssl-ca-file --ssl-client-cert-file --ssl-version --timeout --token"
     elif [ -z $cur ]; then
-      opts="account alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert app app-configure app-create app-delete app-deploy app-force-stop app-reload app-restart app-scale-down app-scale-up app-show app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage deployment deployment-activate deployment-list deployment-show domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show env env-list env-set env-show env-unset git-clone logout member member-add member-list member-remove port-forward server setup snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show tail threaddump"
+      opts="account alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert app app-configure app-create app-delete app-deploy app-force-stop app-reload app-restart app-scale-down app-scale-up app-show app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage deployment deployment-activate deployment-list deployment-show domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show env env-list env-set env-show env-unset git-clone logout member member-add member-list member-remove port-forward scp server setup snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show tail threaddump"
     else
-      opts="account account-logout activate-deployment add-alias add-authorization add-cartridge add-member add-sshkey alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert aliases app app-configure app-create app-delete app-deploy app-env app-force-stop app-reload app-restart app-scale-down app-scale-up app-show app-snapshot app-ssh app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list authorizations cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage cartridges configure-app configure-domain create-app create-domain delete-all-authorization delete-app delete-authorization delete-cert-alias delete-domain deploy deploy-app deployment deployment-activate deployment-list deployment-show deployments domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show domains env env-add env-list env-remove env-set env-show env-unset force-stop-app git-clone leave-domain list-alias list-authorization list-cartridge list-deployment list-domain list-env list-member list-sshkey logout member member-add member-list member-remove members port-forward reload-app reload-cartridge remove-alias remove-cartridge remove-member remove-sshkey rename-domain restart-app restart-cartridge restore-snapshot save-snapshot scale-cartridge scale-down-app scale-up-app server set-env setup show-app show-cartridge show-deployment show-domain show-env show-sshkey snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show start-app start-cartridge status-cartridge stop-app stop-cartridge storage-cartridge tail threaddump tidy-app unset-env update-cert-alias"
+      opts="account account-logout activate-deployment add-alias add-authorization add-cartridge add-member add-sshkey alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert aliases app app-configure app-create app-delete app-deploy app-env app-force-stop app-reload app-restart app-scale-down app-scale-up app-scp app-show app-snapshot app-ssh app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list authorizations cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage cartridges configure-app configure-domain create-app create-domain delete-all-authorization delete-app delete-authorization delete-cert-alias delete-domain deploy deploy-app deployment deployment-activate deployment-list deployment-show deployments domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show domains env env-add env-list env-remove env-set env-show env-unset force-stop-app git-clone leave-domain list-alias list-authorization list-cartridge list-deployment list-domain list-env list-member list-sshkey logout member member-add member-list member-remove members port-forward reload-app reload-cartridge remove-alias remove-cartridge remove-member remove-sshkey rename-domain restart-app restart-cartridge restore-snapshot save-snapshot scale-cartridge scale-down-app scale-up-app scp server set-env setup show-app show-cartridge show-deployment show-domain show-env show-sshkey snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show start-app start-cartridge status-cartridge stop-app stop-cartridge storage-cartridge tail threaddump tidy-app unset-env update-cert-alias"
     fi
   else
     prev="${COMP_WORDS[@]:0:COMP_CWORD}"
@@ -192,7 +192,7 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="env snapshot create delete start stop scale-up scale-down force-stop restart reload tidy show deploy configure"
+          opts="create delete start stop scale-up scale-down force-stop restart reload tidy show deploy configure env snapshot"
         fi
         ;;
 
@@ -206,7 +206,7 @@ _rhc()
 
       "rhc app create")
         if [[ "$cur" == -* ]]; then
-          opts="--app --dns --enable-jenkins --env --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --repo --scaling --type"
+          opts="--app --dns --enable-jenkins --env --from-app --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --no-scaling --repo --scaling --type"
         else
           opts=""
         fi
@@ -276,9 +276,17 @@ _rhc()
         fi
         ;;
 
+      "rhc app scp")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --application-id --local-path --namespace --remote-path --transfer-direction"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc app show")
         if [[ "$cur" == -* ]]; then
-          opts="--app --application-id --configuration --gears --namespace --state"
+          opts="--app --application-id --configuration --gears --namespace --state --verbose"
         else
           opts=""
         fi
@@ -334,7 +342,7 @@ _rhc()
 
       "rhc app-create")
         if [[ "$cur" == -* ]]; then
-          opts="--app --dns --enable-jenkins --env --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --repo --scaling --type"
+          opts="--app --dns --enable-jenkins --env --from-app --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --no-scaling --repo --scaling --type"
         else
           opts=""
         fi
@@ -404,9 +412,17 @@ _rhc()
         fi
         ;;
 
+      "rhc app-scp")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --application-id --local-path --namespace --remote-path --transfer-direction"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc app-show")
         if [[ "$cur" == -* ]]; then
-          opts="--app --application-id --configuration --gears --namespace --state"
+          opts="--app --application-id --configuration --gears --namespace --state --verbose"
         else
           opts=""
         fi
@@ -454,7 +470,7 @@ _rhc()
 
       "rhc apps")
         if [[ "$cur" == -* ]]; then
-          opts=""
+          opts="--mine --verbose"
         else
           opts=""
         fi
@@ -750,7 +766,7 @@ _rhc()
 
       "rhc create-app")
         if [[ "$cur" == -* ]]; then
-          opts="--app --dns --enable-jenkins --env --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --repo --scaling --type"
+          opts="--app --dns --enable-jenkins --env --from-app --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --no-scaling --repo --scaling --type"
         else
           opts=""
         fi
@@ -1396,6 +1412,14 @@ _rhc()
         fi
         ;;
 
+      "rhc scp")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --application-id --local-path --namespace --remote-path --transfer-direction"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc server")
         if [[ "$cur" == -* ]]; then
           opts=""
@@ -1422,7 +1446,7 @@ _rhc()
 
       "rhc show-app")
         if [[ "$cur" == -* ]]; then
-          opts="--app --application-id --configuration --gears --namespace --state"
+          opts="--app --application-id --configuration --gears --namespace --state --verbose"
         else
           opts=""
         fi

data/features/app_feature.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+require 'direct_execution_helper'
+
+describe "rhc app scenarios" do
+  context "with an existing app" do
+    before(:all) do
+      standard_config
+      @app = has_an_application
+    end
+
+    let(:app){ @app }
+
+    it "should clone successfully" do
+      app_name = "clone#{random}"
+      r = rhc 'create-app', app_name, '--from-app', app.name
+      r.stdout.should match /Domain:\s+#{app.domain}/
+      r.stdout.should match /Cartridges:\s+#{app.cartridges.collect{|c| c.name}.join(', ')}/
+      r.stdout.should match /From app:\s+#{app.name}/
+      r.stdout.should match /Gear Size:\s+Copied from '#{app.name}'/
+      r.stdout.should match /Scaling:\s+#{app.scalable? ? 'yes' : 'no'}/
+      r.stdout.should match /Setting deployment configuration/
+      r.stdout.should match /Pulling down a snapshot of application '#{app.name}'/
+    end
+  end
+end

data/features/core_feature.rb

@@ -159,12 +159,12 @@ describe "rhc core scenarios" do
 
   context "when adding a cartridge" do
     context "with a scalable app" do
-      before(:all) do
+      before(:each) do
         standard_config
         @app = has_a_scalable_application
       end
 
-      after(:all) do
+      after(:each) do
         debug.puts "cleaning up scalable app" if debug?
         @app.destroy
       end

data/features/members_feature.rb

@@ -161,6 +161,26 @@ describe "rhc member scenarios" do
           r.status.should == 0
         end
       end
+
+      it "should filter applications by owner" do
+        user = other_user.login
+        name = @domain.applications.first.name
+
+        r = rhc 'add-member', user, '--role', 'admin', '-n', domain.name
+        r.status.should == 0
+
+        with_environment(other_user) do
+          r = rhc 'apps', '--mine'
+          #r.status.should == 0
+          r.stdout.should match "No applications"
+
+          r = rhc 'apps'
+          r.status.should == 0
+          r.stdout.should match /You have access to \d+ applications?/
+        end
+      end
+
+      after { @domain.applications.first.destroy }
     end
   end
 end

data/lib/rhc/cartridge_helpers.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module RHC
   module CartridgeHelpers
 
@@ -7,7 +9,7 @@ module RHC
         from = opts[:from] || all_cartridges
 
         cartridge_names.map do |name|
-          next from.find{ |c| c.url.present? && c.url.downcase == name} || use_cart(RHC::Rest::Cartridge.for_url(name), name) if name =~ %r(\Ahttps?://)i
+          next from.find{ |c| c.url.present? && cartridge_url_downcase(c.url) == name} || use_cart(RHC::Rest::Cartridge.for_url(name), name) if name =~ %r(\Ahttps?://)i
 
           name = name.downcase
           from.find{ |c| c.name.downcase == name } ||
@@ -114,5 +116,13 @@ module RHC
       def jenkins_client_cartridges
         @jenkins_client_cartridges ||= filter_jenkins_cartridges('ci_builder')
       end
+
+      def cartridge_url_downcase(url)
+        url = URI(url)
+        url.scheme = url.scheme.downcase rescue url.scheme
+        url.host = url.host.downcase rescue url.host
+        url.path = url.path.downcase rescue url.path
+        url.to_s
+      end
   end
 end

data/lib/rhc/commands/app.rb

@@ -3,6 +3,8 @@ require 'resolv'
 require 'rhc/git_helpers'
 require 'rhc/cartridge_helpers'
 require 'rhc/deployment_helpers'
+require 'optparse'
+require 'tmpdir'
 
 module RHC::Commands
   class App < Base
@@ -51,9 +53,10 @@ module RHC::Commands
     syntax "<name> <cartridge> [... <cartridge>] [... VARIABLE=VALUE] [-n namespace]"
     option ["-n", "--namespace NAME"], "Namespace for the application"
     option ["-g", "--gear-size SIZE"], "Gear size controls how much memory and CPU your cartridges can use."
-    option ["-s", "--scaling"], "Enable scaling for the web cartridge."
+    option ["-s", "--[no-]scaling"], "Enable scaling for the web cartridge."
     option ["-r", "--repo DIR"], "Path to the Git repository (defaults to ./$app_name)"
     option ["-e", "--env VARIABLE=VALUE"], "Environment variable(s) to be set on this app, or path to a file containing environment variables", :type => :list
+    option ["--from-app NAME"], "Create based on another application. All content and configurations will be copied from the original app."
     option ["--from-code URL"], "URL to a Git repository that will become the initial contents of the application"
     option ["--[no-]git"], "Skip creating the local Git repository."
     option ["--[no-]dns"], "Skip waiting for the application DNS name to resolve. Must be used in combination with --no-git"
@@ -68,6 +71,22 @@ module RHC::Commands
 
       arg_envs, cartridges = cartridges.partition{|item| item.match(env_var_regex_pattern)}
 
+      rest_domain = check_domain!
+      rest_app = nil
+      repo_dir = nil
+
+      if options.from_app
+        raise RHC::AppCloneNotSupportedException, "The server does not support creating apps based on others (rhc create-app --from-app)." if (!rest_domain.has_param?('ADD_APPLICATION', 'cartridges[][name]') || !rest_domain.has_param?('ADD_APPLICATION', 'cartridges[][url]'))
+        raise ArgumentError, "Option --from-code is incompatible with --from--app. When creating an app based on another resource you can either specify a Git repository URL with --from-code or an existing app name with --from-app." if options.from_code     
+        raise ArgumentError, "Option --no-dns is incompatible with --from-app. We need to propagate the new app DNS to be able to configure it." if options.dns == false
+        raise ArgumentError, "Do not specify cartridges when creating an app based on another one. All cartridges will be copied from the original app." if !(cartridges || []).empty?
+
+        from_app = find_app(:app => options.from_app)
+
+        arg_envs = from_app.environment_variables.collect {|env| "#{env.name}=#{env.value} "} + arg_envs
+        cartridges = from_app.cartridges.reject{|c| c.tags.include?('web_proxy')}.collect{|c| c.custom? ? c.url : c.name}
+      end
+
       cartridges = check_cartridges(cartridges, &require_one_web_cart)
 
       options.default \
@@ -76,10 +95,6 @@ module RHC::Commands
 
       raise ArgumentError, "You have named both your main application and your Jenkins application '#{name}'. In order to continue you'll need to specify a different name with --enable-jenkins or choose a different application name." if jenkins_app_name == name && enable_jenkins?
 
-      rest_domain = check_domain!
-      rest_app = nil
-      repo_dir = nil
-
       cart_names = cartridges.collect do |c|
         c.usage_rate? ? "#{c.short_name} (addtl. costs may apply)" : c.short_name
       end.join(', ')
@@ -90,13 +105,31 @@ module RHC::Commands
         warn "Server does not support environment variables."
       end
 
+      scaling = options.scaling
+
+      if from_app
+        scaling = from_app.scalable if scaling.nil?
+
+        cartridges = from_app.cartridges.reject{|c| c.tags.include?('web_proxy')}.collect do |cartridge|
+          {
+            :name => (cartridge.name if !cartridge.custom?), 
+            :url => (cartridge.url if cartridge.custom?),
+            :gear_size => options.gear_size || cartridge.gear_profile,
+            :additional_gear_storage => (cartridge.additional_gear_storage if cartridge.additional_gear_storage > 0),
+            :scales_from => (cartridge.scales_from if cartridge.scalable?),
+            :scales_to => (cartridge.scales_to if cartridge.scalable?)
+          }.reject{|k,v| v.nil? }
+        end
+      end
+
       paragraph do
         header "Application Options"
         say table([["Domain:", options.namespace],
                ["Cartridges:", cart_names],
               (["Source Code:", options.from_code] if options.from_code),
-               ["Gear Size:", options.gear_size || "default"],
-               ["Scaling:", options.scaling ? "yes" : "no"],
+              (["From app:", from_app.name] if from_app),
+               ["Gear Size:", options.gear_size || (from_app ? "Copied from '#{from_app.name}'" : "default")],
+               ["Scaling:", (scaling ? "yes" : "no") + (from_app && options.scaling.nil? ? " (copied from '#{from_app.name}')" : '')],
               (["Environment Variables:", env.map{|item| "#{item.name}=#{item.value}"}.join(', ')] if env.present?),
               ].compact
              )
@@ -106,7 +139,7 @@ module RHC::Commands
         say "Creating application '#{name}' ... "
 
         # create the main app
-        rest_app = create_app(name, cartridges, rest_domain, options.gear_size, options.scaling, options.from_code, env, options.auto_deploy, options.keep_deployments, options.deployment_branch)
+        rest_app = create_app(name, cartridges, rest_domain, options.gear_size, scaling, options.from_code, env, options.auto_deploy, options.keep_deployments, options.deployment_branch, options.deployment_type)
         success "done"
 
         paragraph{ indent{ success rest_app.messages.map(&:strip) } }
@@ -161,22 +194,35 @@ module RHC::Commands
             return 0
           end
         end
+      end
 
-        if options.git
-          section(:now => true, :top => 1, :bottom => 1) do
-            begin
-              if has_git?
-                repo_dir = git_clone_application(rest_app)
-              else
-                warn "You do not have git installed, so your application's git repo will not be cloned"
-              end
-            rescue RHC::GitException => e
-              warn "#{e}"
-              unless RHC::Helpers.windows? and windows_nslookup_bug?(rest_app)
-                add_issue("We were unable to clone your application's git repo - #{e}",
-                          "Clone your git repo",
-                          "rhc git-clone #{rest_app.name}")
-              end
+      if from_app
+        say "Setting deployment configuration ... "
+        rest_app.configure({:auto_deploy => from_app.auto_deploy, :keep_deployments => from_app.keep_deployments , :deployment_branch => from_app.deployment_branch, :deployment_type => from_app.deployment_type})
+        success 'done'
+
+        snapshot_filename = temporary_snapshot_filename(from_app.name)
+        save_snapshot(from_app, snapshot_filename)
+        restore_snapshot(rest_app, snapshot_filename)
+        File.delete(snapshot_filename) if File.exist?(snapshot_filename)
+
+        paragraph { warn "The application '#{from_app.name}' has aliases set which were not copied. Please configure the aliases of your new application manually." } unless from_app.aliases.empty?
+      end
+
+      if options.git
+        section(:now => true, :top => 1, :bottom => 1) do
+          begin
+            if has_git?
+              repo_dir = git_clone_application(rest_app)
+            else
+              warn "You do not have git installed, so your application's git repo will not be cloned"
+            end
+          rescue RHC::GitException => e
+            warn "#{e}"
+            unless RHC::Helpers.windows? and windows_nslookup_bug?(rest_app)
+              add_issue("We were unable to clone your application's git repo - #{e}",
+                        "Clone your git repo",
+                        "rhc git-clone #{rest_app.name}")
             end
           end
         end
@@ -333,6 +379,7 @@ module RHC::Commands
     option ["--state"], "Get the current state of the cartridges in this application"
     option ["--configuration"], "Get the current configuration values set in this application"
     option ["--gears [quota|ssh]"], "Show information about the cartridges on each gear in this application. Pass 'quota' to see per gear disk usage and limits. Pass 'ssh' to print only the SSH connection strings of each gear."
+    option ["-v", "--verbose"], "Display more details about the application's cartridges"
     def show(app_name)
 
       if options.state
@@ -376,7 +423,7 @@ module RHC::Commands
 
       else
         app = find_app(:include => :cartridges)
-        display_app(app, app.cartridges)
+        display_app(app, app.cartridges, nil, options.verbose)
       end
 
       0
@@ -514,20 +561,19 @@ module RHC::Commands
         result
       end
 
-      def create_app(name, cartridges, rest_domain, gear_size=nil, scale=nil, from_code=nil, environment_variables=nil, auto_deploy=nil, keep_deployments=nil, deployment_branch=nil)
+      def create_app(name, cartridges, rest_domain, gear_size=nil, scale=nil, from_code=nil, environment_variables=nil, auto_deploy=nil, keep_deployments=nil, deployment_branch=nil, deployment_type=nil)
         app_options = {:cartridges => Array(cartridges)}
         app_options[:gear_profile] = gear_size if gear_size
         app_options[:scale] = scale if scale
         app_options[:initial_git_url] = from_code if from_code
         app_options[:debug] = true if @debug
-        app_options[:environment_variables] = environment_variables.map{ |item| item.to_hash } if environment_variables.present?
+        app_options[:environment_variables] = environment_variables.map{|i| i.to_hash}.group_by{|i| i[:name]}.values.map(&:last) if environment_variables.present?
         app_options[:auto_deploy] = auto_deploy if !auto_deploy.nil?
         app_options[:keep_deployments] = keep_deployments if keep_deployments
         app_options[:deployment_branch] = deployment_branch if deployment_branch
+        app_options[:deployment_type] = deployment_type if deployment_type
         debug "Creating application '#{name}' with these options - #{app_options.inspect}"
-        rest_app = rest_domain.add_application(name, app_options)
-
-        rest_app
+        rest_domain.add_application(name, app_options)
       rescue RHC::Rest::Exception => e
         if e.code == 109
           paragraph{ say "Valid cartridge types:" }
@@ -721,5 +767,9 @@ WARNING_OUTPUT
     def issues?
       not @issues.nil?
     end
+
+    def temporary_snapshot_filename(app_name)
+      "#{Dir.tmpdir}/#{app_name}_temp_clone.tar.gz"
+    end
   end
 end

data/lib/rhc/commands/apps.rb

@@ -4,16 +4,20 @@ module RHC::Commands
   class Apps < Base
     summary "List all your applications"
     description "Display the list of applications that you own. Includes information about each application."
+    option ['--mine'], "Display only applications you own"
+    option ["-v", "--verbose"], "Display additional details about the application's cartridges"
     def run
-      applications = rest_client.applications(:include => :cartridges).sort
+      applications = (options.mine ?
+        rest_client.owned_applications(:include => :cartridges) :
+        rest_client.applications(:include => :cartridges)).sort
 
       info "In order to deploy applications, you must create a domain with 'rhc setup' or 'rhc create-domain'." and return 1 if applications.empty? && rest_client.domains.empty?
 
-      applications.each{ |a| display_app(a, a.cartridges) }.blank? and
+      applications.each{ |a| display_app(a, a.cartridges, nil, options.verbose) }.blank? and
         info "No applications. Use 'rhc create-app'." and
         return 1
 
-      success "You have #{applications.length} applications"
+      success "You have#{options.mine ? '' : ' access to'} #{pluralize(applications.length, 'application')}."
       0
     end
   end

data/lib/rhc/commands/scp.rb

@@ -21,9 +21,9 @@ module RHC::Commands
     DESC
     syntax "[<app> --] <action> <local_path> <remote_path>"
     takes_application :argument => true
-    argument :action, "Transfer direction: upload|download", ["-t", "--transfer_direction upload|download"], :optional => false
-    argument :local_path, "Local filesystem path", ["-l", "--local_path file_path"], :optional => false
-    argument :remote_path, "Remote filesystem path", ["-r", "--remote_path file_path"], :optional => false
+    argument :action, "Transfer direction: upload|download", ["-t", "--transfer-direction upload|download"], :optional => false
+    argument :local_path, "Local filesystem path", ["-f", "--local-path file_path"], :optional => false
+    argument :remote_path, "Remote filesystem path", ["-r", "--remote-path file_path"], :optional => false
     alias_action 'app scp', :root_command => true
     def run(_, action, local_path, remote_path)
       rest_app = find_app
@@ -48,8 +48,12 @@ module RHC::Commands
         raise RHC::SSHConnectionRefused.new(ssh_opts[0], ssh_opts[1])
       rescue SocketError => e
         raise RHC::ConnectionFailed, "The connection to #{ssh_opts[1]} failed: #{e.message}"
+      rescue Net::SSH::AuthenticationFailed => e
+        debug_error e
+        raise RHC::SSHAuthenticationFailed.new(ssh_opts[1], ssh_opts[0])
       rescue Net::SCP::Error => e
-        raise RHC::RemoteFileOrPathNotFound.new("Remote file, file_path, or directory could not be found.")
+        debug_error e
+        raise RHC::RemoteFileOrPathNotFound.new("An unknown error occurred: #{e.message}")
       end
     end
 

data/lib/rhc/commands/snapshot.rb

@@ -25,45 +25,15 @@ module RHC::Commands
     option ["--ssh PATH"], "Full path to your SSH executable with additional options"
     alias_action :"app snapshot save", :root_command => true, :deprecated => true
     def save(app)
-      ssh = check_ssh_executable! options.ssh
+
       rest_app = find_app
 
       raise RHC::DeploymentsNotSupportedException.new if options.deployment && !rest_app.supports?("DEPLOY")
 
-      ssh_uri = URI.parse(rest_app.ssh_url)
       filename = options.filepath ? options.filepath : "#{rest_app.name}.tar.gz"
 
-      snapshot_cmd = options.deployment ? 'gear archive-deployment' : 'snapshot'
-      ssh_cmd = "#{ssh} #{ssh_uri.user}@#{ssh_uri.host} '#{snapshot_cmd}' > #{filename}"
-      debug ssh_cmd
-
-      say "Pulling down a snapshot to #{filename}..."
+      save_snapshot(rest_app, filename, options.deployment, options.ssh)
 
-      begin
-        if !RHC::Helpers.windows?
-          status, output = exec(ssh_cmd)
-          if status != 0
-            debug output
-            raise RHC::SnapshotSaveException.new "Error in trying to save snapshot. You can try to save manually by running:\n#{ssh_cmd}"
-          end
-        else
-          Net::SSH.start(ssh_uri.host, ssh_uri.user) do |ssh|
-            File.open(filename, 'wb') do |file|
-              ssh.exec! "snapshot" do |channel, stream, data|
-                if stream == :stdout
-                  file.write(data)
-                else
-                  debug data
-                end
-              end
-            end
-          end
-        end
-      rescue Timeout::Error, Errno::EADDRNOTAVAIL, Errno::EADDRINUSE, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Net::SSH::AuthenticationFailed => e
-        debug e.backtrace
-        raise RHC::SnapshotSaveException.new "Error in trying to save snapshot. You can try to save manually by running:\n#{ssh_cmd}"
-      end
-      results { say "Success" }
       0
     end
 
@@ -74,59 +44,14 @@ module RHC::Commands
     option ["--ssh PATH"], "Full path to your SSH executable with additional options"
     alias_action :"app snapshot restore", :root_command => true, :deprecated => true
     def restore(app)
-      ssh = check_ssh_executable! options.ssh
       rest_app = find_app
       filename = options.filepath ? options.filepath : "#{rest_app.name}.tar.gz"
 
       if File.exists? filename
-
-        include_git = RHC::Helpers.windows? ? true : RHC::TarGz.contains(filename, './*/git')
-        ssh_uri = URI.parse(rest_app.ssh_url)
-
-        ssh_cmd = "cat '#{filename}' | #{ssh} #{ssh_uri.user}@#{ssh_uri.host} 'restore#{include_git ? ' INCLUDE_GIT' : ''}'"
-
-        say "Restoring from snapshot #{filename}..."
-        debug ssh_cmd
-
-        begin
-          if !RHC::Helpers.windows?
-            status, output = exec(ssh_cmd)
-            if status != 0
-              debug output
-              raise RHC::SnapshotRestoreException.new "Error in trying to restore snapshot. You can try to restore manually by running:\n#{ssh_cmd}"
-            end
-          else
-            ssh = Net::SSH.start(ssh_uri.host, ssh_uri.user)
-            ssh.open_channel do |channel|
-              channel.exec("restore#{include_git ? ' INCLUDE_GIT' : ''}") do |ch, success|
-                channel.on_data do |ch, data|
-                  say data
-                end
-                channel.on_extended_data do |ch, type, data|
-                  say data
-                end
-                channel.on_close do |ch|
-                  say "Terminating..."
-                end
-                File.open(filename, 'rb') do |file|
-                  file.chunk(1024) do |chunk|
-                    channel.send_data chunk
-                  end
-                end
-                channel.eof!
-              end
-            end
-            ssh.loop
-          end
-        rescue Timeout::Error, Errno::EADDRNOTAVAIL, Errno::EADDRINUSE, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Net::SSH::AuthenticationFailed => e
-          debug e.backtrace
-          raise RHC::SnapshotRestoreException.new "Error in trying to restore snapshot. You can try to restore manually by running:\n#{ssh_cmd}"
-        end
-
+        restore_snapshot(rest_app, filename, options.ssh)
       else
         raise RHC::SnapshotRestoreException.new "Archive not found: #{filename}"
       end
-      results { say "Success" }
       0
     end
 
@@ -134,4 +59,4 @@ module RHC::Commands
       include RHC::SSHHelpers
 
   end
-end
+end

data/lib/rhc/context_helper.rb

@@ -67,22 +67,23 @@ module RHC
     end
 
     def find_app(opts={})
-      if id = options.application_id
+      if id = options.application_id.presence
         if opts.delete(:with_gear_groups)
           return rest_client.find_application_by_id_gear_groups(id, opts)
         else
           return rest_client.find_application_by_id(id, opts)
         end
       end
+      option = (opts && opts[:app]) || options.app
       domain, app =
-        if options.app
-          if options.app =~ /\//
-            options.app.split(/\//)
+        if option
+          if option =~ /\//
+            option.split(/\//)
           else
-            [options.namespace || namespace_context, options.app]
+            [options.namespace || namespace_context, option]
           end
         end
-      if app && domain
+      if app.present? && domain.present?
         if opts.delete(:with_gear_groups)
           rest_client.find_application_gear_groups(domain, app, opts)
         else

data/lib/rhc/exceptions.rb

@@ -138,6 +138,12 @@ module RHC
     end
   end
 
+  class AppCloneNotSupportedException < Exception
+    def initialize(message="The server does not support cloning apps")
+      super message, 134
+    end
+  end
+
   class MissingScalingValueException < Exception
     def initialize(message="Must provide either a min or max value for scaling")
       super message

data/lib/rhc/output_helpers.rb

@@ -26,7 +26,7 @@ module RHC
     #---------------------------
     # Application information
     #---------------------------
-    def display_app(app, cartridges=nil, properties=nil)
+    def display_app(app, cartridges=nil, properties=nil, verbose=false)
       paragraph do
         header [app.name, "@ #{app.app_url}", "(uuid: #{app.uuid})"] do
           section(:bottom => 1) do
@@ -43,7 +43,7 @@ module RHC
                 :aliases]),
               :delete => true
           end
-          cartridges.each{ |c| section(:bottom => 1){ display_cart(c) } } if cartridges
+          cartridges.each{ |c| section(:bottom => 1){ display_cart(c, verbose ? :verbose : []) } } if cartridges
         end
       end
     end
@@ -69,6 +69,8 @@ module RHC
         format_scaling_info(cart.scaling)
       elsif cart.shares_gears?
         "Located with #{cart.collocated_with.join(", ")}"
+      elsif cart.external? && cart.current_scale == 0
+        "none (external service)"
       else
         "%d %s" % [format_value(:current_scale, cart.current_scale), format_value(:gear_profile, cart.gear_profile)]
       end
@@ -84,13 +86,18 @@ module RHC
     #---------------------------
 
     def display_cart(cart, *properties)
+      verbose = properties.delete(:verbose)
       say format_table \
         format_cart_header(cart),
-        get_properties(cart, *properties).
-          concat([[:downloaded_cartridge_url, cart.url]]).
-          concat([[cart.scalable? ? :scaling : :gears, format_cart_gears(cart)]]).
-          concat(cart.properties.map{ |p| ["#{table_heading(p['name'])}:", p['value']] }.sort{ |a,b| a[0] <=> b[0] }).
-          concat(cart.environment_variables.present? ? [[:environment_variables, cart.environment_variables.map{|item| "#{item[:name]}=#{item[:value]}" }.sort.join(', ')]] : []),
+          get_properties(cart, *properties).
+            concat(verbose && cart.custom? ? [[:description, cart.description.strip]] : []).
+            concat([[:downloaded_cartridge_url, cart.url]]).
+            concat(verbose && cart.custom? ? [[:version, cart.version]] : []).
+            concat(verbose && cart.custom? && cart.license.strip.downcase != 'unknown' ? [[:license, cart.license]] : []).
+            concat(cart.custom? ? [[:website, cart.website]] : []).
+            concat([[cart.scalable? ? :scaling : :gears, format_cart_gears(cart)]]).
+            concat(cart.properties.map{ |p| ["#{table_heading(p['name'])}:", p['value']] }.sort{ |a,b| a[0] <=> b[0] }).
+            concat(cart.environment_variables.present? ? [[:environment_variables, cart.environment_variables.map{|item| "#{item[:name]}=#{item[:value]}" }.sort.join(', ')]] : []),
         :delete => true
 
       say format_usage_message(cart) if cart.usage_rate?

data/lib/rhc/rest/cartridge.rb

@@ -5,7 +5,8 @@ module RHC
 
       define_attr :type, :name, :display_name, :properties, :gear_profile, :status_messages, :scales_to, :scales_from, :scales_with,
                   :current_scale, :supported_scales_to, :supported_scales_from, :tags, :description, :collocated_with, :base_gear_storage,
-                  :additional_gear_storage, :url, :environment_variables, :gear_size, :automatic_updates
+                  :additional_gear_storage, :url, :environment_variables, :gear_size, :automatic_updates,
+                  :version, :license, :website, :description
 
       def scalable?
         supported_scales_to != supported_scales_from
@@ -31,6 +32,10 @@ module RHC
         v
       end
 
+      def external?
+        tags.include?('external')
+      end
+
       def shares_gears?
         Array(collocated_with).present?
       end

data/lib/rhc/rest/client.rb

@@ -36,6 +36,7 @@ module RHC
       end
 
       def applications(options={})
+        debug "Getting applications"
         if link = api.link_href(:LIST_APPLICATIONS)
           api.rest_method :LIST_APPLICATIONS, options
         else
@@ -43,6 +44,16 @@ module RHC
         end
       end
 
+      def owned_applications(options={})
+        debug "Getting owned applications"
+        if link = api.link_href(:LIST_APPLICATIONS_BY_OWNER)
+          @owned_applications ||= api.rest_method 'LIST_APPLICATIONS_BY_OWNER', :owner => '@self'
+        else
+          owned_domains_names = owned_domains.map{|d| d.name}
+          @owned_applications ||= applications(options).select{|app| owned_domains_names.include?(app.domain)}
+        end
+      end
+
       def cartridges
         debug "Getting all cartridges"
         @cartridges ||= api.rest_method("LIST_CARTRIDGES", nil, :lazy_auth => true)
@@ -53,7 +64,7 @@ module RHC
         @user ||= api.rest_method "GET_USER"
       end
 
-      #Find Domain by namesapce
+      #Find Domain by namespace
       def find_domain(id)
         debug "Finding domain #{id}"
         if link = api.link_href(:SHOW_DOMAIN, ':name' => id)
@@ -64,18 +75,25 @@ module RHC
       end
 
       def find_application(domain, application, options={})
+        precheck_domain_id(domain)
+        precheck_application_id(application)
         request(:url => link_show_application_by_domain_name(domain, application), :method => "GET", :payload => options)
       end
 
       def find_application_gear_groups(domain, application, options={})
+        precheck_domain_id(domain)
+        precheck_application_id(application)
         request(:url => link_show_application_by_domain_name(domain, application, "gear_groups"), :method => "GET", :payload => options)
       end
 
       def find_application_aliases(domain, application, options={})
+        precheck_domain_id(domain)
+        precheck_application_id(application)
         request(:url => link_show_application_by_domain_name(domain, application, "aliases"), :method => "GET", :payload => options)
       end
 
       def find_application_by_id(id, options={})
+        precheck_application_id(id)
         if api.supports? :show_application
           request(:url => link_show_application_by_id(id), :method => "GET", :payload => options)
         else
@@ -84,6 +102,7 @@ module RHC
       end
 
       def find_application_by_id_gear_groups(id, options={})
+        precheck_application_id(id)
         if api.supports? :show_application
           request(:url => link_show_application_by_id(id, 'gear_groups'), :method => "GET", :payload => options)
         else
@@ -91,6 +110,17 @@ module RHC
         end or raise ApplicationNotFoundException.new("Application with id #{id} not found")
       end
 
+      # Catch domain ids which we can't make API calls for
+      def precheck_domain_id(domain)
+        raise DomainNotFoundException.new("Domain not specified") if domain.blank?
+        raise DomainNotFoundException.new("Domain #{domain} not found") if ['.','..'].include?(domain)
+      end
+
+      def precheck_application_id(application)
+        raise ApplicationNotFoundException.new("Application not specified") if application.blank?
+        raise ApplicationNotFoundException.new("Application #{application} not found") if ['.','..'].include?(application)
+      end
+
       def link_show_application_by_domain_name(domain, application, *args)
         [
           api.links['LIST_DOMAINS']['href'],

data/lib/rhc/rest/mock.rb

@@ -444,7 +444,7 @@ module RHC::Rest::Mock
     end
 
     def mock_domain_links(domain_id='test_domain')
-      [['ADD_APPLICATION',   "domains/#{domain_id}/apps/add", 'post', {'optional_params' => [{'name' => 'environment_variables'}]} ],
+      [['ADD_APPLICATION',   "domains/#{domain_id}/apps/add", 'post', {'optional_params' => [{'name' => 'environment_variables'}, {'name' => 'cartridges[][name]'}, {'name' => 'cartridges[][url]'}]} ],
        ['LIST_APPLICATIONS', "domains/#{domain_id}/apps/",    'get' ],
        ['UPDATE',            "domains/#{domain_id}/update",   'put'],
        ['DELETE',            "domains/#{domain_id}/delete",   'post']]
@@ -681,6 +681,7 @@ module RHC::Rest::Mock
         scale = type[:scale]
         gear_profile = type[:gear_profile]
         git_url = type[:initial_git_url]
+        tags = type[:tags]
         type = Array(type[:cartridges] || type[:cartridge])
       end
       a = MockRestApplication.new(client, name, type, self, scale, gear_profile, git_url)

data/lib/rhc/ssh_helpers.rb

@@ -248,6 +248,94 @@ module RHC
       end
     end
 
+    def save_snapshot(app, filename, for_deployment=false, ssh_executable=nil)
+      ssh_uri = URI.parse(app.ssh_url)
+      ssh_executable = check_ssh_executable! ssh_executable
+
+      snapshot_cmd = for_deployment ? 'gear archive-deployment' : 'snapshot'
+      ssh_cmd = "#{ssh_executable} #{ssh_uri.user}@#{ssh_uri.host} '#{snapshot_cmd}' > #{filename}"
+      ssh_stderr = " 2>/dev/null"
+      debug ssh_cmd
+
+      say "Pulling down a snapshot of application '#{app.name}' to #{filename} ... "
+
+      begin
+        if !RHC::Helpers.windows?
+            status, output = exec(ssh_cmd + (debug? ? '' : ssh_stderr))
+            if status != 0
+              debug output
+              raise RHC::SnapshotSaveException.new "Error in trying to save snapshot. You can try to save manually by running:\n#{ssh_cmd}"
+            end
+        else
+          Net::SSH.start(ssh_uri.host, ssh_uri.user) do |ssh|
+            File.open(filename, 'wb') do |file|
+              ssh.exec! "snapshot" do |channel, stream, data|
+                if stream == :stdout
+                  file.write(data)
+                else
+                  debug data
+                end
+              end
+            end
+          end
+        end
+      rescue Timeout::Error, Errno::EADDRNOTAVAIL, Errno::EADDRINUSE, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Net::SSH::AuthenticationFailed => e
+        debug e.backtrace
+        raise RHC::SnapshotSaveException.new "Error in trying to save snapshot. You can try to save manually by running:\n#{ssh_cmd}"
+      end
+
+      success 'done'
+    end
+
+    def restore_snapshot(app, filename, ssh_executable=nil)
+      include_git = RHC::Helpers.windows? ? true : RHC::TarGz.contains(filename, './*/git')
+      ssh_uri = URI.parse(app.ssh_url)
+      ssh_executable = check_ssh_executable! options.ssh
+
+      ssh_cmd = "cat '#{filename}' | #{ssh_executable} #{ssh_uri.user}@#{ssh_uri.host} 'restore#{include_git ? ' INCLUDE_GIT' : ''}'"
+      ssh_stderr = " 2>/dev/null"
+      debug ssh_cmd
+
+      say "Restoring from snapshot #{filename} to application '#{app.name}' ... "
+
+      begin
+        if !RHC::Helpers.windows?
+          status, output = exec(ssh_cmd + (debug? ? '' : ssh_stderr))
+          if status != 0
+            debug output
+            raise RHC::SnapshotRestoreException.new "Error in trying to restore snapshot. You can try to restore manually by running:\n#{ssh_cmd}"
+          end
+        else
+          ssh = Net::SSH.start(ssh_uri.host, ssh_uri.user)
+          ssh.open_channel do |channel|
+            channel.exec("restore#{include_git ? ' INCLUDE_GIT' : ''}") do |ch, success|
+              channel.on_data do |ch, data|
+                debug data
+              end
+              channel.on_extended_data do |ch, type, data|
+                debug data
+              end
+              channel.on_close do |ch|
+                debug "Terminating..."
+              end
+              File.open(filename, 'rb') do |file|
+                file.chunk(4096) do |chunk|
+                  channel.send_data chunk
+                end
+              end
+              channel.eof!
+            end
+          end
+          ssh.loop
+        end
+      rescue Timeout::Error, Errno::EADDRNOTAVAIL, Errno::EADDRINUSE, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Net::SSH::AuthenticationFailed => e
+        debug e.backtrace
+        raise RHC::SnapshotRestoreException.new "Error in trying to restore snapshot. You can try to restore manually by running:\n#{ssh_cmd}"
+      end
+
+      success 'done'
+    end
+
     # Public: Generate an SSH key and store it in ~/.ssh/id_rsa
     #
     # type - The String type RSA or DSS.

data/lib/rhc/usage_templates/command_help.erb

@@ -1,7 +1,7 @@
 Usage: <%= Array(program :name).first %> <%= @command.name %> <%= @command.syntax %>
 
 <%= @command.description || @command.summary %>
-<% if @actions.blank? or @command.root? and @command.info[:method].present? -%>
+<% if @actions.blank? or @command.root? and @command.info.present? and @command.info[:method].present? -%>
 
 <% unless @command.info[:args].blank? or @command.options.all?{ |o| o[:hide] or o[:switches].present? } -%>
 

data/spec/direct_execution_helper.rb

@@ -1,5 +1,6 @@
 require 'open4'
 require 'rhc/helpers'
+require 'tmpdir'
 
 $source_bin_rhc = File.expand_path('bin/rhc')
 

data/spec/rhc/commands/app_spec.rb

@@ -212,7 +212,7 @@ describe RHC::Commands::App do
     end
 
     context 'when run with a git url' do
-      let(:arguments) { ['app', 'create', 'app1', 'mock_standalone_cart-1', '--from', 'git://url'] }
+      let(:arguments) { ['app', 'create', 'app1', 'mock_standalone_cart-1', '--from-code', 'git://url'] }
       it { expect { run }.to exit_with_code(0) }
       it { run_output.should match("Success") }
       it { run_output.should match("Git remote: git:fake.foo/git/app1.git\n") }
@@ -466,6 +466,51 @@ describe RHC::Commands::App do
     end
   end
 
+  describe 'app create from another app' do
+    before(:each) do
+      FakeFS.deactivate!
+      @domain = rest_client.add_domain("mockdomain")
+      @app = @domain.add_application("app1", "mock_standalone_cart-1")
+      @app.add_alias('myfoo.com')
+      @cart1 = @app.add_cartridge('mock_cart-1')
+      @cart2 = @app.add_cartridge('mock_cart-2')
+      @cart2.gear_profile = 'medium'
+      @instance.stub(:save_snapshot)
+      @instance.stub(:restore_snapshot)
+    end
+
+    context 'when run' do
+      let(:arguments) { ['app', 'create', 'clone', '--from-app', 'app1', '--no-git'] }
+      it { expect { run }.to exit_with_code(0) }
+      it "should clone successfully" do
+        run_output.should match(/Cartridges:\s+mock_standalone_cart-1, mock_cart-1, mock_cart-2/)
+        run_output.should match(/Gear Size:\s+Copied from 'app1'/)
+        run_output.should match(/Setting deployment configuration/)
+        run_output.should match(/done/)
+      end
+    end
+
+    context 'alias already registered' do
+      let(:arguments) { ['app', 'create', 'clone', '--from-app', 'app1', '--no-git'] }
+      before do 
+        RHC::Rest::Mock::MockRestApplication.any_instance.stub(:aliases).and_return(['www.foo.com'])
+      end 
+      it { expect { run }.to exit_with_code(0) }
+      it "should warn" do
+        run_output.should match(/The application 'app1' has aliases set which were not copied/)
+      end
+    end
+
+    context 'when run against unsupported server' do
+      let(:arguments) { ['app', 'create', 'clone', '--from-app', 'app1', '--no-git'] }
+      before { @domain.should_receive(:has_param?).with('ADD_APPLICATION','cartridges[][name]').and_return(false) }
+      it { expect { run }.to exit_with_code(134) }
+      it "should fail" do
+        run_output.should match(/The server does not support creating apps based on others/)
+      end
+    end
+  end
+
   describe 'app delete' do
     let(:arguments) { ['app', 'delete', '--trace', '-a', 'app1', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
 
@@ -579,6 +624,41 @@ describe RHC::Commands::App do
       it { run_output.should match(/Gears:\s+1 small/) }
       it { run_output.should match(%r(From:\s+ https://foo.bar.com)) }
     end
+
+    context 'when run with app with custom external cartridges' do
+      before do
+        @domain = rest_client.add_domain("mockdomain")
+        app = @domain.add_application("app1", "mock_type")
+        cart1 = app.add_cartridge('mock_cart-1')
+        cart1.url = 'https://foo.bar.com'
+        cart1.tags = ['external']
+        cart1.version = '2'
+        cart1.license = 'GPL'
+        cart1.website = 'http://bar.com'
+        cart1.current_scale = 0
+      end
+      context 'verbosely' do
+        let(:arguments) { ['app', 'show', 'app1', '-v'] }
+        it { run_output.should match("app1 @ https://app1-mockdomain.fake.foo/") }
+        it { run_output.should match(/Gears:\s+1 small/) }
+        it { run_output.should match(/Gears:\s+none \(external service\)/) }
+        it { run_output.should match(/Description:\s+Description of mock_cart-1/) }
+        it { run_output.should match(%r(Website:\s+ http://bar.com)) }
+        it { run_output.should match(/Version:\s+2/) }
+        it { run_output.should match(/License:\s+GPL/) }
+        it { run_output.should match(%r(From:\s+ https://foo.bar.com)) }
+      end
+      context 'not verbosely' do
+        it { run_output.should match("app1 @ https://app1-mockdomain.fake.foo/") }
+        it { run_output.should match(/Gears:\s+1 small/) }
+        it { run_output.should match(/Gears:\s+none \(external service\)/) }
+        it { run_output.should_not match(/Description:\s+Description of mock_cart-1/) }
+        it { run_output.should match(%r(Website:\s+ http://bar.com)) }
+        it { run_output.should_not match(/Version:\s+2/) }
+        it { run_output.should_not match(/License:\s+GPL/) }
+        it { run_output.should match(%r(From:\s+ https://foo.bar.com)) }
+      end
+    end
   end
 
   describe 'app show' do

data/spec/rhc/commands/apps_spec.rb

@@ -26,8 +26,24 @@ describe RHC::Commands::Apps do
         before{ domain.add_application('scaled', 'php', true) }
 
         it { expect { run }.to exit_with_code(0) }
-        it { run_output.should match(/scaled.*\-\-.*php.*Scaling:.*x2 \(minimum/m) }
+        it "should match output" do
+          output = run_output
+          output.should match("You have access to 1 application\\.")
+          output.should match(/scaled.*\-\-.*php.*Scaling:.*x2 \(minimum/m)
+        end
       end
+
+      context 'with one owned app' do
+        let(:arguments) { ['apps', '--mine'] }
+        before{ a = domain.add_application('scaled', 'php', true); rest_client.stub(:owned_applications).and_return([a]) }
+        it { expect { run }.to exit_with_code(0) }
+        it "should match output" do
+          output = run_output
+          output.should match("You have 1 application\\.")
+          output.should match(/scaled.*\-\-.*php.*Scaling:.*x2 \(minimum/m)
+        end
+      end
+
     end
 
     context 'when help is shown' do
@@ -35,5 +51,29 @@ describe RHC::Commands::Apps do
       it { expect { run }.to exit_with_code(0) }
       it { run_output.should match(/rhc apps.*Display the list of applications/m) }
     end
+
+    context 'when run verbose with custom external cartridges' do
+      let(:arguments) { ['apps', '-v'] }
+      before do
+        @domain = rest_client.add_domain("mockdomain")
+        app = @domain.add_application("app1", "mock_type")
+        cart1 = app.add_cartridge('mock_cart-1')
+        cart1.url = 'https://foo.bar.com'
+        cart1.tags = ['external']
+        cart1.version = '2'
+        cart1.license = 'GPL'
+        cart1.website = 'http://bar.com'
+        cart1.current_scale = 0
+      end
+      it { run_output.should match("app1 @ https://app1-mockdomain.fake.foo/") }
+      it { run_output.should match(/Gears:\s+1 small/) }
+      it { run_output.should match(/Gears:\s+none \(external service\)/) }
+      it { run_output.should match(/Description:\s+Description of mock_cart-1/) }
+      it { run_output.should match(%r(Website:\s+ http://bar.com)) }
+      it { run_output.should match(/Version:\s+2/) }
+      it { run_output.should match(/License:\s+GPL/) }
+      it { run_output.should match(%r(From:\s+ https://foo.bar.com)) }
+    end
+
   end
 end

data/spec/rhc/commands/scp_spec.rb

@@ -63,14 +63,25 @@ describe RHC::Commands::Scp do
       it { run_output.should match("The connection to 127.0.0.1 failed: SocketError") }
     end
 
-    context 'remote file not found' do
+
+    context 'authentication error' do
+      before(:each) do
+        @domain = rest_client.add_domain("mockdomain")
+        @domain.add_application("app1", "mock_type")
+        File.should_receive(:exist?).with("file.txt").once.and_return(true)
+        Net::SCP.should_receive("upload!".to_sym).with("127.0.0.1", "fakeuuidfortestsapp1","file.txt","app-root/data").and_raise(Net::SSH::AuthenticationFailed)
+      end
+      it { run_output.should match("Authentication to server 127.0.0.1 with user fakeuuidfortestsapp1 failed") }
+    end
+
+    context 'unknown error' do
       before(:each) do
         @domain = rest_client.add_domain("mockdomain")
         @domain.add_application("app1", "mock_type")
         File.should_receive(:exist?).with("file.txt").once.and_return(true)
-        Net::SCP.should_receive("upload!".to_sym).with("127.0.0.1", "fakeuuidfortestsapp1","file.txt","app-root/data").and_raise(Net::SCP::Error)
+        Net::SCP.should_receive("upload!".to_sym).with("127.0.0.1", "fakeuuidfortestsapp1","file.txt","app-root/data").and_raise(Net::SCP::Error.new("SCP error message"))
       end
-      it { run_output.should match("Remote file, file_path, or directory could not be found.") }
+      it { run_output.should match("An unknown error occurred: SCP error message") }
     end
   end
 

data/spec/rhc/commands/snapshot_spec.rb

@@ -57,7 +57,7 @@ describe RHC::Commands::Snapshot do
         ssh.should_receive(:exec!).with("snapshot").and_yield(nil, :stdout, 'foo').and_yield(nil, :stderr, 'foo')
       end
       it { expect { run }.to exit_with_code(0) }
-      it { run_output.should match("Success") }
+      it { run_output.should match("done") }
     end
 
     context 'when timing out on windows' do
@@ -176,4 +176,3 @@ describe RHC::Commands::Snapshot do
     it('should raise') { expect{ run }.to raise_error(RHC::InvalidSSHExecutableException, /SSH executable '#{@targz_filename}' is not executable./) }
   end
 end
-

data/spec/rhc/rest_client_spec.rb

@@ -316,6 +316,29 @@ module RHC
           end
         end
 
+        context "when server supports LIST_APPLICATIONS_BY_OWNER" do
+          let(:api_links){ client_links.merge!(mock_response_links([['LIST_APPLICATIONS_BY_OWNER', 'applications', 'get']])) }
+          before do
+            stub_api_request(:any, "#{api_links['LIST_APPLICATIONS_BY_OWNER']['relative']}?owner=@self").
+              to_return({ :body   => {
+                            :type => 'applications',
+                            :data => [{
+                              :name  => 'mock_application_0',
+                              :links => mock_response_links(mock_app_links('mock_domain_0', 'mock_application_0')),
+                            }]
+                          }.to_json,
+                          :status => 200
+                        })
+          end
+          it "returns owned applications when called" do
+            match = nil
+            expect { match = client.owned_applications }.to_not raise_error
+            match.length.should == 1
+            match.first.name.should == 'mock_application_0'
+            match.first.class.should == RHC::Rest::Application
+          end
+        end
+
         context "find_application" do
           let(:mock_domain){ 'mock_domain_0' }
           let(:mock_app){ 'mock_app' }

data/spec/spec_helper.rb

@@ -233,6 +233,7 @@ module CommandHelpers
     $terminal.close_write
     run!(*args)
   end
+
   def command_output(args=arguments)
     run_command(args)
   rescue SystemExit => e
@@ -553,6 +554,41 @@ def mac?
   RbConfig::CONFIG['host_os'] =~ /^darwin/
 end
 
+def mock_save_snapshot_file(app)
+  @ssh_uri = URI.parse app.ssh_url
+  mock_popen3("ssh #{@ssh_uri.user}@#{@ssh_uri.host} 'snapshot' > #{@app.name}.tar.gz", nil,
+              "Pulling down a snapshot of application '#{app.name}' to #{app.name}.tar.gz", nil)
+end
+
+def mock_restore_snapshot_file(app)
+  @ssh_uri = URI.parse app.ssh_url
+  File.stub(:exists?).and_return(true)
+  RHC::TarGz.stub(:contains).and_return(true)
+  in_mock, out_mock, err_mock = 
+    mock_popen3("ssh #{@ssh_uri.user}@#{@ssh_uri.host} 'restore INCLUDE_GIT'", nil, "Restoring from snapshot #{app.name}.tar.gz to application '#{app.name}'", nil)
+  lines = ''
+  File.open(File.expand_path('../rhc/assets/targz_sample.tar.gz', __FILE__), 'rb') do |file|
+    file.chunk(4096) do |chunk|
+      lines << chunk
+    end
+  end
+  in_mock.stub(:write)
+  in_mock.stub(:close_write)
+end
+
+def mock_popen3(cmd, std_in, std_out, std_err)
+  in_mock = double('std in')
+  out_mock = double('std out')
+  err_mock = double('std err')
+  in_mock.stub(:gets).and_return(std_in)      
+  out_mock.stub(:gets).and_return(std_out)      
+  err_mock.stub(:gets).and_return(std_err)      
+  Open3.stub(:popen3)
+  Open3.should_receive(:popen3).with(cmd).and_yield(in_mock, out_mock, err_mock)
+  return in_mock, out_mock, err_mock
+end
+
+
 RSpec.configure do |config|
   config.include(ExitCodeMatchers)
   config.include(CommanderInvocationMatchers)

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 1
-  - 21
-  - 3
-  version: 1.21.3
+  - 22
+  - 5
+  version: 1.22.5
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-03-10 00:00:00 Z
+date: 2014-04-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
@@ -389,6 +389,7 @@ files:
 - features/members_feature.rb
 - features/assets/deploy.tar.gz
 - features/deployments_feature.rb
+- features/app_feature.rb
 - features/core_feature.rb
 - features/keys_feature.rb
 - features/domains_feature.rb
@@ -484,6 +485,7 @@ test_files:
 - features/members_feature.rb
 - features/assets/deploy.tar.gz
 - features/deployments_feature.rb
+- features/app_feature.rb
 - features/core_feature.rb
 - features/keys_feature.rb
 - features/domains_feature.rb