rhc 1.7.8 → 1.8.9

data/lib/rhc/commands/tail.rb

@@ -12,17 +12,19 @@ module RHC::Commands
     option ["-n", "--namespace NAME"], "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 ["-g", "--gear ID"], "Tail only a specific gear"
     #option ["-c", "--cartridge name"], "Tail only a specific cartridge"
     alias_action :"app tail", :root_command => true, :deprecated => true
     def run(app_name)
       rest_app = rest_client.find_application(options.namespace, app_name, :include => :cartridges)
+      ssh_url = options.gear ? rest_app.gear_ssh_url(options.gear) : rest_app.ssh_url
 
-      tail('*', URI(rest_app.ssh_url), options)
+      tail('*', URI(ssh_url), options)
 
       0
     end
 
-    private 
+    private
       #Application log file tailing
       def tail(cartridge_name, ssh_url, options)
         debug "Tail in progress for cartridge #{cartridge_name}"
@@ -30,7 +32,7 @@ module RHC::Commands
         host = ssh_url.host
         uuid = ssh_url.user
 
-        file_glob = options.files ? options.files : "#{cartridge_name}/logs/*"
+        file_glob = options.files ? options.files : "#{cartridge_name}/log*/*"
         remote_cmd = "tail#{options.opts ? ' --opts ' + Base64::encode64(options.opts).chomp : ''} #{file_glob}"
         ssh_cmd = "ssh -t #{uuid}@#{host} '#{remote_cmd}'"
         begin

data/lib/rhc/context_helper.rb

@@ -38,7 +38,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::Rest::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 create-domain'." if domain.nil?
 
       domain.id
     end

data/lib/rhc/exceptions.rb

@@ -140,4 +140,16 @@ module RHC
       super "The server does not support this command (requires #{min_version}, found #{current_version})."
     end
   end
+
+  class OperationNotSupportedException < Exception
+    def initialize(message="This operation is not supported by the server.")
+      super message, 1
+    end
+  end
+
+  class InvalidURIException < Exception
+    def initialize(uri)
+      super "Invalid URI specified: #{uri}"
+    end
+  end
 end

data/lib/rhc/helpers.rb

@@ -140,16 +140,30 @@ module RHC
       s =~ %r(^http(?:s)?://) ? URI(s).host : s
     end
     def to_uri(s)
-      URI(s =~ %r(^http(?:s)?://) ? s : "https://#{s}")
+      begin
+        URI(s =~ %r(^http(?:s)?://) ? s : "https://#{s}")
+      rescue URI::InvalidURIError
+        raise RHC::InvalidURIException.new(s)
+      end
+    end
+
+    def ssh_string(ssh_url)
+      return nil if ssh_url.nil?
+      uri = URI.parse(ssh_url)
+      "#{uri.user}@#{uri.host}"
+    rescue => e
+      RHC::Helpers.debug_error(e)
+      ssh_url
     end
+
     def openshift_rest_endpoint
       uri = to_uri((options.server rescue nil) || ENV['LIBRA_SERVER'] || "openshift.redhat.com")
       uri.path = '/broker/rest/api' if uri.path.blank? || uri.path == '/'
       uri
     end
-    
+
     def token_for_user
-      options.token or (token_store.get(options.rhlogin, options.server) if options.rhlogin)
+      options.token or (token_store.get(options.rhlogin, options.server) if options.rhlogin && options.use_authorization_tokens)
     end
 
     def client_from_options(opts)
@@ -338,7 +352,7 @@ module RHC
         end
       end
     end
-    
+
     def with_tolerant_encoding(&block)
       # :nocov:
       if RUBY_VERSION.to_f >= 1.9

data/lib/rhc/highline_extensions.rb

@@ -24,7 +24,14 @@ class HighLineExtension < HighLine
       template  = ERB.new(statement, nil, "%")
       statement = template.result(binding)
 
-      statement = statement.textwrap_ansi(@wrap_at, false).join("#{indentation}\n") unless @wrap_at.nil?
+      if @wrap_at
+        statement = statement.textwrap_ansi(@wrap_at, false)
+        if @last_line_open && statement.length > 1
+          @last_line_open = false
+          @output.puts
+        end
+        statement = statement.join("#{indentation}\n") 
+      end
       statement = send(:page_print, statement) unless @page_at.nil?
 
       @output.print(indentation) unless @last_line_open
@@ -33,7 +40,7 @@ class HighLineExtension < HighLine
         if statement[-1, 1] == " " or statement[-1, 1] == "\t"
           @output.print(statement)
           @output.flush
-          true
+          statement.strip_ansi.length + (@last_line_open || 0)
         else
           @output.puts(statement)
           false
@@ -309,7 +316,7 @@ class HighLine::Table
     end
 
     def columns
-      @columns ||= source_rows.map(&:length).max
+      @columns ||= source_rows.map(&:length).max || 0
     end
 
     def column_widths
@@ -396,7 +403,7 @@ class HighLine::Table
           
         body = (header_rows + source_rows).inject([]) do |a,row| 
           row = row.zip(widths).map{ |column,w| w && w > 0 ? column.textwrap_ansi(w, false) : [column] }
-          row.map(&:length).max.times do |i|
+          (row.map(&:length).max || 0).times do |i|
             a << (fmt % row.map{ |r| r[i] }).rstrip
           end
           a

data/lib/rhc/rest/application.rb

@@ -21,11 +21,20 @@ module RHC
         carts.delete_if{|x| scales_with.include?(x.name)}
       end
 
-      def add_cartridge(name, options={})
+      def add_cartridge(cart, options={})
         debug "Adding cartridge #{name}"
-        @cartridges = nil
-        attributes['cartridges'] = nil
-        rest_method "ADD_CARTRIDGE", {:name => name}, options
+        clear_attribute :cartridges
+        rest_method(
+          "ADD_CARTRIDGE",
+          if cart.is_a? String 
+            {:name => cart}
+          elsif cart.respond_to? :[]
+            cart
+          else
+            cart.url ? {:url => cart.url} : {:name => cart.name}
+          end,
+          options
+        )
       end
 
       def cartridges
@@ -47,6 +56,13 @@ module RHC
         rest_method "GET_GEAR_GROUPS"
       end
 
+      def gear_ssh_url(gear_id)
+        gear = gear_groups.map { |group| group.gears }.flatten.find { |g| g['id'] == gear_id }
+
+        raise ArgumentError.new("Gear #{gear_id} not found") if gear.nil?
+        gear['ssh_url'] or raise OperationNotSupportedException.new("The server does not support per gear operations")
+      end
+
       def tidy
         debug "Starting application #{name}"
         rest_method 'TIDY', :event => "tidy"
@@ -111,7 +127,7 @@ module RHC
           if aliases.nil? or not aliases.is_a?(Array)
             supports?('LIST_ALIASES') ? rest_method("LIST_ALIASES") : []
           else
-            aliases.map do |a| 
+            aliases.map do |a|
               Alias.new(a.is_a?(String) ? {'id' => a} : a, client)
             end
           end
@@ -173,11 +189,7 @@ module RHC
       end
 
       def ssh_string
-        uri = URI.parse(ssh_url)
-        "#{uri.user}@#{uri.host}"
-      rescue => e
-        RHC::Helpers.debug_error(e)
-        ssh_url
+        RHC::Helpers.ssh_string(ssh_url)
       end
 
       def <=>(other)

data/lib/rhc/rest/attributes.rb

@@ -10,6 +10,11 @@ module RHC::Rest::Attributes
   def attribute(name)
     instance_variable_get("@#{name}") || attributes[name.to_s]
   end
+
+  def clear_attribute(name)
+    v = instance_variable_set("@#{name}", nil)
+    attributes.delete(name.to_s) or v 
+  end
 end
 
 module RHC::Rest::AttributesClass

data/lib/rhc/rest/cartridge.rb

@@ -3,15 +3,24 @@ module RHC
     class Cartridge < Base
       HIDDEN_TAGS = [:framework, :web_framework, :cartridge].map(&:to_s)
 
-      define_attr :type, :name, :display_name, :properties, :gear_profile, :status_messages, :scales_to, :scales_from, :scales_with, :current_scale, :supported_scales_to, :supported_scales_from, :tags, :description, :collocated_with, :base_gear_storage, :additional_gear_storage
+      define_attr :type, :name, :display_name, :properties, :gear_profile, :status_messages, :scales_to, :scales_from, :scales_with, :current_scale, :supported_scales_to, :supported_scales_from, :tags, :description, :collocated_with, :base_gear_storage, :additional_gear_storage, :url
 
       def scalable?
         supported_scales_to != supported_scales_from
       end
 
+      def custom?
+        url.present?
+      end
+
       def only_in_new?
         type == 'standalone'
       end
+
+      def only_in_existing?
+        type == 'embedded'
+      end
+
       def shares_gears?
         Array(collocated_with).present?
       end
@@ -28,7 +37,14 @@ module RHC
       end
 
       def display_name
-        attribute(:display_name) || name
+        attribute(:display_name) || name || url_basename
+      end
+
+      #
+      # Use this value when the user should interact with this cart via CLI arguments
+      #
+      def short_name
+        name || url
       end
 
       def usage_rate?
@@ -113,6 +129,20 @@ module RHC
         return 1  if type == 'standalone' && other.type != 'standalone'
         name <=> other.name
       end
+
+      def url_basename
+        uri = URI.parse(url)
+        name = uri.fragment
+        name = Rack::Utils.parse_nested_query(uri.query)['name'] if name.blank? && uri.query
+        name = File.basename(uri.path) if name.blank? && uri.path.present? && uri.path != '/'
+        name.presence || url
+      rescue 
+        url
+      end
+
+      def self.for_url(url)
+        new 'url' => url
+      end
     end
   end
 end

data/lib/rhc/rest/domain.rb

@@ -15,7 +15,13 @@ module RHC
         payload = {:name => name}
         options.each{ |key, value| payload[key.to_sym] = value }
 
-        cartridges = Array(payload.delete(:cartridge)).concat(Array(payload.delete(:cartridges))).compact.uniq
+        cartridges = Array(payload.delete(:cartridge)).concat(Array(payload.delete(:cartridges))).map do |cart|
+            if cart.is_a? String or cart.respond_to? :[]
+              cart
+            else
+              cart.url ? {:url => cart.url} : cart.name
+            end
+          end.compact.uniq
         if client.api_version_negotiated >= 1.3
           payload[:cartridges] = cartridges
         else

data/lib/rhc/rest/gear_group.rb

@@ -1,7 +1,7 @@
 module RHC
   module Rest
     class GearGroup < Base
-      define_attr :gears, :cartridges
+      define_attr :gears, :cartridges, :gear_profile
     end
   end
 end

data/lib/rhc/rest/mock.rb

@@ -392,12 +392,13 @@ module RHC::Rest::Mock
        ['UPDATE',   "domains/#{domain_id}/apps/#{app_id}/aliases/#{alias_id}/update", 'post' ]]
     end
 
-    def mock_cartridge_response(cart_count=1)
+    def mock_cartridge_response(cart_count=1, url=false)
       carts = []
       while carts.length < cart_count
         carts << {
           :name  => "mock_cart_#{carts.length}",
-          :type  => "mock_cart_#{carts.length}_type",
+          :url   => url ? "http://a.url/#{carts.length}" : nil,
+          :type  => carts.empty? ? 'standalone' : 'embedded',
           :links => mock_response_links(mock_cart_links('mock_domain','mock_app',"mock_cart_#{carts.length}"))
         }
       end
@@ -427,7 +428,7 @@ module RHC::Rest::Mock
         :status => 200
       }
     end
-    
+
     def mock_gear_groups_response()
       groups = [{}]
       type  = 'gear_groups'
@@ -608,7 +609,8 @@ module RHC::Rest::Mock
     def initialize(client=nil)
       super({}, client)
       @cartridges = [{'name' => 'fake_geargroup_cart-0.1'}]
-      @gears = [{'state' => 'started', 'id' => 'fakegearid'}]
+      @gears = [{'state' => 'started', 'id' => 'fakegearid', 'ssh_url' => 'ssh://fakegearid@fakesshurl.com'}]
+      @gear_profile = 'small'
     end
   end
 
@@ -689,9 +691,22 @@ module RHC::Rest::Mock
       @domain.applications.delete self
     end
 
-    def add_cartridge(name, embedded=true)
+    def add_cartridge(cart, embedded=true)
+      name, url = 
+        if cart.is_a? String
+          [cart, nil]
+        elsif cart.respond_to? :[]
+          [cart[:name] || cart['name'], cart[:url] || cart['url']]
+        elsif RHC::Rest::Cartridge === cart
+          [cart.name, cart.url]
+        end
+
       type = embedded ? "embedded" : "standalone"
       c = MockRestCartridge.new(client, name, type, self)
+      if url 
+        c.url = url
+        c.name = c.url_basename
+      end
       c.properties << {'name' => 'prop1', 'value' => 'value1', 'description' => 'description1' }
       @cartridges << c
       c.messages << "Cartridge added with properties"

data/lib/rhc/wizard.rb

@@ -389,7 +389,7 @@ module RHC
           paragraph do
             say "Your namespace is unique to your account and is the suffix of the " \
                 "public URLs we assign to your applications. You may configure your " \
-                "namespace here or leave it blank and use 'rhc domain create' to " \
+                "namespace here or leave it blank and use 'rhc create-domain' to " \
                 "create a namespace later.  You will not be able to create " \
                 "applications without first creating a namespace."
           end
@@ -420,10 +420,10 @@ module RHC
         else
           info "none"
 
-          paragraph{ say "Run 'rhc app create' to create your first application." }
+          paragraph{ say "Run 'rhc create-app' to create your first application." }
           paragraph do
             say table(standalone_cartridges.sort {|a,b| a.display_name <=> b.display_name }.map do |cart|
-              [' ', cart.display_name, "rhc app create <app name> #{cart.name}"]
+              [' ', cart.display_name, "rhc create-app <app name> #{cart.name}"]
             end)
           end
         end
@@ -514,7 +514,7 @@ module RHC
     def config_namespace(namespace)
       # skip if string is empty
       if namespace_optional? and (namespace.nil? or namespace.chomp.blank?)
-        paragraph{ info "You may create a namespace later through 'rhc domain create'" }
+        paragraph{ info "You may create a namespace later through 'rhc create-domain'" }
         return true
       end
 

data/spec/rhc/auth_spec.rb

@@ -422,6 +422,8 @@ describe RHC::Auth::TokenStore do
     before{ subject.put('foo', 'bar', 'token') }
     it("can be retrieved"){ subject.get('foo', 'bar').should == 'token' }
   end
+
+  it("should handle missing files"){ subject.get('foo', 'other').should be_nil }
   it("should put a file on disk"){ expect{ subject.put('test', 'server', 'value') }.to change{ Dir.entries(dir).length }.by(1) }
 
   describe "#clear" do

data/spec/rhc/command_spec.rb

@@ -118,7 +118,7 @@ describe RHC::Commands::Base do
             alias_action :exe, :deprecated => true
             def execute(testarg); 1; end
 
-            argument :args, "Test arg list", ['--tests'], :arg_type => :list
+            argument :args, "Test arg list", ['--tests ARG'], :arg_type => :list
             summary "Test command execute-list"
             def execute_list(args); 1; end
 
@@ -185,6 +185,7 @@ describe RHC::Commands::Base do
         it { expects_running('static-execute-list', '--trace').should call(:execute_list).on(instance).with([]) }
         it { expects_running('static-execute-list', '1', '2', '3').should call(:execute_list).on(instance).with(['1', '2', '3']) }
         it { expects_running('static-execute-list', '1', '2', '3').should call(:execute_list).on(instance).with(['1', '2', '3']) }
+        it('should make the option an array') { expects_running('static-execute-list', '--tests', '1').should call(:execute_list).on(instance).with(['1']) }
         it('should make the option available') { command_for('static-execute-list', '1', '2', '3').send(:options).tests.should == ['1','2','3'] }
       end
 
@@ -305,6 +306,7 @@ describe RHC::Commands::Base do
 
         context "when tokens are not allowed" do
           it("calls the server") { rest_client.send(:auth).is_a? RHC::Auth::Basic }
+          it("does not have a token set") { command_for(*arguments).send(:token_for_user).should be_nil }
         end
 
         context "when tokens are allowed" do

data/spec/rhc/commands/app_spec.rb

@@ -195,6 +195,14 @@ describe RHC::Commands::App do
       after{ rest_client.domains.first.applications.first.cartridges.find{ |c| c.name == 'mock_cart-1' }.should be_true }
     end
 
+    context 'when run with a cart URL' do
+      let(:arguments) { ['app', 'create', 'app1', 'http://foo.com', 'mock_cart-1', '--noprompt', '-p',  'password'] }
+      it { expect { run }.to exit_with_code(0) }
+      it { run_output.should match("Success") }
+      it { run_output.should match("Cartridges: http://foo.com, mock_cart-1\n") }
+      after{ rest_client.domains.first.applications.first.cartridges.find{ |c| c.url == 'http://foo.com' }.should be_true }
+    end
+
     context 'when run with a git url' do
       let(:arguments) { ['app', 'create', 'app1', 'mock_standalone_cart-1', '--from', 'git://url', '--noprompt', '-p',  'password'] }
       it { expect { run }.to exit_with_code(0) }
@@ -253,6 +261,16 @@ describe RHC::Commands::App do
       let(:arguments) { ['app', 'create', 'app1', 'unique_standalone', 'mock_standalone_cart', '--trace', '--noprompt'] }
       it { expect { run }.to raise_error(RHC::MultipleCartridgesException, /You must select only a single web cart/) }
     end
+    context 'when I pick a custom URL cart' do
+      let(:arguments) { ['app', 'create', 'app1', 'http://foo.com', '--trace', '--noprompt'] }
+      it('tells me about custom carts') { run_output.should match("The cartridge 'http://foo.com' will be downloaded") }
+      it('lists the cart using the short_name') { run_output.should match(%r(Cartridges:\s+http://foo.com$)) }
+    end    
+    context 'when I pick a custom URL cart and a web cart' do
+      let(:arguments) { ['app', 'create', 'app1', 'http://foo.com', 'unique_standalone', '--trace', '--noprompt'] }
+      it('tells me about custom carts') { run_output.should match("The cartridge 'http://foo.com' will be downloaded") }
+      it('lists the carts using the short_name') { run_output.should match(%r(Cartridges:\s+http://foo.com, mock_unique_standalone_cart-1$)) }
+    end    
   end
 
   describe 'app create enable-jenkins' do
@@ -539,7 +557,7 @@ describe RHC::Commands::App do
         @domain = rest_client.add_domain("mockdomain")
         @domain.add_application("app1", "mock_type")
       end
-      it { run_output.should match("fakegearid started fake_geargroup_cart-0.1") }
+      it { run_output.should match("fakegearid started fake_geargroup_cart-0.1 small fakegearid@fakesshurl.com") }
     end
   end