rhc 0.97.17 → 0.98.16

data/spec/rhc/wizard_spec.rb

@@ -22,7 +22,7 @@ describe RHC::Wizard do
     it "should print out first run greeting" do
       @wizard.run_next_stage
       greeting = $terminal.read
-      greeting.count("\n").should == 8
+      greeting.count("\n").should >= 7
       greeting.should match(Regexp.escape("It looks like you have not configured or used OpenShift client tools on this computer."))
       greeting.should match(Regexp.escape("\n#{@wizard.config_path}\n"))
     end
@@ -719,7 +719,7 @@ describe RHC::Wizard do
       end
 
       def add_domain(domain_name)
-        raise Rhc::Rest::ValidationException.new("Error: domain name should be '#{@domain_name}' but got '#{domain_name}'") if domain_name != @domain_name
+        raise RHC::Rest::ValidationException.new("Error: domain name should be '#{@domain_name}' but got '#{domain_name}'") if domain_name != @domain_name
 
         MockDomain.new(domain_name)
       end
@@ -748,7 +748,7 @@ describe RHC::Wizard do
     end
 
     def stub_rhc_client_new
-      Rhc::Rest::Client.stub(:new) do |end_point, name, password|
+      RHC::Rest::Client.stub(:new) do |end_point, name, password|
         MockRestApi.new(end_point, name, password)
       end
     end

data/spec/spec.opts

@@ -0,0 +1 @@
+--color

data/spec/spec_helper.rb

@@ -11,7 +11,7 @@ class FakeFS::File
   end
 
   # Epic fail - FakeFS manages to redefine this to '/'
-  PATH_SEPARATOR = ":"
+  const_set('PATH_SEPARATOR', ":")
 
   def self.executable?(path)
     # if the file exists we will assume it is executable
@@ -44,11 +44,11 @@ module ClassSpecHelpers
     end
   end
   def new_command_runner *args, &block
-    Commander::Runner.instance_variable_set :"@singleton", RHC::Commands::Runner.new(args)
+    Commander::Runner.instance_variable_set :"@singleton", RHC::CommandRunner.new(args)
     program :name, 'test'
     program :version, '1.2.3'
     program :description, 'something'
-    program :help_formatter, RHC::UsageHelpFormatter
+    program :help_formatter, RHC::HelpFormatter
 
     #create_test_command
     yield if block

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 441
+  hash: 439
   prerelease: false
   segments: 
   - 0
-  - 97
-  - 17
-  version: 0.97.17
+  - 98
+  - 16
+  version: 0.98.16
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-23 00:00:00 -05:00
+date: 2012-09-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,10 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
+        - 2
         - 0
-        version: "0"
+        - 11
+        version: 2.0.11
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -258,20 +260,19 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/rhc-rest/client.rb
-- lib/rhc-rest/exceptions/exceptions.rb
-- lib/rhc-rest/domain.rb
-- lib/rhc-rest/user.rb
-- lib/rhc-rest/cartridge.rb
-- lib/rhc-rest/key.rb
-- lib/rhc-rest/application.rb
 - lib/rhc.rb
-- lib/rhc-rest.rb
+- lib/rhc/autocomplete.rb
 - lib/rhc/version.rb
 - lib/rhc/ssh_key_helpers.rb
 - lib/rhc/client.rb
 - lib/rhc/exceptions.rb
 - lib/rhc/cli.rb
+- lib/rhc/rest/client.rb
+- lib/rhc/rest/domain.rb
+- lib/rhc/rest/user.rb
+- lib/rhc/rest/cartridge.rb
+- lib/rhc/rest/key.rb
+- lib/rhc/rest/application.rb
 - lib/rhc/wizard.rb
 - lib/rhc/targz.rb
 - lib/rhc/commands.rb
@@ -282,29 +283,29 @@ files:
 - lib/rhc/vendor/parseconfig.rb
 - lib/rhc/vendor/sshkey.rb
 - lib/rhc/vendor/okjson.rb
+- lib/rhc/command_runner.rb
+- lib/rhc/context_helper.rb
+- lib/rhc/rest.rb
 - lib/rhc/commands/base.rb
 - lib/rhc/commands/setup.rb
+- lib/rhc/commands/port-forward.rb
 - lib/rhc/commands/domain.rb
+- lib/rhc/commands/sshkey.rb
 - lib/rhc/commands/server.rb
 - lib/rhc/helpers.rb
 - lib/rhc/config.rb
 - lib/rhc/coverage_helper.rb
 - lib/rhc-common.rb
+- lib/rhc/usage_templates/missing_help.erb
 - lib/rhc/usage_templates/command_help.erb
 - lib/rhc/usage_templates/help.erb
+- lib/rhc/autocomplete_templates/rhc.erb
 - conf/express.conf
 - LICENSE
 - COPYRIGHT
 - README.md
 - Rakefile
-- test/support/testcase.rb
-- test/support/server.rb
-- test/unit/command_test.rb
-- test/sample-usage.rb
-- test/functional/domain_test.rb
-- test/functional/application_test.rb
-- test/functional/test_credentials.rb
-- test/test_helper.rb
+- spec/spec.opts
 - spec/rhc/helpers_spec.rb
 - spec/rhc/config_spec.rb
 - spec/rhc/rest_client_spec.rb
@@ -316,6 +317,8 @@ files:
 - spec/rhc/assets/targz_corrupted.tar.gz
 - spec/rhc/assets/targz_sample.tar.gz
 - spec/rhc/command_spec.rb
+- spec/rhc/commands/port-forward_spec.rb
+- spec/rhc/commands/sshkey_spec.rb
 - spec/rhc/commands/setup_spec.rb
 - spec/rhc/commands/domain_spec.rb
 - spec/rhc/commands/server_spec.rb
@@ -325,21 +328,37 @@ files:
 - spec/rest_spec_helper.rb
 - spec/spec_helper.rb
 - spec/coverage_helper.rb
+- features/sshkey.feature
+- features/support/key1
 - features/support/env.rb
+- features/support/key1.pub
+- features/support/before_hooks.rb
+- features/support/assumptions.rb
+- features/support/ssh.sh
+- features/support/key2
+- features/support/key3.pub
+- features/support/key2.pub
+- features/step_definitions/sshkey_steps.rb
 - features/step_definitions/client_steps.rb
 - features/step_definitions/application_steps.rb
 - features/step_definitions/cartridge_steps.rb
 - features/step_definitions/domain_steps.rb
+- features/multiple_cartridge.feature
 - features/verify.feature
+- features/cartridge.feature
+- features/application.feature
 - features/lib/rhc_helper.rb
 - features/lib/rhc_helper/httpify.rb
 - features/lib/rhc_helper/persistable.rb
 - features/lib/rhc_helper/loggable.rb
 - features/lib/rhc_helper/domain.rb
+- features/lib/rhc_helper/sshkey.rb
 - features/lib/rhc_helper/commandify.rb
 - features/lib/rhc_helper/cartridge.rb
 - features/lib/rhc_helper/app.rb
 - features/lib/rhc_helper/runnable.rb
+- features/domain.feature
+- features/client.feature
 - features/README.md
 - bin/rhc-tail-files
 - bin/rhc-sshkey
@@ -390,14 +409,7 @@ signing_key:
 specification_version: 3
 summary: OpenShift Client Tools
 test_files: 
-- test/support/testcase.rb
-- test/support/server.rb
-- test/unit/command_test.rb
-- test/sample-usage.rb
-- test/functional/domain_test.rb
-- test/functional/application_test.rb
-- test/functional/test_credentials.rb
-- test/test_helper.rb
+- spec/spec.opts
 - spec/rhc/helpers_spec.rb
 - spec/rhc/config_spec.rb
 - spec/rhc/rest_client_spec.rb
@@ -409,6 +421,8 @@ test_files:
 - spec/rhc/assets/targz_corrupted.tar.gz
 - spec/rhc/assets/targz_sample.tar.gz
 - spec/rhc/command_spec.rb
+- spec/rhc/commands/port-forward_spec.rb
+- spec/rhc/commands/sshkey_spec.rb
 - spec/rhc/commands/setup_spec.rb
 - spec/rhc/commands/domain_spec.rb
 - spec/rhc/commands/server_spec.rb
@@ -418,19 +432,35 @@ test_files:
 - spec/rest_spec_helper.rb
 - spec/spec_helper.rb
 - spec/coverage_helper.rb
+- features/sshkey.feature
+- features/support/key1
 - features/support/env.rb
+- features/support/key1.pub
+- features/support/before_hooks.rb
+- features/support/assumptions.rb
+- features/support/ssh.sh
+- features/support/key2
+- features/support/key3.pub
+- features/support/key2.pub
+- features/step_definitions/sshkey_steps.rb
 - features/step_definitions/client_steps.rb
 - features/step_definitions/application_steps.rb
 - features/step_definitions/cartridge_steps.rb
 - features/step_definitions/domain_steps.rb
+- features/multiple_cartridge.feature
 - features/verify.feature
+- features/cartridge.feature
+- features/application.feature
 - features/lib/rhc_helper.rb
 - features/lib/rhc_helper/httpify.rb
 - features/lib/rhc_helper/persistable.rb
 - features/lib/rhc_helper/loggable.rb
 - features/lib/rhc_helper/domain.rb
+- features/lib/rhc_helper/sshkey.rb
 - features/lib/rhc_helper/commandify.rb
 - features/lib/rhc_helper/cartridge.rb
 - features/lib/rhc_helper/app.rb
 - features/lib/rhc_helper/runnable.rb
+- features/domain.feature
+- features/client.feature
 - features/README.md

data/lib/rhc-rest/exceptions/exceptions.rb

@@ -1,75 +0,0 @@
-module Rhc
-  module Rest
-    class BaseException < RuntimeError
-      attr_reader :code
-      def initialize(message=nil, code=nil)
-        super(message)
-        @code = code
-      end
-    end
-
-    #Exceptions thrown in case of an HTTP 5xx is received.
-    class ServerErrorException < Rhc::Rest::BaseException; end
-
-    #Exceptions thrown in case of an HTTP 503 is received.
-    #
-    #503 Service Unavailable
-    #
-    #The server is currently unable to handle the request due to a temporary 
-    #overloading or maintenance of the server. The implication is that this 
-    #is a temporary condition which will be alleviated after some delay.
-    
-    class ServiceUnavailableException < Rhc::Rest::ServerErrorException; end
-
-    #Exceptions thrown in case of an HTTP 4xx is received with the exception 
-    #of 401, 403, 403 and 422 where a more sepcific exception is thrown
-    #
-    #HTTP Error Codes 4xx
-    #
-    #The 4xx class of status code is intended for cases in which the client 
-    #seems to have errored.
-    
-    
-    class ClientErrorException < Rhc::Rest::BaseException; end
-
-    #Exceptions thrown in case of an HTTP 404 is received.
-    #
-    #404 Not Found
-    #
-    #The server has not found anything matching the Request-URI or the
-    #requested resource does not exist
-    class ResourceNotFoundException < Rhc::Rest::ClientErrorException; end
-
-    #Exceptions thrown in case of an HTTP 422 is received.
-    class ValidationException < Rhc::Rest::ClientErrorException
-      attr_reader :field
-      def initialize(message, field=nil, error_code=nil)
-        super(message, error_code)
-        @field = field
-      end
-    end
-
-    #Exceptions thrown in case of an HTTP 403 is received.
-    #
-    #403 Forbidden
-    #
-    #The server understood the request, but is refusing to fulfill it.
-    #Authorization will not help and the request SHOULD NOT be repeated. 
-    class RequestDeniedException < Rhc::Rest::ClientErrorException; end
-
-    #Exceptions thrown in case of an HTTP 401 is received.
-    #
-    #401 Unauthorized
-    #
-    #The request requires user authentication.  If the request already 
-    #included Authorization credentials, then the 401 response indicates 
-    #that authorization has been refused for those credentials. 
-    class UnAuthorizedException < Rhc::Rest::ClientErrorException; end
-
-    # Unreachable host, SSL Exception
-    class ResourceAccessException < Rhc::Rest::BaseException; end
-    #I/O Exceptions Connection timeouts, etc
-    class ConnectionException < Rhc::Rest::BaseException; end
-    class TimeoutException < ConnectionException; end
-  end
-end

data/test/functional/application_test.rb

@@ -1,71 +0,0 @@
-require File.expand_path('../../test_helper', __FILE__)
-
-class ApplicationTest < Test::Unit::TestCase
-  setup :with_devenv
-
-  def teardown
-    if @client && @client.domains
-      @client.domains.each do |domain|
-        domain.delete(true)
-      end
-    end
-  end
-
-  def test_create_app
-    domain_name = "rhcrest#{@random}"
-    domain = @client.add_domain(domain_name)
-    assert domain.namespace == domain_name
-    app = domain.add_application("app", {:cartridge => "php-5.3"})
-    puts app
-    assert app.name == "app", "application name is not equal "
-    puts app.framework
-    assert app.framework == "php-5.3"
-    apps = @client.find_application("app")
-    assert apps.length == 1
-    assert apps.first.name == "app"
-  end
-
-=begin
-  def test_create_scalable_app
-    domain_name = "rhcrest#{@random}"
-    domain = @client.add_domain(domain_name)
-    assert domain.namespace == domain_name
-    app = domain.add_application("app", {:cartridge => "php-5.3", :scale => true})
-    assert app.name == "app"
-    assert app.framework == "php-5.3"
-    assert app.scalable == true
-    apps = @client.find_application("app")
-    assert apps.length == 1
-    assert apps.first.name == "app"
-  end
-
-  def test_create_app_with_small_node
-    domain_name = "rhcrest#{@random}"
-    domain = @client.add_domain(domain_name)
-    assert domain.namespace == domain_name
-    app = domain.add_application("app", {:cartridge => "php-5.3", :node_profile => "small"})
-    assert app.name == "app"
-    assert app.framework == "php-5.3"
-    assert app.node_profile = "small"
-    apps = @client.find_application("app")
-    assert apps.length == 1
-    assert apps.first.name == "app"
-
-  end
-
-  def test_create_scalable_app_with_small_node
-    domain_name = "rhcrest#{@random}"
-    domain = @client.add_domain(domain_name)
-    assert domain.namespace == domain_name
-    app = domain.add_application("app", {:cartridge => "php-5.3", :scale => true, :node_profile => "small"})
-    assert app.name == "app"
-    assert app.framework == "php-5.3"
-    assert app.node_profile = "small"
-    assert app.scalable == true
-    apps = @client.find_application("app")
-    assert apps.length == 1
-    assert apps.first.name == "app"
-  end
-=end
-
-end

data/test/functional/domain_test.rb

@@ -1,123 +0,0 @@
-require File.expand_path('../../test_helper', __FILE__)
-
-class DomainTest < Test::Unit::TestCase
-
-  setup :with_devenv
-
-  def teardown
-    if @client && @client.domains
-      @client.domains.each do |domain|
-        domain.delete(true)
-      end
-    end
-  end
-
-  def test_create_domain
-
-    domain_name = "rhcrest#{@random}"
-
-    domain = @client.add_domain(domain_name)
-    assert domain.namespace == domain_name
-
-    domains = @client.domains
-    assert domains.length == 1
-    domain = domains.first
-    assert domain.namespace == domain_name
-
-    domains = @client.find_domain(domain_name)
-    assert domains.length == 1
-    domain = domains.first
-    assert domain.namespace == domain_name
-
-  end
-
-  def test_create_multiple_domains
-
-    domain_name = "rhcrest#{@random}"
-    domain = @client.add_domain(domain_name)
-    assert domain.namespace == domain_name
-
-    domains = @client.domains
-    assert domains.length == 1
-    domain = domains.first
-    assert domain.namespace == domain_name
-
-    domains = @client.find_domain(domain_name)
-    assert domains.length == 1
-    domain = domains.first
-    assert domain.namespace == domain_name
-
-    domain_name = "rhcrest#{@random}X"
-    domain = @client.add_domain(domain_name)
-    assert domain.namespace == domain_name
-
-    domains = @client.domains
-    assert domains.length == 2
-
-    domains = @client.find_domain(domain_name)
-    assert domains.length == 1
-    domain = domains.first
-    assert domain.namespace == domain_name
-  end
-
-  def test_update_domain
-
-    domain_name = "rhcrest#{@random}"
-    domain = @client.add_domain(domain_name)
-    assert domain.namespace == domain_name
-    new_domain_name = "rhcrest#{@random}X"
-    domain = domain.update(new_domain_name)
-
-    domains = @client.domains
-    assert domains.length == 1
-    domain = domains.first
-    assert domain.namespace == new_domain_name
-
-    domains = @client.find_domain(new_domain_name)
-    assert domains.length == 1
-    domain = domains.first
-    assert domain.namespace == new_domain_name
-
-  end
-
-  def test_update_domain_with_app
-
-    domain_name = "rhcrest#{@random}"
-    domain = @client.add_domain(domain_name)
-    assert domain.namespace == domain_name
-    app = domain.add_application("app", {:cartridge => "php-5.3"})
-    new_domain_name = "rhcrest#{@random}X"
-    domain = domain.update(new_domain_name)
-
-    domains = @client.domains
-    assert domains.length == 1
-    domain = domains.first
-    assert domain.namespace == new_domain_name
-
-    domains = @client.find_domain(new_domain_name)
-    assert domains.length == 1
-    domain = domains.first
-    assert domain.namespace == new_domain_name
-
-  end
-
-  def test_delete_domain_with_app
-
-    domain_name = "rhcrest#{@random}"
-    domain = @client.add_domain(domain_name)
-    assert domain.namespace == domain_name
-    app = domain.add_application("app", {:cartridge => "php-5.3"})
-    assert_raise Rhc::Rest::ClientErrorException do
-      domain.delete
-    end
-  end
-
-  def test_force_delete_domain_with_app
-    domain_name = "rhcrest#{@random}"
-    domain = @client.add_domain(domain_name)
-    assert domain.namespace == domain_name
-    app = domain.add_application("app", {:cartridge => "php-5.3"})
-    domain.delete(true)
-    assert @client.domains.length == 0
-  end
-end