rhc 1.24.4 → 1.25.2

data/features/core_feature.rb

@@ -163,6 +163,7 @@ describe "rhc core scenarios" do
     context "with a scalable app" do
       before(:each) do
         standard_config
+        has_gears_available(1)
         @app = has_a_scalable_application
       end
 

data/lib/rhc/rest/base.rb

@@ -1,4 +1,4 @@
-require 'cgi'
+require 'uri'
 
 module RHC
   module Rest
@@ -8,6 +8,8 @@ module RHC
 
       define_attr :messages
 
+      URI_ESCAPE_REGEX = Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")
+
       def initialize(attrs=nil, client=nil)
         @attributes = (attrs || {}).stringify_keys!
         @attributes['messages'] ||= []
@@ -22,7 +24,7 @@ module RHC
         link = link(link_name)
         raise "No link defined for #{link_name}" unless link
         url = link['href']
-        url = url.gsub(/:\w+/) { |s| CGI.escape(options[:params][s]) || s } if options[:params]
+        url = url.gsub(/:\w+/) { |s| URI.escape(options[:params][s], URI_ESCAPE_REGEX) || s } if options[:params]
         method = options[:method] || link['method']
 
         result = client.request(options.merge({
@@ -53,7 +55,7 @@ module RHC
 
       def link_href(sym, params=nil, resource=nil, &block)
         if (l = link(sym)) && (h = l['href'])
-          h = h.gsub(/:\w+/){ |s| params[s].nil? ? s : CGI.escape(params[s]) } if params
+          h = h.gsub(/:\w+/){ |s| params[s].nil? ? s : URI.escape(params[s], URI_ESCAPE_REGEX) } if params
           h = "#{h}/#{resource}" if resource
           return h
         end

data/lib/rhc/rest/client.rb

@@ -199,12 +199,15 @@ module RHC
       end
 
       def link_show_application_by_domain_name(domain, application, *args)
-        [
-          api.links['LIST_DOMAINS']['href'],
-          domain,
-          "applications",
-          application,
-        ].concat(args).map{ |s| URI.escape(s) }.join("/")
+        if link = api.link_href(:SHOW_APPLICATION_BY_DOMAIN, {':domain_name' => domain, ':name' => application}, *args)
+          link
+        else
+          # Pre-1.5 API
+          (
+            [api.links['LIST_DOMAINS']['href']] + 
+            ([domain, "applications", application] + args).map{|s| URI.escape(s, RHC::Rest::Base::URI_ESCAPE_REGEX) }
+          ).join("/")
+        end
       end
 
       def link_show_application_by_id(id, *args)

data/lib/rhc/rest/mock.rb

@@ -422,10 +422,10 @@ module RHC::Rest::Mock
 
     def mock_client_links
       mock_teams_links.concat([
-       ['GET_USER',        'user/',       'get' ],
+       ['GET_USER',        'user',        'get' ],
        ['ADD_DOMAIN',      'domains/add', 'post'],
-       ['LIST_DOMAINS',    'domains/',    'get' ],
-       ['LIST_CARTRIDGES', 'cartridges/', 'get' ]
+       ['LIST_DOMAINS',    'domains',     'get' ],
+       ['LIST_CARTRIDGES', 'cartridges',  'get' ]
       ])
     end
 
@@ -454,7 +454,7 @@ module RHC::Rest::Mock
 
     def mock_team_links(team_id='test_team')
       [['GET',            "team/#{team_id}",          'get'    ],
-       ['ADD_MEMBER',     "team/#{team_id}/members/", 'post', {'optional_params' => [{'name' => 'id'}, {'name' => 'login'}], 'required_params' => [{'name' => 'role'}]} ],
+       ['ADD_MEMBER',     "team/#{team_id}/members",  'post', {'optional_params' => [{'name' => 'id'}, {'name' => 'login'}], 'required_params' => [{'name' => 'role'}]} ],
        ['LIST_MEMBERS',   "team/#{team_id}/update",   'get'    ],
        ['UPDATE_MEMBERS', "team/#{team_id}/delete",   'patch', {'optional_params' => [{'name' => 'id'}, {'name' => 'login'}, {'name' => 'members'}] } ],
        ['LEAVE',          "team/#{team_id}/delete",   'delete' ],
@@ -463,7 +463,7 @@ module RHC::Rest::Mock
 
     def mock_domain_links(domain_id='test_domain')
       [['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' ],
+       ['LIST_APPLICATIONS', "domains/#{domain_id}/apps",     'get' ],
        ['UPDATE',            "domains/#{domain_id}/update",   'put'],
        ['DELETE',            "domains/#{domain_id}/delete",   'post']]
     end

data/spec/direct_execution_helper.rb

@@ -141,6 +141,32 @@ module RhcExecutionHelper
     object.members.length.should == 1
   end
 
+  def has_gears_available(gear_count=1, for_user=nil)
+    debug.puts "Ensuring user has at least #{gear_count} gears free" if debug?
+
+    c = for_user ? for_user.client : client
+    
+    max_gears = c.user.max_gears
+    consumed_gears = c.user.consumed_gears
+    raise "User has max_gears=#{max_gears}, cannot make #{gear_count} gears available" if max_gears < gear_count
+    
+    max_consumed = max_gears - gear_count
+    if consumed_gears <= max_consumed
+      debug.puts "  user can use up to #{max_consumed} gears and is only using #{consumed_gears}" if debug?
+      return
+    end
+
+    delete_count = 0
+    c.owned_applications.sort_by(&:gear_count).reverse.each do |app|
+      if (consumed_gears - delete_count) > max_consumed
+        debug.puts "  deleting app to free #{app.gear_count} gears" if debug?
+        delete_count += app.gear_count
+        debug.puts "  user is now using #{consumed_gears - delete_count} gears" if debug?
+        app.destroy
+      end
+    end
+  end
+
   def has_an_application(for_user=nil)
     c = for_user ? for_user.client : client
     debug.puts "Creating or reusing an app" if debug?

data/spec/rhc/rest_client_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 require 'stringio'
 require 'rest_spec_helper'
 require 'rhc/rest'
+require 'uri'
 
 module RHC
   module Rest
@@ -368,6 +369,11 @@ module RHC
               :status => 'not_found'
             }, 404)
           end
+          it "encodes application id correctly" do
+              url = client.link_show_application_by_domain_name("~[", "~]")
+              URI.parse(url)
+              url.should == "https://test.domain.com/domains/~%5B/applications/~%5D"
+          end
           it "returns application object for nested application IDs" do
               match = client.find_application(mock_domain, mock_app)
               match.class.should     == RHC::Rest::Application

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 127
+  hash: 119
   prerelease: 
   segments: 
   - 1
-  - 24
-  - 4
-  version: 1.24.4
+  - 25
+  - 2
+  version: 1.25.2
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-05-12 00:00:00 Z
+date: 2014-05-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh