rhc 1.4.8 → 1.5.13

data/lib/rhc/commands/git_clone.rb

@@ -17,9 +17,8 @@ module RHC::Commands
     # TODO: Implement default values for arguments once ffranz has added context arguments
     # argument :directory, "The name of a new directory to clone into", [], :default => nil
     def run(app_name)
-      domain = rest_client.find_domain(options.namespace)
-      app = domain.find_application(app_name)
-      git_clone_application(app)
+      rest_app = rest_client.find_application(options.namespace, app_name)
+      git_clone_application(rest_app)
 
       0
     end

data/lib/rhc/commands/port_forward.rb

@@ -14,21 +14,19 @@ module RHC::Commands
       @service     = service
       @remote_host = remote_host
       @port_to     = port_to
-      @host_from   = mac? ? "localhost" : remote_host # forward locally on a Mac
+      @host_from   = '127.0.0.1'
       @port_from   = port_from || port_to # match ports if possible
       @bound       = false
     end
 
     def to_cmd_arg
       # string to be used in a direct SSH command
-      mac? ? "-L #{port_from}:#{remote_host}:#{port_to}" : "-L #{remote_host}:#{port_from}:#{remote_host}:#{port_to}"
+      "-L #{port_from}:#{remote_host}:#{port_to}"
     end
 
     def to_fwd_args
       # array of arguments to be passed to Net::SSH::Service::Forward#local
-      args = [port_from.to_i, remote_host, port_to.to_i]
-      args.unshift(remote_host) unless mac?
-      args
+      [port_from.to_i, remote_host, port_to.to_i]
     end
 
     def bound?
@@ -75,9 +73,7 @@ module RHC::Commands
     option ["-n", "--namespace namespace"], "Namespace of the application you are port forwarding to", :context => :namespace_context, :required => true
     argument :app, "Application you are port forwarding to (required)", ["-a", "--app app"]
     def run(app)
-
-      rest_domain = rest_client.find_domain options.namespace
-      rest_app = rest_domain.find_application app
+      rest_app = rest_client.find_application(options.namespace, app)
 
       ssh_uri = URI.parse(rest_app.ssh_url)
       say "Using #{rest_app.ssh_url}..." if options.debug
@@ -134,8 +130,8 @@ module RHC::Commands
                     debug args.inspect
                     ssh.forward.local(*args)
                     fs.bound = true
-                  rescue Errno::EADDRINUSE
-                    debug "trying local port #{fs.port_from}"
+                  rescue Errno::EADDRINUSE, Errno::EACCES => e
+                    warn "#{e} while forwarding port #{fs.port_from}. Trying local port #{fs.port_from+1}"
                     fs.port_from += 1
                   rescue Timeout::Error, Errno::EADDRNOTAVAIL, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Net::SSH::AuthenticationFailed => e
                     given_up = true
@@ -145,10 +141,13 @@ module RHC::Commands
 
               bound_ports = forwarding_specs.select(&:bound?)
               if bound_ports.length > 0
+                paragraph {
+                  say "To connect to a service running on OpenShift, use the Local address"
+                }
                 items = bound_ports.map do |fs|
                   [fs.service, "#{fs.host_from}:#{fs.port_from}", " => ", "#{fs.remote_host}:#{fs.port_to.to_s}"]
                 end
-                table(items, :header => ["Service", "Connect to", "    ", "Forward to"]).each { |s| success "  #{s}" }
+                table(items, :header => ["Service", "Local", "    ", "OpenShift"]).each { |s| success "  #{s}" }
               end
 
               # for failed port forwarding attempts

data/lib/rhc/commands/setup.rb

@@ -16,14 +16,17 @@ module RHC::Commands
       .openshift/express.conf file in your home directory. If you run 
       setup at a later time, any previous configuration will be reused.
 
-
       Pass the --clean option to ignore your saved configuration and only
       use options you pass on the command line. Pass --config FILE to use
       default values from another config (the values will still be written
       to .openshift/express.conf).
+
+      If the server supports authorization tokens, you may pass the 
+      --create-token option to instruct the wizard to generate a key for you.
       DESC
     option ["--server NAME"], "Hostname of an OpenShift server", :context => :server_context, :required => true
     option ['--clean'], "Ignore any saved configuration options"
+    option ['--[no-]create-token'], "Create an authorization token for this server"
     def run
       raise OptionParser::InvalidOption, "Setup can not be run with the --noprompt option" if options.noprompt
       RHC::RerunWizard.new(config, options).run ?  0 : 1

data/lib/rhc/commands/snapshot.rb

@@ -14,7 +14,8 @@ module RHC::Commands
     argument :app, "Application you are saving a snapshot (required)", ["-a", "--app app"]
     alias_action :"app snapshot save", :root_command => true, :deprecated => true
     def save(app)
-      ssh_uri = URI.parse(rest_client.find_domain(options.namespace).find_application(app).ssh_url)
+      rest_app = rest_client.find_application(options.namespace, app)
+      ssh_uri = URI.parse(rest_app.ssh_url)
       filename = options.filepath ? options.filepath : "#{app}.tar.gz"
 
       ssh_cmd = "ssh #{ssh_uri.user}@#{ssh_uri.host} 'snapshot' > #{filename}"
@@ -64,8 +65,8 @@ module RHC::Commands
       if File.exists? filename
 
         include_git = RHC::Helpers.windows? ? true : RHC::TarGz.contains(filename, './*/git')
-
-        ssh_uri = URI.parse(rest_client.find_domain(options.namespace).find_application(app).ssh_url)
+        rest_app = rest_client.find_application(options.namespace, app)
+        ssh_uri = URI.parse(rest_app.ssh_url)
 
         ssh_cmd = "cat #{filename} | ssh #{ssh_uri.user}@#{ssh_uri.host} 'restore#{include_git ? ' INCLUDE_GIT' : ''}'"
 

data/lib/rhc/commands/tail.rb

@@ -12,13 +12,12 @@ module RHC::Commands
     option ["-n", "--namespace namespace"], "Namespace of your application", :context => :namespace_context, :required => true
     option ["-o", "--opts options"], "Options to pass to the server-side (linux based) tail command (applicable to tail command only) (-f is implicit.  See the linux tail man page full list of options.) (Ex: --opts '-n 100')"
     option ["-f", "--files files"], "File glob relative to app (default <application_name>/logs/*) (optional)"
+    #option ["-c", "--cartridge name"], "Tail only a specific cartridge"
     alias_action :"app tail", :root_command => true, :deprecated => true
     def run(app_name)
-      domain = rest_client.find_domain(options.namespace)
-      app = domain.find_application(app_name)
-      cartridges = app.cartridges
+      rest_app = rest_client.find_application(options.namespace, app_name, :include => :cartridges)
 
-      tail(cartridges.first.name, URI(app.ssh_url), options)
+      tail('*', URI(rest_app.ssh_url), options)
 
       0
     end

data/lib/rhc/commands/threaddump.rb

@@ -6,8 +6,7 @@ module RHC::Commands
     option ["-n", "--namespace namespace"], "Namespace of your application", :context => :namespace_context, :required => true
     argument :app, "Name of the application on which to execute the thread dump", ["-a", "--app name"]
     def run(app)
-      rest_domain = rest_client.find_domain(options.namespace)
-      rest_app = rest_domain.find_application(app)
+      rest_app = rest_client.find_application(options.namespace, app)
       rest_app.threaddump.messages.each { |m| say m }
 
       0

data/lib/rhc/commands.rb

@@ -40,6 +40,8 @@ module Commander
             if sw = opts.send(:search, :long, key.to_s.gsub(/_/, '-'))
               _, cb, val = sw.send(:conv_arg, nil, value) {|*exc| raise(*exc) }
               cb.call(val) if cb
+            else
+              proxy_options << [key, value]
             end
           end
         end
@@ -62,13 +64,34 @@ end
 #
 module Commander
   class Command
+    remove_const(:Options)
     class Options
       def initialize(init=nil)
         @table = {}
         default(init) if init
       end
+      def respond_to?(meth)
+        super || meth.to_s =~ /^\w+(=)?$/
+      end
       def method_missing meth, *args, &block
-        meth.to_s =~ /=$/ ? self[meth.to_s.chop] = args.first : self[meth]
+        if meth.to_s =~ /^\w+=$/
+          raise ArgumentError, "Options does not support #{meth} without a single argument" if args.length != 1
+          self[meth.to_s.chop] = args.first
+        elsif meth.to_s =~ /^\w+$/
+          if !@table.has_key?(meth)
+            begin; return super; rescue NoMethodError; nil; end
+          end
+          raise ArgumentError, "Options does not support #{meth} with arguments" if args.length != 0
+          self[meth]
+        else
+          super
+        end
+      end
+      def respond_to_missing?(meth, private_method = false)
+        meth.to_s =~ /^\w+(=)?$/
+      end
+      def ==(other)
+        __hash__ == other.__hash__
       end
       def []=(meth, value)
         @table[meth.to_sym] = value
@@ -84,6 +107,9 @@ module Commander
       def __replace__(options)
         @table = __to_hash__(options).dup
       end
+      def __hash__
+        @table
+      end
       def __to_hash__(obj)
         Options === obj ? obj.__hash__ : obj
       end
@@ -105,7 +131,7 @@ module RHC
       commands[opts[:name]] = opts
     end
     def self.global_option(*args, &block)
-      global_options << [args, block]
+      global_options << [args.freeze, block]
     end
 
     def self.deprecated?
@@ -134,6 +160,7 @@ module RHC
 
     def self.to_commander(instance=Commander::Runner.instance)
       global_options.each do |args, block|
+        args = args.dup
         opts = (args.pop if Hash === args.last) || {}
         option = instance.global_option(*args, &block).last
         option.merge!(opts)
@@ -148,7 +175,7 @@ module RHC
           (options_metadata = opts[:options] || []).each do |o|
             option_data = [o[:switches], o[:description]].flatten(1)
             c.option *option_data
-            o[:arg] = Commander::Runner.switch_to_sym(o[:switches].last)
+            o[:arg] = Commander::Runner.switch_to_sym(Array(o[:switches]).last)
           end
 
           deprecated[name.to_sym] = opts[:deprecated] unless opts[:deprecated].nil?
@@ -202,6 +229,13 @@ module RHC
       end
 
       def self.fill_arguments(cmd, options, args_metadata, options_metadata, args)
+        Commander::Runner.instance.options.each do |opt|
+          if opt[:context]
+            arg = Commander::Runner.switch_to_sym(opt[:switches].last)
+            options[arg] ||= lambda{ cmd.send(opt[:context]) }
+          end
+        end
+
         # process options
         options_metadata.each do |option_meta|
           arg = option_meta[:arg]

data/lib/rhc/config.rb

@@ -52,6 +52,8 @@ module RHC
       :server =>      ['libra_server', nil, 'The OpenShift server to connect to'],
       :rhlogin =>     ['default_rhlogin', nil, 'Your OpenShift login name'],
       :password =>    nil,
+      :use_authorization_tokens =>
+                      [nil, :boolean, 'If true, the server will attempt to create and use authorization tokens to connect to the server'],
       :timeout =>     [nil, :integer, 'The default timeout for network operations'],
       :insecure =>    [nil, :boolean, "If true, certificate errors will be ignored.\nWARNING: This may allow others to eavesdrop on your communication with OpenShift."],
       :ssl_version => [nil, nil, 'The SSL protocol version to use when connecting to this server'],
@@ -133,7 +135,14 @@ module RHC
           opts = Array(opts)
           value = self[opts[0] || name.to_s]
           if value
-            value = value unless value.blank?
+            value = case opts[1]
+                    when :integer
+                      Integer(value)
+                    when :boolean
+                      !!(value =~ /^\s*(y|yes|1|t|true)\s*$/i)
+                    else
+                      value unless value.blank?
+                    end
             h[name] = value unless value.nil?
           end
           h

data/lib/rhc/context_helper.rb

@@ -12,6 +12,10 @@ module RHC
       ENV['LIBRA_SERVER'] || (!options.clean && config['libra_server']) || "openshift.redhat.com"
     end
 
+    def token_context
+      token_store.get(options.rhlogin, options.server) if options.rhlogin
+    end
+
     def app_context
       debug "Getting app context"
 
@@ -38,7 +42,7 @@ module RHC
       # right now we don't have any logic since we only support one domain
       # TODO: add domain lookup based on uuid
       domain = rest_client.domains.first
-      raise RHC::DomainNotFoundException, "No domains configured for this user.  You may create one using 'rhc domain create'." if domain.nil?
+      raise RHC::Rest::DomainNotFoundException, "No domains configured for this user.  You may create one using 'rhc domain create'." if domain.nil?
 
       domain.id
     end

data/lib/rhc/core_ext.rb

@@ -49,6 +49,16 @@ unless HTTP::Message.method_defined? :ok?
   #:nocov:
 end
 
+unless DateTime.method_defined? :to_time 
+  #:nocov:
+  class DateTime
+    def to_time
+      Time.parse(to_s)
+    end
+  end
+  #:nocov:
+end
+
 #
 # Allow http => https redirection, see 
 # http://bugs.ruby-lang.org/issues/859 to 1.8.7 for rough

data/lib/rhc/exceptions.rb

@@ -13,18 +13,6 @@ module RHC
     end
   end
 
-  class DomainNotFoundException < Exception
-    def initialize(message="Domain not found")
-      super message, 127
-    end
-  end
-
-  class ApplicationNotFoundException < Exception
-    def initialize(message="Application not found")
-      super message, 101
-    end
-  end
-
   class CartridgeNotFoundException < Exception
     def initialize(message="Cartridge not found")
       super message, 154

data/lib/rhc/git_helpers.rb

@@ -1,4 +1,5 @@
   require 'open4'
+require 'fileutils'
 
 module RHC
   module GitHelpers
@@ -16,6 +17,15 @@ module RHC
         end
     end
 
+    def git_clone_deploy_hooks(repo_dir)
+      debug "Deploy default hooks"
+      Dir.chdir(repo_dir) do |dir|
+        Dir.glob(".openshift/git_hooks/*") do |hook|
+          FileUtils.cp(hook, ".git/hooks/")
+        end
+      end
+    end
+
     def git_clone_application(app)
       repo_dir = options.repo || app.name
 
@@ -29,6 +39,8 @@ module RHC
         git_config_set "rhc.domain-name", app.domain_id
       end
 
+      git_clone_deploy_hooks(repo_dir)
+
       true
     end
 

data/lib/rhc/helpers.rb

@@ -47,7 +47,7 @@ module RHC
 
     def date(s)
       now = Date.today
-      d = datetime_rfc3339(s)
+      d = datetime_rfc3339(s).to_time
       if now.year == d.year
         return d.strftime('%l:%M %p').strip if now.yday == d.yday
         d.strftime('%b %d %l:%M %p')
@@ -58,6 +58,29 @@ module RHC
       "Unknown date"
     end
 
+    def distance_of_time_in_words(from_time, to_time = 0)
+      from_time = from_time.to_time if from_time.respond_to?(:to_time)
+      to_time = to_time.to_time if to_time.respond_to?(:to_time)
+      distance_in_minutes = (((to_time - from_time).abs)/60).round
+      distance_in_seconds = ((to_time - from_time).abs).round
+
+      case distance_in_minutes
+        when 0..1
+          return distance_in_minutes == 0 ?
+                 "less than 1 minute" :
+                 "#{distance_in_minutes} minute"
+
+        when 2..44           then "#{distance_in_minutes} minutes"
+        when 45..89          then "about 1 hour"
+        when 90..1439        then "about #{(distance_in_minutes.to_f / 60.0).round} hours"
+        when 1440..2519      then "about 1 day"
+        when 2520..43199     then "#{(distance_in_minutes.to_f / 1440.0).round} days"
+        when 43200..86399    then "about 1 month"
+        else
+          "about #{(distance_in_minutes.to_f / 43200.0).round} months"
+      end
+    end
+
     def datetime_rfc3339(s)
       DateTime.strptime(s, '%Y-%m-%dT%H:%M:%S%z')
       # Replace with d = DateTime.rfc3339(s)
@@ -74,8 +97,11 @@ module RHC
     #
     # Global config
     #
+
     global_option '-l', '--rhlogin LOGIN', "OpenShift login"
     global_option '-p', '--password PASSWORD', "OpenShift password"
+    global_option '--token TOKEN', "An authorization token for accessing your account.", :context => :token_context
+
     global_option '-d', '--debug', "Turn on debugging", :hide => true
 
     global_option '--server NAME', String, 'An OpenShift server hostname (default: openshift.redhat.com)'
@@ -160,6 +186,9 @@ module RHC
     def debug(msg)
       $stderr.puts "DEBUG: #{msg}" if debug?
     end
+    def debug_error(e)
+      debug "#{e.message} (#{e.class})\n  #{e.backtrace.join("\n  ")}"
+    end
     def debug?
       false
     end
@@ -296,6 +325,7 @@ module RHC
       # Predefined headings (or parts of headings)
       headings.merge!({
         :creation_time  => "Created",
+        :expires_in_seconds => "Expires In",
         :uuid           => "UUID",
         :current_scale  => "Current",
         :scales_from    => "Minimum",

data/lib/rhc/output_helpers.rb

@@ -120,6 +120,17 @@ module RHC
       )
     end
 
+    def display_authorization(auth, default=nil)
+      say_table(
+        auth.note || "<no description>",
+        get_properties(auth, :token, :scopes, :creation_time, :expires_in_seconds),
+        {
+          :delete => true,
+          :color => (:green if auth.token == default),
+        }
+      )
+    end
+
     def format_key_header(key)
       [
         key.name,
@@ -177,9 +188,12 @@ module RHC
       def get_properties(object,*properties)
         properties.map do |prop|
           # Either send the property to the object or yield it
-          value = block_given? ? yield(prop) : object.send(prop)
-          # Some values (like date) need some special handling
-
+          value = begin
+                    block_given? ? yield(prop) : object.send(prop)
+                  rescue ::Exception => e
+                    debug_error(e)
+                    "<error>"
+                  end
           [prop, format_value(prop,value)]
         end
       end
@@ -205,6 +219,8 @@ module RHC
           ((value.nil? or value == 0) ? "None" : "#{value}GB")
         when :aliases
           value.join ', '
+        when :expires_in_seconds
+          distance_of_time_in_words(value)
         else
           case value
           when Array then value.join(', ')

data/lib/rhc/rest/api.rb

@@ -24,7 +24,8 @@ module RHC
             @server_api_versions, links = api_info({
               :url => client.url,
               :method => :get,
-              :headers => {'Accept' => "application/json; version=#{api_version_negotiated}"},
+              :accept => :json,
+              :api_version => api_version_negotiated,
               :lazy_auth => true,
             })
           end

data/lib/rhc/rest/application.rb

@@ -3,8 +3,6 @@ require 'uri'
 module RHC
   module Rest
     class Application < Base
-      include Rest
-
       define_attr :domain_id, :name, :creation_time, :uuid, :aliases,
                   :git_url, :app_url, :gear_profile, :framework,
                   :scalable, :health_check_path, :embedded, :gear_count,
@@ -142,12 +140,15 @@ module RHC
       end
 
       def host
-        @host ||= URI(app_url).host
+        @host ||= URI.parse(app_url).host rescue nil
       end
 
       def ssh_string
-        uri = URI(ssh_url)
+        uri = URI.parse(ssh_url)
         "#{uri.user}@#{uri.host}"
+      rescue => e
+        RHC::Helpers.debug_error(e)
+        ssh_url
       end
 
       def <=>(other)

data/lib/rhc/rest/authorization.rb

@@ -0,0 +1,10 @@
+require 'rhc/rest/base'
+
+module RHC
+  module Rest
+    class Authorization < Base
+      define_attr :token, :note, :expires_in, :expires_in_seconds, :scopes, :created_at
+      alias_method :creation_time, :created_at
+    end
+  end
+end

data/lib/rhc/rest/base.rb

@@ -20,7 +20,8 @@ module RHC
         link = links[link_name.to_s]
         raise "No link defined for #{link_name}" unless link
         url = link['href']
-        method = link['method']
+        url = url.gsub(/:\w+/) { |s| options[:params][s] } if options[:params]
+        method = options[:method] || link['method']
 
         client.request(options.merge({
           :url => url,
@@ -33,6 +34,10 @@ module RHC
         attributes['links'] || {}
       end
 
+      def supports?(sym)
+        links.has_key?(sym.to_s) || links.has_key?(sym.to_s.upcase)
+      end
+
       protected
         attr_reader :client