rhc 1.6.8 → 1.7.8

data/spec/wizard_spec_helper.rb

@@ -64,8 +64,8 @@ module WizardStepsHelper
     
     last_output do |s|
       s.should match('Since you do not have any keys associated')
-      s.should match(/Fingerprint\: (?:[a-f0-9]{2}\:){15}/)
-      s.should match("Uploading key 'default' from #{current_ssh_dir}/id_rsa.pub ... ")
+      #s.should match(/Fingerprint\: (?:[a-f0-9]{2}\:){15}/)
+      s.should match("Uploading key 'default' ... ")
     end
   end
 
@@ -130,7 +130,7 @@ module WizardStepsHelper
 
     next_stage.should_not be_nil
     last_output do |s|
-      s.should match(/Checking common problems \.+.+?done/)
+      s.should match(/Checking common problems \.+.+? done/)
     end
   end
 
@@ -161,6 +161,7 @@ module WizardStepsHelper
       s.should match(/Checking your namespace .*none/)
       s.should match(/(?:Too long.*?){2}/m)
     end
+    subject.send(:options).__hash__[:namespace].should == 'testnamespace'
   end
 
   def should_skip_creating_namespace
@@ -173,12 +174,14 @@ module WizardStepsHelper
       s.should match("You will not be able to create applications without first creating a namespace")
       s.should match("You may create a namespace later through 'rhc domain create'")
     end
+    subject.send(:options).__hash__[:namespace].should be_nil
   end
 
   def should_find_a_namespace(namespace)
     next_stage.should_not be_nil
 
     last_output.should match(/Checking your namespace .*#{namespace}/)
+    subject.send(:options).__hash__[:namespace].should be_nil
   end
 
   def should_list_types_of_apps_to_create
@@ -321,7 +324,7 @@ EOF
   end
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.include(WizardHelper)
   config.include(WizardStepsHelper)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhc
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.7.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -64,17 +64,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.6.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.6.11
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +136,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -144,23 +144,23 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -233,151 +233,155 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/rhc/cartridge_helpers.rb
-- lib/rhc/exceptions.rb
-- lib/rhc/rest/user.rb
-- lib/rhc/rest/application.rb
-- lib/rhc/rest/base.rb
-- lib/rhc/rest/mock.rb
-- lib/rhc/rest/authorization.rb
-- lib/rhc/rest/domain.rb
-- lib/rhc/rest/gear_group.rb
-- lib/rhc/rest/key.rb
-- lib/rhc/rest/api.rb
-- lib/rhc/rest/attributes.rb
-- lib/rhc/rest/client.rb
-- lib/rhc/rest/cartridge.rb
-- lib/rhc/rest/alias.rb
-- lib/rhc/auth.rb
-- lib/rhc/version.rb
-- lib/rhc/output_helpers.rb
 - lib/rhc/core_ext.rb
-- lib/rhc/autocomplete.rb
-- lib/rhc/coverage_helper.rb
-- lib/rhc/config.rb
-- lib/rhc/json.rb
-- lib/rhc/commands.rb
-- lib/rhc/commands/server.rb
-- lib/rhc/commands/base.rb
-- lib/rhc/commands/authorization.rb
-- lib/rhc/commands/domain.rb
+- lib/rhc/help_formatter.rb
+- lib/rhc/vendor/zliby.rb
+- lib/rhc/vendor/sshkey.rb
+- lib/rhc/vendor/parseconfig.rb
+- lib/rhc/vendor/okjson.rb
 - lib/rhc/commands/apps.rb
+- lib/rhc/commands/port_forward.rb
 - lib/rhc/commands/threaddump.rb
-- lib/rhc/commands/account.rb
+- lib/rhc/commands/sshkey.rb
+- lib/rhc/commands/setup.rb
 - lib/rhc/commands/snapshot.rb
+- lib/rhc/commands/account.rb
+- lib/rhc/commands/logout.rb
 - lib/rhc/commands/git_clone.rb
-- lib/rhc/commands/port_forward.rb
-- lib/rhc/commands/cartridge.rb
-- lib/rhc/commands/setup.rb
+- lib/rhc/commands/domain.rb
+- lib/rhc/commands/alias.rb
+- lib/rhc/commands/server.rb
 - lib/rhc/commands/app.rb
+- lib/rhc/commands/base.rb
+- lib/rhc/commands/authorization.rb
 - lib/rhc/commands/tail.rb
-- lib/rhc/commands/sshkey.rb
-- lib/rhc/commands/alias.rb
-- lib/rhc/vendor/zliby.rb
-- lib/rhc/vendor/okjson.rb
-- lib/rhc/vendor/parseconfig.rb
-- lib/rhc/vendor/sshkey.rb
-- lib/rhc/tar_gz.rb
-- lib/rhc/command_runner.rb
-- lib/rhc/ssh_helpers.rb
-- lib/rhc/git_helpers.rb
-- lib/rhc/wizard.rb
-- lib/rhc/cli.rb
+- lib/rhc/commands/cartridge.rb
+- lib/rhc/highline_extensions.rb
+- lib/rhc/helpers.rb
 - lib/rhc/auth/basic.rb
-- lib/rhc/auth/token.rb
 - lib/rhc/auth/token_store.rb
+- lib/rhc/auth/token.rb
+- lib/rhc/exceptions.rb
 - lib/rhc/context_helper.rb
-- lib/rhc/help_formatter.rb
+- lib/rhc/commands.rb
+- lib/rhc/config.rb
+- lib/rhc/git_helpers.rb
+- lib/rhc/coverage_helper.rb
+- lib/rhc/json.rb
+- lib/rhc/version.rb
+- lib/rhc/autocomplete.rb
+- lib/rhc/auth.rb
+- lib/rhc/wizard.rb
+- lib/rhc/cli.rb
+- lib/rhc/output_helpers.rb
+- lib/rhc/tar_gz.rb
 - lib/rhc/rest.rb
-- lib/rhc/helpers.rb
+- lib/rhc/command_runner.rb
+- lib/rhc/cartridge_helpers.rb
+- lib/rhc/ssh_helpers.rb
+- lib/rhc/rest/key.rb
+- lib/rhc/rest/mock.rb
+- lib/rhc/rest/api.rb
+- lib/rhc/rest/attributes.rb
+- lib/rhc/rest/application.rb
+- lib/rhc/rest/client.rb
+- lib/rhc/rest/domain.rb
+- lib/rhc/rest/alias.rb
+- lib/rhc/rest/user.rb
+- lib/rhc/rest/base.rb
+- lib/rhc/rest/authorization.rb
+- lib/rhc/rest/cartridge.rb
+- lib/rhc/rest/gear_group.rb
 - lib/rhc.rb
+- lib/rhc/usage_templates/options_help.erb
 - lib/rhc/usage_templates/command_syntax_help.erb
-- lib/rhc/usage_templates/help.erb
-- lib/rhc/usage_templates/missing_help.erb
 - lib/rhc/usage_templates/command_help.erb
-- lib/rhc/usage_templates/options_help.erb
-- lib/rhc/autocomplete_templates/rhc.erb
+- lib/rhc/usage_templates/missing_help.erb
+- lib/rhc/usage_templates/help.erb
+- lib/rhc/autocomplete_templates/bash.erb
 - conf/express.conf
+- autocomplete/rhc_bash
 - LICENSE
 - COPYRIGHT
 - README.md
 - Rakefile
-- spec/spec_helper.rb
-- spec/coverage_helper.rb
-- spec/rhc/json_spec.rb
-- spec/rhc/rest_spec.rb
-- spec/rhc/helpers_spec.rb
-- spec/rhc/rest_client_spec.rb
 - spec/rhc/wizard_spec.rb
-- spec/rhc/config_spec.rb
-- spec/rhc/cli_spec.rb
+- spec/rhc/highline_extensions_spec.rb
+- spec/rhc/targz_spec.rb
+- spec/rhc/commands/setup_spec.rb
 - spec/rhc/commands/tail_spec.rb
+- spec/rhc/commands/logout_spec.rb
+- spec/rhc/commands/alias_spec.rb
+- spec/rhc/commands/account_spec.rb
 - spec/rhc/commands/domain_spec.rb
-- spec/rhc/commands/apps_spec.rb
-- spec/rhc/commands/git_clone_spec.rb
-- spec/rhc/commands/server_spec.rb
 - spec/rhc/commands/app_spec.rb
-- spec/rhc/commands/setup_spec.rb
-- spec/rhc/commands/port_forward_spec.rb
-- spec/rhc/commands/account_spec.rb
 - spec/rhc/commands/snapshot_spec.rb
-- spec/rhc/commands/alias_spec.rb
 - spec/rhc/commands/cartridge_spec.rb
 - spec/rhc/commands/sshkey_spec.rb
-- spec/rhc/commands/threaddump_spec.rb
+- spec/rhc/commands/server_spec.rb
 - spec/rhc/commands/authorization_spec.rb
+- spec/rhc/commands/port_forward_spec.rb
+- spec/rhc/commands/threaddump_spec.rb
+- spec/rhc/commands/apps_spec.rb
+- spec/rhc/commands/git_clone_spec.rb
+- spec/rhc/auth_spec.rb
+- spec/rhc/json_spec.rb
+- spec/rhc/config_spec.rb
+- spec/rhc/helpers_spec.rb
+- spec/rhc/rest_spec.rb
+- spec/rhc/context_spec.rb
+- spec/rhc/assets/cert_key_rsa
 - spec/rhc/assets/foo.txt
+- spec/rhc/assets/empty.txt
 - spec/rhc/assets/cert.crt
 - spec/rhc/assets/targz_corrupted.tar.gz
-- spec/rhc/assets/empty.txt
 - spec/rhc/assets/targz_sample.tar.gz
-- spec/rhc/assets/cert_key_rsa
-- spec/rhc/command_spec.rb
+- spec/rhc/rest_client_spec.rb
+- spec/rhc/cli_spec.rb
 - spec/rhc/rest_application_spec.rb
-- spec/rhc/targz_spec.rb
-- spec/rhc/context_spec.rb
-- spec/rhc/auth_spec.rb
+- spec/rhc/command_spec.rb
+- spec/rest_spec_helper.rb
+- spec/spec_helper.rb
+- spec/coverage_helper.rb
 - spec/wizard_spec_helper.rb
-- spec/keys/example.pem
-- spec/keys/server.pem
 - spec/keys/example_private.pem
-- spec/rest_spec_helper.rb
-- spec/spec.opts
-- features/multiple_cartridge.feature
-- features/domain.feature
-- features/verify.feature
-- features/cartridge.feature
+- spec/keys/server.pem
+- spec/keys/example.pem
 - features/client.feature
-- features/support/env.rb
+- features/verify.feature
+- features/README.md
+- features/geared_application.feature
+- features/support/before_hooks.rb
 - features/support/key2.pub
-- features/support/key1
+- features/support/assumptions.rb
 - features/support/key1.pub
+- features/support/key1
+- features/support/env.rb
 - features/support/platform_support.rb
-- features/support/before_hooks.rb
 - features/support/key3.pub
 - features/support/key2
-- features/support/assumptions.rb
-- features/application.feature
+- features/lib/rhc_helper/sshkey.rb
+- features/lib/rhc_helper/api.rb
+- features/lib/rhc_helper/commandify.rb
+- features/lib/rhc_helper/persistable.rb
+- features/lib/rhc_helper/loggable.rb
+- features/lib/rhc_helper/domain.rb
+- features/lib/rhc_helper/runnable.rb
+- features/lib/rhc_helper/app.rb
+- features/lib/rhc_helper/httpify.rb
+- features/lib/rhc_helper/cartridge.rb
+- features/lib/rhc_helper.rb
 - features/sshkey.feature
-- features/geared_application.feature
+- features/domain.feature
+- features/cartridge.feature
 - features/scaled_application.feature
 - features/step_definitions/cartridge_steps.rb
+- features/step_definitions/sshkey_steps.rb
 - features/step_definitions/application_steps.rb
 - features/step_definitions/client_steps.rb
 - features/step_definitions/domain_steps.rb
-- features/step_definitions/sshkey_steps.rb
-- features/lib/rhc_helper.rb
-- features/lib/rhc_helper/httpify.rb
-- features/lib/rhc_helper/domain.rb
-- features/lib/rhc_helper/runnable.rb
-- features/lib/rhc_helper/loggable.rb
-- features/lib/rhc_helper/commandify.rb
-- features/lib/rhc_helper/api.rb
-- features/lib/rhc_helper/cartridge.rb
-- features/lib/rhc_helper/app.rb
-- features/lib/rhc_helper/persistable.rb
-- features/lib/rhc_helper/sshkey.rb
-- features/README.md
+- features/application.feature
+- features/multiple_cartridge.feature
 - bin/rhc
 homepage: https://github.com/openshift/rhc
 licenses: []
@@ -410,79 +414,80 @@ signing_key:
 specification_version: 3
 summary: OpenShift Client Tools
 test_files:
-- spec/spec_helper.rb
-- spec/coverage_helper.rb
-- spec/rhc/json_spec.rb
-- spec/rhc/rest_spec.rb
-- spec/rhc/helpers_spec.rb
-- spec/rhc/rest_client_spec.rb
 - spec/rhc/wizard_spec.rb
-- spec/rhc/config_spec.rb
-- spec/rhc/cli_spec.rb
+- spec/rhc/highline_extensions_spec.rb
+- spec/rhc/targz_spec.rb
+- spec/rhc/commands/setup_spec.rb
 - spec/rhc/commands/tail_spec.rb
+- spec/rhc/commands/logout_spec.rb
+- spec/rhc/commands/alias_spec.rb
+- spec/rhc/commands/account_spec.rb
 - spec/rhc/commands/domain_spec.rb
-- spec/rhc/commands/apps_spec.rb
-- spec/rhc/commands/git_clone_spec.rb
-- spec/rhc/commands/server_spec.rb
 - spec/rhc/commands/app_spec.rb
-- spec/rhc/commands/setup_spec.rb
-- spec/rhc/commands/port_forward_spec.rb
-- spec/rhc/commands/account_spec.rb
 - spec/rhc/commands/snapshot_spec.rb
-- spec/rhc/commands/alias_spec.rb
 - spec/rhc/commands/cartridge_spec.rb
 - spec/rhc/commands/sshkey_spec.rb
-- spec/rhc/commands/threaddump_spec.rb
+- spec/rhc/commands/server_spec.rb
 - spec/rhc/commands/authorization_spec.rb
+- spec/rhc/commands/port_forward_spec.rb
+- spec/rhc/commands/threaddump_spec.rb
+- spec/rhc/commands/apps_spec.rb
+- spec/rhc/commands/git_clone_spec.rb
+- spec/rhc/auth_spec.rb
+- spec/rhc/json_spec.rb
+- spec/rhc/config_spec.rb
+- spec/rhc/helpers_spec.rb
+- spec/rhc/rest_spec.rb
+- spec/rhc/context_spec.rb
+- spec/rhc/assets/cert_key_rsa
 - spec/rhc/assets/foo.txt
+- spec/rhc/assets/empty.txt
 - spec/rhc/assets/cert.crt
 - spec/rhc/assets/targz_corrupted.tar.gz
-- spec/rhc/assets/empty.txt
 - spec/rhc/assets/targz_sample.tar.gz
-- spec/rhc/assets/cert_key_rsa
-- spec/rhc/command_spec.rb
+- spec/rhc/rest_client_spec.rb
+- spec/rhc/cli_spec.rb
 - spec/rhc/rest_application_spec.rb
-- spec/rhc/targz_spec.rb
-- spec/rhc/context_spec.rb
-- spec/rhc/auth_spec.rb
+- spec/rhc/command_spec.rb
+- spec/rest_spec_helper.rb
+- spec/spec_helper.rb
+- spec/coverage_helper.rb
 - spec/wizard_spec_helper.rb
-- spec/keys/example.pem
-- spec/keys/server.pem
 - spec/keys/example_private.pem
-- spec/rest_spec_helper.rb
-- spec/spec.opts
-- features/multiple_cartridge.feature
-- features/domain.feature
-- features/verify.feature
-- features/cartridge.feature
+- spec/keys/server.pem
+- spec/keys/example.pem
 - features/client.feature
-- features/support/env.rb
+- features/verify.feature
+- features/README.md
+- features/geared_application.feature
+- features/support/before_hooks.rb
 - features/support/key2.pub
-- features/support/key1
+- features/support/assumptions.rb
 - features/support/key1.pub
+- features/support/key1
+- features/support/env.rb
 - features/support/platform_support.rb
-- features/support/before_hooks.rb
 - features/support/key3.pub
 - features/support/key2
-- features/support/assumptions.rb
-- features/application.feature
+- features/lib/rhc_helper/sshkey.rb
+- features/lib/rhc_helper/api.rb
+- features/lib/rhc_helper/commandify.rb
+- features/lib/rhc_helper/persistable.rb
+- features/lib/rhc_helper/loggable.rb
+- features/lib/rhc_helper/domain.rb
+- features/lib/rhc_helper/runnable.rb
+- features/lib/rhc_helper/app.rb
+- features/lib/rhc_helper/httpify.rb
+- features/lib/rhc_helper/cartridge.rb
+- features/lib/rhc_helper.rb
 - features/sshkey.feature
-- features/geared_application.feature
+- features/domain.feature
+- features/cartridge.feature
 - features/scaled_application.feature
 - features/step_definitions/cartridge_steps.rb
+- features/step_definitions/sshkey_steps.rb
 - features/step_definitions/application_steps.rb
 - features/step_definitions/client_steps.rb
 - features/step_definitions/domain_steps.rb
-- features/step_definitions/sshkey_steps.rb
-- features/lib/rhc_helper.rb
-- features/lib/rhc_helper/httpify.rb
-- features/lib/rhc_helper/domain.rb
-- features/lib/rhc_helper/runnable.rb
-- features/lib/rhc_helper/loggable.rb
-- features/lib/rhc_helper/commandify.rb
-- features/lib/rhc_helper/api.rb
-- features/lib/rhc_helper/cartridge.rb
-- features/lib/rhc_helper/app.rb
-- features/lib/rhc_helper/persistable.rb
-- features/lib/rhc_helper/sshkey.rb
-- features/README.md
+- features/application.feature
+- features/multiple_cartridge.feature