rhc 1.25.3 → 1.26.9

data/lib/rhc/context_helper.rb

@@ -1,4 +1,5 @@
 require 'rhc/git_helpers'
+require 'rhc/server_helpers'
 
 module RHC
   #
@@ -7,6 +8,7 @@ module RHC
   #
   module ContextHelpers
     include RHC::GitHelpers
+    include RHC::ServerHelpers
 
     def self.included(other)
       other.module_eval do
@@ -136,7 +138,7 @@ module RHC
     end
 
     def server_context(defaults=nil, arg=nil)
-      value = ENV['LIBRA_SERVER'] || (!options.clean && config['libra_server']) || "openshift.redhat.com"
+      value = libra_server_env || (!options.clean && config['libra_server']) || openshift_online_server
       defaults[arg] = value if defaults && arg
       value
     end

data/lib/rhc/core_ext.rb

@@ -7,6 +7,7 @@ class Object
   def present?
     !blank?
   end
+  
   def blank?
     respond_to?(:empty?) ? empty? : !self
   end
@@ -171,16 +172,10 @@ end
 
 class Hash
   def stringify_keys!
-    keys.each do |key|
-      v = delete(key)
-      if v.is_a? Hash
-        v.stringify_keys!
-      elsif v.is_a? Array
-        v.each{ |value| value.stringify_keys! if value.is_a? Hash }
-      end
-      self[(key.to_s rescue key) || key] = v
-    end
-    self
+    transform_keys!(:to_s)
+  end
+  def symbolize_keys!
+    transform_keys!(:to_sym)
   end
   def slice!(*args)
     s = []
@@ -199,4 +194,17 @@ class Hash
     # right wins if there is no left
     merge!( other_hash ){|key,left,right| left }
   end
+  protected
+    def transform_keys!(operation)
+      keys.each do |key|
+        v = delete(key)
+        if v.is_a? Hash
+          v.transform_keys!(operation)
+        elsif v.is_a? Array
+          v.each{ |value| value.transform_keys!(operation) if value.is_a? Hash }
+        end
+        self[(key.send(operation) rescue key) || key] = v
+      end
+      self
+    end
 end

data/lib/rhc/exceptions.rb

@@ -85,6 +85,30 @@ module RHC
     end
   end
 
+  class ServerNicknameExistsException < Exception
+    def initialize(nickname)
+      super "You already have a server configured with the nickname '#{nickname}'", 164
+    end
+  end
+
+  class ServerHostnameExistsException < Exception
+    def initialize(hostname)
+      super "You already have a server configured with the hostname '#{hostname}'", 165
+    end
+  end
+
+  class ServerNotConfiguredException < Exception
+    def initialize(server)
+      super "You don't have any server configured with the hostname or nickname '#{server}'", 166
+    end
+  end
+
+  class ServerInUseException < Exception
+    def initialize(message="Server in use")
+      super message, 167
+    end
+  end
+
   class GitPermissionDenied < GitException; end
   class GitDirectoryExists < GitException; end
 

data/lib/rhc/helpers.rb

@@ -2,6 +2,7 @@ require 'commander/user_interaction'
 require 'rhc/version'
 require 'rhc/config'
 require 'rhc/output_helpers'
+require 'rhc/server_helpers'
 require 'rbconfig'
 
 require 'resolv'
@@ -23,6 +24,7 @@ module RHC
     include Commander::UI
     include Commander::UI::AskForClass
     include RHC::OutputHelpers
+    include RHC::ServerHelpers
 
     extend self
 
@@ -108,7 +110,7 @@ module RHC
 
     global_option '-d', '--debug', "Turn on debugging", :hide => true
 
-    global_option '--server NAME', String, 'An OpenShift server hostname (default: openshift.redhat.com)'
+    global_option '--server HOSTNAME', String, 'An OpenShift server hostname (default: openshift.redhat.com)'
     global_option '-k', '--insecure', "Allow insecure SSL connections.  Potential security risk.", :hide => true
 
     global_option '--limit INTEGER', Integer, "Maximum number of simultaneous operations to execute.", :hide => true
@@ -152,19 +154,10 @@ module RHC
       ROLES[s.downcase]
     end
 
-    def openshift_server
-      to_host((options.server rescue nil) || ENV['LIBRA_SERVER'] || "openshift.redhat.com")
-    end
-    def openshift_online_server?
-      openshift_server =~ /openshift.redhat.com$/i
-    end
-    def openshift_url
-      "https://#{openshift_server}"
-    end
-
     def to_host(s)
       s =~ %r(^http(?:s)?://) ? URI(s).host : s
     end
+
     def to_uri(s)
       begin
         URI(s =~ %r(^http(?:s)?://) ? s : "https://#{s}")
@@ -187,12 +180,6 @@ module RHC
       [uri.host, uri.user]
     end
 
-    def openshift_rest_endpoint
-      uri = to_uri((options.server rescue nil) || ENV['LIBRA_SERVER'] || "openshift.redhat.com")
-      uri.path = '/broker/rest/api' if uri.path.blank? || uri.path == '/'
-      uri
-    end
-
     def token_for_user
       options.token or (token_store.get(options.rhlogin, options.server) if options.rhlogin && options.use_authorization_tokens)
     end
@@ -350,7 +337,8 @@ module RHC
         :downloaded_cartridge_url => 'From',
         :auto_deploy     => 'Deployment',
         :sha1            => 'SHA1',
-        :ref             => 'Git Reference'
+        :ref             => 'Git Reference',
+        :use_authorization_tokens => 'Use Auth Tokens'
       })
 
       headings[value]
@@ -476,6 +464,11 @@ module RHC
       env_vars
     end
 
+    def to_boolean(s, or_nil=false)
+      return nil if s.nil? && or_nil
+      s.is_a?(String) ? !!(s =~ /^(true|t|yes|y|1)$/i) : s
+    end
+
     BOUND_WARNING = self.method(:warn).to_proc
   end
 end

data/lib/rhc/highline_extensions.rb

@@ -110,8 +110,8 @@ class HighLineExtension < HighLine
     @wrap_at ? @wrap_at - indentation.length : nil
   end
 
-  def header(str,opts = {}, &block)
-    say Header.new(str, default_max_width, '  ')
+  def header(str, opts={}, &block)
+    say Header.new(str, default_max_width, '  ', (opts[:color]))
     if block_given?
       indent &block
     end

data/lib/rhc/output_helpers.rb

@@ -3,7 +3,7 @@ module RHC
 
     def display_team(team, ids=false)
       paragraph do
-        header ["Team #{team.name}", ("(owned by #{team.owner})" if team.owner.present?)] do
+        header ["Team #{team.name}", ("(owned by #{team.owner.name})" if team.owner.present?)] do
           section(:bottom => 1) do
             say format_table \
               nil,
@@ -21,7 +21,7 @@ module RHC
 
     def display_domain(domain, applications=nil, ids=false)
       paragraph do
-        header ["Domain #{domain.name}", ("(owned by #{domain.owner})" if domain.owner.present?)] do
+        header ["Domain #{domain.name}", ("(owned by #{domain.owner.name})" if domain.owner.present?)] do
           section(:bottom => 1) do
             say format_table \
               nil,
@@ -70,6 +70,32 @@ module RHC
       display_app(rest_app, nil, [:auto_deploy, :keep_deployments, :deployment_type, :deployment_branch])
     end
 
+    def display_server(server)
+      paragraph do
+        header ["Server '#{server.nickname || to_host(server.hostname)}'", ("(in use)" if server.default?)], {:color => (:green if server.default?)} do
+          section(:bottom => 1) do
+            say format_table \
+              nil,
+              get_properties(
+                server,
+                :hostname,
+                :login,
+                :use_authorization_tokens,
+                :insecure,
+                :timeout,
+                :ssl_version, 
+                :ssl_client_cert_file, 
+                :ssl_ca_file
+              ),
+              {
+                :delete => true,
+                :color => (:green if server.default?)
+              }
+          end
+        end
+      end
+    end
+
     def format_cart_header(cart)
       [
         cart.name,

data/lib/rhc/rest/client.rb

@@ -108,8 +108,6 @@ module RHC
       end
 
       def find_team(name, options={})
-        precheck_team_id(name)
-
         matching_teams = if options[:global]
           search_teams(name, true).select { |t| t.name == name }
         elsif options[:owned]

data/lib/rhc/rest/membership.rb

@@ -142,9 +142,7 @@ module RHC::Rest
     end
 
     def owner
-      if o = Array(attributes['members']).find{ |m| m['owner'] == true }
-        o['name'] || o['login']
-      end
+      members.find(&:owner?)
     end
   end
 end

data/lib/rhc/rest/mock.rb

@@ -608,8 +608,8 @@ module RHC::Rest::Mock
       d = MockRestDomain.new(self, id)
       if extra
         d.attributes['creation_time'] = '2013-07-21T15:00:44Z'
-        d.attributes['members'] = [{'owner' => true, 'name' => 'a_user_name'}]
         d.attributes['allowed_gear_sizes'] = ['small']
+        d.add_member(RHC::Rest::Membership::Member.new(:id => '1', :role => 'admin', :explicit_role => 'admin', :owner => true, :login => 'a_user_name', :type => 'user'))
       end
       @domains << d
       d
@@ -723,6 +723,7 @@ module RHC::Rest::Mock
       @name = id
       @applications = []
       self.attributes = {:links => mock_response_links(mock_domain_links(id))}
+      init_members
     end
 
     def rename(id)

data/lib/rhc/server_helpers.rb

@@ -0,0 +1,46 @@
+require 'rhc/servers'
+
+module RHC
+  module ServerHelpers
+    def openshift_server
+      to_host(openshift_raw_server)
+    end
+
+    def openshift_online_server?
+      openshift_server =~ openshift_online_server_regex
+    end
+
+    def openshift_online_server
+      'openshift.redhat.com'
+    end
+
+    def openshift_online_server_regex
+      /^#{openshift_online_server.gsub(/\./, '\.')}$/i
+    end
+
+    def openshift_url
+      "https://#{openshift_server}"
+    end
+
+    def openshift_rest_endpoint
+      uri = to_uri(openshift_raw_server)
+      uri.path = '/broker/rest/api' if uri.path.blank? || uri.path == '/'
+      uri
+    end
+
+    def libra_server_env
+      ENV['LIBRA_SERVER']
+    end
+
+    def rhc_server_env
+      ENV['RHC_SERVER']
+    end
+
+    protected
+      def openshift_raw_server
+        server = (options.server rescue nil) || ENV['LIBRA_SERVER'] || (config['libra_server'] rescue nil) || openshift_online_server
+        @servers ||= RHC::Servers.new
+        (@servers.find(server).hostname rescue nil) || server
+      end
+  end
+end

data/lib/rhc/servers.rb

@@ -0,0 +1,192 @@
+require 'yaml'
+require 'fileutils'
+require 'rhc/helpers'
+require 'rhc/server_helpers'
+
+module RHC
+  class Server
+    include RHC::ServerHelpers
+    attr_accessor :hostname, :nickname, :login 
+    attr_accessor :use_authorization_tokens, :insecure, :timeout
+    attr_accessor :ssl_version, :ssl_client_cert_file, :ssl_ca_file
+    attr_accessor :default
+
+    def self.from_yaml_hash(hash)
+      hash.symbolize_keys!
+      Server.new(hash.delete(:hostname), hash)
+    end
+
+    def initialize(hostname, args={})
+      @hostname = RHC::Servers.to_host(hostname)
+      @nickname = args[:nickname]
+      @login = args[:login]
+      @use_authorization_tokens = RHC::Helpers.to_boolean(args[:use_authorization_tokens], true)
+      @insecure = RHC::Helpers.to_boolean(args[:insecure], true)
+      @timeout = Integer(args[:timeout]) if args[:timeout].present?
+      @ssl_version = args[:ssl_version]
+      @ssl_client_cert_file = args[:ssl_client_cert_file]
+      @ssl_ca_file = args[:ssl_ca_file]
+      @default = args[:default]
+    end
+
+    def default?
+      !!@default
+    end
+
+    def designation
+      @nickname || @hostname
+    end
+
+    def to_yaml_hash
+      {}.tap do |h| 
+        instance_variables.each do |k| 
+          h[k.to_s.delete('@')] = instance_variable_get(k)
+        end
+      end.reject{|k, v| v.nil? || k == 'default'}.inject({}){|h, (k, v)| h[k] = v.is_a?(String) ? v.to_s : v; h }
+    end
+
+    def to_config
+      RHC::Vendor::ParseConfig.new.tap do |config| 
+        h = to_yaml_hash
+        h['default_rhlogin'] = h.delete('login')
+        h['libra_server'] = h.delete('hostname')
+        h.each{|k, v| config.add(k, v)}
+      end
+    end
+
+    def to_s
+      @nickname ? "#{@nickname} (#{@hostname})" : @hostname
+    end
+
+    def <=>(other)
+      designation <=> other.designation
+    end
+  end
+
+  class Servers
+    include RHC::ServerHelpers
+    attr_reader :servers
+
+    def initialize(config=nil)
+      @servers ||= load || []
+      sync_from_config(config)
+    end
+
+    def reload(config=nil)
+      @servers = load || []
+      sync_from_config(config)
+      self
+    end
+
+    def path
+      File.join(RHC::Config.home_dir, '.openshift', "#{ENV['OPENSHIFT_SERVERS'].presence || 'servers'}.yml")
+    end
+
+    def present?
+      File.exists?(path)
+    end
+
+    def self.to_host(hostname)
+      uri = RHC::Helpers.to_uri(hostname)
+      uri.scheme == 'https' && uri.port == URI::HTTPS::DEFAULT_PORT ? uri.host : hostname
+    end
+
+    def add(hostname, args={})
+      raise RHC::ServerHostnameExistsException.new(hostname) if hostname_exists?(hostname)
+      raise RHC::ServerNicknameExistsException.new(args[:nickname]) if args[:nickname] && nickname_exists?(args[:nickname])
+
+      args[:nickname] = suggest_server_nickname(Servers.to_host(hostname)) unless args[:nickname].present?
+
+      Server.new(hostname, args).tap{ |server| @servers << server }
+    end
+
+    def update(server, args={})
+      find(server).tap do |s|
+        args.each do |k, v|
+          s.send("#{k}=", v) unless v.nil?
+        end
+      end
+    end
+
+    def add_or_update(hostname, args={})
+      update(hostname, args) rescue add(hostname, args)
+    end
+
+    def remove(server)
+      @servers.delete(find(server))
+    end
+
+    def list
+      @servers || []
+    end
+
+    def find(server)
+      exists?(server).tap{|s| raise RHC::ServerNotConfiguredException.new(server) unless s }
+    end
+
+    def nickname_exists?(nickname)
+      list.select{|s| s.nickname.present? && s.nickname == nickname}.first
+    end
+
+    def hostname_exists?(hostname)
+      hostname = Servers.to_host(hostname)
+      list.select{|s| s.hostname == hostname}.first
+    end
+
+    def exists?(server)
+      hostname_exists?(server) || nickname_exists?(server)
+    end
+
+    def default
+      list.select(&:default?).first || list.first
+    end
+
+    def sync_from_config(config)
+      unless config.nil? || !config.has_configs_from_files?
+        o = config.to_options
+        add_or_update(
+          o[:server], 
+          :login                    => o[:rhlogin], 
+          :use_authorization_tokens => o[:use_authorization_tokens],
+          :insecure                 => o[:insecure],
+          :timeout                  => o[:timeout],
+          :ssl_version              => o[:ssl_version],
+          :ssl_client_cert_file     => o[:ssl_client_cert_file],
+          :ssl_ca_file              => o[:ssl_ca_file])
+        list.each{|server| server.default = server.hostname == o[:server]}
+      end
+    end
+
+    def save!
+      FileUtils.mkdir_p File.dirname(path)
+      File.open(path, 'w') do |c| 
+        c.puts list.collect{|s| {'server' => s.to_yaml_hash}}.to_yaml
+      end
+      self
+    end
+
+    def backup
+      FileUtils.cp(path, "#{path}.bak") if File.exists? path
+    end
+
+    protected
+      def load
+        (YAML.load_file(path) || [] rescue []).collect do |e|
+          Server.from_yaml_hash e['server']
+        end
+      end
+
+      def suggest_server_nickname(hostname)
+        suggestion = (case hostname
+        when openshift_online_server_regex
+          'online'
+        when /^(.*)\.#{openshift_online_server.gsub(/\./, '\.')}$/i
+          $1
+        else
+          'server' + ((list.compact.map{|i| i.match(/^server(\d+)$/)}.compact.map{|i| i[1]}.map(&:to_i).max + 1).to_s rescue '1')
+        end)
+        s = nickname_exists?(suggestion)
+        s.present? && s.hostname != hostname ? nil : suggestion
+      end
+  end
+end