rhc 1.3.8 → 1.4.7

data/spec/rhc/commands/cartridge_spec.rb

@@ -370,9 +370,8 @@ describe RHC::Commands::Cartridge do
     end
   end
 
-=begin
-#  Commenting this out for US2438
   describe 'cartridge storage' do
+    let!(:rest_client){ MockRestClient.new }
     let(:cmd_base) { ['cartridge', 'storage'] }
     let(:std_args) { ['-a', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] | (@extra_args || []) }
     let(:cart_type) { ['mock_cart-1'] }
@@ -393,7 +392,7 @@ describe RHC::Commands::Cartridge do
 
     context 'when run for a non-existent cartridge' do
       let(:arguments) { cmd_base | ['bogus_cart'] | std_args }
-      it { fail_with_message("Cartridge bogus_cart can't be found in application", 154) }
+      it { fail_with_message("There are no cartridges that match 'bogus_cart'.", 154) }
     end
 
     context 'when run with -c flag' do
@@ -458,5 +457,4 @@ describe RHC::Commands::Cartridge do
       end
     end
   end
-=end
 end

data/spec/rhc/commands/port_forward_spec.rb

@@ -139,19 +139,28 @@ describe RHC::Commands::PortForward do
     end
 
     context 'when port forwarding a scaled app with ports to forward' do
+      let(:haproxy_host_1) { '127.0.0.1' }
+      let(:haproxy_host_2) { '127.0.0.2' }
+      let(:mongo_host) { '51125bb94a-test907742.dev.rhcloud.com' }
+      let(:ipv6_host) { '::1' }
       before(:each) do
         Net::SSH.should_receive(:start).with(@uri.host, @uri.user).and_yield(@ssh).twice
-        @ssh.should_receive(:exec!).with("rhc-list-ports").and_yield(nil, :stderr, "httpd -> 127.0.0.1:8080\nhttpd -> 127.0.0.2:8080")
+        @ssh.should_receive(:exec!).with("rhc-list-ports").
+          and_yield(nil, :stderr, "httpd -> #{haproxy_host_1}:8080\nhttpd -> #{haproxy_host_2}:8080\nmongodb -> #{mongo_host}:35541\nmysqld -> #{ipv6_host}:3306")
         forward = mock(Net::SSH::Service::Forward)
         @ssh.should_receive(:forward).at_least(3).times.and_return(forward)
         if mac?
-          forward.should_receive(:local).with(8080, '127.0.0.1', 8080)
-          forward.should_receive(:local).with(8080, '127.0.0.2', 8080).and_raise(Errno::EADDRINUSE)
-          forward.should_receive(:local).with(8081, '127.0.0.2', 8080)
+          forward.should_receive(:local).with(8080, haproxy_host_1, 8080)
+          forward.should_receive(:local).with(8080, haproxy_host_2, 8080).and_raise(Errno::EADDRINUSE)
+          forward.should_receive(:local).with(8081, haproxy_host_2, 8080)
+          forward.should_receive(:local).with(35541, mongo_host, 35541)
+          forward.should_receive(:local).with(3306, ipv6_host, 3306)
         else
-          forward.should_receive(:local).with('127.0.0.1', 8080, '127.0.0.1', 8080)
-          forward.should_receive(:local).with('127.0.0.2', 8080, '127.0.0.2', 8080).and_raise(Errno::EADDRINUSE)
-          forward.should_receive(:local).with('127.0.0.2', 8081, '127.0.0.2', 8080)
+          forward.should_receive(:local).with(haproxy_host_1, 8080, haproxy_host_1, 8080)
+          forward.should_receive(:local).with(haproxy_host_2, 8080, haproxy_host_2, 8080).and_raise(Errno::EADDRINUSE)
+          forward.should_receive(:local).with(haproxy_host_2, 8081, haproxy_host_2, 8080)
+          forward.should_receive(:local).with(mongo_host, 35541, mongo_host, 35541)
+          forward.should_receive(:local).with(ipv6_host, 3306, ipv6_host, 3306)
         end
         @ssh.should_receive(:loop).and_raise(Interrupt.new)
       end

data/spec/rhc/helpers_spec.rb

@@ -8,6 +8,7 @@ require 'highline/import'
 require 'rhc/config'
 require 'rhc/helpers'
 require 'date'
+require 'resolv'
 
 describe RHC::Helpers do
   before(:each) do
@@ -320,6 +321,34 @@ describe RHC::Helpers do
       subject.fingerprint_for_local_key('1').should be_nil
     end
   end
+  
+  context "Resolv helper" do
+    let(:resolver) { Object.new }
+    let(:existent_host) { 'real_host' }
+    let(:nonexistent_host) { 'fake_host' }
+    
+    before :all do
+      Resolv::Hosts.stub(:new) { resolver }
+      resolver.stub(:getaddress).with(existent_host)   { existent_host }
+      resolver.stub(:getaddress).with(nonexistent_host){ Resolv::ResolvError }
+    end
+    
+    context "when hosts file has the desired host" do
+      it "does not raise error" do
+        expect {
+          subject.hosts_file_contains?(existent_host)
+        }.to_not raise_error
+      end
+    end
+
+    context "when hosts file does not have the desired host" do
+      it "does not raise error" do
+        expect {
+          subject.hosts_file_contains?(nonexistent_host)
+        }.to_not raise_error
+      end
+    end
+  end
 
   class OutputTests
     include RHC::Helpers
@@ -490,6 +519,7 @@ describe RHC::CartridgeHelpers do
 
   subject do
     Class.new(Object) do
+      include RHC::Helpers
       include RHC::CartridgeHelpers
 
       def config
@@ -498,26 +528,32 @@ describe RHC::CartridgeHelpers do
     end.new
   end
 
-  describe '#find_cartridge' do
+  describe '#check_cartridges' do
     let(:cartridges){ [] }
     let(:find_cartridges){ [] }
     context "with a generic object" do
-      let(:rest_obj) do
-        Object.new.tap do |o|
-          o.stub(:find_cartridges).and_return(find_cartridges)
-          o.stub(:cartridges).and_return(cartridges)
-        end
-      end
-      it { expect{ subject.find_cartridge(rest_obj, 'foo') }.should raise_error(RHC::CartridgeNotFoundException, 'Cartridge \'foo\' is not a valid cartridge name.') }
+      it { expect{ subject.send(:check_cartridges, 'foo', :from => cartridges) }.should raise_error(RHC::CartridgeNotFoundException, 'There are no cartridges that match \'foo\'.') }
     end
-    context "with an Application" do
-      let(:rest_obj) do
-        RHC::Rest::Application.new('name' => 'my_app').tap do |o|
-          o.stub(:find_cartridges).and_return(find_cartridges)
-          o.stub(:cartridges).and_return(cartridges)
-        end
-      end
-      it { expect{ subject.find_cartridge(rest_obj, 'foo') }.should raise_error(RHC::CartridgeNotFoundException, 'Cartridge \'foo\' cannot be found in application \'my_app\'.') }
+  end
+  describe '#web_carts_only' do
+    it { expect{ subject.send(:web_carts_only).call([]) }.to raise_error(RHC::MultipleCartridgesException, /You must select only a single web/) }
+  end
+
+  describe '#match_cart' do
+    context 'with a nil cart' do
+      let(:cart){ OpenStruct.new(:name => nil, :description => nil, :tags => nil) }
+      it{ subject.send(:match_cart, cart, 'foo').should be_false }
+    end
+    context 'with simple strings' do
+      let(:cart){ OpenStruct.new(:name => 'FOO-more_max any', :description => 'bar', :tags => [:baz]) }
+      it{ subject.send(:match_cart, cart, 'foo').should be_true }
+      it{ subject.send(:match_cart, cart, 'fo').should be_true }
+      it{ subject.send(:match_cart, cart, 'oo').should be_true }
+      it{ subject.send(:match_cart, cart, 'bar').should be_true }
+      it{ subject.send(:match_cart, cart, 'baz').should be_true }
+      it{ subject.send(:match_cart, cart, 'more max').should be_true }
+      it{ subject.send(:match_cart, cart, 'foo more max any').should be_true }
+      it{ subject.send(:match_cart, cart, 'foo_more max-any').should be_true }
     end
   end
 end

data/spec/rhc/wizard_spec.rb

@@ -56,12 +56,7 @@ describe RHC::Wizard do
       subject.should_receive(:ssh_key_uploaded?).and_return(true)
       subject.should_receive(:applications).and_return([app])
       Net::SSH.should_receive(:start).and_raise(StandardError.new('an_error'))
-      subject.should_receive(:report_result) do |ssh, msg|
-        ssh.should be_nil
-        msg.should match('An SSH connection could not be established')
-        msg.should match('an_error')
-      end
-      subject.send(:test_ssh_connectivity).should be_false
+      expect{ subject.send(:test_ssh_connectivity) }.to raise_error(RuntimeError, /An SSH connection could not be established to foo.com/)
     end
   end
 

data/spec/spec_helper.rb

@@ -55,7 +55,6 @@ class FakeFS::File
   end
 end
 
-#include 'mocha'
 require 'rhc/cli'
 
 include WebMock::API

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhc
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
@@ -225,22 +209,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: dnsruby
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -261,20 +229,7 @@ description: The client tools for the OpenShift platform that allow for applicat
   management.
 email: dev@lists.openshift.redhat.com
 executables:
-- rhc-tail-files
-- rhc-domain
-- rhc-user-info
-- rhc-create-domain
-- rhc-ctl-app
-- rhc-ctl-domain
-- rhc-chk
-- rhc-app
-- rhc-create-app
 - rhc
-- rhc-sshkey
-- rhc-domain-info
-- rhc-snapshot
-- rhc-port-forward
 extensions: []
 extra_rdoc_files: []
 files:
@@ -330,7 +285,6 @@ files:
 - lib/rhc/help_formatter.rb
 - lib/rhc/rest.rb
 - lib/rhc/helpers.rb
-- lib/rhc-common.rb
 - lib/rhc.rb
 - lib/rhc/usage_templates/command_syntax_help.erb
 - lib/rhc/usage_templates/help.erb
@@ -414,20 +368,7 @@ files:
 - features/lib/rhc_helper/persistable.rb
 - features/lib/rhc_helper/sshkey.rb
 - features/README.md
-- bin/rhc-tail-files
-- bin/rhc-domain
-- bin/rhc-user-info
-- bin/rhc-create-domain
-- bin/rhc-ctl-app
-- bin/rhc-ctl-domain
-- bin/rhc-chk
-- bin/rhc-app
-- bin/rhc-create-app
 - bin/rhc
-- bin/rhc-sshkey
-- bin/rhc-domain-info
-- bin/rhc-snapshot
-- bin/rhc-port-forward
 homepage: https://github.com/openshift/rhc
 licenses: []
 post_install_message: ! '===========================================================================

data/bin/rhc-app

@@ -1,549 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rhc/coverage_helper'
-
-require 'rhc-common'
-require 'base64'
-
-if ["add-alias", "remove-alias"].include? ARGV[0]
-  RHC::Helpers.deprecated_command('rhc alias (add|remove)',true)
-elsif "snapshot" == ARGV[0]
-  RHC::Helpers.deprecated_command('rhc snapshot (save|restore)',true)
-elsif "tail" == ARGV[0]
-  RHC::Helpers.deprecated_command('rhc tail',true)
-elsif "cartridge" == ARGV[0]
-  RHC::Helpers.deprecated_command('rhc cartridge (add|remove|status|stop|start|restart|reload)',true)
-else
-  RHC::Helpers.deprecated_command('rhc app (create|delete|show|stop|force-stop|start|restart|reload|tidy)',true)
-end
-
-$embed_mapper = { 'add' => 'configure', 'remove' => 'deconfigure' }
-
-#
-# print help
-#
-def p_usage(exit_code = 255)
-    libra_server = get_var('libra_server')
-    rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
-    type_keys = RHC::get_cartridge_listing(nil, ', ', libra_server, RHC::Config.default_proxy, 'standalone', false)
-    puts <<USAGE
-
-Usage: rhc app (<command> | cartridge <cartridge-action> | --help) [<args>]
-Create and manage an OpenShift application.
-
-List of commands
-  create                         Create a new application on OpenShift
-  show                           Display information about a user
-  start                          Starts the application (includes all cartridges)
-  stop                           Stops the application (includes all cartridges)
-  force-stop                     Stops all application processes
-  restart                        Restart the application
-  reload                         Reloads application configuration
-  status                         Returns application status
-  destroy                        Destroys the application
-  tidy                           Garbage collects the git repo and empties log/tmp dirs
-  add-alias                      Add a custom domain name for the application
-  remove-alias                   Remove a custom domain name for the application
-  tail                           Tail the logs of an application
-  snapshot       [save|restore]  Saves/Restores an application snapshot to/from a tarball at the location specified using --filepath (default: ./$APPNAME.tar.gz)
-  cartridge      <action>        Manage a cartridge running in this application
-
-List of cartridge actions
-  list                           List of supported embedded cartridges
-  add                            Add a cartridge to this application
-  remove                         Remove a cartridge from this application
-  stop                           Stop a cartridge
-  start                          Start a cartridge
-  restart                        Restart a cartridge
-  status                         Returns cartridge status
-  reload                         Reloads cartridge configuration
-
-List of arguments
-  -l|--rhlogin      rhlogin      OpenShift login (#{rhlogin})
-  -p|--password     password     Password (optional, will prompt)
-  -a|--app          application  Application name  (alphanumeric - max #{RHC::APP_NAME_MAX_LENGTH} chars) (required)
-  -t|--type         type         Type of app to create (#{type_keys}) (required for creating an application)
-  -c|--cartridge    cartridge    The embedded cartrige to manage (required for the cartridge command)
-  -g|--gear-size    size         The size of the gear for this app ([small|medium], defaults to small)
-  -s|--scaling                   Enable scaling for this app
-  -r|--repo         path         Git Repo path (defaults to ./$app_name)
-  -n|--nogit                     Only create remote space, don't pull it locally
-  --no-dns                       Skip DNS check. Must be used in combination with --nogit
-  -d|--debug                     Print Debug info
-  -h|--help                      Show Usage info
-  -b|--bypass                    Bypass warnings (applicable to application destroying only)
-  -f|--filepath     filepath     Applicable in case of snapshot and log command
-  -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')
-  --alias           alias        Specify server alias (when using add/remove-alias)
-  --config          path         Path of alternate config file
-  --timeout         #            Timeout, in seconds, for the session
-  --enable-jenkins  [name]       Enables builds for your application with Jenkins.  You may optionally specify the name of the Jenkins application that is created (default: 'jenkins').  Note that --no-dns is ignored for the creation of the Jenkins application.
-USAGE
-exit exit_code
-end
-
-
-def validate_args(val_type=true, val_cartridge=false, val_timeout=true)
-
-  # If provided a config path, check it
-  RHC::Config.check_cpath($opt)
-  
-  # Pull in configs from files
-  $libra_server = get_var('libra_server')
-  debug = get_var('debug') == 'false' ? nil : get_var('debug')
-  
-  $opt['rhlogin'] = get_var('default_rhlogin') unless $opt['rhlogin']
-  p_usage if !RHC::check_rhlogin($opt['rhlogin'])
-  
-  p_usage if !RHC::check_app($opt['app'])
-
-  if val_type && !$opt['type']
-    puts "Application Type is required"
-    p_usage
-  end
-  
-  if val_cartridge && !$opt['cartridge']
-    puts "Cartridge name is required"
-    p_usage
-  end
-  
-  debug = true if $opt.has_key? 'debug'
-  RHC::debug(debug)
-  
-  RHC::timeout($opt["timeout"], get_var('timeout')) if val_timeout
-  RHC::connect_timeout($opt["timeout"], get_var('timeout')) if val_timeout
-
-  $password = $opt['password'] ? $opt['password'] : RHC::get_password
-end
-
-def create_app
-  validate_args
-  
-  user_info = RHC::get_user_info($libra_server, $opt['rhlogin'], $password, RHC::Config.default_proxy, false)
-  app_info = user_info['app_info']
-  
-  if app_info[$opt['app']]
-    puts "An application named '#{$opt['app']}' in namespace '#{user_info['user_info']['domains'][0]['namespace']}' already exists"
-    exit 255
-  end
-  
-  jenkins_app_name = nil
-  has_jenkins = false
-  if $opt['enable-jenkins']
-    app_info.each do |app_name, app|
-      if app['framework'] == 'jenkins-1.4'
-        jenkins_app_name = app_name
-        has_jenkins = true
-        puts "
-Found existing Jenkins application: #{jenkins_app_name}
-"
-        if !$opt['enable-jenkins'].empty?
-          puts "Ignoring specified Jenkins app name: #{$opt['enable-jenkins']}"
-        end
-      end
-    end
-    if !has_jenkins
-      if $opt['type'] =~ /^jenkins-/
-        has_jenkins = true
-        if $opt['no-dns']
-          puts "
-The --no-dns option can't be used in conjunction with --enable-jenkins 
-when creating a #{$opt['type']} application.  Either remove the --no-dns
-option or first install your #{$opt['type']} application with --no-dns
-and then use 'rhc app cartridge add' to embed the Jenkins client. 
-"
-          exit 255
-        end
-        jenkins_app_name = $opt['app']
-        puts "
-The Jenkins client will be embedded into the Jenkins application 
-currently being created: '#{$opt['app']}'
-"
-      end
-    end
-    if !has_jenkins
-      if !$opt['enable-jenkins'].empty?
-        jenkins_app_name = $opt['enable-jenkins']
-      else
-        jenkins_app_name = 'jenkins'
-      end
-    
-      if !RHC::check_app(jenkins_app_name)
-          p_usage
-      end
-  
-      if jenkins_app_name == $opt['app']
-        puts "You must specify a different name for your application and Jenkins ('#{$opt['app']}')."
-        exit 100
-      end
-    
-      if app_info.has_key?(jenkins_app_name)
-        puts "You already have an application named '#{jenkins_app_name}'."
-        puts "In order to continue you'll need to specify a different name"
-        puts "with --enable-jenkins or destroy the existing application."
-        exit 100
-      end
-    end
-  end
-
-  $opt['gear-size']='small' unless $opt['gear-size']
-  
-  $opt['repo'] = $opt['app'] unless $opt['repo']
-  
-  if @mydebug
-    puts "
-    Found a bug? Post to the forum and we'll get right on it.
-        IRC: #openshift on freenode
-        Forums: https://openshift.redhat.com/community/forums/openshift
-    
-    "
-  end
-  
-  #
-  # Confirm local git repo exists
-  #
-  unless $opt['nogit']
-      if File.exists?($opt['repo'])
-          puts "We will not overwrite an existing git repo. Please remove:"
-          puts "  #{File.expand_path($opt['repo'])}"
-          puts "Then try again."
-          puts
-          exit 210
-      else
-          begin
-              # Create the parent directory for the git repo
-              @git_parent = File.expand_path($opt['repo'] + "/../")
-              FileUtils.mkdir_p(@git_parent)
-          rescue Exception => e
-              puts "Could not write to #{@git_parent}"
-              puts "Reason: #{e.message}"
-              puts
-              puts "Please re-run from a directory you have write access to or specify -r with a"
-              puts "path you have write access to"
-              puts
-              exit 211
-          end
-      end
-  end
-  
-  if jenkins_app_name && !has_jenkins
-    jenkins_app = RHC::create_app($libra_server, RHC::Config.default_proxy, user_info, jenkins_app_name, 'jenkins-1.4', $opt['rhlogin'], $password, nil, false, true, true)
-    available = RHC::check_app_available(RHC::Config.default_proxy, jenkins_app[:app_name], jenkins_app[:fqdn], jenkins_app[:health_check_path], jenkins_app[:result], jenkins_app[:git_url], nil, true)
-    if !available
-      puts "Unable to access your new Jenkins application."
-      exit 1
-    end
-  end
-  
-  #
-  # Create remote application space
-  #
-  main_app = RHC::create_app($libra_server, RHC::Config.default_proxy, user_info, $opt['app'], $opt['type'], $opt['rhlogin'], $password, $opt['repo'], $opt['no-dns'], $opt['nogit'], false, $opt['gear-size'], $opt['scaling'])
-  if jenkins_app_name
-    puts "Now embedding the jenkins client into '#{$opt['app']}'..."
-    RHC::ctl_app($libra_server, RHC::Config.default_proxy, $opt['app'], $opt['rhlogin'], $password, 'configure', true, 'jenkins-client-1.4', nil, false)
-  end
-  
-  if $opt['no-dns']
-    # In case of the no-dns option, the availability check is not made
-    # This also results in the git information and app creation result not being displayed
-    # Hence, for this case, we print out the git url and result here
-    puts "git url: #{main_app[:git_url]}"
-    if main_app[:result] && !main_app[:result].empty?
-      puts "#{main_app[:result]}"
-    end
-  else
-    available = RHC::check_app_available(RHC::Config.default_proxy, main_app[:app_name], main_app[:fqdn], main_app[:health_check_path], main_app[:result], main_app[:git_url], $opt['repo'], $opt['nogit'])
-    if !available
-      puts "Unable to access your new application."
-      exit 1
-    end
-  end
-
-end
-
-def get_args(l)
-  l.shift
-  args = ""
-  l.each do|a|
-    if (a.to_s.strip.length == 0 || a.to_s.strip.match(/\s/) ); a = "'#{a}'" end    
-    args += " #{a}"
-  end
-  args
-end
-
-def show_app
-  validate_args(false)
-  user_info = RHC::get_user_info($libra_server, $opt['rhlogin'], $password, RHC::Config.default_proxy, true)
-  
-  app_found = false
-  unless user_info['app_info'].empty?
-    user_info['app_info'].each do |key, val|
-      if key == $opt['app']
-        app_found = true
-        puts ""
-        puts "Application Info"
-        puts "================"
-        puts key
-        puts "    Framework: #{val['framework']}"
-        puts "     Creation: #{val['creation_time']}"
-        puts "         UUID: #{val['uuid']}"
-        puts "      Git URL: ssh://#{val['uuid']}@#{key}-#{user_info['user_info']['domains'][0]['namespace']}.#{user_info['user_info']['rhc_domain']}/~/git/#{key}.git/"
-        puts "   Public URL: http://#{key}-#{user_info['user_info']['domains'][0]['namespace']}.#{user_info['user_info']['rhc_domain']}/"
-        if val['aliases'] && !val['aliases'].empty?
-          puts "      Aliases: #{val['aliases'].join(', ')}"
-        end
-        puts ""
-        puts " Embedded: "
-        if val['embedded'] && !val['embedded'].empty? 
-            val['embedded'].each do |embed_key, embed_val|
-                if embed_val.has_key?('info') && !embed_val['info'].empty?
-                    puts "      #{embed_key} - #{embed_val['info']}"
-                else
-                    puts "      #{embed_key}"
-                end
-            end
-        else
-            puts "      None"
-        end
-        puts ""
-        
-        # there should be a single application with the given app name
-        break
-        
-      end
-    end
-  end
-
-  if !app_found
-    puts
-    puts "Could not find app '#{$opt['app']}'.  Please run 'rhc domain show' to get a list"
-    puts "of your current running applications"
-    puts
-    exit 1
-  end
-
-end
-
-def control_app(command)
-  validate_args(false)
-  
-  if ($opt['alias'] and !(command =~ /-alias$/)) || (command =~ /-alias$/ and ! $opt['alias'])
-    puts "When specifying alias make sure to use add-alias or remove-alias command"
-    p_usage
-  end
-
-  command = "deconfigure" if command == "destroy"
-  
-  if !$opt["bypass"] and command == "deconfigure"
-    # deconfigure is the actual hook called on 'destroy'
-    # destroy is used for clarity
-    puts <<WARNING
-!!!! WARNING !!!! WARNING !!!! WARNING !!!!
-You are about to destroy the #{$opt['app']} application.
-
-This is NOT reversible, all remote data for this application will be removed.
-WARNING
-
-    print "Do you want to destroy this application (y/n): "
-    begin
-      agree = gets.chomp
-      if agree != 'y'
-          puts "\n"
-          exit 217
-      end
-    rescue Interrupt
-      puts "\n"
-      exit 217
-    end
-  end
-
-  RHC::ctl_app($libra_server, RHC::Config.default_proxy, $opt['app'], $opt['rhlogin'], $password, command, false, nil, $opt['alias'])
-end
-
-def control_cartridge(command)
-  validate_args(false, true)
-  
-  # override command if it's in the mapper
-  command = $embed_mapper[command] if $embed_mapper[command]
-  framework = $opt['cartridge']
-  
-  RHC::ctl_app($libra_server, RHC::Config.default_proxy, $opt['app'], $opt['rhlogin'], $password, command, true, framework, $opt['alias'])
-end
-
-def show_embedded_list
-    libra_server = get_var('libra_server')
-    puts ""
-    puts "List of supported embedded cartridges:"
-    puts ""
-    type_keys = RHC::get_cartridge_listing(nil, ', ', libra_server, RHC::Config.default_proxy, 'embedded', false)
-    puts type_keys
-    puts ""
-
-    # we should always get something back unless there was an error
-    exit 255 if type_keys.length == 0
-    exit 0
-end
-
-def save_or_restore_snapshot(command)
-  validate_args(false, false, true)
-
-  user_info = RHC::get_user_info($libra_server, $opt['rhlogin'], $password, RHC::Config.default_proxy, @mydebug, false)
-  
-  app = $opt['app']
-  $opt['filepath'] = "#{$opt['app']}.tar.gz" unless $opt['filepath']
-  
-  unless user_info['app_info'][app]
-      puts
-      puts "Could not find app '#{app}'.  Please run 'rhc domain show' to get a list"
-      puts "of your current running applications"
-      puts
-      exit 101
-  end
-  
-  app_uuid = user_info['app_info'][app]['uuid']
-  namespace = user_info['user_info']['domains'][0]['namespace']
-  rhc_domain = user_info['user_info']['rhc_domain']
-  
-  if command == 'save'
-    status = RHC.snapshot_create rhc_domain, namespace, app, app_uuid, $opt['filepath'], @mydebug
-    exit status if ! status
-  else
-    status = RHC.snapshot_restore rhc_domain, namespace, app, app_uuid, $opt['filepath'], @mydebug
-    exit status if ! status
-  end
-
-end
-
-begin
-  argv_c = ARGV.clone
-  
-  if ARGV[0] =~ /^create$/
-    ARGV.shift
-    opts = GetoptLong.new(
-        ["--debug", "-d", GetoptLong::NO_ARGUMENT],
-        ["--help",  "-h", GetoptLong::NO_ARGUMENT],
-        ["--rhlogin", "-l", GetoptLong::REQUIRED_ARGUMENT],
-        ["--gear-size", "-g", GetoptLong::REQUIRED_ARGUMENT],
-        ["--password", "-p", GetoptLong::REQUIRED_ARGUMENT],
-        ["--no-dns", GetoptLong::NO_ARGUMENT],
-        ["--nogit", "-n", GetoptLong::NO_ARGUMENT],
-        ["--app",   "-a", GetoptLong::REQUIRED_ARGUMENT],
-        ["--repo",  "-r", GetoptLong::REQUIRED_ARGUMENT],
-        ["--type",  "-t", GetoptLong::REQUIRED_ARGUMENT],
-        ["--enable-jenkins", GetoptLong::OPTIONAL_ARGUMENT],
-        ["--scaling", "-s", GetoptLong::OPTIONAL_ARGUMENT],
-        ["--config", GetoptLong::REQUIRED_ARGUMENT],
-        ["--timeout", GetoptLong::REQUIRED_ARGUMENT]
-    )
-  elsif ARGV[0] =~ /^(show|start|stop|force-stop|restart|reload|status|destroy|tidy|add-alias|remove-alias|destroy)$/
-    ARGV.shift
-    opts = GetoptLong.new(
-        ["--debug", "-d", GetoptLong::NO_ARGUMENT],
-        ["--help",  "-h", GetoptLong::NO_ARGUMENT],
-        ["--rhlogin", "-l", GetoptLong::REQUIRED_ARGUMENT],
-        ["--password", "-p", GetoptLong::REQUIRED_ARGUMENT],
-        ["--app",   "-a", GetoptLong::REQUIRED_ARGUMENT],
-        ["--alias", GetoptLong::REQUIRED_ARGUMENT],
-        ["--bypass", "-b", GetoptLong::NO_ARGUMENT],
-        ["--config", GetoptLong::REQUIRED_ARGUMENT],
-        ["--timeout", GetoptLong::REQUIRED_ARGUMENT]
-    )
-  elsif ARGV[0] =~ /^cartridge$/
-    ARGV.shift
-    ARGV.shift if ARGV[0] =~ /^(add|remove|stop|start|restart|status|reload|list)$/
-    opts = GetoptLong.new(
-        ["--debug", "-d", GetoptLong::NO_ARGUMENT],
-        ["--help", "-h", GetoptLong::NO_ARGUMENT],
-        ["--rhlogin", "-l", GetoptLong::REQUIRED_ARGUMENT],
-        ["--password", "-p", GetoptLong::REQUIRED_ARGUMENT],
-        ["--app", "-a", GetoptLong::REQUIRED_ARGUMENT],
-        ["--cartridge", "-c", GetoptLong::REQUIRED_ARGUMENT],
-        ["--config", GetoptLong::REQUIRED_ARGUMENT],
-        ["--timeout", GetoptLong::REQUIRED_ARGUMENT]
-    )
-  elsif ARGV[0] =~ /^tail$/
-    ARGV.shift
-    opts = GetoptLong.new(
-        ["--debug", "-d", GetoptLong::NO_ARGUMENT],
-        ["--help", "-h", GetoptLong::NO_ARGUMENT],
-        ["--rhlogin", "-l", GetoptLong::REQUIRED_ARGUMENT],
-        ["--password", "-p", GetoptLong::REQUIRED_ARGUMENT],
-        ["--app", "-a", GetoptLong::REQUIRED_ARGUMENT],
-        ["--opts", "-o", GetoptLong::REQUIRED_ARGUMENT],
-        ["--filepath", "-f", GetoptLong::REQUIRED_ARGUMENT],
-        ["--config", GetoptLong::REQUIRED_ARGUMENT],
-        ["--timeout", GetoptLong::REQUIRED_ARGUMENT]
-    )
-  elsif ARGV[0] =~ /^snapshot$/
-    ARGV.shift
-    ARGV.shift if ARGV[0] =~ /^(save|restore)$/
-    opts = GetoptLong.new(
-        ["--debug", "-d", GetoptLong::NO_ARGUMENT],
-        ["--help", "-h", GetoptLong::NO_ARGUMENT],
-        ["--rhlogin", "-l", GetoptLong::REQUIRED_ARGUMENT],
-        ["--password", "-p", GetoptLong::REQUIRED_ARGUMENT],
-        ["--app", "-a", GetoptLong::REQUIRED_ARGUMENT],
-        ["--filepath", "-f", GetoptLong::REQUIRED_ARGUMENT],
-        ["--config", GetoptLong::REQUIRED_ARGUMENT],
-        ["--timeout", GetoptLong::REQUIRED_ARGUMENT]
-    )
-  else
-    opts = GetoptLong.new(
-      ["--help",  "-h", GetoptLong::NO_ARGUMENT]
-    )
-    unless ARGV[0] =~ /^(help|-h|--help)$/
-      puts "Missing or invalid command!" unless ARGV[0] =~ /^(help|-h|--help)$/
-      #  just exit at this point
-      # printing the usage description will be handled in the rescue
-      exit 255
-    end
-  end
-
-  $opt = {}
-  opts.each do |o, a|
-    $opt[o[2..-1]] = a.to_s
-  end
-
-rescue Exception => e
-  p_usage
-end
-
-p_usage 0 if $opt["help"]
-
-case argv_c[0]
-  when "create"
-    create_app
-  when "show"
-    show_app
-  when "start", "stop", "force-stop", "restart", "reload", "status", "tidy", "add-alias", "remove-alias", "destroy"
-    control_app(argv_c[0])
-  when "tail"
-    system("rhc-tail-files #{get_args argv_c} 2>&1")
-    exit $?.exitstatus
-  when "snapshot"
-    case argv_c[1]
-    when "save", "restore"
-      save_or_restore_snapshot(argv_c[1])
-    else
-      puts "Missing or invalid snapshot action!"
-      p_usage
-    end
-  when "cartridge"
-    case argv_c[1]
-    when "add", "remove", "start", "stop", "restart", "status", "reload"
-      control_cartridge(argv_c[1])
-    when "list", nil
-      show_embedded_list
-    else
-      puts "Missing or invalid cartridge action!"
-      p_usage
-    end
-  when "-h", "--help", "help", nil
-    p_usage 0
-  else
-    puts "Invalid command!"
-    p_usage
-end
-
-exit 0