rhc 0.97.17 → 0.98.16

data/lib/rhc/context_helper.rb

@@ -0,0 +1,19 @@
+module RHC
+  module ContextHelpers
+    def app_context
+      # We currently do not have a way of determening an app context so return nil
+      # In the future we will use the uuid embeded in the git config to query
+      # the server for the repo's app name
+      nil
+    end
+
+    def namespace_context
+      # right now we don't have any logic since we only support one domain
+      # :nocov: remove nocov when cart tests go back in
+      domain = rest_client.domains[0]
+      raise RHC::DomainNotFoundException("No domains configured for this user.  You may create one using 'rhc domain create'.") if domain.nil?
+
+      domain.id
+    end
+  end
+end

data/lib/rhc/coverage_helper.rb

@@ -18,7 +18,7 @@ if RUBY_VERSION >= '1.9' and ENV['RHC_FEATURE_COVERAGE']
     # Groups - general categories of test areas
     add_group('Commands') { |src_file| src_file.filename.include?(File.join(%w[lib rhc commands])) }
     add_group('RHC Lib')  { |src_file| src_file.filename.include?(File.join(%w[lib rhc])) }
-    add_group('REST')     { |src_file| src_file.filename.include?(File.join(%w[lib rhc-rest])) }  
+    add_group('REST')     { |src_file| src_file.filename.include?(File.join(%w[lib rhc/rest])) }  
     add_group('Legacy')   { |src_file| src_file.filename.include?(File.join(%w[bin])) or
                                        src_file.filename.include?(File.join(%w[lib rhc-common.rb])) }
     add_group('Test')     { |src_file| src_file.filename.include?(File.join(%w[features])) or

data/lib/rhc/exceptions.rb

@@ -1,20 +1,71 @@
-require 'rhc-rest/exceptions/exceptions'
 module RHC
-  class DomainNotFoundException < Rhc::Rest::ResourceNotFoundException
+  class Exception < StandardError
+    attr_reader :code
+    def initialize(message=nil, code=nil)
+      super(message)
+      @code = code
+    end
+  end
+
+  class DomainNotFoundException < Exception
     def initialize(message="Domain not found")
       super message, 127
     end
   end
 
-  class ApplicationNotFoundException < Rhc::Rest::ResourceNotFoundException
+  class ApplicationNotFoundException < Exception
     def initialize(message="Application not found")
       super message, 101
     end
   end
 
-  class KeyNotFoundException < Rhc::Rest::ResourceNotFoundException
+  class KeyNotFoundException < Exception
     def initialize(message="SSHKey not found")
       super message, 118
     end
   end
+
+  class DeprecatedError < RuntimeError; end
+  
+  class KeyFileNotExistentException < Exception
+    def initialize(message="SSH Key file not found")
+      super message, 128
+    end
+  end
+  
+  class KeyFileAccessDeniedException < Exception
+    def initialize(message = "Insufficient acces to SSH Key file")
+      super message, 128
+    end
+  end
+
+  class KeyDataInvalidException < Exception
+    def initialize(message = "SSH Key file contains invalid data")
+      super message, 128
+    end
+  end
+
+  class ScaledApplicationsNotSupportedException < Exception
+    def initialize(message="Scaled applications not supported")
+      super message, 128
+    end
+  end
+
+  class PermissionDeniedException < Exception
+    def initialize(message="Permission denied")
+      super message, 129
+    end
+  end
+
+  class NoPortsToForwardException < Exception
+    def initialize(message="No available ports to forward")
+      super message, 102
+    end
+  end
+
+  class PortForwardFailedException < Exception
+    def initialize(message="Port forward failed")
+      super message, 1
+    end
+  end
 end

data/lib/rhc/help_formatter.rb

@@ -1,11 +1,10 @@
 require 'commander/help_formatters/base'
 
 module RHC
-  class UsageHelpFormatter < Commander::HelpFormatter::Terminal
-    def template name
+  class HelpFormatter < Commander::HelpFormatter::Terminal
+    def template(name)
       ERB.new(File.read(File.join(File.dirname(__FILE__), 'usage_templates', "#{name}.erb")), nil, '-')
     end
   end
-
   # TODO: class ManPageHelpFormatter
 end

data/lib/rhc/helpers.rb

@@ -8,8 +8,8 @@ module RHC
 
   module Helpers
     private
-      def self.global_option(switches, description)
-        RHC::Commands.global_option switches, description
+      def self.global_option(*args, &block)
+        RHC::Commands.global_option *args, &block
       end
   end
 
@@ -21,6 +21,18 @@ module RHC
 
     extend self
 
+    def disable_deprecated?
+      # 1) default for now is false
+      # 2) when releasing a 1.0 beta flip this to true
+      # 3) all deprecated aliases should be removed right before 1.0
+      disable = false
+
+      env_disable = ENV['DISABLE_DEPRECATED']
+      disable = true if env_disable == '1'
+
+      disable
+    end
+
     def decode_json(s)
       RHC::Vendor::OkJson.decode(s)
     end
@@ -32,6 +44,8 @@ module RHC
         return d.strftime('%l:%M %p').strip if now.yday == d.yday
       end
       d.strftime('%b %d %l:%M %p')
+    rescue ArgumentError
+      "Unknown date"
     end
 
     def datetime_rfc3339(s)
@@ -44,7 +58,7 @@ module RHC
     #
 
     def user_agent
-      "rhc/#{RHC::VERSION::STRING} (ruby #{RUBY_VERSION}; #{RUBY_PLATFORM})#{" (API #{Rhc::Rest::API_VERSION})" rescue ''}"
+      "rhc/#{RHC::VERSION::STRING} (ruby #{RUBY_VERSION}; #{RUBY_PLATFORM})#{" (API #{RHC::Rest::API_VERSION})" rescue ''}"
     end
 
     def get(uri, opts=nil, *args)
@@ -56,16 +70,16 @@ module RHC
     # Global config
     #
 
-    global_option ['--config FILE'], "Path of a different config file"
+    global_option '-l', '--rhlogin login', "OpenShift login"
+    global_option '-p', '--password password', "OpenShift password"
+    global_option '-d', '--debug', "Turn on debugging"
+
+    global_option '--noprompt', "Do not ask for input"
+    global_option '--config FILE', "Path of a different config file"
     def config
       raise "Operations requiring configuration must define a config accessor"
     end
 
-    global_option ['--noprompt'], "Bypass first run wizard"
-    global_option ['-l', '--rhlogin login'], "Red Hat login (RedHat Network or OpenShift)"
-    global_option ['-p', '--password password'], "Red Hat password"
-    global_option ['-d', '--debug'], "Turn on debugging"
-
     def openshift_server
       config.get_value('libra_server')
     end
@@ -76,20 +90,6 @@ module RHC
       "#{openshift_url}/broker/rest/api"
     end
 
-    def rest_client
-      return @rest_client if @rest_client
-
-      username = config.username
-      unless username
-        username = ask "To connect to #{openshift_server} enter your OpenShift login (email or Red Hat login id): "
-        config.config_user(username)
-      end
-
-      password = RHC::Config.password || RHC::get_password
-
-      @rest_client = Rhc::Rest::Client.new(openshift_rest_node, username, password, @options.debug)
-    end
-
     #
     # Output helpers
     #
@@ -104,6 +104,9 @@ module RHC
     def warn(msg, *args)
       say color(msg, :yellow)
     end
+    def error(msg, *args)
+      say color(msg, :red)
+    end
 
     def color(s, color)
       $terminal.color(s, color)
@@ -129,6 +132,11 @@ module RHC
       end
     end
 
+    def header(s)
+      say s
+      say "=" * s.length
+    end
+
       ##
     # section
     #

data/lib/{rhc-rest.rb → rhc/rest.rb}

@@ -1,18 +1,92 @@
-require 'rest-client'
 require 'logger'
-require 'rhc-rest/exceptions/exceptions'
-require 'rhc-rest/application'
-require 'rhc-rest/cartridge'
-require 'rhc-rest/client'
-require 'rhc-rest/domain'
-require 'rhc-rest/key'
-require 'rhc-rest/user'
-
-module Rhc
+require 'rest-client'
+
+module RHC
+  module Rest
+
+    autoload :Application, 'rhc/rest/application'
+    autoload :Cartridge,   'rhc/rest/cartridge'
+    autoload :Client,      'rhc/rest/client'
+    autoload :Domain,      'rhc/rest/domain'
+    autoload :Key,         'rhc/rest/key'
+    autoload :User,        'rhc/rest/user'
+
+    class Exception < RuntimeError
+      attr_reader :code
+      def initialize(message=nil, code=nil)
+        super(message)
+        @code = code
+      end
+    end
+
+    #Exceptions thrown in case of an HTTP 5xx is received.
+    class ServerErrorException < Exception; end
+
+    #Exceptions thrown in case of an HTTP 503 is received.
+    #
+    #503 Service Unavailable
+    #
+    #The server is currently unable to handle the request due to a temporary 
+    #overloading or maintenance of the server. The implication is that this 
+    #is a temporary condition which will be alleviated after some delay.
+    class ServiceUnavailableException < ServerErrorException; end
+
+    #Exceptions thrown in case of an HTTP 4xx is received with the exception 
+    #of 401, 403, 403 and 422 where a more sepcific exception is thrown
+    #
+    #HTTP Error Codes 4xx
+    #
+    #The 4xx class of status code is intended for cases in which the client 
+    #seems to have errored.
+    class ClientErrorException < Exception; end
+
+    #Exceptions thrown in case of an HTTP 404 is received.
+    #
+    #404 Not Found
+    #
+    #The server has not found anything matching the Request-URI or the
+    #requested resource does not exist
+    class ResourceNotFoundException < ClientErrorException; end
+
+    #Exceptions thrown in case of an HTTP 422 is received.
+    class ValidationException < ClientErrorException
+      attr_reader :field
+      def initialize(message, field=nil, error_code=nil)
+        super(message, error_code)
+        @field = field
+      end
+    end
+
+    #Exceptions thrown in case of an HTTP 403 is received.
+    #
+    #403 Forbidden
+    #
+    #The server understood the request, but is refusing to fulfill it.
+    #Authorization will not help and the request SHOULD NOT be repeated. 
+    class RequestDeniedException < ClientErrorException; end
+
+    #Exceptions thrown in case of an HTTP 401 is received.
+    #
+    #401 Unauthorized
+    #
+    #The request requires user authentication.  If the request already 
+    #included Authorization credentials, then the 401 response indicates 
+    #that authorization has been refused for those credentials. 
+    class UnAuthorizedException < ClientErrorException; end
+
+    # Unreachable host, SSL Exception
+    class ResourceAccessException < Exception; end
+
+    #I/O Exceptions Connection timeouts, etc
+    class ConnectionException < Exception; end
+    class TimeoutException < ConnectionException; end
+  end
+
+
   module Rest
     #API_VERSION = '1.1'
     @@headers = {:accept => :json}
-    #@@headers = {:accept => "application/json;version=#{Rhc::Rest::VERSION}"}
+    #@@headers = {:accept => "application/json;version=#{RHC::Rest::VERSION}"}
 
     def logger
       Logger.new(STDOUT)
@@ -84,7 +158,7 @@ module Rhc
         raise ConnectionException.new("Connection to server got interrupted: #{e.message}")
       rescue RestClient::ExceptionWithResponse => e
         process_error_response(e.response)
-      rescue Exception => e
+      rescue => e
         raise ResourceAccessException.new("Failed to access resource: #{e.message}")
       end
     end
@@ -94,29 +168,28 @@ module Rhc
       begin
         result = RHC::Json.decode(response)
         messages = result['messages']
-      rescue Exception => e
+      rescue => e
         logger.debug "Response did not include a message from server" if @mydebug
-        #puts response
       end
       case response.code
       when 401
-        raise UnAuthorizedException.new("Not authenticated")
+        raise UnAuthorizedException, "Not authenticated"
       when 403
         messages.each do |message|
           if message['severity'].upcase == "ERROR"
-            raise RequestDeniedException.new(message['text'])
+            raise RequestDeniedException, message['text']
           end
         end
       when 404
         messages.each do |message|
           if message['severity'].upcase == "ERROR"
-            raise ResourceNotFoundException.new(message['text'])
+            raise ResourceNotFoundException, message['text']
           end
         end
       when 409
         messages.each do |message|
           if message['severity'] and message['severity'].upcase == "ERROR"
-            raise ValidationException.new(message['text'])
+            raise ValidationException, message['text']
           end
         end
       when 422
@@ -133,25 +206,24 @@ module Rhc
       when 400
         messages.each do |message|
           if message['severity'].upcase == "ERROR"
-            raise ClientErrorException.new(message['text'])
+            raise ClientErrorException, message['text']
           end
         end
       when 500
         messages.each do |message|
           if message['severity'].upcase == "ERROR"
-            raise ServerErrorException.new(message['text'])
+            raise ServerErrorException, message['text']
           end
         end
       when 503
         messages.each do |message|
           if message['severity'].upcase == "ERROR"
-            raise ServiceUnavailableException.new(message['text'])
+            raise ServiceUnavailableException, message['text']
           end
         end
       else
-        raise ResourceAccessException.new("Server returned error code with no output: #{response.code}")
+        raise ResourceAccessException, "Server returned error code with no output: #{response.code}"
       end
-
     end
   end
 end

data/lib/{rhc-rest → rhc/rest}/application.rb

@@ -1,5 +1,5 @@
 
-module Rhc
+module RHC
   module Rest
     class Application
       include Rest

data/lib/{rhc-rest → rhc/rest}/cartridge.rb

@@ -1,4 +1,4 @@
-module Rhc
+module RHC
   module Rest
     class Cartridge
       include Rest

data/lib/{rhc-rest → rhc/rest}/client.rb

@@ -1,7 +1,7 @@
 require 'base64'
 require 'rhc/json'
 
-module Rhc
+module RHC
   module Rest
     class Client
       include Rest
@@ -9,7 +9,16 @@ module Rhc
         # use mydebug for legacy reasons
         @mydebug = @mydebug || debug
         logger.debug "Connecting to #{end_point}" if @mydebug
-        credentials = Base64.encode64("#{username}:#{password}")
+
+        credentials = nil
+        userpass = "#{username}:#{password}"
+        # :nocov: version dependent code
+        if RUBY_VERSION.to_f == 1.8
+          credentials = Base64.encode64(userpass).delete("\n")
+        else
+          credentials = Base64.strict_encode64(userpass)
+        end
+        # :nocov:
         @@headers["Authorization"] = "Basic #{credentials}"
         @@headers["User-Agent"] = RHC::Helpers.user_agent rescue nil
         #first get the API
@@ -19,9 +28,7 @@ module Rhc
           response = request.execute
           result = RHC::Json.decode(response)
           @links = request(request)
-        rescue RestClient::ExceptionWithResponse => e
-            logger.error "Failed to get API #{e.response}"
-        rescue Exception => e
+        rescue => e
           raise ResourceAccessException.new("Resource could not be accessed:#{e.message}")
         end
       end
@@ -62,13 +69,21 @@ module Rhc
         return request(request)
       end
 
-      #Find Cartridge by name
-      def find_cartridge(name)
+      #Find Cartridge by name or regex
+      def find_cartridges(name)
         logger.debug "Finding cartridge #{name}" if @mydebug
+        regex = nil
+        if name.is_a?(Hash)
+          name = name[:name] if name[:name]
+          regex = name[:regex] if name[:regex]
+        end
+
         filtered = Array.new
         cartridges.each do |cart|
-          if cart.name == name
-          filtered.push(cart)
+          if regex
+            filtered.push(cart) if cart.name.match(regex)
+          else
+            filtered.push(cart) if cart.name == name
           end
         end
         return filtered
@@ -89,6 +104,22 @@ module Rhc
 
         raise RHC::KeyNotFoundException.new("Key #{name} does not exist")
       end
+      
+      def sshkeys
+        logger.debug "Finding all keys for #{user.login}" if @mydebug
+        user.keys
+      end
+      
+      def add_key(name, key, content)
+        logger.debug "Adding key #{key} for #{user.login}" if @mydebug
+        user.add_key name, key, content
+      end
+      
+      def delete_key(name)
+        logger.debug "Deleting key '#{name}'" if @mydebug
+        key = find_key(name)
+        key.destroy
+      end
 
       def logout
         #TODO logout