startapp 0.1.11 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3273849d96283aa44ad1b0258b5adc134d84f505
-  data.tar.gz: 8fa2feaa6770f0c9d2631551dc81ce5d71832cd3
+  metadata.gz: e13052412a98ea1d21434f471024f9f07a51aff3
+  data.tar.gz: c8d60adc7432be67b81528b3ef87a0eedd642c94
 SHA512:
-  metadata.gz: c958c30189bff712117922940cc776a27081a35b9dd0f6e51066fc08e20492df4a064481d0de030f76641a8a68d17c188e5e7f6a34a81f631a1c067d21ea11c8
-  data.tar.gz: baa4dad7bec30f1d91c28eb655beb16f8ec9a9b020f64787a207a8f9e9a8518152fa5b571bf57fb9f9df35a5badede7aa40790c1c86267ed8cd151c755c3d663
+  metadata.gz: 6b2e0ada6ed5bba114b7e5cadd47c6c5bf526e24b1747e91a64435285838d0adb2d92b1e997e3a778b71f82fd8f3091fdaed76d7be74313a94d0d3c75f83e79b
+  data.tar.gz: b5aac4e369506a156a9e55c5c6d893f818405c28a51b3bf956288a146bc9af8be74449a8db91fed0103b9f239eb37239922fa9569d0887eac1aaba2f7c5a7f3c

data/README.md

@@ -7,8 +7,8 @@ info on installing the tool on each supported operating system.
 
 Please stop by #openshift on irc.freenode.net if you have any questions or
 comments.  For more information about OpenShift, visit https://openshift.redhat.com
-or the OpenShift forum
-https://openshift.redhat.com/community/forums/openshift.
+or the OpenShift support page
+https://openshift.redhat.com/support.
 
 
 ## Using RHC to create an application

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

@@ -50,6 +50,7 @@ describe "rhc core scenarios" do
   context "when creating an app" do
     when_running 'create-app', 'test1', a_web_cartridge
     before{ no_applications }
+    after { no_applications }
     it "returns the proper info and is in the rest api" do
       status.should == 0
       output.should match "Your application 'test1' is now available"
@@ -69,6 +70,7 @@ describe "rhc core scenarios" do
       standard_config
       @app = has_an_application
     end
+    after(:all){ @app.destroy }
 
     let(:app){ @app }
 
@@ -159,12 +161,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

@@ -104,7 +104,7 @@ describe "rhc member scenarios" do
         members.any?{ |m| m.id == other_users[user1].id && m.editor? }.should be_true
         members.any?{ |m| m.id == other_users[user2].id && m.editor? }.should be_true
 
-        r = rhc 'remove-member', domain.name, '--all'
+        r = rhc 'remove-member', '-n', domain.name, '--all'
         r.status.should == 0
         r.stdout.should match "Removing all members from domain.*done"
         members = client.find_domain(domain.name).members
@@ -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/commands/app.rb

@@ -51,9 +51,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 +69,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 +93,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 +103,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 +137,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) } }
@@ -162,6 +193,19 @@ module RHC::Commands
           end
         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
@@ -334,6 +378,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
@@ -377,7 +422,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
@@ -515,20 +560,21 @@ 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:" }
@@ -722,5 +768,10 @@ 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 'app setup' or 'app 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 'app 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/create.rb

@@ -39,9 +39,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"

data/lib/rhc/commands/domain.rb

@@ -149,8 +149,9 @@ module RHC::Commands
       domain = rest_client.find_domain(namespace)
 
       say "Leaving domain ... "
-      domain.leave
+      result = domain.leave
       success "done"
+      result.messages.each{ |s| paragraph{ say s } }
 
       0
     end