rhc 0.93.18 → 0.93.19

data/bin/rhc

@@ -38,7 +38,7 @@ def get_args
 end
 
 
-wizard_run = default_setup_wizard unless ARGV.include?('--noprompt')
+wizard_run = default_setup_wizard unless ARGV.include?('--noprompt') or ARGV.include?('--help') or ARGV.include?('-h')
 
 case ARGV[0]
 when "domain"
@@ -62,6 +62,11 @@ when "server"
     retcode = e.status
   end
 when "setup"
+  if ARGV.include?('--help') or ARGV.include?('-h')
+    puts "Usage: rhc setup"
+    puts "Runs the setup wizard to configure your account"
+    exit 0
+  end
   exit 0 if wizard_run
   w = RHC::RerunWizard.new(RHC::Config.local_config_path) 
   success = w.run

data/bin/rhc-chk

@@ -5,10 +5,11 @@ require 'net/https'
 require 'rbconfig'
 require 'yaml'
 require 'tempfile'
+require 'rhc/vendor/sshkey'
 
 if RUBY_VERSION.to_f == 1.9
   require 'rubygems'
-  gem     'test-unit'
+  gem     'test-unit'#, '~> 1.2.3'
 end
 
 require 'test/unit'
@@ -281,7 +282,7 @@ class Test3_SSH < Test::Unit::TestCase
     check_permissions(@libra_kfile, /[4-7]00/) # Needs to at least be readable by user and nobody else
 
     # Derive the public key from the private key
-    key_dump = SSHKey.new(File.read(@libra_kfile)).ssh_public_key
+    key_dump = RHC::Vendor::SSHKey.new(File.read(@libra_kfile)).ssh_public_key
     @@local_derived_ssh_pubkey = key_dump.to_s.strip.split(' ')[1]
 
     assert_not_nil @@local_derived_ssh_pubkey, error_for(:no_derive)
@@ -313,12 +314,9 @@ class Test3_SSH < Test::Unit::TestCase
     fp.close if fp
   end
 
-  def test_05_ssh_config
-    check_permissions('~/.ssh/config',/600/)
-  end
-
   def test_06_ssh_agent
-    loaded_keys = `ssh-add -L`.lines.to_a
+    loaded_keys = `ssh-add -L`
+    loaded_keys = loaded_keys.send(loaded_keys.respond_to?(:lines) ? :lines : :to_s).to_a
     # Make sure we can load keys from ssh-agent
     assert !loaded_keys.empty?, error_for(:no_keys_loaded)
     loaded_keys.map!{|key| key.split(' ')[1]}
@@ -380,7 +378,7 @@ class CheckRunner < Test::Unit::UI::Console::TestRunner
   end
 
   def render_message(message)
-    lines = message.to_a
+    lines = message.send(message.respond_to?(:lines) ? :lines : :to_s).to_a
     message = [] 
     @num ||= 0
     message << "#{@num+=1}) #{lines.shift.strip}"
@@ -417,7 +415,8 @@ class CheckRunner < Test::Unit::UI::Console::TestRunner
         @num = 0
         print_underlined get_message(:status,:error)
         @errors.each do |e| 
-          lines = e.long_display.to_a[1..-1]
+          display = e.long_display
+          lines = display.send(display.respond_to?(:lines) ? :lines : :to_s).to_a[1..-1]
           puts "#{@num+=1}) #{lines.shift}"
           lines.each{|l| puts "\t#{l}"}
         end 

data/lib/rhc-common.rb

@@ -4,7 +4,7 @@ require 'getoptlong'
 require 'net/http'
 require 'net/https'
 require 'net/ssh'
-require 'sshkey'
+require 'rhc/vendor/sshkey'
 require 'parseconfig'
 require 'resolv'
 require 'uri'
@@ -315,10 +315,9 @@ 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
-    rescue NotImplementedError
-      # key invalid, do nothing
-      # this happens if the user does not have a default key
+    rescue Net::SSH::Exception, NotImplementedError
+      # 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
 
     if ssh_keys['keys'] && ssh_keys['keys'].kind_of?(Hash)
@@ -334,8 +333,11 @@ end
           tempfile = `mktemp /tmp/openshift.XXXXXXXX`
           `echo "#{type} #{key}" > #{tempfile}`
           ssh_keys['keys'][name]['fingerprint'] = `ssh-keygen -lf #{tempfile}`.split(' ')[1]
+        rescue NotImplementedError, Net::SSH::Exception
+          # Could be a new unsupported key type or invalid data on the server
+          ssh_keys['keys'][name]['fingerprint'] = 'Key type is not recognized.  Please check this key is valid.'
         end
-end
+      end
     end
     ssh_keys
   end
@@ -1187,9 +1189,9 @@ end
 #
 # Returns nil on failure or public key location as a String on success
 def generate_ssh_key_ruby(type="RSA", bits = 1024, comment = "OpenShift-Key")
-  key = SSHKey.generate(:type => type,
-                        :bits => bits,
-                        :comment => comment)
+  key = RHC::Vendor::SSHKey.generate(:type => type,
+                                     :bits => bits,
+                                     :comment => comment)
   ssh_dir = "#{RHC::Config.home_dir}/.ssh"
   if File.exists?("#{ssh_dir}/id_rsa")
     puts "SSH key already exists: #{ssh_dir}/id_rsa.  Reusing..."

data/lib/rhc/targz.rb

@@ -5,7 +5,9 @@ require 'archive/tar/minitar'
 include Archive::Tar
 
 if File.executable?('/usr/bin/gnutar') then
+  #:nocov:
   TAR_BIN = '/usr/bin/gnutar'
+  #:nocov:
 else
   TAR_BIN = 'tar'
 end

data/lib/rhc/vendor/sshkey.rb

@@ -0,0 +1,253 @@
+# modified version of SSHKey rubygem module
+# https://github.com/bensie/sshkey
+#
+# Copyright (c) 2011 James Miller
+
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'openssl'
+require 'base64'
+require 'digest/md5'
+require 'digest/sha1'
+
+module RHC
+  module Vendor
+    class SSHKey
+      SSH_TYPES      = {"rsa" => "ssh-rsa", "dsa" => "ssh-dss"}
+      SSH_CONVERSION = {"rsa" => ["e", "n"], "dsa" => ["p", "q", "g", "pub_key"]}
+
+      attr_reader :key_object, :comment, :type
+      attr_accessor :passphrase
+
+      class << self
+        # Generate a new keypair and return an SSHKey object
+        #
+        # The default behavior when providing no options will generate a 2048-bit RSA
+        # keypair.
+        #
+        # ==== Parameters
+        # * options<~Hash>:
+        #   * :type<~String> - "rsa" or "dsa", "rsa" by default
+        #   * :bits<~Integer> - Bit length
+        #   * :comment<~String> - Comment to use for the public key, defaults to ""
+        #   * :passphrase<~String> - Encrypt the key with this passphrase
+        #
+        def generate(options = {})
+          type   = options[:type] || "rsa"
+
+          # JRuby modulus size must range from 512 to 1024
+          default_bits = type == "rsa" ? 2048 : 1024
+
+          bits   = options[:bits] || default_bits
+          cipher = OpenSSL::Cipher::Cipher.new("AES-128-CBC") if options[:passphrase]
+
+          case type.downcase
+          when "rsa" then new(OpenSSL::PKey::RSA.generate(bits).to_pem(cipher, options[:passphrase]), options)
+          when "dsa" then new(OpenSSL::PKey::DSA.generate(bits).to_pem(cipher, options[:passphrase]), options)
+          else
+            raise "Unknown key type: #{type}"
+          end
+        end
+
+        # Validate an existing SSH public key
+        #
+        # Returns true or false depending on the validity of the public key provided
+        #
+        # ==== Parameters
+        # * ssh_public_key<~String> - "ssh-rsa AAAAB3NzaC1yc2EA...."
+        #
+        def valid_ssh_public_key?(ssh_public_key)
+          ssh_type, encoded_key = ssh_public_key.split(" ")
+          type = SSH_TYPES.invert[ssh_type]
+          prefix = [0,0,0,7].pack("C*")
+          decoded = Base64.decode64(encoded_key)
+
+          # Base64 decoding is too permissive, so we should validate if encoding is correct
+          return false unless Base64.encode64(decoded).gsub("\n", "") == encoded_key
+          return false unless decoded.sub!(/^#{prefix}#{ssh_type}/, "")
+
+          unpacked = decoded.unpack("C*")
+          data = []
+          index = 0
+          until unpacked[index].nil?
+            datum_size = from_byte_array unpacked[index..index+4-1], 4
+            index = index + 4
+            datum = from_byte_array unpacked[index..index+datum_size-1], datum_size
+            data << datum
+            index = index + datum_size
+          end
+
+          SSH_CONVERSION[type].size == data.size
+        rescue
+          false
+        end
+
+        # Fingerprints
+        #
+        # Accepts either a public or private key
+        #
+        # MD5 fingerprint for the given SSH key
+        def md5_fingerprint(key)
+          if key.match(/PRIVATE/)
+            new(key).md5_fingerprint
+          else
+            Digest::MD5.hexdigest(decoded_key(key)).gsub(fingerprint_regex, '\1:\2')
+          end
+        end
+        alias_method :fingerprint, :md5_fingerprint
+
+        # SHA1 fingerprint for the given SSH key
+        def sha1_fingerprint(key)
+          if key.match(/PRIVATE/)
+            new(key).sha1_fingerprint
+          else
+            Digest::SHA1.hexdigest(decoded_key(key)).gsub(fingerprint_regex, '\1:\2')
+          end
+        end
+
+        private
+
+        def from_byte_array(byte_array, expected_size = nil)
+          num = 0
+          raise "Byte array too short" if !expected_size.nil? && expected_size != byte_array.size
+          byte_array.reverse.each_with_index do |item, index|
+            num += item * 256**(index)
+          end
+          num
+        end
+
+        def decoded_key(key)
+          Base64.decode64(key.chomp.gsub(/ssh-[dr]s[as] /, ''))
+        end
+
+        def fingerprint_regex
+          /(.{2})(?=.)/
+        end
+      end
+
+      # Create a new SSHKey object
+      #
+      # ==== Parameters
+      # * private_key - Existing RSA or DSA private key
+      # * options<~Hash>
+      #   * :comment<~String> - Comment to use for the public key, defaults to ""
+      #   * :passphrase<~String> - If the key is encrypted, supply the passphrase
+      #
+      def initialize(private_key, options = {})
+        @passphrase = options[:passphrase]
+        @comment    = options[:comment] || ""
+        begin
+          @key_object = OpenSSL::PKey::RSA.new(private_key, passphrase)
+          @type = "rsa"
+        rescue
+          @key_object = OpenSSL::PKey::DSA.new(private_key, passphrase)
+          @type = "dsa"
+        end
+      end
+
+      # Fetch the RSA/DSA private key
+      #
+      # rsa_private_key and dsa_private_key are aliased for backward compatibility
+      def private_key
+        key_object.to_pem
+      end
+      alias_method :rsa_private_key, :private_key
+      alias_method :dsa_private_key, :private_key
+
+      # Fetch the encrypted RSA/DSA private key using the passphrase provided
+      #
+      # If no passphrase is set, returns the unencrypted private key
+      def encrypted_private_key
+        return private_key unless passphrase
+        key_object.to_pem(OpenSSL::Cipher::Cipher.new("AES-128-CBC"), passphrase)
+      end
+
+      # Fetch the RSA/DSA public key
+      #
+      # rsa_public_key and dsa_public_key are aliased for backward compatibility
+      def public_key
+        key_object.public_key.to_pem
+      end
+      alias_method :rsa_public_key, :public_key
+      alias_method :dsa_public_key, :public_key
+
+      # SSH public key
+      def ssh_public_key
+        [SSH_TYPES[type], Base64.encode64(ssh_public_key_conversion).gsub("\n", ""), comment].join(" ").strip
+      end
+
+      # Fingerprints
+      #
+      # MD5 fingerprint for the given SSH public key
+      def md5_fingerprint
+        Digest::MD5.hexdigest(ssh_public_key_conversion).gsub(/(.{2})(?=.)/, '\1:\2')
+      end
+      alias_method :fingerprint, :md5_fingerprint
+
+      # SHA1 fingerprint for the given SSH public key
+      def sha1_fingerprint
+        Digest::SHA1.hexdigest(ssh_public_key_conversion).gsub(/(.{2})(?=.)/, '\1:\2')
+      end
+
+      private
+
+      # SSH Public Key Conversion
+      #
+      # All data type encoding is defined in the section #5 of RFC #4251.
+      # String and mpint (multiple precision integer) types are encoded this way:
+      # 4-bytes word: data length (unsigned big-endian 32 bits integer)
+      # n bytes: binary representation of the data
+
+      # For instance, the "ssh-rsa" string is encoded as the following byte array
+      # [0, 0, 0, 7, 's', 's', 'h', '-', 'r', 's', 'a']
+      def ssh_public_key_conversion
+        out = [0,0,0,7].pack("C*")
+        out += SSH_TYPES[type]
+
+        SSH_CONVERSION[type].each do |method|
+          byte_array = to_byte_array(key_object.public_key.send(method).to_i)
+          out += encode_unsigned_int_32(byte_array.length).pack("c*")
+          out += byte_array.pack("C*")
+        end
+
+        return out
+      end
+
+      def encode_unsigned_int_32(value)
+        out = []
+        out[0] = value >> 24 & 0xff
+        out[1] = value >> 16 & 0xff
+        out[2] = value >> 8 & 0xff
+        out[3] = value & 0xff
+        return out
+      end
+
+      def to_byte_array(num)
+        result = []
+        begin
+          result << (num & 0xff)
+          num >>= 8
+        end until (num == 0 || num == -1) && (result.last[7] == num[7])
+        result.reverse
+      end
+
+    end
+  end
+end

data/lib/rhc/wizard.rb

@@ -2,13 +2,7 @@ require 'rhc-common'
 require 'rhc/helpers'
 require 'highline/system_extensions'
 require 'net/ssh'
-
-# ruby 1.8 -> 1.9 magic
-begin
-  require 'ftools'
-rescue LoadError
-  require 'fileutils'
-end
+require 'fileutils'
 
 module RHC
   class Wizard
@@ -410,7 +404,7 @@ EOF
             --dest=#{service} #{obj_path} #{method} #{stringafied_params}"
       output = `#{cmd} 2>&1`
 
-      throw output if output.start_with?('Error') and !$?.success?
+      raise output if output.start_with?('Error') and !$?.success?
 
       # parse the output
       results = []
@@ -461,7 +455,8 @@ EOF
 
       begin
         git_installed = package_kit_method('IsInstalled', 'Query', 'string:git string:')
-        if git_installed
+        # double check due to slight differences in older platforms
+        if git_installed or has_git?
           section(:bottom => 1) { say "found" }
         else
           section(:bottom => 1) { say "needs to be installed" }
@@ -523,6 +518,8 @@ EOF
     def has_git?
       %x{ git --version }
       $?.success?
+    rescue
+      false
     end
 
     def has_dbus_send?
@@ -561,8 +558,8 @@ EOF
           say "Configuration file #{@config_path} already exists, " \
               "backing up to #{backup}"
         end
-        File.cp(@config_path, backup)
-        File.delete(@config_path)
+        FileUtils.cp(@config_path, backup)
+        FileUtils.rm(@config_path)
       end
       super
       true

data/spec/spec_helper.rb

@@ -15,10 +15,10 @@ begin
   end
 
   original_stderr = $stderr
-  at_exit do
+  SimpleCov.at_exit do
     begin
       SimpleCov.result.format!
-      if SimpleCov.result.covered_percent < 100
+      if SimpleCov.result.covered_percent < 99.0
         original_stderr.puts "Coverage not 100%, build failed."
         exit 1
       end

metadata

@@ -1,301 +1,301 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rhc
-version: !ruby/object:Gem::Version 
-  hash: 335
+version: !ruby/object:Gem::Version
+  version: 0.93.19
   prerelease: 
-  segments: 
-  - 0
-  - 93
-  - 18
-  version: 0.93.18
 platform: ruby
-authors: 
+authors:
 - Red Hat
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sshkey
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: net-ssh
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: archive-tar-minitar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: parseconfig
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: parseconfig
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: commander
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: commander
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 4
-        - 0
-        version: "4.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 6
-        version: "1.6"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 6
-        version: "1.6"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: fakefs
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
-        version: "0.4"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :development
-  version_requirements: *id010
-description: The client tools for the OpenShift platform that allow for application management.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.4'
+description: The client tools for the OpenShift platform that allow for application
+  management.
 email: dev@openshift.redhat.com
-executables: 
-- rhc-user-info
-- rhc-chk
+executables:
+- rhc-app
 - rhc-create-app
-- rhc-domain-info
-- rhc-ctl-domain
-- rhc-sshkey
-- rhc-tail-files
-- rhc-create-domain
-- rhc-ctl-app
 - rhc-domain
-- rhc-snapshot
-- rhc-app
+- rhc-tail-files
 - rhc-port-forward
+- rhc-user-info
 - rhc
+- rhc-ctl-app
+- rhc-ctl-domain
+- rhc-create-domain
+- rhc-snapshot
+- rhc-sshkey
+- rhc-domain-info
+- rhc-chk
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/rhc-common.rb
-- lib/rhc.rb
-- lib/rhc-rest/domain.rb
-- lib/rhc-rest/application.rb
-- lib/rhc-rest/cartridge.rb
-- lib/rhc-rest/client.rb
-- lib/rhc-rest/key.rb
-- lib/rhc-rest/exceptions/exceptions.rb
-- lib/rhc-rest/user.rb
-- lib/rhc-rest/version.rb
+- lib/rhc/vendor/sshkey.rb
+- lib/rhc/vendor/okjson.rb
+- lib/rhc/vendor/zliby.rb
 - lib/rhc/helpers.rb
-- lib/rhc/cli.rb
 - lib/rhc/config.rb
-- lib/rhc/commands.rb
-- lib/rhc/wizard.rb
-- lib/rhc/core_ext.rb
 - lib/rhc/client.rb
 - lib/rhc/json.rb
-- lib/rhc/vendor/okjson.rb
-- lib/rhc/vendor/zliby.rb
-- lib/rhc/commands/base.rb
+- lib/rhc/commands.rb
 - lib/rhc/commands/server.rb
+- lib/rhc/commands/base.rb
+- lib/rhc/core_ext.rb
+- lib/rhc/cli.rb
+- lib/rhc/wizard.rb
 - lib/rhc/targz.rb
+- lib/rhc.rb
 - lib/rhc-rest.rb
+- lib/rhc-rest/user.rb
+- lib/rhc-rest/domain.rb
+- lib/rhc-rest/client.rb
+- lib/rhc-rest/application.rb
+- lib/rhc-rest/key.rb
+- lib/rhc-rest/version.rb
+- lib/rhc-rest/cartridge.rb
+- lib/rhc-rest/exceptions/exceptions.rb
 - conf/express.conf
 - LICENSE
 - COPYRIGHT
 - README.md
 - Rakefile
-- test/sample-usage.rb
-- test/support/server.rb
 - test/support/testcase.rb
+- test/support/server.rb
+- test/sample-usage.rb
 - test/functional/test_credentials.rb
-- test/functional/domain_test.rb
 - test/functional/application_test.rb
-- test/unit/command_test.rb
+- test/functional/domain_test.rb
 - test/test_helper.rb
+- test/unit/command_test.rb
 - spec/spec_helper.rb
-- spec/rhc/json_spec.rb
 - spec/rhc/helpers_spec.rb
-- spec/rhc/command_spec.rb
 - spec/rhc/wizard_spec.rb
+- spec/rhc/command_spec.rb
 - spec/rhc/commands/server_spec.rb
-- spec/rhc/cli_spec.rb
 - spec/rhc/targz_spec.rb
-- spec/rhc/assets/foo.txt
-- spec/rhc/assets/targz_corrupted.tar.gz
+- spec/rhc/cli_spec.rb
+- spec/rhc/json_spec.rb
 - spec/rhc/assets/targz_sample.tar.gz
-- bin/rhc-user-info
-- bin/rhc-chk
+- spec/rhc/assets/targz_corrupted.tar.gz
+- spec/rhc/assets/foo.txt
+- bin/rhc-app
 - bin/rhc-create-app
-- bin/rhc-domain-info
-- bin/rhc-ctl-domain
-- bin/rhc-sshkey
-- bin/rhc-tail-files
-- bin/rhc-create-domain
-- bin/rhc-ctl-app
 - bin/rhc-domain
-- bin/rhc-snapshot
-- bin/rhc-app
+- bin/rhc-tail-files
 - bin/rhc-port-forward
+- bin/rhc-user-info
 - bin/rhc
+- bin/rhc-ctl-app
+- bin/rhc-ctl-domain
+- bin/rhc-create-domain
+- bin/rhc-snapshot
+- bin/rhc-sshkey
+- bin/rhc-domain-info
+- bin/rhc-chk
 homepage: https://github.com/openshift/os-client-tools
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: OpenShift Client Tools
-test_files: 
-- test/sample-usage.rb
-- test/support/server.rb
+test_files:
 - test/support/testcase.rb
+- test/support/server.rb
+- test/sample-usage.rb
 - test/functional/test_credentials.rb
-- test/functional/domain_test.rb
 - test/functional/application_test.rb
-- test/unit/command_test.rb
+- test/functional/domain_test.rb
 - test/test_helper.rb
+- test/unit/command_test.rb
 - spec/spec_helper.rb
-- spec/rhc/json_spec.rb
 - spec/rhc/helpers_spec.rb
-- spec/rhc/command_spec.rb
 - spec/rhc/wizard_spec.rb
+- spec/rhc/command_spec.rb
 - spec/rhc/commands/server_spec.rb
-- spec/rhc/cli_spec.rb
 - spec/rhc/targz_spec.rb
-- spec/rhc/assets/foo.txt
-- spec/rhc/assets/targz_corrupted.tar.gz
+- spec/rhc/cli_spec.rb
+- spec/rhc/json_spec.rb
 - spec/rhc/assets/targz_sample.tar.gz
+- spec/rhc/assets/targz_corrupted.tar.gz
+- spec/rhc/assets/foo.txt