rhc 1.29.7 → 1.30.2

data/autocomplete/rhc_bash

@@ -8,7 +8,7 @@ _rhc()
   cur="${COMP_WORDS[COMP_CWORD]}"
   if [ $COMP_CWORD -eq 1 ]; then
     if [[ "$cur" == -* ]]; then
-      opts="--always-prefix --clean --config --debug --insecure --limit --mock --noprompt --password --raw --rhlogin --server --ssl-ca-file --ssl-client-cert-file --ssl-version --timeout --token"
+      opts="--always-prefix --clean --config --debug --header --insecure --limit --mock --noprompt --password --raw --rhlogin --server --ssl-ca-file --ssl-client-cert-file --ssl-client-key-file --ssl-version --timeout --token"
     elif [ -z $cur ]; then
       opts="account alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert app app-configure app-create app-delete app-deploy app-force-stop app-reload app-restart app-scale-down app-scale-up app-show app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage deployment deployment-activate deployment-list deployment-show domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show env env-list env-set env-show env-unset git-clone help logout member member-add member-list member-remove member-update port-forward region region-list scp server server-add server-configure server-list server-remove server-show server-status server-use setup snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show tail team team-create team-delete team-leave team-list team-show threaddump"
     else
@@ -86,7 +86,7 @@ _rhc()
 
       "rhc add-server")
         if [[ "$cur" == -* ]]; then
-          opts="--insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --ssl-ca-file --ssl-client-cert-file --ssl-version --timeout --use --use-authorization-tokens"
+          opts="--insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --ssl-ca-file --ssl-client-cert-file --ssl-client-key-file --ssl-version --timeout --use --use-authorization-tokens"
         else
           opts=""
         fi
@@ -774,7 +774,7 @@ _rhc()
 
       "rhc configure-server")
         if [[ "$cur" == -* ]]; then
-          opts="--hostname --insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --ssl-ca-file --ssl-client-cert-file --ssl-version --timeout --use --use-authorization-tokens"
+          opts="--hostname --insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --ssl-ca-file --ssl-client-cert-file --ssl-client-key-file --ssl-version --timeout --use --use-authorization-tokens"
         else
           opts=""
         fi
@@ -1566,7 +1566,7 @@ _rhc()
 
       "rhc server add")
         if [[ "$cur" == -* ]]; then
-          opts="--insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --ssl-ca-file --ssl-client-cert-file --ssl-version --timeout --use --use-authorization-tokens"
+          opts="--insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --ssl-ca-file --ssl-client-cert-file --ssl-client-key-file --ssl-version --timeout --use --use-authorization-tokens"
         else
           opts=""
         fi
@@ -1574,7 +1574,7 @@ _rhc()
 
       "rhc server configure")
         if [[ "$cur" == -* ]]; then
-          opts="--hostname --insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --ssl-ca-file --ssl-client-cert-file --ssl-version --timeout --use --use-authorization-tokens"
+          opts="--hostname --insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --ssl-ca-file --ssl-client-cert-file --ssl-client-key-file --ssl-version --timeout --use --use-authorization-tokens"
         else
           opts=""
         fi
@@ -1622,7 +1622,7 @@ _rhc()
 
       "rhc server-add")
         if [[ "$cur" == -* ]]; then
-          opts="--insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --ssl-ca-file --ssl-client-cert-file --ssl-version --timeout --use --use-authorization-tokens"
+          opts="--insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --ssl-ca-file --ssl-client-cert-file --ssl-client-key-file --ssl-version --timeout --use --use-authorization-tokens"
         else
           opts=""
         fi
@@ -1630,7 +1630,7 @@ _rhc()
 
       "rhc server-configure")
         if [[ "$cur" == -* ]]; then
-          opts="--hostname --insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --ssl-ca-file --ssl-client-cert-file --ssl-version --timeout --use --use-authorization-tokens"
+          opts="--hostname --insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --ssl-ca-file --ssl-client-cert-file --ssl-client-key-file --ssl-version --timeout --use --use-authorization-tokens"
         else
           opts=""
         fi

data/lib/rhc/helpers.rb

@@ -113,6 +113,7 @@ module RHC
     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 '--header HEADER', String,"Custom header to pass to server", :hide => true
     global_option '--limit INTEGER', Integer, "Maximum number of simultaneous operations to execute.", :hide => true
     global_option '--raw', "Do not format the output from the requested operations.", :hide => true
     global_option '--always-prefix', "Include the gear prefix on all output from the server.", :hide => true
@@ -199,11 +200,21 @@ module RHC
       return nil if token_store_user_key.nil?
       token_store.get(token_store_user_key, options.server)
     end
+    
+    def parse_headers(headers)
+      Hash[
+        Array(headers).map do |header|
+          key, value = header.split(/: */, 2)
+          [key, value || ""] if key.presence
+        end.compact
+      ]
+    end
 
     def client_from_options(opts)
       RHC::Rest::Client.new({
           :url => openshift_rest_endpoint.to_s,
           :debug => options.debug,
+          :headers => parse_headers(options.header),
           :timeout => options.timeout,
           :warn => BOUND_WARNING,
         }.merge!(ssl_options).merge!(opts))
@@ -433,7 +444,7 @@ module RHC
           debug("Checking for #{host} from Resolv::Hosts: #{result.inspect}") if debug?
           result
         rescue => e
-          debug "Error while resolving with Resolv::Hosts: #{e.message}(#{e.class})\n  #{e.backtrace.join("\n  ")}"
+          debug "Application could not be resolved through Hosts file:  #{e.message}(#{e.class})\n #{e.backtrace.join("\n ")}\n Attempting DNS resolution."
         end
       end
     end

data/spec/rhc/helpers_spec.rb

@@ -45,6 +45,17 @@ describe AllRhcHelpers do
 
   it("should decode json"){ subject.decode_json("{\"a\" : 1}").should == {'a' => 1} }
 
+  it("should parse custom headers") {
+    subject.parse_headers(nil).should == {}
+    subject.parse_headers("").should == {}
+    subject.parse_headers("A").should == {"A" => ""}
+    subject.parse_headers("A:B").should == {"A" => "B"}
+    subject.parse_headers("A: B").should == {"A" => "B"}
+    subject.parse_headers(["A: B", "A: C"]).should == {"A" => "C"}
+    subject.parse_headers(["A: B", "C: D"]).should == {"A" => "B", "C" => "D"}
+    subject.parse_headers(["A:B:C"]).should == {"A" => "B:C"}
+  }
+
   shared_examples_for "colorized output" do
     it("should be colorized") do
       message = "this is #{_color} -"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 109
+  hash: 107
   prerelease: 
   segments: 
   - 1
-  - 29
-  - 7
-  version: 1.29.7
+  - 30
+  - 2
+  version: 1.30.2
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-09-02 00:00:00 Z
+date: 2014-09-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh