rhc 1.5.13 → 1.6.8

data/lib/rhc/commands/app.rb

@@ -12,25 +12,25 @@ module RHC::Commands
 
     summary "Create an application"
     description <<-DESC
-      Create an application. Every OpenShift application must have one 
+      Create an application. Every OpenShift application must have one
       web cartridge which serves web requests, and can have a number of
-      other cartridges which provide capabilities like databases, 
+      other cartridges which provide capabilities like databases,
       scheduled jobs, or continuous integration.
 
-      You can see a list of all valid cartridge types by running 
+      You can see a list of all valid cartridge types by running
       'rhc cartridge list'.
 
       When your application is created, a domain name that is a combination
-      of the name of your app and the namespace of your domain will be 
+      of the name of your app and the namespace of your domain will be
       registered in DNS.  A copy of the code for your application
-      will be checked out locally into a folder with the same name as 
+      will be checked out locally into a folder with the same name as
       your application.  Note that different types of applications may
       require different structures - check the README provided with the
       cartridge if you have questions.
 
-      OpenShift runs the components of your application on small virtual 
+      OpenShift runs the components of your application on small virtual
       servers called "gears".  Each account or plan is limited to a number
-      of gears which you can use across multiple applications.  Some 
+      of gears which you can use across multiple applications.  Some
       accounts or plans provide access to gears with more memory or more
       CPU.  Run 'rhc account' to see the number and sizes of gears available
       to you.  When creating an application the --gear-size parameter
@@ -51,7 +51,7 @@ module RHC::Commands
     argument :cartridges, "The web framework this application should use", ["-t", "--type cartridge"], :arg_type => :list
     #argument :additional_cartridges, "A list of other cartridges such as databases you wish to add. Cartridges can also be added later using 'rhc cartridge add'", [], :arg_type => :list
     def create(name, cartridges)
-      cartridges = check_cartridges(cartridges, &require_one_web_cart) 
+      cartridges = check_cartridges(cartridges, &require_one_web_cart)
 
       options.default \
         :dns => true,
@@ -63,10 +63,14 @@ module RHC::Commands
       rest_domain = rest_client.find_domain(options.namespace)
       rest_app = nil
 
+      cart_names = cartridges.collect do |c|
+        c.usage_rate? ? "#{c.name} (addtl. costs may apply)" : c.name
+      end.join(', ')
+
       paragraph do
         header "Application Options"
         table([["Namespace:", options.namespace],
-               ["Cartridges:", cartridges.map(&:name).join(', ')],
+               ["Cartridges:", cart_names],
               (["Source Code:", options.from_code] if options.from_code),
                ["Gear Size:", options.gear_size || "default"],
                ["Scaling:", options.scaling ? "yes" : "no"],
@@ -312,7 +316,7 @@ module RHC::Commands
     private
       include RHC::GitHelpers
       include RHC::CartridgeHelpers
-      
+
       def require_one_web_cart
         lambda{ |carts|
           match, ambiguous = carts.partition{ |c| not c.is_a?(Array) }
@@ -320,7 +324,7 @@ module RHC::Commands
           possible_web = ambiguous.flatten.any?(&:only_in_new?)
           if not (selected_web or possible_web)
             section(:bottom => 1){ list_cartridges(standalone_cartridges) }
-            raise RHC::CartridgeNotFoundException, "Every application needs a web cartridge to handle incoming web requests. Please provide the short name of one of the carts listed above."         
+            raise RHC::CartridgeNotFoundException, "Every application needs a web cartridge to handle incoming web requests. Please provide the short name of one of the carts listed above."
           end
           if selected_web
             carts.map! &other_carts_only

data/lib/rhc/commands/cartridge.rb

@@ -22,15 +22,20 @@ module RHC::Commands
             underline("#{name} (#{c.only_in_new? ? 'web' : 'addon'})"),
             c.description,
             tags.present? ? "\nTagged with: #{tags.sort.join(', ')}" : nil,
+            c.usage_rate? ? "\n#{format_usage_message(c)}" : nil,
           ].compact << "\n"
         end.flatten
       else
-        table(carts.map{ |c| [c.name, c.display_name, c.only_in_new? ? 'web' : 'addon'] })
+        table(carts.collect do |c|
+          [c.usage_rate? ? "#{c.name} (*)" : c.name,
+           c.display_name,
+           c.only_in_new? ? 'web' : 'addon']
+        end)
       end
 
-
       say list.join("\n")
       paragraph{ say "Note: Web cartridges can only be added to new applications." }
+      paragraph{ say "(*) denotes a cartridge with additional usage costs." } if carts.any? { |c| c.usage_rate? }
 
       0
     end
@@ -46,6 +51,8 @@ module RHC::Commands
 
       say "Adding #{cart.name} to application '#{options.app}' ... "
 
+      say format_usage_message(cart) if cart.usage_rate?
+
       rest_app = rest_client.find_application(options.namespace, options.app, :include => :cartridges)
       rest_cartridge = rest_app.add_cartridge(cart.name)
 

data/lib/rhc/exceptions.rb

@@ -19,6 +19,12 @@ module RHC
     end
   end
 
+  class AliasNotFoundException < Exception
+    def initialize(message="Alias not found")
+      super message, 156
+    end
+  end
+
   class MultipleCartridgesException < Exception
     def initialize(message="Multiple cartridge found")
       super message, 155

data/lib/rhc/helpers.rb

@@ -297,6 +297,9 @@ module RHC
       align = opts[:align] || []
       join = opts[:join] || ' '
       if opts[:header]
+        opts[:header].each_with_index do |s, i|
+          widths[i] = [widths[i] || 0, s.length].max
+        end
         sep = opts[:separator] || "="
         ary = Array.new(opts[:header].length)
         items.unshift ary.each_with_index {|obj, idx| ary[idx] = sep.to_s * (widths[idx] || 1)}

data/lib/rhc/output_helpers.rb

@@ -106,6 +106,11 @@ module RHC
           concat(cart.properties.map{ |p| ["#{table_heading(p['name'])}:", p['value']] }.sort{ |a,b| a[0] <=> b[0] }),
         :delete => true
       display_no_info("cartridge") unless @table_displayed
+
+      if cart.usage_rate?
+         say "\n"
+         say format_usage_message(cart)
+      end
     end
 
     def display_key(key, *properties)
@@ -151,6 +156,10 @@ module RHC
       end
     end
 
+    def format_usage_message(cart)
+      "This gear costs an additional $#{cart.usage_rate} per gear after the first 3 gears."
+    end
+
     #---------------------------
     # Misc information
     #---------------------------
@@ -203,8 +212,8 @@ module RHC
         case prop
         when :plan_id
           case value
-          when 'freeshift' then 'FreeShift'
-          when 'megashift' then 'MegaShift'
+          when 'free' then 'Free'
+          when 'silver' then 'Silver'
           else value && value.capitalize || nil
           end
         when :visible_to_ssh?
@@ -218,7 +227,7 @@ module RHC
         when :base_gear_storage,:additional_gear_storage
           ((value.nil? or value == 0) ? "None" : "#{value}GB")
         when :aliases
-          value.join ', '
+          value.kind_of?(Array) ? value.join(', ') : value
         when :expires_in_seconds
           distance_of_time_in_words(value)
         else

data/lib/rhc/rest.rb

@@ -13,6 +13,7 @@ module RHC
     autoload :Key,           'rhc/rest/key'
     autoload :User,          'rhc/rest/user'
     autoload :GearGroup,     'rhc/rest/gear_group'
+    autoload :Alias,         'rhc/rest/alias'
 
     class Exception < RuntimeError
       attr_reader :code
@@ -112,6 +113,8 @@ module RHC
 
     class MultipleCartridgeCreationNotSupported < Exception; end
 
+    class SslCertificatesNotSupported < Exception; end
+
     class AuthorizationsNotSupported < Exception
       def initialize(message="The server does not support setting, retrieving, or authenticating with authorization tokens.")
         super(message, 1)

data/lib/rhc/rest/alias.rb

@@ -0,0 +1,50 @@
+require 'rhc/rest/base'
+
+module RHC
+  module Rest
+    class Alias < Base
+
+      define_attr :id, :has_private_ssl_certificate, :certificate_added_at
+
+      def has_private_ssl_certificate?
+        has_private_ssl_certificate
+      end
+
+      def destroy
+        debug "Deleting alias #{self.id}"
+        rest_method "DELETE"
+      end
+      alias :delete :destroy
+
+      def add_certificate(ssl_certificate_content, private_key_content, pass_phrase)
+        debug "Running add_certificate for alias #{@id}"
+        if (client.api_version_negotiated >= 1.4)
+          foo = rest_method "UPDATE", {
+            :ssl_certificate => ssl_certificate_content, 
+            :private_key => private_key_content, 
+            :pass_phrase => pass_phrase
+          }
+        else
+          raise RHC::Rest::SslCertificatesNotSupported, "The server does not support SSL certificates for custom aliases."
+        end
+      end
+
+      def delete_certificate
+        debug "Running delete_certificate for alias #{@id}"
+        if (client.api_version_negotiated >= 1.4)
+          rest_method "UPDATE", {}
+        else
+          raise RHC::Rest::SslCertificatesNotSupported, "The server does not support SSL certificates for custom aliases."
+        end
+      end
+
+      def <=>(a)
+        return self.name <=> a.name
+      end
+
+      def to_s
+        self.id
+      end
+    end
+  end
+end

data/lib/rhc/rest/application.rb

@@ -3,7 +3,7 @@ require 'uri'
 module RHC
   module Rest
     class Application < Base
-      define_attr :domain_id, :name, :creation_time, :uuid, :aliases,
+      define_attr :domain_id, :name, :creation_time, :uuid,
                   :git_url, :app_url, :gear_profile, :framework,
                   :scalable, :health_check_path, :embedded, :gear_count,
                   :ssh_url, :building_app, :cartridges, :initial_git_url
@@ -97,7 +97,31 @@ module RHC
 
       def remove_alias(app_alias)
         debug "Running remove_alias for #{name}"
-        rest_method "REMOVE_ALIAS", :event => "remove-alias", :alias => app_alias
+        if (client.api_version_negotiated >= 1.4)
+          find_alias(app_alias).destroy
+        else
+          rest_method "REMOVE_ALIAS", :event => "remove-alias", :alias => app_alias
+        end
+      end
+
+      def aliases
+        debug "Getting all aliases for application #{name}"
+        if (client.api_version_negotiated >= 1.4)
+          rest_method "LIST_ALIASES"
+        else
+          attributes['aliases']
+        end
+      end
+
+      def find_alias(name, options={})
+        debug "Finding alias #{name} in app #{@name}"
+
+        if name.is_a?(Hash)
+          options = name
+          name = options[:name]
+        end
+        aliases.each { |a| return a if a.is_a?(String) || a.id == name }
+        raise RHC::AliasNotFoundException.new("Alias #{name} can't be found in application #{@name}.")
       end
 
       #Find Cartridge by name

data/lib/rhc/rest/cartridge.rb

@@ -31,6 +31,21 @@ module RHC
         attribute(:display_name) || name
       end
 
+      def usage_rate?
+        rate = usage_rate
+        rate && rate > 0.0
+      end
+
+      def usage_rate
+        rate = attribute(:usage_rate_usd)
+
+        if attribute(:usage_rates)
+          rate ||= attribute(:usage_rates).inject(0) { |total, rate| total + rate['usd'].to_f }
+        end
+
+        rate.to_f rescue 0.0
+      end
+
       def scaling
         {
           :current_scale => current_scale,
@@ -56,7 +71,7 @@ module RHC
         rest_method "START", :event => "start"
       end
 
-      def stop()
+      def stop
         debug "Stopping cartridge #{name}"
         rest_method "STOP", :event => "stop"
       end

data/lib/rhc/rest/client.rb

@@ -3,6 +3,7 @@ require 'rhc/helpers'
 require 'uri'
 require 'logger'
 require 'httpclient'
+require 'benchmark'
 
 module RHC
   module Rest
@@ -75,6 +76,14 @@ module RHC
         })
       end
 
+      def find_application_aliases(domain, application, options={})
+        response = request({
+          :url => link_show_application_by_domain_name(domain, application, "aliases"),
+          :method => "GET",
+          :payload => options
+        })
+      end
+
       def link_show_application_by_domain_name(domain, application, *args)
         [
           api.links['LIST_DOMAINS']['href'],
@@ -188,7 +197,15 @@ module RHC
       # The list may not necessarily be sorted; we will select the last
       # matching one supported by the server.
       # See #api_version_negotiated
-      CLIENT_API_VERSIONS = [1.1, 1.2, 1.3]
+      CLIENT_API_VERSIONS = [1.1, 1.2, 1.3, 1.4]
+
+      # Set the http_proxy env variable, read by
+      # HTTPClient, being sure to add the http protocol
+      # if not specified already
+      proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
+      if proxy && proxy !~ /^(\w+):\/\// then
+        ENV['http_proxy'] = "http://#{proxy}"
+      end
 
       def initialize(*args)
         options = args[0].is_a?(Hash) && args[0] || {}
@@ -232,7 +249,7 @@ module RHC
       end
 
       def api
-        @api ||= RHC::Rest::Api.new(self, @preferred_api_versions).tap do |api| 
+        @api ||= RHC::Rest::Api.new(self, @preferred_api_versions).tap do |api|
           self.current_api_version = api.api_version_negotiated
         end
       end
@@ -247,10 +264,11 @@ module RHC
           begin
             client, args = new_request(options.dup)
             auth = options[:auth] || self.auth
+            response = nil
 
             debug "Request #{args[0].to_s.upcase} #{args[1]}" if debug?
-            response = client.request(*(args << true))
-            debug "   code #{response.status}" if debug? && response
+            time = Benchmark.realtime{ response = client.request(*(args << true)) }
+            debug "   code %s %4i ms" % [response.status, (time*1000).to_i] if debug? && response
 
             next if retry_proxy(response, i, args, client)
             auth.retry_auth?(response, self) and next if auth
@@ -489,6 +507,8 @@ module RHC
             Key.new(data, self)
           when 'gear_groups'
             data.map{ |json| GearGroup.new(json, self) }
+          when 'aliases'
+            data.map{ |json| Alias.new(json, self) }
           else
             data
           end

data/lib/rhc/rest/mock.rb

@@ -54,7 +54,7 @@ module RHC::Rest::Mock
         to_return({
           :body => {
             :data => mock_response_links(authorizations ? mock_api_with_authorizations : mock_real_client_links),
-            :supported_api_versions => [1.0, 1.1, 1.2, 1.3],
+            :supported_api_versions => [1.0, 1.1, 1.2, 1.3, 1.4],
           }.to_json
         })
     end
@@ -255,6 +255,7 @@ module RHC::Rest::Mock
             {:name => 'mock_standalone_cart-1', :type => 'standalone', :tags => ['cartridge'], :display_name => 'Mock1 Cart'},
             {:name => 'mock_standalone_cart-2', :type => 'standalone', :description => 'Mock2 description'},
             {:name => 'mock_embedded_cart-1', :type => 'embedded', :tags => ['scheduled'], :display_name => 'Mock1 Embedded Cart'},
+            {:name => 'premium_cart-1', :type => 'standalone', :tags => ['premium'], :display_name => 'Premium Cart', :usage_rate_usd => '0.02'},
           ],
         }.to_json
       }
@@ -333,6 +334,7 @@ module RHC::Rest::Mock
        ['THREAD_DUMP',     "domains/#{domain_id}/apps/#{app_id}/event",     'post'],
        ['ADD_ALIAS',       "domains/#{domain_id}/apps/#{app_id}/event",     'post'],
        ['REMOVE_ALIAS',    "domains/#{domain_id}/apps/#{app_id}/event",     'post'],
+       ['LIST_ALIASES',    "domains/#{domain_id}/apps/#{app_id}/aliases",   'get'],
        ['DELETE',          "domains/#{domain_id}/apps/#{app_id}/delete",    'post']]
     end
 
@@ -381,6 +383,12 @@ module RHC::Rest::Mock
        ['LIST_KEYS', 'user/keys/',    'get' ]]
     end
 
+    def mock_alias_links(domain_id='test_domain',app_id='test_app',alias_id='test.foo.com')
+      [['DELETE',   "domains/#{domain_id}/apps/#{app_id}/aliases/#{alias_id}/delete", 'post'],
+       ['GET',      "domains/#{domain_id}/apps/#{app_id}/aliases/#{alias_id}",        'get' ],
+       ['UPDATE',   "domains/#{domain_id}/apps/#{app_id}/aliases/#{alias_id}/update", 'post' ]]
+    end
+
     def mock_cartridge_response(cart_count=1)
       carts = []
       while carts.length < cart_count
@@ -450,6 +458,9 @@ module RHC::Rest::Mock
     end
 
     def cartridges
+      premium_embedded = MockRestCartridge.new(self, "premium_cart", "embedded")
+      premium_embedded.usage_rate = 0.05
+
       [MockRestCartridge.new(self, "mock_cart-1", "embedded"), # code should sort this to be after standalone
        MockRestCartridge.new(self, "mock_standalone_cart-1", "standalone"),
        MockRestCartridge.new(self, "mock_standalone_cart-2", "standalone"),
@@ -457,7 +468,9 @@ module RHC::Rest::Mock
        MockRestCartridge.new(self, "jenkins-1.4", "standalone"),
        MockRestCartridge.new(self, "mock_cart-2", "embedded"),
        MockRestCartridge.new(self, "unique_mock_cart-1", "embedded"),
-       MockRestCartridge.new(self, "jenkins-client-1.4", "embedded")]
+       MockRestCartridge.new(self, "jenkins-client-1.4", "embedded"),
+       premium_embedded
+      ]
     end
 
     def add_domain(id)
@@ -577,6 +590,41 @@ module RHC::Rest::Mock
     end
   end
 
+  class MockRestAlias < RHC::Rest::Alias
+    include Helpers
+
+    def initialize(client, id, has_private_ssl_certificate=false, certificate_added_at=nil)
+      super({}, client)
+      @id = id
+      @has_private_ssl_certificate = has_private_ssl_certificate
+      @certificate_added_at = certificate_added_at
+    end
+
+    def add_certificate(ssl_certificate_content, private_key_content, pass_phrase)
+      if (client.api_version_negotiated >= 1.4)
+        @has_private_ssl_certificate = true
+        @certificate_added_at = Time.now
+      else
+        raise RHC::Rest::SslCertificatesNotSupported, "The server does not support SSL certificates for custom aliases."
+      end
+    end
+
+    def delete_certificate
+      if (client.api_version_negotiated >= 1.4)
+        @has_private_ssl_certificate = false
+        @certificate_added_at = nil
+      else
+        raise RHC::Rest::SslCertificatesNotSupported, "The server does not support SSL certificates for custom aliases."
+      end
+    end
+
+    def destroy 
+      puts @application.inspect
+      puts self.inspect
+      @application.aliases.delete self
+    end
+  end
+
   class MockRestApplication < RHC::Rest::Application
     include Helpers
     def fakeuuid
@@ -656,10 +704,25 @@ module RHC::Rest::Mock
     def tidy
       @app
     end
+
+    def add_alias(app_alias)
+      @aliases << MockRestAlias.new(@client, app_alias)
+    end
+
+    def remove_alias(app_alias)
+      @aliases.delete_if {|x| x.id == app_alias}
+    end
+
+    def aliases
+      @aliases
+    end
   end
 
   class MockRestCartridge < RHC::Rest::Cartridge
     include Helpers
+
+    attr_accessor :usage_rate
+
     def initialize(client, name, type, app=nil, properties=[{'type' => 'cart_data', 'name' => 'connection_url', 'value' => "http://fake.url" }])
       super({}, client)
       @name = name
@@ -672,6 +735,7 @@ module RHC::Rest::Mock
       @current_scale = 1
       @gear_profile = 'small'
       @additional_gear_storage = 5
+      @usage_rate = 0.0
     end
 
     def destroy