rhc 0.97.17 → 0.98.16

data/lib/{rhc-rest → rhc/rest}/domain.rb

@@ -1,4 +1,4 @@
-module Rhc
+module RHC
   module Rest
     class Domain
       include Rest

data/lib/{rhc-rest → rhc/rest}/key.rb

@@ -1,4 +1,4 @@
-module Rhc
+module RHC
   module Rest
     class Key
       include Rest
@@ -29,6 +29,16 @@ module Rhc
         return request(request)
       end
       alias :delete :destroy
+      
+      def fingerprint
+        begin
+          public_key = Net::SSH::KeyFactory.load_data_public_key("#{type} #{content}")
+          public_key.fingerprint
+        rescue NotImplementedError, OpenSSL::PKey::PKeyError => e
+          'Invalid key'
+        end
+        
+      end
     end
   end
 end

data/lib/{rhc-rest → rhc/rest}/user.rb

@@ -1,4 +1,4 @@
-module Rhc
+module RHC
   module Rest
     class User
       include Rest

data/lib/rhc/ssh_key_helpers.rb

@@ -39,7 +39,7 @@ module RHC
                                          :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..."
+        say "SSH key already exists: #{ssh_dir}/id_rsa.  Reusing..."
         return nil
       else
         unless File.exists?(ssh_dir)
@@ -60,6 +60,15 @@ module RHC
         File.executable?(File.join(directory, executable.to_s))
       end
     end
+    
+    # Public: Format SSH key's core attributes (name, type, fingerprint)
+    # in a given ERB template
+    # 
+    # key - an object to be formatted
+    # template - ERB template
+    def format(key, template)
+      template.result(binding)
+    end
 
     private
 

data/lib/rhc/targz.rb

@@ -11,17 +11,16 @@ module RHC
 
     def self.contains(filename, search, force_ruby=false)
       
-      return false if ! (File.file? filename and File.basename(filename).downcase =~ /.\.tar\.gz$/i)
+      return false if ! (File.file? filename and File.basename(filename).downcase =~ /.\.t(ar\.)?gz$/i)
 
-      contains = false
+      regex = Regexp.new search
       if RHC::Helpers.windows? or force_ruby
-        search = /#{search.to_s}/ if ! search.is_a?(Regexp)
         begin
           RHC::Vendor::Zlib::GzipReader.open(filename) do |gz|
             Minitar::Reader.open gz do |tar|
               tar.each_entry do |entry|
-                if entry.full_name =~ search
-                  contains = true
+                if entry.full_name =~ regex
+                  return true
                 end
               end
             end
@@ -30,10 +29,10 @@ module RHC
           return false
         end
       else
-        `#{TAR_BIN} --wildcards -tf #{filename} '#{search.to_s}' 2> /dev/null`
-        contains = $?.exitstatus == 0
+        # combining STDOUT and STDERR (i.e., 2>&1) does not suppress output
+        # when the specs run via 'bundle exec rake spec'
+        return system "#{TAR_BIN} --wildcards -tf #{filename} #{regex.source} 2>/dev/null >/dev/null"
       end
-      contains
     end
 
   end

data/lib/rhc/usage_templates/command_help.erb

@@ -1,5 +1,6 @@
 Usage: rhc <%= @command.name %> <%= @command.syntax %>
-<%= @command.description || @command.summary || 'No description.' %>
+
+<%= @command.description || @command.summary %>
 <% unless @actions.nil? or @actions.empty? -%>
 
 List of Actions
@@ -7,17 +8,17 @@ List of Actions
   <%= "%-18s %s\n" % [action[:name], action[:summary]] -%>
 <% end -%>
 <% end -%>
-<% unless @command.options.nil? or @command.options.empty? -%>
+<% unless @command.options.nil? or @command.options.empty? or @command.options.all?{ |o| o[:hide] } -%>
 
 Options for <%= @command.name %>
-<% for option in @command.options -%>
-  <%= "%-25s %s\n" % [option[:switches].join('|'), option[:description]] -%>
+<% for option in @command.options -%><% next if option[:hide] -%>
+  <%= "%-25s %s\n" % [option[:switches].join(', '), option[:description]] -%>
 <% end -%>
 <% end -%>
 
 Global Options
-<% for option in @global_options -%>
-  <%= "%-25s %s\n" % [option[:switches].join('|'), option[:description]] -%>
+<% for option in @global_options -%><% next if option[:hide] -%>
+  <%= "%-25s %s\n" % [option[:switches].join(', '), option[:description]] -%>
 <% end -%>
 <%#-
   Other Attrs we may wish to use:

data/lib/rhc/usage_templates/help.erb

@@ -1,23 +1,20 @@
 Usage: <%= program :name %> (<resource> | --help) [<action>] [<args>]
 <%= program :description %>
 
-List of Resources
-  <%# remove these as they are added to commander%>
-  app                Manage applications within the rhcloud account.
-  sshkey             Manage multiple keys for the registered rhcloud user.
-  port-forward       Forward remote ports to the workstation
+List of Commands and Resources
+  app                Manage applications within the OpenShift account.
 <% for name, command in @commands.sort -%>
-	<%- unless alias? name or name == "help" or name.include?(" ") -%>  <%="%-18s %s\n" % [command.name, command.summary || command.description] %><%- end -%>
+	<%- unless alias? name or name == "help" or name.include?(" ") or command.summary.nil? -%>  <%="%-18s %s\n" % [command.name, command.summary || command.description] %><%- end -%>
 <%- end -%>
 
 Global Options
 <%- unless @options.nil? or @options.empty?  -%>
-<% for option in @options -%>
-  <%= "%-25s %s\n" % [option[:switches].join('|'), option[:description]] -%>
+<% for option in @options -%><% next if option[:hide] -%>
+  <%= "%-25s %s\n" % [option[:switches].join(', '), option[:description]] -%>
 <% end -%>
 <%- end -%>
 
-See '<%= program :name %> <resource> --help' for more applicable commands and arguments on a specific resource.
+See '<%= program :name %> help <resource>' for more specifics on each resource or command.
 <% if program :help -%>
   <% for title, body in program(:help) %>
   <%= $terminal.color title.to_s.upcase, :bold %>:

data/lib/rhc/usage_templates/missing_help.erb

@@ -0,0 +1 @@
+See '<%= program :name %> help' for a list of available commands.

data/lib/rhc/version.rb

@@ -1,8 +1,8 @@
 module RHC
   module VERSION #:nocov:
     MAJOR = 0
-    MINOR = 97
-    MICRO = 17
+    MINOR = 98
+    MICRO = 16
     #PRE  = ''
     STRING = [MAJOR,MINOR,MICRO].compact.join('.')
   end

data/lib/rhc/wizard.rb

@@ -52,10 +52,6 @@ module RHC
       true
     end
 
-    def needs_configuration?
-      not (@config.has_local_config? or @config.has_opts_config? or @config.noprompt?)
-    end
-
     private
 
     def greeting_stage
@@ -95,7 +91,7 @@ module RHC
       # instantiate a REST client that stages can use
       # TODO: use only REST calls in the wizard
       end_point = "https://#{@libra_server}/broker/rest/api"
-      @rest_client = Rhc::Rest::Client.new(end_point, @username, @password)
+      @rest_client = RHC::Rest::Client.new(end_point, @username, @password)
 
       true
     end
@@ -116,7 +112,7 @@ EOF
 
         paragraph do
           say "Created local config file: " + @config_path
-          say "The express.conf file contains user configuration, and can be transferred to different computers."
+          say "The #{File.basename(@config_path)} file contains user configuration, and can be transferred to different computers."
         end
 
         true
@@ -368,13 +364,12 @@ EOF
           return true
         end
 
-
         begin
           domain = @rest_client.add_domain(namespace)
 
           say "Your domain name '#{domain.id}' has been successfully created"
-        rescue Rhc::Rest::ValidationException => e
-          say "#{e.to_s}"
+        rescue RHC::Rest::ValidationException => e
+          say e.message
           return false
         end
       end

data/spec/coverage_helper.rb

@@ -29,7 +29,7 @@ unless RUBY_VERSION < '1.9'
     # Filters - these files will be ignored.
     add_filter 'lib/rhc/vendor/'   # vendored files should be taken directly and only
                                    # namespaces changed
-    add_filter 'lib/rhc-rest/'     # REST coverage is not yet 100%
+    add_filter 'lib/rhc/rest/'     # REST coverage is not yet 100%
     add_filter 'lib/bin/'          # This is just for safety; simplecov isn't picking these up.
     add_filter 'lib/rhc-common.rb' # deprecated, functionality moved into client or rhc/helpers.rb
     add_filter 'features/'         # Don't report on the files that run the cucumber tests
@@ -39,7 +39,7 @@ unless RUBY_VERSION < '1.9'
     # Groups - general categories of test areas
     add_group('Commands') { |src_file| src_file.filename.include?(File.join(%w[lib rhc commands])) }
     add_group('RHC Lib')  { |src_file| src_file.filename.include?(File.join(%w[lib rhc])) }
-    add_group('REST')     { |src_file| src_file.filename.include?(File.join(%w[lib rhc-rest])) }  
+    add_group('REST')     { |src_file| src_file.filename.include?(File.join(%w[lib rhc/rest])) }  
     add_group('Legacy')   { |src_file| src_file.filename.include?(File.join(%w[bin])) or
                                        src_file.filename.include?(File.join(%w[lib rhc-common.rb])) }  
     add_group('Test')     { |src_file| src_file.filename.include?(File.join(%w[features])) or

data/spec/rest_spec_helper.rb

@@ -1,6 +1,7 @@
 require 'webmock/rspec'
-require 'rhc-rest'
+require 'rhc/rest'
 require 'rhc/exceptions'
+require 'base64'
 
 Spec::Matchers.define :have_same_attributes_as do |expected|
   match do |actual|
@@ -10,6 +11,15 @@ Spec::Matchers.define :have_same_attributes_as do |expected|
   end
 end
 
+# ruby 1.8 does not have strict_encode
+if RUBY_VERSION.to_f == 1.8
+  module Base64
+    def strict_encode64(value)
+      encode64(value).delete("\n")
+    end
+  end
+end
+
 module RestSpecHelper
   def mock_user
     "test_user"
@@ -113,24 +123,51 @@ module RestSpecHelper
     }
   end
 
-  class MockRestClient < Rhc::Rest::Client
+  class MockRestClient < RHC::Rest::Client
     def initialize
-      Rhc::Rest::Client.stub(:new) { self }
+      RHC::Rest::Client.stub(:new) { self }
       @domains = []
+      @keys = [
+        MockRestKey.new('mockkey1', 'ssh-rsa', 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDNK8xT3O+kSltmCMsSqBfAgheB3YFJ9Y0ESJnFjFASVxH70AcCQAgdQSD/r31+atYShJdP7f0AMWiQUTw2tK434XSylnZWEyIR0V+j+cyOPdVQlns6D5gPOnOtweFF0o18YulwCOK8Q1H28GK8qyWhLe0FcMmxtKbbQgaVRvQdXZz4ThzutCJOyJm9xVb93+fatvwZW76oLLvfFJcJSOK2sgW7tJM2A83bm4mwixFDF7wO/+C9WA+PgPKJUIjvy1gZjBhRB+3b58vLOnYhPOgMNruJwzB+wJ3pg8tLJEjxSbHyyoi6OqMBs4BVV7LdzvwTDxEjcgtHVvaVNXgO5iRX'),
+        MockRestKey.new('mockkey2', 'ssh-dsa', 'AAAAB3NzaC1kc3MAAACBAPaaFj6Xjrjd8Dc4AAkJe0HigqaXMxj/87xHoV+nPgerHIceJWhPUWdW40lSASrgpAV9Eq4zzD+L19kgYdbMw0vSX5Cj3XtNOsow9MmMxFsYjTxCv4eSs/rLdGPaYZ5GVRPDu8tN42Bm8lj5o+ky3HzwW+mkQMZwcADQIgqtn6QhAAAAFQCirDfIMf/JoMOFf8CTnsTKWw/0zwAAAIAIQp6t2sLIp1d2TBfd/qLjOJA10rPADcnhBzWB/cd/oFJ8a/2nmxeSPR5Ov18T6itWqbKwvZw2UC0MrXoYbgcfVNP/ym1bCd9rB5hu1sg8WO4JIxA/47PZooT6PwTKVxHuENEzQyJL2o6ZJq+wuV0taLvm6IaM5TAZuEJ2p4TC/gAAAIBpLcVXZREa7XLY55nyidt/+UC+PxpjhPHOHbzL1OvWEaumN4wcJk/JZPppgXX9+WDkTm1SD891U0cXnGMTP0OZOHkOUHF2ZcfUe7p9kX4WjHs0OccoxV0Lny6MC4DjalJyaaEbijJHSUX3QlLcBOlPHJWpEpvWQ9P8AN4PokiGzA==')
+      ]
     end
 
     def domains
       @domains
     end
 
+    def cartridges
+      [MockRestCartridge.new("mock_cart-1", "mock_cart_type-1"),
+       MockRestCartridge.new("mock_cart-2", "mock_cart_type-2"),
+       MockRestCartridge.new("unique_mock_cart-1", "unique_mock_cart_type-1")]
+    end
+
     def add_domain(id)
       d = MockRestDomain.new(id, self)
       @domains << d
       d
     end
+    
+    def sshkeys
+      @keys
+    end
+    
+    def find_key(name)
+      # RHC::Rest::Client#find_key(name) returns the first (and only) key
+      @keys.select { |key| key.name == name }.first
+    end
+    
+    def add_key(name, type, content)
+      @keys << MockRestKey.new(name, type, content)
+    end
+    
+    def delete_key(name)
+      @keys.delete_if { |key| key.name == name }
+    end
   end
 
-  class MockRestDomain
+  class MockRestDomain < RHC::Rest::Domain
     attr_reader :id
 
     def initialize(id, client)
@@ -145,18 +182,15 @@ module RestSpecHelper
     end
 
     def destroy
-      @client.domains.delete_if do |d|
-        match = (d.id == @id)
-        raise Rhc::Rest::ClientErrorException.new("Mock error.  Trying to delete domain with apps.", 128) if match and not applications.empty?
-        match
-      end
+      raise RHC::Rest::ClientErrorException.new("Applications must be empty.") unless @applications.empty?
+      @client.domains.delete_if { |d| d.id == @id }
 
       @client = nil
       @applications = nil
     end
 
-    def add_application(name, type)
-      a = MockRestApplication.new(name, type, self)
+    def add_application(name, type=nil, scale=nil)
+      a = MockRestApplication.new(name, type, self, scale)
       @applications << a
       a
     end
@@ -167,9 +201,9 @@ module RestSpecHelper
   end
 
   class MockRestApplication
-    attr_reader :name, :uuid, :creation_time, :git_url, :app_url, :aliases
+    attr_reader :name, :uuid, :creation_time, :git_url, :app_url, :aliases, :scalable, :embedded, :ssh_url
 
-    def initialize(name, type, domain)
+    def initialize(name, type, domain, scale=nil)
       @name = name
       @domain = domain
       @cartridges = []
@@ -177,8 +211,14 @@ module RestSpecHelper
       @uuid = "fakeuuidfortests"
       @git_url = "git:fake.foo/git/#{@name}.git"
       @app_url = "https://#{@name}-#{@domain.id}.fake.foo/"
+      @ssh_url = "ssh://#{@uuid}@127.0.0.1"
+      @embedded = {}
       @aliases = []
-      add_cartridge(type, false)
+      if scale
+        @scalable = true
+        @embedded = {"haproxy-1.4" => {:info => ""}}
+      end
+      add_cartridge(type, false) if type
     end
 
     def add_cartridge(name, embedded=true)
@@ -193,16 +233,26 @@ module RestSpecHelper
     end
   end
 
-  class MockRestCartridge < Rhc::Rest::Cartridge
+  class MockRestCartridge < RHC::Rest::Cartridge
     attr_reader :name
     attr_reader :type
     attr_reader :properties
 
-    def initialize(name, type, app, properties={:cart_data => {:connection_url => {'value' => "http://fake.url" }}})
+    def initialize(name, type, app=nil, properties={:cart_data => {:connection_url => {'value' => "http://fake.url" }}})
       @name = name
       @type = type
       @app = app
       @properties = properties
     end
   end
+  
+  class MockRestKey < RHC::Rest::Key
+    attr_reader :name, :type, :content
+    def initialize(name, type, content)
+      @name    = name
+      @type    = type
+      @content = content
+    end
+    
+  end
 end

data/spec/rhc/cli_spec.rb

@@ -9,16 +9,27 @@ describe RHC::CLI do
     it('should provide a --config switch') { run_output.should =~ /\-\-config FILE/ }
   end
 
+  shared_examples_for 'an invalid command' do
+    let(:arguments) { @arguments }
+    it('should contain the invalid command message') { run_output.should =~ /is not recognized/ }
+    it('should contain the arguments') { run_output.should include(@arguments[0]) }
+    it('should reference --help') { run_output.should =~ / help\b/ }
+  end
+
   describe '#start' do
     context 'with no arguments' do
-      let(:arguments) { [] }
-      it { expect { run }.should exit_with_code(1) }
-      it('should provide a message about --help') { run_output.should =~ /\-\-help/ }
+      before(:each) { @arguments = [] }
+      it_should_behave_like 'a help page'
+    end
+
+    context 'with an invalid command' do
+      before(:each) { @arguments = ['invalidcommand'] }
+      it_should_behave_like 'an invalid command'
     end
 
     context 'with help and invalid command' do
-      let(:arguments) { ['invalidcommand', 'help'] }
-      it { expect { run }.should exit_with_code(1) }
+      before(:each) { @arguments = ['invalidcommand', '--help'] }
+      it_should_behave_like 'an invalid command'
     end
 
     context 'with --help' do

data/spec/rhc/command_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'rhc/commands/base'
+require 'rhc/exceptions'
 
 describe RHC::Commands::Base do
   describe '#object_name' do
@@ -13,7 +14,7 @@ describe RHC::Commands::Base do
         end
         StaticRootClass
       end
-      its(:object_name) { should == 'staticrootclass' }
+      its(:object_name) { should == 'static-root-class' }
     end
     context 'when the class is nested in a module' do
       subject do 
@@ -22,7 +23,7 @@ describe RHC::Commands::Base do
         end
         Nested::StaticRootClass
       end
-      its(:object_name) { should == 'staticrootclass' }
+      its(:object_name) { should == 'static-root-class' }
     end
   end
 
@@ -87,9 +88,18 @@ describe RHC::Commands::Base do
 
             def test; 1; end
 
-            argument :testarg, "Test arg", "--testarg testarg"
+            argument :testarg, "Test arg", ["--testarg testarg"]
             summary "Test command execute"
-            def execute; 1; end
+            alias_action :exe, :deprecated => true
+            def execute(testarg); 1; end
+
+            argument :args, "Test arg list", [], :arg_type => :list
+            summary "Test command execute_list"
+            def execute_list(*args); 1; end
+
+            def raise_error
+              raise StandardError.new("test exception")
+            end
             def raise_exception
               raise Exception.new("test exception")
             end
@@ -98,7 +108,7 @@ describe RHC::Commands::Base do
         Static
       end
 
-      it("should register itself") { expect { subject }.to change(commands, :length).by(3) }
+      it("should register itself") { expect { subject }.to change(commands, :length).by(5) }
       it("should have an object name of the class") { subject.object_name.should == 'static' }
 
       context 'and when test is called' do
@@ -122,13 +132,58 @@ describe RHC::Commands::Base do
         it { expects_running('static', 'execute').should exit_with_code(1) }
       end
 
+      context 'and when execute_list is called' do
+        it { expects_running('static', 'execute_list').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']) }
+      end
+
+      context 'and when an error is raised in a call' do
+        it { expects_running('static', 'raise_error').should raise_error(StandardError, "test exception") }
+      end
+
       context 'and when an exception is raised in a call' do
-        it { expects_running('static', 'raise_exception').should exit_with_code(128) }
+        it { expects_running('static', 'raise_exception').should raise_error(Exception, "test exception") }
       end
 
       context 'and when an exception is raised in a call with --trace option' do
         it { expects_running('static', 'raise_exception', "--trace").should raise_error(Exception, "test exception") }
       end
+
+      context 'and when deprecated alias is called' do
+        it do
+          expects_running('static', 'exe', "arg").should call(:execute).on(instance).with('arg')
+          $stderr.seek(0)
+          $stderr.read.should match("Warning: The command 'rhc static exe' is deprecated.  Please use 'rhc static execute' instead.")
+        end
+      end
+
+      context 'and when deprecated alias is called with DISABLE_DEPRECATED env var' do
+        before { ENV['DISABLE_DEPRECATED'] = '1' }
+        after { ENV['DISABLE_DEPRECATED'] = nil }
+        it { expects_running('static', 'exe', 'arg', '--trace').should raise_error(RHC::DeprecatedError) }
+      end
+    end
+  end
+
+  describe "rest_client" do
+    before do
+      FakeFS.activate!
+      RHC::Rest::Client.stub!(:new) { |openshift_rest_node, username, password, debug| @username = username; @password = password; true}
+    end
+
+    it "should ask for username" do
+      $terminal.write_line("testuser@foo.bar")
+      $terminal.write_line("password")
+      subject.send(:rest_client).should be_true
+      @username.should == "testuser@foo.bar"
+      subject.send(:config)["default_rhlogin"].should == @username
+      @password.should == "password"
+    end
+
+    after do
+      FakeFS::FileSystem.clear
+      FakeFS.deactivate!
     end
   end
+
 end