pbox 1.17.3 → 1.17.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fda0d6c905acc54318e03055ff72e1cb34140d4
-  data.tar.gz: 012a55f670f3d439adcb90c68b508e4f0d6e0538
+  metadata.gz: bfee555f9ee9118e0f424635efa02f04ac6a2f42
+  data.tar.gz: 397cdb8bd8890ecb90e24c5347b41ea06e428b6f
 SHA512:
-  metadata.gz: f7d2c4e91179db74dc0d4fe400dd5a1d3105a1e8288143632bec1ec0b54c7e2a76b3a0d4fe74604eee0237bc83e589a222de418a713634db78308b5f235ea9ae
-  data.tar.gz: 353ddb0aac829648776646b8aaee22e2904769091437d997974114e3eceb41b59c2a8bc5318ee7017bf2aa83a5b8a80eaabd1c83c315bc12511f9460ca78d621
+  metadata.gz: bdb3780c523b969c9b368145055815c843aaeacac1225058b0410227bc770d07b93cee33d68f3e4f899fd4d6e3a6e77253e2626df4fdd4b6998b5565b476adfa
+  data.tar.gz: 43bec694062f48e44c2ac6493cbb420c05b8c35eb8ec2a99a9e7e70c8eb9b3073130a84edc4c061e560322453b5deaeeb21fd333f794e50c184bfc4f9a7b7ada

data/features/core_feature.rb

@@ -161,14 +161,16 @@ describe "pbox core scenarios" do
       let(:app){ @app }
 
       it "should add a cartridge with small gear size" do
-        r = pbox 'add-cartridge', an_addon_cartridge, '-a', app.name, '--gear-size', 'small'
-        r.stdout.should match /#{an_addon_cartridge}/
+        cartridge = a_random_cartridge(['embedded', 'service', 'database'])
+        r = pbox 'add-cartridge', cartridge, '-a', app.name, '--gear-size', 'small'
+        r.stdout.should match /#{cartridge}/
         r.stdout.should match /Gears:\s+1 small/
         r.status.should == 0
       end
 
       it "should fail for a cartridge with not allowed gear size" do
-        r = pbox 'add-cartridge', an_addon_cartridge, '-a', app.name, '--gear-size', 'medium'
+        cartridge = a_random_cartridge(['embedded', 'service', 'database'])
+        r = pbox 'add-cartridge', cartridge, '-a', app.name, '--gear-size', 'medium'
         r.stdout.should match "The gear size 'medium' is not valid for this domain. Allowed sizes: small."
         r.status.should_not == 0
       end

data/features/domains_feature.rb

@@ -34,12 +34,21 @@ describe "pbox domain scenarios" do
 
     it "should reject invalid gear size configuration changes" do
       all_sizes = client.user.capabilities.gear_sizes
+      valid_sizes = client.api.links['ADD_DOMAIN']['optional_params'].inject([]) {|sizes, p| sizes += p['valid_options'] if p['name'] == 'allowed_gear_sizes' } rescue []
+      disallowed_sizes = valid_sizes - all_sizes
 
       r = pbox 'configure-domain', domain.name, '--allowed-gear-sizes', '_not_a_size_'
       r.status.should_not == 1
       r.stdout.should match "Updating domain configuration.*The following gear sizes are invalid: _not_a_size_"
       client.reset.find_domain(domain.name).allowed_gear_sizes.should == all_sizes
 
+      if disallowed_sizes.first
+        r = pbox 'configure-domain', domain.name, '--allowed-gear-sizes', disallowed_sizes.first
+        r.status.should_not == 1
+        r.stdout.should match "Updating domain configuration.*The following gear sizes are not available.*: #{disallowed_sizes.first}"
+        client.reset.find_domain(domain.name).allowed_gear_sizes.should == all_sizes
+      end
+
       r = pbox 'configure-domain', domain.name, '--allowed-gear-sizes'
       r.status.should_not == 1
       r.stdout.should match "invalid option: Provide a comma delimited .* --allowed-gear-sizes"

data/lib/rhc/cartridge_helpers.rb

@@ -51,7 +51,7 @@ module RHC
         ].compact.any?{ |s| s.present? && s.downcase.gsub(/[_\-\s]/,' ').include?(search) } || 
         search.length > 2 && [
           cart.description
-        ].compact.any?{ |s| s.present? && !s.downcase.match(/\b#{search}\b/).nil? }
+        ].compact.any?{ |s| s.present? && !s.downcase.match(/\b#{Regexp.escape(search)}\b/).nil? }
       end
 
       def web_carts_only

data/lib/rhc/commands/cartridge.rb

@@ -199,7 +199,7 @@ module RHC::Commands
       cartridges such as databases may require specific increments of scaling (1, 3, 5) in order to
       properly function.  Please consult the cartridge documentation for more on specifics of scaling.
 
-      Set both values the same to guarantee a scale value.  You may pecify both values with the argument
+      Set both values the same to guarantee a scale value.  You may specify both values with the argument
       'multiplier' or use '--min' and '--max' independently.
 
       Scaling may take several minutes or more if the server must provision multiple gears. Your operation

data/lib/rhc/commands/domain.rb

@@ -37,7 +37,8 @@ module RHC::Commands
       '--allowed-gear-sizes' option.  If '--no-allowed-gear-sizes' is set, no applications
       can be created in the domain.  Older servers may not support this option.
       DESC
-    option ['--[no-]allowed-gear-sizes [SIZES]'], 'A comma-delimited list of the gear sizes that will be allowed in this domain.', :optional => true
+    option ['--no-allowed-gear-sizes'], 'Do not allow any gear sizes in this domain.', :optional => true
+    option ['--allowed-gear-sizes [SIZES]'], 'A comma-delimited list of the gear sizes that will be allowed in this domain.', :optional => true
     argument :namespace, "New domain name (letters and numbers, max 16 chars)", ["-n", "--namespace NAME"]
     def create(namespace)
       say "Creating domain '#{namespace}' ... "
@@ -68,12 +69,13 @@ module RHC::Commands
 
     summary "Change one or more configuration settings on the domain"
     syntax "<namespace>"
-    option ['--[no-]allowed-gear-sizes [SIZES]'], 'A comma-delimited list of the gear sizes that will be allowed in this domain.', :optional => true
+    option ['--no-allowed-gear-sizes'], 'Do not allow any gear sizes in this domain.', :optional => true
+    option ['--allowed-gear-sizes [SIZES]'], "A comma-delimited list of gear sizes allowed in this domain. To see available sizes, run 'pbox account'.", :optional => true
     takes_domain :argument => true
     def configure(_)
       domain = find_domain
       payload = {}
-      payload[:allowed_gear_sizes] = check_allowed_gear_sizes unless options.allowed_gear_sizes.nil?
+      payload[:allowed_gear_sizes] = check_allowed_gear_sizes unless options.allowed_gear_sizes.nil? and options.no_allowed_gear_sizes.nil?
 
       if payload.present?
         say "Updating domain configuration ... "
@@ -128,11 +130,12 @@ module RHC::Commands
     summary "Delete a domain"
     syntax "<namespace>"
     takes_domain :argument => true
+    option ["-f", "--force"], "Force the action"
     def delete(_)
       domain = find_domain
 
       say "Deleting domain '#{domain.name}' ... "
-      domain.destroy
+      domain.destroy(options.force.present?)
       success "deleted"
 
       0
@@ -153,7 +156,8 @@ module RHC::Commands
 
     protected
       def check_allowed_gear_sizes
-        sizes = options.allowed_gear_sizes
+        raise OptionParser::InvalidOption, "--allowed-gear-sizes and --no-allowed-gear-sizes cannot both be specified" unless options.allowed_gear_sizes.nil? or options.no_allowed_gear_sizes.nil?
+        sizes = options.no_allowed_gear_sizes.nil? ? options.allowed_gear_sizes : false
         raise OptionParser::InvalidOption, "The server does not support --allowed-gear-sizes" unless sizes.nil? || rest_client.api.has_param?(:add_domain, 'allowed_gear_sizes')
         if sizes.is_a? String
           sizes.split(',').map(&:strip).map(&:presence)

data/lib/rhc/deployment_helpers.rb

@@ -10,11 +10,34 @@ module RHC
     protected
 
       def deploy_artifact(rest_app, artifact, hot_deploy, force_clean_build)
-        File.file?(artifact) ?
-          deploy_local_file(rest_app, artifact, hot_deploy, force_clean_build) :
-        artifact =~ /^#{URI::regexp}$/ ?
-          deploy_file_from_url(rest_app, artifact, hot_deploy, force_clean_build) :
-        deploy_git_ref(rest_app, artifact, hot_deploy, force_clean_build)
+        is_file = File.file?(artifact)
+        is_url = URI::ABS_URI.match(artifact).present?
+
+        if rest_app.deployment_type == 'binary'
+          if is_file
+            deploy_local_file(rest_app, artifact, hot_deploy, force_clean_build)
+          elsif is_url
+            deploy_file_from_url(rest_app, artifact, hot_deploy, force_clean_build)
+          else
+            paragraph do
+              warn "The application '#{rest_app.name}' is configured for binary deployments but the artifact "\
+                "provided ('#{artifact}') is not a binary file. Please provide the path to a deployable file on "\
+                "your local filesystem or a url, or configure your app to deploy from a git reference with 'pbox "\
+                "configure-app #{rest_app.name} --deployment-type git'."
+            end
+            raise IncompatibleDeploymentTypeException
+          end
+        elsif is_file || is_url
+          paragraph do
+            warn "The application '#{rest_app.name}' is configured for git "\
+              "reference deployments but the artifact provided ('#{artifact}') is #{is_file ? 'a file' : 'a url'}. Please "\
+              "provide a git reference to deploy (branch, tag or commit SHA1) or configure your app to deploy from binaries "\
+              "with 'pbox configure-app #{rest_app.name} --deployment-type binary'."
+          end
+          raise IncompatibleDeploymentTypeException
+        else
+          deploy_git_ref(rest_app, artifact, hot_deploy, force_clean_build)
+        end
       end
 
       def deploy_git_ref(rest_app, ref, hot_deploy, force_clean_build)

data/lib/rhc/exceptions.rb

@@ -132,6 +132,12 @@ module RHC
     end
   end
 
+  class IncompatibleDeploymentTypeException < Exception
+    def initialize(message="The artifact provided is not compatible with the app deployment type.")
+      super message, 133
+    end
+  end
+
   class MissingScalingValueException < Exception
     def initialize(message="Must provide either a min or max value for scaling")
       super message

data/lib/rhc/rest/mock.rb

@@ -667,8 +667,8 @@ module RHC::Rest::Mock
       self
     end
 
-    def destroy
-      raise RHC::Rest::ClientErrorException.new("Applications must be empty.") unless @applications.empty?
+    def destroy(force=false)
+      raise RHC::Rest::ClientErrorException.new("Applications must be empty.") unless @applications.empty? or force.present?
       client.domains.delete_if { |d| d.name == @name }
 
       @applications = nil
@@ -929,9 +929,10 @@ module RHC::Rest::Mock
 
     attr_accessor :usage_rate
 
-    def initialize(client, name, type, app=nil, tags=[], properties=[{'type' => 'cart_data', 'name' => 'connection_url', 'value' => "http://fake.url" }])
+    def initialize(client, name, type, app=nil, tags=[], properties=[{'type' => 'cart_data', 'name' => 'connection_url', 'value' => "http://fake.url" }], description=nil)
       super({}, client)
       @name = name
+      @description = description || "Description of #{name}"
       @type = type
       @app = app
       @tags = tags

data/spec/direct_execution_helper.rb

@@ -36,8 +36,9 @@ module RhcExecutionHelper
     end
   end
 
-  def an_addon_cartridge
-    'mysql-5'
+  def a_random_cartridge(with_tags=nil, for_user=nil)
+    c = for_user ? for_user.client : client
+    c.cartridges.select{|cartridge| with_tags.nil? || (with_tags - cartridge.tags).empty?}.shuffle.first.name
   end
 
   def pbox(*args)

data/spec/rhc/commands/cartridge_spec.rb

@@ -184,6 +184,15 @@ describe RHC::Commands::Cartridge do
       }
     end
 
+    context 'when cartridge with regex breaking name does not exist' do
+      let(:arguments) { ['cartridge', 'add', '*##', '--app', 'app1'] }
+      before do
+        domain = rest_client.add_domain("mock_domain")
+        app = domain.add_application("app1", "mock_type")
+      end
+      it{ fail_with_code 154 }
+    end
+
     context 'when cartridge does not exist' do
       let(:arguments) { ['cartridge', 'add', 'nomatch_cart', '--app', 'app1'] }
       before do

data/spec/rhc/commands/deployment_spec.rb

@@ -58,6 +58,7 @@ describe RHC::Commands::Deployment do
 
     context "binary file successfully" do
       before do
+        @rest_app.stub(:deployment_type).and_return('binary')
         ssh = double(Net::SSH)
         session = double(Net::SSH::Connection::Session)
         channel = double(Net::SSH::Connection::Channel)
@@ -92,6 +93,7 @@ describe RHC::Commands::Deployment do
      URI('https://foo.com/path/to/file/' + DEPLOYMENT_APP_NAME + '.tar.gz')].each do |uri|
       context "url file successfully" do
         before do
+        @rest_app.stub(:deployment_type).and_return('binary')
           ssh = double(Net::SSH)
           session = double(Net::SSH::Connection::Session)
           channel = double(Net::SSH::Connection::Channel)
@@ -126,6 +128,7 @@ describe RHC::Commands::Deployment do
 
     context "binary file with corrupted file" do
       before do
+        @rest_app.stub(:deployment_type).and_return('binary')
         ssh = double(Net::SSH)
         session = double(Net::SSH::Connection::Session)
         channel = double(Net::SSH::Connection::Channel)
@@ -165,7 +168,10 @@ describe RHC::Commands::Deployment do
     end
 
     context "fails when deploying binary file" do
-      before (:each) { Net::SSH.should_receive(:start).and_raise(Errno::ECONNREFUSED) }
+      before (:each) do
+        @rest_app.stub(:deployment_type).and_return('binary')
+        Net::SSH.should_receive(:start).and_raise(Errno::ECONNREFUSED)
+      end
       let(:arguments) {['app', 'deploy', @targz_filename, '--app', DEPLOYMENT_APP_NAME]}
       it "should exit with error" do
         expect{ run }.to exit_with_code(1)
@@ -173,7 +179,10 @@ describe RHC::Commands::Deployment do
     end
 
     context "fails when deploying binary file" do
-      before (:each) { Net::SSH.should_receive(:start).and_raise(SocketError) }
+      before (:each) do
+        @rest_app.stub(:deployment_type).and_return('binary')
+        Net::SSH.should_receive(:start).and_raise(SocketError)
+      end
       let(:arguments) {['app', 'deploy', @targz_filename, '--app', DEPLOYMENT_APP_NAME]}
       it "should exit with error" do
         expect{ run }.to exit_with_code(1)
@@ -181,7 +190,10 @@ describe RHC::Commands::Deployment do
     end
 
     context "fails when deploying url file" do
-      before (:each) { Net::SSH.should_receive(:start).and_raise(Errno::ECONNREFUSED) }
+      before (:each) do
+        @rest_app.stub(:deployment_type).and_return('binary')
+        Net::SSH.should_receive(:start).and_raise(Errno::ECONNREFUSED)
+      end
       let(:arguments) {['app', 'deploy', 'http://foo.com/deploy.tar.gz', '--app', DEPLOYMENT_APP_NAME]}
       it "should exit with error" do
         expect{ run }.to exit_with_code(1)
@@ -189,7 +201,10 @@ describe RHC::Commands::Deployment do
     end
 
     context "fails when deploying url file" do
-      before (:each) { Net::SSH.should_receive(:start).and_raise(SocketError) }
+      before (:each) do
+        @rest_app.stub(:deployment_type).and_return('binary')
+        Net::SSH.should_receive(:start).and_raise(SocketError)
+      end
       let(:arguments) {['app', 'deploy', 'http://foo.com/deploy.tar.gz', '--app', DEPLOYMENT_APP_NAME]}
       it "should exit with error" do
         expect{ run }.to exit_with_code(1)
@@ -217,6 +232,32 @@ describe RHC::Commands::Deployment do
       end
     end
 
+    context "fails when deploying git reference on an app configured to deployment_type = binary" do
+      before { @rest_app.stub(:deployment_type).and_return('binary') }
+      let(:arguments) {['app', 'deploy', 'master', '--app', DEPLOYMENT_APP_NAME]}
+      it "should exit with error" do
+        expect{ run }.to exit_with_code(133)
+      end
+    end
+
+    context "fails when deploying file on an app configured to deployment_type = git" do
+      before { @rest_app.stub(:deployment_type).and_return('git') }
+      let(:arguments) {['app', 'deploy', @targz_filename, '--app', DEPLOYMENT_APP_NAME]}
+      it "should exit with error" do
+        expect{ run }.to exit_with_code(133)
+      end
+    end
+
+    [URI('http://foo.com/path/to/file/' + DEPLOYMENT_APP_NAME + '.tar.gz'),
+     URI('https://foo.com/path/to/file/' + DEPLOYMENT_APP_NAME + '.tar.gz')].each do |uri|
+      context "fails when deploying url on an app configured to deployment_type = git" do
+        before { @rest_app.stub(:deployment_type).and_return('git') }
+        let(:arguments) {['app', 'deploy', uri.to_s, '--app', DEPLOYMENT_APP_NAME]}
+        it "should exit with error" do
+          expect{ run }.to exit_with_code(133)
+        end
+      end
+    end
   end
 
   describe "activate deployment" do

data/spec/rhc/commands/domain_spec.rb

@@ -321,6 +321,11 @@ describe RHC::Commands::Domain do
         it("should succeed"){ expect { run }.to exit_with_code(0) }
         it("should display the domain config"){ run_output.should match(/Domain domain1 configuration.*Allowed Gear Sizes:\s+<none>/m) }
       end
+
+      context "with --allowed-gear-sizes and --no-allowed-gear-sizes" do
+        let(:arguments) { ['domain', 'configure', 'domain1', '--trace', '--no-allowed-gear-sizes', '--allowed-gear-sizes', 'small'] }
+        it("raise an invalid option"){ expect{ run }.to raise_error(OptionParser::InvalidOption, /--allowed-gear-sizes.*--no-allowed-gear-sizes/) }
+      end
     end
   end
 
@@ -368,6 +373,19 @@ describe RHC::Commands::Domain do
       end
       it { run_output.should match("Applications must be empty") }
     end
+
+    context 'when delete is forced' do
+      let(:arguments) { ['domain', 'delete', 'deleteme', '--force'] }
+      before do
+        domain = rest_client.add_domain("deleteme")
+        domain.add_application 'testapp1', 'mock-1.0'
+      end
+      it "should delete successfully" do
+        expect { run }.to exit_with_code(0)
+        rest_client.domains.empty?.should be_true
+      end
+    end
+    
   end
 
   describe 'help' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pbox
 version: !ruby/object:Gem::Version
-  version: 1.17.3
+  version: 1.17.6
 platform: ruby
 authors:
 - ProtonBox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh