rhc 1.2.7 → 1.3.8

data/bin/rhc

@@ -1,9 +1,6 @@
 #!/usr/bin/env ruby
 require 'rhc/coverage_helper'
 
-# Require rhc-common for wizard invocation
-require 'rhc-common'
-
 def get_args
   ARGV.shift
   args = ""
@@ -15,13 +12,16 @@ def get_args
 end
 
 begin
-  begin
+  retcode = begin
     require 'rhc/cli'
     RHC::CLI.set_terminal
     RHC::CLI.start(ARGV)
-    retcode = 0
+  rescue Interrupt
+    puts "Interrupted"
+    128 + 2
   rescue SystemExit => e
-    retcode = e.status
+    puts
+    e.status
   end
 
   if retcode == nil
@@ -32,6 +32,4 @@ begin
   end
 
   exit retcode
-rescue Interrupt
-  exit 128 + 2 #INT
 end

data/bin/rhc-chk

@@ -19,6 +19,25 @@ end
 require 'test/unit'
 require 'test/unit/ui/console/testrunner'
 
+class Hash
+  # given a potentially nested hash, overwrite the value
+  # if the key matches the given key
+  def deep_cleanse(key)
+    each_pair do |k,v|
+      case v
+      when Hash
+        v.deep_cleanse key
+      when Array
+        v.map {|e| e.deep_cleanse(key) if e.is_a? Hash}
+      else
+        if k.to_s == key
+          self[k] = "*" * 12
+        end
+      end
+    end
+  end
+end
+
 #
 # print help
 #
@@ -41,6 +60,8 @@ USAGE
 exit exit_code
 end
 
+warn "#{$0} has been deprecated. Please run 'rhc setup' instead."
+
 begin
   opts = GetoptLong.new(
     ["--debug", "-d", GetoptLong::NO_ARGUMENT],
@@ -119,14 +140,6 @@ $debuginfo = {
   }
 }
 
-# Don't actually log the password, but some information to help with troubleshooting
-if $opt['password']
-  $debuginfo['options']['Command Line']['password'] = {
-    "Length" => $opt['password'].length, 
-    "Starts with" => $opt['password'][0..0]
-  }
-end
-
 #
 # Check for proxy environment
 #
@@ -167,7 +180,7 @@ module TestBase
       body = RHC::json_decode(response.body)
       body['data'] = body['data'] && body['data'] != '' ? RHC::json_decode(body['data']) : ''
       $debuginfo['fetches'] << {url.to_s => {
-        'body' => body,
+        'body' => body.deep_cleanse('password'),
         'header' => response.instance_variable_get(:@header)
       }}
     end
@@ -518,7 +531,7 @@ class CheckRunner < Test::Unit::UI::Console::TestRunner
     if $debug
       Tempfile.open(%w(rhc-chk. .log))do |file|
         ObjectSpace.undefine_finalizer(file) # persist tempfile
-        file.write $debuginfo.to_yaml
+        file.write $debuginfo.deep_cleanse('password').to_yaml
         puts
         puts "Debugging information dumped to #{file.path}"
       end

data/features/domain.feature

@@ -17,7 +17,7 @@ Feature: Existing Domain Operations
 
   Scenario: Domain Create Fails
     When rhc domain create is called
-    Then the domain command should fail with an exitcode of 103
+    Then the domain command should fail with an exitcode of 128
 
   Scenario: Domain Delete
     When domain is deleted

data/features/lib/rhc_helper.rb

@@ -8,11 +8,12 @@ module RHCHelper
   # The regex to parse the UUID output from the create app results
   UUID_OUTPUT_PATTERN = /UUID\s*(?:\:|=)\s*(.+)/i unless const_defined?(:UUID_OUTPUT_PATTERN)
   # The regex to parse the Gear Profile output from the create app results
-  GEAR_PROFILE_OUTPUT_PATTERN = /Info.*Gear Size\s*(?:\:|=)\s*(\w+)/m unless const_defined?(:GEAR_PROFILE_OUTPUT_PATTERN)
+  GEAR_PROFILE_OUTPUT_PATTERN = /Gear Size\s*(?:\:|=)\s*(\w+)/m unless const_defined?(:GEAR_PROFILE_OUTPUT_PATTERN)
   # Regex to parse passwords out of logging messages
   PASSWORD_REGEX = / -p [^\s]* / unless const_defined?(:PASSWORD_REGEX)
 end
-\
+
+require 'rhc_helper/api'
 require 'rhc_helper/loggable'
 require 'rhc_helper/commandify'
 require 'rhc_helper/httpify'

data/features/lib/rhc_helper/api.rb

@@ -0,0 +1,7 @@
+module RHCHelper
+  module API
+    def new_client
+      RHC::Rest::Client.new(:url => $end_point, :user => $username, :password => $password, :verify_mode => OpenSSL::SSL::VERIFY_NONE)
+    end
+  end
+end

data/features/lib/rhc_helper/app.rb

@@ -8,6 +8,8 @@ module RHCHelper
   class App 
     extend Persistable
     extend Runnable
+    extend API
+    include API
     include Loggable
     include Commandify
     include Runnable
@@ -38,13 +40,12 @@ module RHCHelper
       #   4 - if no namespace is found, create namespace? (blank is no)
       args = [$username, $password]
       args << 'yes' unless ($keyed_users ||= []).include?($username)
-      puts "User #{$username} has no keys" if args.length == 3
       args << '' # always skip namespace
       if $namespace
         # Namespace is already created, so don't pass anything in
         logger.info("Namespace (#{$namespace}) should be found by the wizard")
         run("rhc setup", nil, args) do |exitstatus, out, err, arg|
-          raise "Unmatched namespace #{$namespace}" unless out.include?($namespace)
+          raise "Unmatched namespace #{$namespace}\n\n#{out}" unless out.include?($namespace)
         end
       else
         # Pass in a blank value for namespace to create in the next step
@@ -57,7 +58,7 @@ module RHCHelper
 
     def self.create_unique(type, scalable, gear_profile=nil, prefix="test")
       # Get a REST client to verify the application name
-      client = RHC::Rest::Client.new($end_point, $username, $password)
+      client = new_client
 
       # Cleanup all test applications
       test_names = []
@@ -100,15 +101,12 @@ module RHCHelper
       persist
     end
 
+    # Get a REST client to verify the application is on the server
     def is_created?
-      # Get a REST client to verify the application is on the server
-      client = RHC::Rest::Client.new($end_point, $username, $password)
-      begin
-        client.domains[0].find_application(name)
-      rescue
-        return false
-      end
+      new_client.domains[0].find_application(name)
       true
+    rescue RHC::ApplicationNotFoundException
+      false
     end
 
     def cartridge(name)

data/features/lib/rhc_helper/domain.rb

@@ -8,6 +8,7 @@ module RHCHelper
   class Domain
     extend Runnable
     extend Commandify
+    extend API
     include Dnsruby
 
     class << self
@@ -27,7 +28,7 @@ module RHCHelper
 
     def self.create_if_needed(prefix="test")
       unless $namespace
-        client = RHC::Rest::Client.new($end_point, $username, $password)
+        client = new_client
         domain = client.domains.first
         if domain
           $namespace = domain.id

data/features/lib/rhc_helper/runnable.rb

@@ -1,7 +1,5 @@
 require 'open4'
 require 'timeout'
-require 'iconv'
-require 'rubygems'
 
 module RHCHelper
   module Runnable
@@ -24,7 +22,7 @@ module RHCHelper
     end
 
     def run(cmd, arg=nil, input=[])
-      logger.info("Running: #{cmd}")
+      logger.info("Running: #{cmd} #{arg}")
 
       exit_code = -1
       output = nil
@@ -39,29 +37,9 @@ module RHCHelper
         status = Open4.spawn(cmd, 'stdout' => stdout, 'stderr' => stderr, 'stdin' => stdin, 'quiet' => true)
         out, err = [stdout, stderr].map(&:string)
 
-        #pid, stdin, stdout, stderr = Open4::popen4 cmd
-        #input.each {|line| stdin.puts line}
-        #stdin.close
-
-        # Block until the command finishes
-        #ignored, status = Process::waitpid2 pid
-        #out = stdout.read.strip
-        #err = stderr.read.strip
         stdout.close
         stderr.close
 
-        # Force the output to ASCII-only characters or logger will barf.
-        if (Gem::Version.new(RUBY_VERSION.dup) <=> Gem::Version.new('1.9.3')) >= 0
-          out.encode!('UTF-8', 'UTF-8', :undef => :replace, :invalid => :replace)
-          err.encode!('UTF-8', 'UTF-8', :undef => :replace, :invalid => :replace)
-        else
-          out = iconv_handler.iconv(out + ' ')[0..-2]
-          err = iconv_handler.iconv(err + ' ')[0..-2]
-        end
-
-        logger.debug("Standard Output:\n#{out}")
-        logger.debug("Standard Error:\n#{err}")
-
         # Allow a caller to pass in a block to process the output
         yield status.exitstatus, out, err, arg if block_given?
         exit_code = status.exitstatus
@@ -71,7 +49,7 @@ module RHCHelper
         logger.error("(#{$$}): Execution failed #{cmd} with exit_code: #{exit_code.to_s}")
       end
 
-      return exit_code
+      exit_code
     end
   end
 end

data/features/sshkey.feature

@@ -28,7 +28,7 @@ As an OpenShift user, I want to manage SSH keys with 'rhc sshkey' commands.
   @sshkey_add
   Scenario: invalid key name is given
     When a new SSH key "key1.pub" is added as "blah\\ss"
-    Then the command exits with status code 117
+    Then the command exits with status code 128
 
   @sshkey_add
   Scenario: invalid SSH key is added
@@ -43,13 +43,13 @@ As an OpenShift user, I want to manage SSH keys with 'rhc sshkey' commands.
   @sshkey_add @key1
   Scenario: SSH key with the same name already exists
     When a new SSH key "key2.pub" is added as "key1"
-    Then the command exits with status code 120
+    Then the command exits with status code 128
 
   @sshkey_add
   Scenario: SSH key with the identical content already exists
     Given a new SSH key "key1.pub" is added as "key1"
     And a new SSH key "key1.pub" is added as "key2"
-    Then the command exits with status code 121  
+    Then the command exits with status code 128
 
   @sshkey_remove @key1
   Scenario: SSH key is deleted successfully

data/features/step_definitions/cartridge_steps.rb

@@ -32,7 +32,7 @@ Then /^the (.+) cartridge should be (.*)$/ do |name,status|
              when :stopped
                "(.+) stopped"
              when :removed
-               "Invalid cartridge specified: '#{name}'"
+               "Cartridge '#{name}' cannot be found in application"
              else
                raise "Unrecognized status type #{status}"
              end
@@ -61,14 +61,14 @@ end
 
 Then /^the (\w+) scaling value should be (.*)$/ do |minmax,value|
   expected = {
-    :min => "Minimum",
-    :max => "Maximum"
+    :min => "minimum",
+    :max => "maximum"
   }[minmax.to_sym]
 
-  value = (value == "-1" ? "available gears" : value)
+  value = (value == "-1" ? "available" : value)
 
-  match_string = [expected,value].join(" = ")
-  regex = Regexp.new(/\s+#{match_string}/)
+  match_string = [expected,value].join(": ")
+  regex = Regexp.new(/\b#{match_string}/)
 
   @app.cartridge(@cartridge_name).send(:show).should match(regex)
 end

data/features/step_definitions/client_steps.rb

@@ -22,7 +22,6 @@ Given /^the libra client tools$/ do
 end
 
 When /^the setup wizard is run$/ do
-  puts "Running setup"
   RHCHelper::App.rhc_setup
 
   # Force a refresh of the loaded RHC state

data/features/step_definitions/sshkey_steps.rb

@@ -35,11 +35,11 @@ end
 Then /^the output (does not include|includes) (.*)$/ do |includes,str|
   regex = case str
           when /^the key information for "(.*?)"$/
-            /Name: #{$1}/
+            /#{$1} \(type\: /
           when "deprecation warning"
             /deprecated/
           when "the key information"
-            /Name:.*Type:.*Fingerprint:/m
+            /type: .*?\n\s*-+\n\s*Fingerprint: /m
           end
   includes = case includes
              when "does not"

data/features/support/before_hooks.rb

@@ -1,5 +1,4 @@
 Before('@clean') do
-  puts "Cleaning applications and keys now"
   clean_applications(true)
 end
 

data/features/support/env.rb

@@ -4,10 +4,12 @@ require 'rhc/coverage_helper'
 SimpleCov.at_exit{ SimpleCov.result.format! } if defined? SimpleCov
 
 require 'rhc_helper'
-require 'rhc/rest'
+require 'rhc'
 require 'rhc/config'
+require 'rhc/commands'
 require 'rhc/helpers'
 require 'rhc/commands'
+require 'pry' if ENV['PRY']
 
 def set_path
   ENV["PATH"] = "#{ENV['RHC_LOCAL_PATH']}:#{ENV['PATH']}" if ENV['RHC_LOCAL_PATH']
@@ -97,7 +99,7 @@ def clean_applications(leave_domain = false)
 
   users.each do |user|
     _log "\tUser: #{user}"
-    client = RHC::Rest::Client.new($end_point, user, $password)
+    client = RHC::Rest::Client.new(:url => $end_point, :user => user, :password => $password, :verify_mode => OpenSSL::SSL::VERIFY_NONE)
     client.domains.each do |domain|
       _log "\t\tDomain: #{domain.id}"
       domain.applications.each do |app|
@@ -125,7 +127,7 @@ unless ENV['NO_CLEAN']
 
   # Start with a clean config
   _log "  Replacing express.conf with the specified libra_server"
-  File.open(RHC::Config::local_config_path, 'w') {|f| f.write("libra_server=#{URI.parse($end_point).host}") }
+  File.open(RHC::Config::local_config_path, 'w') {|f| f.write("libra_server=#{URI.parse($end_point).host}\ninsecure=true") }
   RHC::Config.initialize
 
   # Clean up temp dir

data/lib/rhc-common.rb

@@ -13,7 +13,7 @@ require 'rhc/rest'
 require 'rhc/helpers'
 require 'rhc/config'
 require 'rhc/wizard'
-require 'rhc/targz'
+require 'rhc/tar_gz'
 require 'rhc/json'
 
 module RHC

data/lib/rhc.rb

@@ -2,24 +2,25 @@
 # FIXME Remove rubygems from requirements, ensure library is correct
 
 # Only require external gem dependencies here
-require 'rest_client'
 require 'logger'
+require 'pp'
+
+require 'pry' if ENV['PRY']
 
 # Extend core methods
 require 'rhc/core_ext'
 
 module RHC
-  autoload :Helpers,        'rhc/helpers'
-  autoload :Rest,           'rhc/rest'
-  autoload :HelpFormatter,  'rhc/help_formatter'
+  autoload :Auth,           'rhc/auth'
   autoload :CommandRunner,  'rhc/command_runner'
-  autoload :VERSION,        'rhc/version'
   autoload :Commands,       'rhc/commands'
   autoload :Config,         'rhc/config'
+  autoload :Helpers,        'rhc/helpers'
+  autoload :HelpFormatter,  'rhc/help_formatter'
+  autoload :Rest,           'rhc/rest'
+  autoload :TarGz,          'rhc/tar_gz'
+  autoload :VERSION,        'rhc/version'
 end
 
 require 'rhc/exceptions'
 
-# Replace me with proper autoloads on the module RHC
-require 'rhc-common'
-

data/lib/rhc/auth.rb

@@ -0,0 +1,3 @@
+module RHC::Auth
+  autoload :Basic, 'rhc/auth/basic'
+end

data/lib/rhc/auth/basic.rb

@@ -0,0 +1,54 @@
+module RHC::Auth
+  class Basic
+    attr_reader :cookie
+
+    def initialize(*args)
+      if args[0].is_a?(String) or args.length > 1
+        @username, @password = args
+      else
+        @options = args[0] || Commander::Command::Options.new
+        @username = options[:rhlogin]
+        @password = options[:password]
+        @no_interactive = options[:noprompt]
+      end
+      @skip_interactive = !@password.nil?
+    end
+
+    def to_request(request)
+      (request[:cookies] ||= {})[:rh_sso] = cookie if cookie
+      request[:user] ||= username || (request[:lazy_auth] != true && ask_username) || nil
+      request[:password] ||= password || (username? && request[:lazy_auth] != true && ask_password) || nil
+      request
+    end
+
+    def retry_auth?(response)
+      if response.status == 401
+        @cookie = nil
+        error "Username or password is not correct" if username? && password
+        unless @skip_interactive or @no_interactive
+          ask_username unless username?
+          ask_password
+          true
+        end
+      else
+        @cookie ||= Array(response.cookies).inject(nil){ |v, c| c.name == 'rh_sso' ? c.value : v }
+        false
+      end
+    end
+
+    protected
+      include RHC::Helpers
+      attr_reader :options, :username, :password
+
+      def ask_username
+        @username = ask("Login to #{openshift_server}: ") unless @no_interactive
+      end
+      def ask_password
+        @password = ask("Password: ") { |q| q.echo = '*' } unless @no_interactive
+      end
+
+      def username?
+        username.present?
+      end
+  end
+end