rhc 0.96.9 → 0.97.17

data/features/step_definitions/domain_steps.rb

@@ -1,8 +1,44 @@
 include RHCHelper
+
+And /^an existing domain$/ do
+  $namespace.nil?.should be_false, 'No existing namespace to alter'
+end
+
+And /^given domains is empty$/ do
+  $namespace.nil?.should be_true
+end
+
 When /^a new domain is needed and created$/ do
   Domain.create_if_needed
 end
 
+When /^domain is updated$/ do
+  Domain.update
+end
+
+When /^domain is deleted$/ do
+  Domain.delete
+end
+
+When /^rhc domain (.*)is run$/ do |action|
+  action.rstrip!
+  cmd = "rhc_domain"
+  cmd += "_#{action}" if action.length > 0
+  Domain.send(:"#{cmd}")
+end
+
+Then /^the default domain action output should equal the show action output$/ do
+  Domain.domain_output.should match($namespace)
+
+  domain_output = Domain.domain_output.lines
+  domain_show_output = Domain.domain_show_output.lines
+
+  # check line by line while ignoring debug output which is timestamped
+  domain_output.zip(domain_show_output) do |a, b|
+    a.should == b unless a.match("DEBUG") 
+  end
+end
+
 Then /^the domain should be reserved?$/ do
   # Sleep to allow DNS to propogate
   sleep 5
@@ -17,3 +53,12 @@ Then /^the domain should be reserved?$/ do
 
   resolved.should be_true, 'Not able to lookup DNS TXT record in time.'
 end
+
+Then /^the domain command should fail with an exitcode of (\d*)$/ do |exitcode|
+  exitcode = exitcode.to_i
+  Domain.exitcode.should == exitcode
+end
+
+Then /^domains should be empty$/ do
+  $namespace.should be_nil
+end

data/features/verify.feature

@@ -11,7 +11,43 @@ Feature: Client Integration Tests
     When a new domain is needed and created
     Then the domain should be reserved
 
+  Scenario: Domain Update
+    Given the libra client tools
+    And an existing domain
+    When domain is updated
+    Then the domain should be reserved
+
+  Scenario: Domain Show
+    Given the libra client tools
+    And an existing domain
+    When rhc domain is run
+    When rhc domain show is run
+    Then the default domain action output should equal the show action output
+
+  Scenario: Domain Create Fails
+    Given the libra client tools
+    And an existing domain
+    When rhc domain create is called
+    Then the domain command should fail with an exitcode of 128
+
+  Scenario: Domain Delete
+    Given the libra client tools
+    And an existing domain
+    When domain is deleted
+    Then domains should be empty
+
+  Scenario: Domain Update Fails
+    Given the libra client tools
+    And given domains is empty
+    When domain is updated
+    Then the domain command should fail with an exitcode of 127
+
   @init
+  Scenario: Domain Creation for Apps
+    Given the libra client tools
+    When a new domain is needed and created
+    Then the domain should be reserved
+
   Scenario: Application Creation
     Given the libra client tools
     When 1 php-5.3 applications are created

data/lib/rhc-common.rb

@@ -150,11 +150,11 @@ end
   def self.check_rhlogin(rhlogin)
     if rhlogin
       if rhlogin =~ /["\$\^<>\|%\/;:,\\\*=~]/
-        puts 'RHLogin may not contain any of these characters: (\") ($) (^) (<) (>) (|) (%) (/) (;) (:) (,) (\) (*) (=) (~)'
+        puts 'OpenShift login may not contain any of these characters: (\") ($) (^) (<) (>) (|) (%) (/) (;) (:) (,) (\) (*) (=) (~)'
         return false
       end
     else
-      puts "RHLogin is required"
+      puts "OpenShift login is required"
       return false
     end
     true
@@ -319,7 +319,7 @@ end
       tempfile = `mktemp /tmp/openshift.XXXXXXXX`
       `echo "#{ssh_keys['ssh_type']} #{ssh_keys['ssh_key']}" > #{tempfile}`
       ssh_keys['fingerprint'] = `ssh-keygen -lf #{tempfile}`.split(' ')[1]
-    rescue Net::SSH::Exception, NotImplementedError
+    rescue Net::SSH::Exception, NotImplementedError, OpenSSL::PKey::PKeyError
       # Could be a new unsupported key type or invalid data on the server
       ssh_keys['fingerprint'] = 'Key type is not recognized.  Please check this key is valid.'
     end
@@ -511,7 +511,7 @@ end
       end_point = "https://#{libra_server}/broker/rest/api"
       client = Rhc::Rest::Client.new(end_point, rhlogin, password)
 
-      domain = client.find_domain(user_info['user_info']['domains'][0]['namespace']).first
+      domain = client.find_domain(user_info['user_info']['domains'][0]['namespace'])
 
       namespace = domain.id
       # Catch errors
@@ -1229,10 +1229,8 @@ end
 #          nil of there was an error
 #
 def default_setup_wizard
-  if RHC::Config.should_run_wizard?
-    w = RHC::Wizard.new(RHC::Config.local_config_path)
-    return w.run
-  end
+  w = RHC::Wizard.new(RHC::Config)
+  return w.run if w.needs_configuration?
 
   false
 end

data/lib/rhc-rest.rb

@@ -62,6 +62,13 @@ module Rhc
       end
     end
 
+    def new_request(options)
+      # user specified timeout takes presidence
+      options[:timeout] = $rest_timeout || options[:timeout]
+
+      RestClient::Request.new options
+    end
+
     def request(request)
       begin
         response = request.execute
@@ -71,8 +78,10 @@ module Rhc
           @@headers["cookie"] = "rh_sso=#{rh_sso}"
         end
         return parse_response(response) unless response.nil? or response.code == 204
-      rescue RestClient::RequestTimeout, RestClient::ServerBrokeConnection => e
-        raise ConnectionException.new("Connection to server timed out or got interrupted: #{e.message}")
+      rescue RestClient::RequestTimeout => e
+        raise TimeoutException.new("Connection to server timed out. It is possible the operation finished without being able to report success. Use 'rhc domain show' or 'rhc app status' to check the status of your applications.") 
+      rescue RestClient::ServerBrokeConnection => e
+        raise ConnectionException.new("Connection to server got interrupted: #{e.message}")
       rescue RestClient::ExceptionWithResponse => e
         process_error_response(e.response)
       rescue Exception => e

data/lib/rhc-rest/application.rb

@@ -3,7 +3,8 @@ module Rhc
   module Rest
     class Application
       include Rest
-      attr_reader :domain_id, :name, :creation_time, :uuid, :aliases, :git_url, :app_url, :node_profile, :framework, :scalable, :health_check_path, :embedded
+      attr_reader :domain_id, :name, :creation_time, :uuid, :aliases, :git_url, :app_url, :gear_profile, :framework, 
+      :scalable, :health_check_path, :embedded, :gear_count, :ssh_url, :scale_min, :scale_max
       def initialize(args)
         #logger.debug args
         @domain_id = args[:domain_id] || args["domain_id"]
@@ -11,8 +12,19 @@ module Rhc
         @creation_time = args[:creation_time] || args["creation_time"]
         @uuid = args[:uuid] || args["uuid"]
         @aliases = args[:aliases] || args["aliases"]
-        @server_identity = args[:server_identity] || args["server_identity"]
+        @git_url = args[:git_url] || args["git_url"]
+        @app_url = args[:app_url] || args["app_url"]
+        @gear_profile = args[:gear_profile] || args["gear_profile"]
+        @framework = args[:framework] || args["framework"]
+        @scalable = args[:scalable] || args["scalable"]
+        @health_check_path = args[:health_check_path] || args["health_check_path"]
+        @embedded = args[:embedded] || args["embedded"]
+        @gear_count = args[:gear_count] || args["gear_count"]
+        @ssh_url = args[:ssh_url] || args["ssh_url"]
+        @scale_min = args[:scale_min] || args["scale_min"]
+        @scale_max = args[:scale_max] || args["scale_max"]
         @links = args[:links] || args["links"]
+        
       end
 
       #Add Cartridge
@@ -21,7 +33,7 @@ module Rhc
         url = @links['ADD_CARTRIDGE']['href']
         method =  @links['ADD_CARTRIDGE']['method']
         payload = {:name => name}
-        request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
+        request = new_request(:url => url, :method => method, :headers => @@headers, :payload => payload)
         return request(request)
       end
 
@@ -30,7 +42,7 @@ module Rhc
         logger.debug "Getting all cartridges for application #{self.name}" if @mydebug
         url = @links['LIST_CARTRIDGES']['href']
         method =  @links['LIST_CARTRIDGES']['method']
-        request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
+        request = new_request(:url => url, :method => method, :headers => @@headers)
         return request(request)
       end
 
@@ -40,7 +52,7 @@ module Rhc
         url = @links['START']['href']
         method =  @links['START']['method']
         payload = {:event=> "start"}
-        request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
+        request = new_request(:url => url, :method => method, :headers => @@headers, :payload => payload)
         return request(request)
       end
 
@@ -54,7 +66,7 @@ module Rhc
         else
           payload = {:event=> "stop"}
         end
-        request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
+        request = new_request(:url => url, :method => method, :headers => @@headers, :payload => payload)
         return request(request)
       end
 
@@ -64,7 +76,7 @@ module Rhc
         url = @links['RESTART']['href']
         method =  @links['RESTART']['method']
         payload = {:event=> "restart"}
-        request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
+        request = new_request(:url => url, :method => method, :headers => @@headers, :payload => payload)
         return request(request)
       end
 
@@ -73,7 +85,7 @@ module Rhc
         logger.debug "Deleting application #{self.name}" if @mydebug
         url = @links['DELETE']['href']
         method =  @links['DELETE']['method']
-        request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
+        request = new_request(:url => url, :method => method, :headers => @@headers)
         return request(request)
       end
       alias :delete :destroy

data/lib/rhc-rest/cartridge.rb

@@ -2,11 +2,23 @@ module Rhc
   module Rest
     class Cartridge
       include Rest
-      attr_reader :type, :name
+      attr_reader :type, :name, :properties
       def initialize(args)
         @name = args[:name] || args["name"]
         @type = args[:type] || args["type"]
         @links = args[:links] || args["links"]
+        @properties = {}
+        props = args[:properties] || args["properties"] || []
+        props.each do |p|
+          category = @properties[:"#{p['type']}"] || {}
+          category[:"#{p['name']}"] = p
+          @properties[:"#{p['type']}"] = category
+        end
+      end
+
+      def property(category, key)
+         category = properties[category]
+         category ? category[key] : nil
       end
 
       #Start Cartridge
@@ -15,7 +27,7 @@ module Rhc
         url = @links['START']['href']
         method =  @links['START']['method']
         payload = {:event=> "start"}
-        request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
+        request = new_request(:url => url, :method => method, :headers => @@headers, :payload => payload)
         return request(request)
       end
 
@@ -25,7 +37,7 @@ module Rhc
         url = @links['STOP']['href']
         method =  @links['STOP']['method']
         payload = {:event=> "stop"}
-        request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
+        request = new_request(:url => url, :method => method, :headers => @@headers, :payload => payload)
         return request(request)
       end
 
@@ -35,7 +47,7 @@ module Rhc
         url = @links['RESTART']['href']
         method =  @links['RESTART']['method']
         payload = {:event=> "restart"}
-        request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
+        request = new_request(:url => url, :method => method, :headers => @@headers, :payload => payload)
         return request(request)
       end
 
@@ -45,7 +57,7 @@ module Rhc
         url = @links['RESTART']['href']
         method =  @links['RESTART']['method']
         payload = {:event=> "reload"}
-        request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
+        request = new_request(:url => url, :method => method, :headers => @@headers, :payload => payload)
         return request(request)
       end
 
@@ -54,7 +66,7 @@ module Rhc
         logger.debug "Deleting cartridge #{self.name}" if @mydebug
         url = @links['DELETE']['href']
         method =  @links['DELETE']['method']
-        request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
+        request = new_request(:url => url, :method => method, :headers => @@headers)
         return request(request)
       end
       alias :delete :destroy

data/lib/rhc-rest/client.rb

@@ -5,14 +5,16 @@ module Rhc
   module Rest
     class Client
       include Rest
-      def initialize(end_point, username, password)
+      def initialize(end_point, username, password, debug=false)
+        # use mydebug for legacy reasons
+        @mydebug = @mydebug || debug
         logger.debug "Connecting to #{end_point}" if @mydebug
         credentials = Base64.encode64("#{username}:#{password}")
         @@headers["Authorization"] = "Basic #{credentials}"
         @@headers["User-Agent"] = RHC::Helpers.user_agent rescue nil
         #first get the API
         RestClient.proxy = ENV['http_proxy']
-        request = RestClient::Request.new(:url => end_point, :method => :get, :headers => @@headers)
+        request = new_request(:url => end_point, :method => :get, :headers => @@headers)
         begin
           response = request.execute
           result = RHC::Json.decode(response)
@@ -30,7 +32,7 @@ module Rhc
         url = @links['ADD_DOMAIN']['href']
         method =  @links['ADD_DOMAIN']['method']
         payload = {:id => id}
-        request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
+        request = new_request(:url => url, :method => method, :headers => @@headers, :payload => payload)
         return request(request)
       end
 
@@ -39,36 +41,16 @@ module Rhc
         logger.debug "Getting all domains" if @mydebug
         url = @links['LIST_DOMAINS']['href']
         method =  @links['LIST_DOMAINS']['method']
-        request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
+        request = new_request(:url => url, :method => method, :headers => @@headers)
         return request(request)
       end
 
       #Find Domain by namesapce
       def find_domain(id)
         logger.debug "Finding domain #{id}" if @mydebug
-        filtered = Array.new
-        domains.each do |domain|
-        #TODO do a regex caomparison
-          if domain.id == id
-          filtered.push(domain)
-          end
-        end
-        return filtered
-      end
+        domains.each { |domain| return domain if domain.id == id }
 
-      #Find Application by name
-      def find_application(name)
-        logger.debug "Finding application #{name}" if @mydebug
-        filtered = Array.new
-        domains.each do |domain|
-        #TODO do a regex caomparison
-          domain.applications.each do |app|
-            if app.name == name
-            filtered.push(app)
-            end
-          end
-        end
-        return filtered
+        raise RHC::DomainNotFoundException.new("Domain #{id} does not exist")
       end
 
       #Get all Cartridge
@@ -76,7 +58,7 @@ module Rhc
         logger.debug "Getting all cartridges" if @mydebug
         url = @links['LIST_CARTRIDGES']['href']
         method =  @links['LIST_CARTRIDGES']['method']
-        request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
+        request = new_request(:url => url, :method => method, :headers => @@headers)
         return request(request)
       end
 
@@ -85,7 +67,6 @@ module Rhc
         logger.debug "Finding cartridge #{name}" if @mydebug
         filtered = Array.new
         cartridges.each do |cart|
-        #TODO do a regex caomparison
           if cart.name == name
           filtered.push(cart)
           end
@@ -97,21 +78,16 @@ module Rhc
       def user
         url = @links['GET_USER']['href']
         method =  @links['GET_USER']['method']
-        request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
+        request = new_request(:url => url, :method => method, :headers => @@headers)
         return request(request)
       end
 
       #find Key by name
       def find_key(name)
         logger.debug "Finding key #{name}" if @mydebug
-        filtered = Array.new
-        user.keys.each do |key|
-        #TODO do a regex caomparison
-          if key.name == name
-          filtered.push(key)
-          end
-        end
-        return filtered
+        user.keys.each { |key| return key if key.name == name }
+
+        raise RHC::KeyNotFoundException.new("Key #{name} does not exist")
       end
 
       def logout

data/lib/rhc-rest/domain.rb

@@ -26,7 +26,7 @@ module Rhc
         if options[:scale]
           timeout = 300 # 5 minute timeout for scalable app
         end
-        request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload, :timeout => timeout)
+        request = new_request(:url => url, :method => method, :headers => @@headers, :payload => payload, :timeout => timeout)
         return request(request)
       end
 
@@ -35,17 +35,25 @@ module Rhc
         logger.debug "Getting all applications for domain #{self.id}" if @mydebug
         url = @links['LIST_APPLICATIONS']['href']
         method =  @links['LIST_APPLICATIONS']['method']
-        request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
+        request = new_request(:url => url, :method => method, :headers => @@headers)
         return request(request)
       end
 
+      def find_application(name)
+        logger.debug "Finding application #{name}" if @mydebug
+        applications.each { |app| return app if app.name == name }
+
+        raise RHC::ApplicationNotFoundException.new("Application #{name} does not exist")
+      end
+
       #Update Domain
       def update(new_id)
         logger.debug "Updating domain #{self.id} to #{new_id}" if @mydebug
         url = @links['UPDATE']['href']
         method =  @links['UPDATE']['method']
         payload = {:id => new_id}
-        request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
+        # 5 minute timeout as this may take time if there are a lot of apps
+        request = new_request(:url => url, :method => method, :headers => @@headers, :payload => payload, :timeout=> 300)
         return request(request)
       end
       alias :save :update
@@ -56,7 +64,7 @@ module Rhc
         url = @links['DELETE']['href']
         method =  @links['DELETE']['method']
         payload = {:force => force}
-        request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
+        request = new_request(:url => url, :method => method, :headers => @@headers, :payload => payload)
         return request(request)
       end
       alias :delete :destroy