rhc 0.93.19 → 0.94.8

data/lib/rhc-common.rb

@@ -1,11 +1,10 @@
-require 'rubygems'
+require 'rubygems' # Will eventually be removed when this file is deprecated
 require 'fileutils'
 require 'getoptlong'
 require 'net/http'
 require 'net/https'
 require 'net/ssh'
 require 'rhc/vendor/sshkey'
-require 'parseconfig'
 require 'resolv'
 require 'uri'
 require 'highline/import'
@@ -531,14 +530,8 @@ end
       rescue Rhc::Rest::ResourceAccessException => e
         print_response_err(Struct::FakeResponse.new(e.message,e.code))
       rescue Rhc::Rest::ValidationException => e
-        print_response_err(Struct::FakeResponse.new(e.message,406))
-      rescue Rhc::Rest::ServerErrorException => e 
-        if e.message =~ /^Failed to create application .* due to:Scalable app cannot be of type/ 
-          puts "Can not create a scaling app of type #{app_type}, either disable scaling or choose another app type"
-          exit 1
-        else
-          raise e 
-        end
+        validation_error_code = (e.code.nil?) ? 406 : e.code
+        print_response_err(Struct::FakeResponse.new(e.message, validation_error_code))
       end
     else
       json_data = generate_json(data)
@@ -610,7 +603,7 @@ end
         puts <<WARNING
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-WARNING: We weren't able to lookup your hostname (#{fqdn}) 
+WARNING: We were unable to lookup your hostname (#{fqdn}) 
 in a reasonable amount of time.  This can happen periodically and will just
 take an extra minute or two to propagate depending on where you are in the
 world.  Once you are able to access your application in a browser, you can then
@@ -631,7 +624,7 @@ also try destroying and recreating the application as well using:
 If this doesn't work for you, let us know in the forums or in IRC and we'll
 make sure to get you up and running.
 
-  Forums: https://www.redhat.com/openshift/forums/express
+  Forums: https://openshift.redhat.com/community/forums/openshift
 
   IRC: #openshift (on Freenode)
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -651,9 +644,45 @@ WARNING
         quiet = (@mydebug ? ' ' : '--quiet ')
         git_clone = %x<git clone #{quiet} #{git_url} #{repo_dir}>
         if $?.exitstatus != 0
-            puts "Error in git clone"
-            puts git_clone
-            exit 216
+
+          if RHC::Helpers.windows? 
+
+            `nslookup #{app_name}-#{namespace}.#{rhc_domain}`
+            windows_nslookup = $?.exitstatus == 0
+            `ping #{app_name}-#{namespace}.#{rhc_domain} -n 2`
+            windows_ping = $?.exitstatus == 0
+            
+            if windows_nslookup and !windows_ping # this is related to BZ #826769
+              puts <<WINSOCKISSUE
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+WARNING: We were unable to lookup your hostname (#{fqdn}) 
+in a reasonable amount of time.  This can happen periodically and will just
+take up to 10 extra minutes to propagate depending on where you are in the
+world. This may also be related to an issue with Winsock on Windows [1][2]. 
+We recommend you wait a few minutes then clone your git repository manually.
+
+  Git Clone command: 
+    git clone #{git_url} #{repo_dir}
+
+[1] http://support.microsoft.com/kb/299357
+[2] http://support.microsoft.com/kb/811259
+
+If this doesn't work for you, let us know in the forums or in IRC and we'll
+make sure to get you up and running.
+
+  Forums: https://openshift.redhat.com/community/forums/openshift
+
+  IRC: #openshift (on Freenode)
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+WINSOCKISSUE
+              exit 0
+            end
+          end
+          puts "Error in git clone"
+          puts git_clone
+          exit 216
         end
     else
       if is_embedded_jenkins
@@ -939,15 +968,6 @@ _gem_cfg = File.join(File.expand_path(File.dirname(__FILE__) + "/../conf"), @con
 
 local_config_path = File.expand_path(@local_config_path)
 
-begin
-  @global_config = ParseConfig.new(@config_path)
-  @local_config = ParseConfig.new(File.expand_path(@local_config_path)) if \
-    File.exists?(@local_config_path)
-rescue Errno::EACCES => e
-  puts "Could not open config file: #{e.message}"
-  exit 253
-end
-
 #
 # Check for proxy environment
 #
@@ -962,26 +982,6 @@ else
 end
 
 
-#
-# Support funcs
-#
-def check_cpath(opts)
-  if !opts["config"].nil?
-    @opts_config_path = opts["config"]
-    if !File.readable?(File.expand_path(@opts_config_path))
-      puts "Could not open config file: #{@opts_config_path}"
-      exit 253
-    else
-      begin
-        @opts_config = ParseConfig.new(File.expand_path(@opts_config_path))
-      rescue Errno::EACCES => e
-        puts "Could not open config file (#{@opts_config_path}): #{e.message}"
-        exit 253
-      end
-    end
-  end
-end
-
 def config_path
   return @opts_config_path ? @opts_config_path : @local_config_path
 end
@@ -990,23 +990,6 @@ def config
   return @opts_config ? @opts_config : @local_config
 end
 
-#
-# Check for local var in
-#   0) --config path file
-#   1) ~/.openshift/express.conf
-#   2) /etc/openshift/express.conf
-#   3) $GEM/../conf/express.conf
-#
-def get_var(var)
-  v = nil
-  if !@opts_config.nil? && @opts_config.get_value(var)
-    v = @opts_config.get_value(var)
-  else
-    v = @local_config.get_value(var) ? @local_config.get_value(var) : @global_config.get_value(var)
-  end
-  v
-end
-
 def ask_password
   return ask("Password: ") { |q| q.echo = '*' }
 end
@@ -1064,7 +1047,7 @@ end
 def self.add_rhlogin_config(rhlogin, uuid)
     config_path = RHC::Config.local_config_path
     f = open(File.expand_path(config_path), 'a')
-    unless RHC::Config.get_value('default_rhlogin')
+    unless RHC::Config['default_rhlogin']
         f.puts("# Default rhlogin to use if none is specified")
         f.puts("default_rhlogin=#{rhlogin}")
         f.puts("")
@@ -1171,7 +1154,7 @@ def add_or_update_key(command, identifier, pub_key_file_path, rhlogin, password)
     data[:action] = 'update-key'
   end
 
-  url = URI.parse("https://#{RHC::Config.get_value('libra_server')}/broker/ssh_keys")
+  url = URI.parse("https://#{RHC::Config['libra_server']}/broker/ssh_keys")
   handle_key_mgmt_response(url, data, password)
 end
 
@@ -1241,7 +1224,7 @@ end
 
 # Public: legacy convinience function for getting config keys
 def get_var(key)
-  RHC::Config.get_value(key)
+  RHC::Config[key]
 end
 
 # Public: convinience function for running the wizard

data/lib/rhc-rest.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'rest-client'
 require 'logger'
 require 'rhc-rest/exceptions/exceptions'
@@ -8,7 +7,6 @@ require 'rhc-rest/client'
 require 'rhc-rest/domain'
 require 'rhc-rest/key'
 require 'rhc-rest/user'
-require 'rhc/helpers'
 
 @@end_point = ""
 @@headers = {:accept => :json}
@@ -123,12 +121,10 @@ module Rhc
         #puts response
         e = nil
         messages.each do |message|
-          if message["field"]
-            if e and e.field ==message["field"]
-              e.message << " #{message["text"]}"
-            else
-              e = ValidationException.new(message["text"], message["field"])
-            end
+          if e and e.field == message["field"]
+            e.message << " #{message["text"]}"
+          else
+            e = ValidationException.new(message["text"], message["field"], message["code"])
           end
         end
         raise e

data/lib/rhc-rest/client.rb

@@ -1,4 +1,5 @@
 require 'base64'
+require 'rhc/json'
 
 module Rhc
   module Rest

data/lib/rhc-rest/exceptions/exceptions.rb

@@ -43,8 +43,8 @@ module Rhc
     #Exceptions thrown in case of an HTTP 422 is received.
     class ValidationException < Rhc::Rest::ClientErrorException
       attr_reader :field
-      def initialize(message, field=nil)
-        super(message)
+      def initialize(message, field=nil, error_code=nil)
+        super(message, error_code)
         @field = field
       end
     end

data/lib/rhc/client.rb

@@ -1,3 +1,5 @@
+require 'rhc/helpers'
+
 class RHC::Client
   def initialize() #auth info
   end

data/lib/rhc/config.rb

@@ -1,14 +1,15 @@
-require 'parseconfig'
+require 'rhc/vendor/parseconfig'
+require 'rhc/core_ext'
 
 module RHC
   module Config
     def self.initialize
-      @@defaults = ParseConfig.new()
+      @@defaults = RHC::Vendor::ParseConfig.new()
       @@global_config = nil
       @@local_config = nil
       @@opts_config = nil
       @@default_proxy = nil
-      @@env_config = ParseConfig.new()
+      @@env_config = RHC::Vendor::ParseConfig.new()
 
       @@defaults.add('libra_server', 'openshift.redhat.com')
       @@env_config.add('libra_server', ENV['LIBRA_SERVER']) if ENV['LIBRA_SERVER']
@@ -27,8 +28,8 @@ module RHC
       @@local_config_path = File.join(@@home_conf_path, @@conf_name)
 
       begin
-        @@global_config = ParseConfig.new(config_path)
-        @@local_config = ParseConfig.new(File.expand_path(@@local_config_path)) if File.exists?(@@local_config_path)
+        @@global_config = RHC::Vendor::ParseConfig.new(config_path)
+        @@local_config = RHC::Vendor::ParseConfig.new(File.expand_path(@@local_config_path)) if File.exists?(@@local_config_path)
       rescue Errno::EACCES => e
         puts "Could not open config file: #{e.message}"
         exit 253
@@ -44,18 +45,22 @@ module RHC
       @@local_config_path = File.join(@@home_conf_path, @@conf_name)
     end
 
-    def self.get_value(key)
+    def self.[](key)
       # evaluate in cascading order
       configs = [@@opts_config, @@env_config, @@local_config, @@global_config, @@defaults]
       result = nil
       configs.each do |conf|
-        result = conf.get_value(key) if !conf.nil?
+        result = conf[key] if !conf.nil?
         break if !result.nil?
       end
 
       result
     end
 
+    def self.get_value(key)
+      self[key]
+    end
+
     # Public: configures the default user for this session
     def self.config_user(username)
       @@defaults.add('default_rhlogin', username)
@@ -63,7 +68,7 @@ module RHC
 
     def self.set_local_config(confpath)
       begin
-        @@local_config = ParseConfig.new(File.expand_path(confpath))
+        @@local_config = RHC::Vendor::ParseConfig.new(File.expand_path(confpath))
       rescue Errno::EACCES => e
         puts "Could not open config file: #{e.message}"
         exit 253
@@ -72,7 +77,7 @@ module RHC
 
     def self.set_opts_config(confpath)
       begin
-        @@opts_config = ParseConfig.new(File.expand_path(confpath))
+        @@opts_config = RHC::Vendor::ParseConfig.new(File.expand_path(confpath))
       rescue Errno::EACCES => e
         puts "Could not open config file: #{e.message}"
         exit 253
@@ -120,6 +125,10 @@ module RHC
       @@home_dir
     end
 
+    def self.default_rhlogin
+      get_value('default_rhlogin')
+    end
+
     def self.default_proxy
       #
       # Check for proxy environment

data/lib/rhc/json.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'rhc/vendor/okjson'
 
 module RHC

data/lib/rhc/targz.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'stringio'
 require 'rhc/vendor/zliby'
 require 'archive/tar/minitar'
@@ -45,4 +44,4 @@ module RHC
 
 	end
 
-end
+end

data/lib/rhc/vendor/parseconfig.rb

@@ -0,0 +1,178 @@
+# modified version of parseconfig rubygem module
+# 
+# Author::      BJ Dierkes <derks@bjdierkes.com> 
+# Copyright::   Copyright (c) 2006,2012 BJ Dierkes
+# License::     MIT 
+# URL::         https://github.com/derks/ruby-parseconfig
+# 
+
+# This class was written to simplify the parsing of configuration
+# files in the format of "param = value".  Please review the
+# demo files included with this package.
+#
+# For further information please refer to the './doc' directory
+# as well as the ChangeLog and README files included.
+#
+
+# Note: A group is a set of parameters defined for a subpart of a
+# config file
+
+module RHC
+  module Vendor
+    class ParseConfig
+
+      Version = '1.0.2'
+
+      attr_accessor :config_file, :params, :groups
+
+      # Initialize the class with the path to the 'config_file'
+      # The class objects are dynamically generated by the
+      # name of the 'param' in the config file.  Therefore, if
+      # the config file is 'param = value' then the itializer
+      # will eval "@param = value"
+      #
+      def initialize(config_file=nil)
+        @config_file = config_file
+        @params = {}
+        @groups = []
+
+        if(self.config_file)
+          self.validate_config()
+          self.import_config()
+        end
+      end
+
+      # Validate the config file, and contents
+      def validate_config()
+        if !File.readable?(self.config_file)
+          raise Errno::EACCES, "#{self.config_file} is not readable"
+        end
+
+        # FIX ME: need to validate contents/structure?
+      end
+
+      # Import data from the config to our config object.
+      def import_config()
+        # The config is top down.. anything after a [group] gets added as part
+        # of that group until a new [group] is found.
+        group = nil
+        File.open(self.config_file) { |f| f.each do |line|
+          line.strip!
+          unless (/^\#/.match(line))
+            if(/\s*=\s*/.match(line))
+              param, value = line.split(/\s*=\s*/, 2)
+              var_name = "#{param}".chomp.strip
+              value = value.chomp.strip
+              new_value = ''
+              if (value)
+                if value =~ /^['"](.*)['"]$/
+                  new_value = $1
+                else
+                  new_value = value
+                end
+              else
+                new_value = ''
+              end
+
+              if group
+                self.add_to_group(group, var_name, new_value)
+              else
+                self.add(var_name, new_value)
+              end
+
+            elsif(/^\[(.+)\]$/.match(line).to_a != [])
+              group = /^\[(.+)\]$/.match(line).to_a[1]
+              self.add(group, {})
+
+            end
+          end
+        end }
+      end
+
+      # This method will provide the value held by the object "@param"
+      # where "@param" is actually the name of the param in the config 
+      # file.  
+      #
+      # DEPRECATED - will be removed in future versions
+      #
+      def get_value(param)
+        puts "ParseConfig Deprecation Warning: get_value() is deprecated. Use " + \
+             "config['param'] or config['group']['param'] instead."
+        return self.params[param]
+      end
+
+      # This method is a shortcut to accessing the @params variable
+      def [](param)
+        return self.params[param]
+      end
+
+      # This method returns all parameters/groups defined in a config file.
+      def get_params()
+        return self.params.keys
+      end
+
+      # List available sub-groups of the config.
+      def get_groups()
+        return self.groups
+      end
+
+      # This method adds an element to the config object (not the config file)
+      # By adding a Hash, you create a new group
+      def add(param_name, value)
+        if value.class == Hash
+          if self.params.has_key?(param_name)
+            if self.params[param_name].class == Hash
+              self.params[param_name].merge!(value)
+            elsif self.params.has_key?(param_name)
+              if self.params[param_name].class != value.class
+                raise ArgumentError, "#{param_name} already exists, and is of different type!"
+              end
+            end
+          else
+            self.params[param_name] = value
+          end
+          if ! self.groups.include?(param_name)
+            self.groups.push(param_name)
+          end
+        else
+          self.params[param_name] = value
+        end
+      end
+
+      # Add parameters to a group. Note that parameters with the same name
+      # could be placed in different groups
+      def add_to_group(group, param_name, value)
+        if ! self.groups.include?(group)
+          self.add(group, {})
+        end
+        self.params[group][param_name] = value
+      end
+
+      # Writes out the config file to output_stream
+      def write(output_stream=STDOUT)
+        self.params.each do |name,value| 
+          if value.class.to_s != 'Hash'
+            if value.scan(/\w+/).length > 1
+              output_stream.puts "#{name} = \"#{value}\""
+            else
+              output_stream.puts "#{name} = #{value}"
+            end
+          end
+        end
+        output_stream.puts "\n"
+
+        self.groups.each do |group|
+          output_stream.puts "[#{group}]"
+          self.params[group].each do |param, value| 
+            if value.scan(/\w+/).length > 1
+              output_stream.puts "#{param} = \"#{value}\""
+            else
+              output_stream.puts "#{param} = #{value}"
+            end
+          end
+          output_stream.puts "\n"
+        end
+      end
+    end
+  end
+end