rhc 0.92.11 → 0.93.18

data/test/support/server.rb

@@ -0,0 +1,14 @@
+class Test::Unit::TestCase
+
+  def with_devenv
+    omit("Cannot run unless a devenv is specified")
+
+    @random = rand(1000)
+    end_point = "https://ec2-23-20-154-157.compute-1.amazonaws.com/broker/rest"
+    username = "rhc-rest-test-#{@random}"
+    password = "xyz123"
+    @client = Rhc::Rest::Client.new(end_point, username, password)
+    @domains = []
+  end
+
+end

data/test/support/testcase.rb

@@ -0,0 +1,3 @@
+require 'test/unit'
+require 'test/unit/omission'
+require 'pp'

data/test/test_helper.rb

@@ -0,0 +1,4 @@
+$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+
+# Load support files
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/test/unit/command_test.rb

@@ -0,0 +1,19 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+class CommandTest < Test::Unit::TestCase
+  
+  def define_test_command
+    Class.new(RHC::Commands::Base) do
+      def run
+        1      
+      end
+    end
+    
+  end
+
+  test 'should register a command' do
+    assert_difference('commands.length', 1) do
+      define_test_command
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 377
+  hash: 335
   prerelease: 
   segments: 
   - 0
-  - 92
-  - 11
-  version: 0.92.11
+  - 93
+  - 18
+  version: 0.93.18
 platform: ruby
 authors: 
 - Red Hat
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-11 00:00:00 Z
+date: 2012-06-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: parseconfig
+  name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -32,7 +32,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: sshkey
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -46,7 +46,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: net-ssh
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -59,29 +59,133 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: archive-tar-minitar
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: parseconfig
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: commander
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 4
+        - 0
+        version: "4.0"
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rest-client
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 6
+        version: "1.6"
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: webmock
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 6
+        version: "1.6"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
+  type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: fakefs
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 4
+        version: "0.4"
+  type: :development
+  version_requirements: *id010
 description: The client tools for the OpenShift platform that allow for application management.
-email: openshift@redhat.com
+email: dev@openshift.redhat.com
 executables: 
-- rhc
-- rhc-domain
-- rhc-app
-- rhc-sshkey
+- rhc-user-info
 - rhc-chk
 - rhc-create-app
-- rhc-create-domain
+- rhc-domain-info
 - rhc-ctl-domain
+- rhc-sshkey
+- rhc-tail-files
+- rhc-create-domain
 - rhc-ctl-app
+- rhc-domain
 - rhc-snapshot
-- rhc-domain-info
-- rhc-user-info
-- rhc-tail-files
+- rhc-app
 - rhc-port-forward
-extensions: 
-- ext/mkrf_conf.rb
+- rhc
+extensions: []
+
 extra_rdoc_files: []
 
 files: 
 - lib/rhc-common.rb
+- lib/rhc.rb
 - lib/rhc-rest/domain.rb
 - lib/rhc-rest/application.rb
 - lib/rhc-rest/cartridge.rb
@@ -90,8 +194,44 @@ files:
 - lib/rhc-rest/exceptions/exceptions.rb
 - lib/rhc-rest/user.rb
 - lib/rhc-rest/version.rb
+- lib/rhc/helpers.rb
+- lib/rhc/cli.rb
+- lib/rhc/config.rb
+- lib/rhc/commands.rb
+- lib/rhc/wizard.rb
+- lib/rhc/core_ext.rb
+- lib/rhc/client.rb
+- lib/rhc/json.rb
+- lib/rhc/vendor/okjson.rb
+- lib/rhc/vendor/zliby.rb
+- lib/rhc/commands/base.rb
+- lib/rhc/commands/server.rb
+- lib/rhc/targz.rb
 - lib/rhc-rest.rb
-- lib/rhc
+- conf/express.conf
+- LICENSE
+- COPYRIGHT
+- README.md
+- Rakefile
+- test/sample-usage.rb
+- test/support/server.rb
+- test/support/testcase.rb
+- test/functional/test_credentials.rb
+- test/functional/domain_test.rb
+- test/functional/application_test.rb
+- test/unit/command_test.rb
+- test/test_helper.rb
+- spec/spec_helper.rb
+- spec/rhc/json_spec.rb
+- spec/rhc/helpers_spec.rb
+- spec/rhc/command_spec.rb
+- spec/rhc/wizard_spec.rb
+- spec/rhc/commands/server_spec.rb
+- spec/rhc/cli_spec.rb
+- spec/rhc/targz_spec.rb
+- spec/rhc/assets/foo.txt
+- spec/rhc/assets/targz_corrupted.tar.gz
+- spec/rhc/assets/targz_sample.tar.gz
 - bin/rhc-user-info
 - bin/rhc-chk
 - bin/rhc-create-app
@@ -106,13 +246,7 @@ files:
 - bin/rhc-app
 - bin/rhc-port-forward
 - bin/rhc
-- conf/express.conf
-- LICENSE
-- COPYRIGHT
-- README.md
-- Rakefile
-- ext/mkrf_conf.rb
-homepage: https://openshift.redhat.com/app/express
+homepage: https://github.com/openshift/os-client-tools
 licenses: []
 
 post_install_message: 
@@ -145,5 +279,23 @@ rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: OpenShift Client Tools
-test_files: []
-
+test_files: 
+- test/sample-usage.rb
+- test/support/server.rb
+- test/support/testcase.rb
+- test/functional/test_credentials.rb
+- test/functional/domain_test.rb
+- test/functional/application_test.rb
+- test/unit/command_test.rb
+- test/test_helper.rb
+- spec/spec_helper.rb
+- spec/rhc/json_spec.rb
+- spec/rhc/helpers_spec.rb
+- spec/rhc/command_spec.rb
+- spec/rhc/wizard_spec.rb
+- spec/rhc/commands/server_spec.rb
+- spec/rhc/cli_spec.rb
+- spec/rhc/targz_spec.rb
+- spec/rhc/assets/foo.txt
+- spec/rhc/assets/targz_corrupted.tar.gz
+- spec/rhc/assets/targz_sample.tar.gz

data/ext/mkrf_conf.rb

@@ -1,58 +0,0 @@
-## Add some testing for when we are building a rpm and when we're not
-msg = ''
-
-unless ENV['RHC_RPMBUILD']
-  require 'rubygems'
-  require 'rubygems/command.rb'
-  require 'rubygems/dependency_installer.rb' 
-  require 'rubygems/uninstaller.rb'
-  begin
-    Gem::Command.build_args = ARGV
-  rescue NoMethodError
-  end 
-  inst = Gem::DependencyInstaller.new
-  begin
-    if RUBY_VERSION > "1.9"
-      inst.install "test-unit"
-    end
-
-    # Attempt native json installation (unless JSON_PURE is specified)
-    #   - fall back to json_pure if it fails
-    #   - Known failure conditions
-    #     - Ubuntu: using ruby and not ruby-dev
-    begin
-      throw if ENV['JSON_PURE']
-      inst.install('json')
-    rescue
-      inst.install('json_pure')
-    end
-
-  rescue
-    exit(1)
-  end 
-
-  # Remove rhc-rest if it's installed
-  begin
-    Gem::Uninstaller.new('rhc-rest').uninstall
-
-    # This only gets printed if verbose is specified 
-    #   TODO: Need to figure out how to get it always shown
-    msg = <<-MSG
-      ===================================================
-        rhc-rest is no longer needed as an external gem
-          - If it is installed, it will be removed
-          - Its libraries are now included in rhc
-            - Any applications requiring rhc-rest will 
-              still function as expected
-      ===================================================
-    MSG
-  rescue Gem::LoadError,Gem::InstallError
-    # This means that rhc-rest was not installed, not a problem
-  end
-end
-
-f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w")   # create dummy rakefile to indicate success
-f.write("task :default do\n")
-f.write("\tputs '%s'\n" % msg) if msg
-f.write("end\n")
-f.close

data/lib/rhc

@@ -1,115 +0,0 @@
-#
-# This is the bash auto completion script for the rhc command
-# 
-_rhc()
-{
-    local cur opts
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-
-    if [ $COMP_CWORD -eq 1 ]; then
-        opts="domain app sshkey port-forward help"
-        COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
-    elif [ $COMP_CWORD -eq 2 ]; then
-        case "${COMP_WORDS[1]}" in
-            domain)
-                opts="create show alter status destroy"
-                ;;
-            app)
-                opts="create show start stop force-stop restart reload status destroy tidy add-alias remove-alias threaddump snapshot tail cartridge"
-                ;;
-            sshkey)
-                opts="add update remove list"
-                ;;
-            port-forward)
-                opts="--debug --help --rhlogin --password --namespace --config --timeout --app"
-                ;;
-            *)
-                opts=""
-                ;;
-        esac
-
-    elif [ $COMP_CWORD -eq 3 ]; then
-        case "${COMP_WORDS[1]}" in
-            domain)
-                case "${COMP_WORDS[2]}" in
-                    create | alter | destroy)
-                        opts="--debug --help --rhlogin --password --namespace --config --timeout"
-                        ;;
-                    show | status)
-                        opts="--debug --help --rhlogin --password --config --timeout"
-                        ;;
-                    *)
-                        ;;
-                esac
-                ;;
-            app)
-                case "${COMP_WORDS[2]}" in
-                    create)
-                        opts="--debug --help --rhlogin --password --no-dns --nogit --app --repo --type --enable-jenkins --config --timeout"
-                        ;;
-                    show | start | stop | force-stop | restart | reload | status | destroy | tidy | add-alias | remove-alias | threaddump | destroy )
-                        opts="--debug --help --rhlogin --password --app --alias --bypass --config --timeout"
-                        ;;
-                    tail)
-                        opts="--debug --help --rhlogin --password --app --opts --filepath --config --timeout"
-                        ;;
-                    snapshot)
-                        opts="save restore"
-                        ;;
-                    cartridge)
-                        opts="add remove stop start restart status reload list"
-                        ;;
-                    *)
-                        ;;
-                esac
-                ;;
-            sshkey)
-                case "${COMP_WORDS[2]}" in
-                    add | update)
-                        opts="--debug --help --rhlogin --password --identifier --ssh --config --timeout"
-                        ;;
-                    remove)
-                        opts="--debug --help --rhlogin --password --identifier --config --timeout"
-                        ;;
-                    list)
-                        opts="--debug --help --rhlogin --password --config --timeout"
-                        ;;
-                    *)
-                        ;;
-                esac
-                ;;
-        esac
-
-    elif [ $COMP_CWORD -eq 4 ]; then
-        case "${COMP_WORDS[1]}" in
-            app)
-                case "${COMP_WORDS[2]}" in
-                    snapshot)
-                        case "${COMP_WORDS[3]}" in
-                            save | restore)
-                                opts="--debug --help --rhlogin --password --app --filepath --config --timeout"
-                                ;;
-                            *)
-                                ;;
-                        esac
-                        ;;
-                    cartridge)
-                        case "${COMP_WORDS[3]}" in
-                            add | remove | stop | start | restart | status | reload | list)
-                                opts="--debug --help --rhlogin --password --app --cartridge --config --timeout"
-                                ;;
-                            *)
-                                ;;
-                        esac
-                        ;;
-                esac
-                ;;
-        esac
-
-    fi
-
-   if [ ${#opts[@]} -gt 0 ]; then COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ); fi
-   return 0
-}
-complete -o default -F _rhc rhc