rhc 1.12.4 → 1.13.6

data/autocomplete/rhc_bash

@@ -10,9 +10,9 @@ _rhc()
     if [[ "$cur" == -* ]]; then
       opts="--always-prefix --clean --config --debug --insecure --limit --mock --noprompt --password --raw --rhlogin --server --ssl-ca-file --ssl-client-cert-file --ssl-version --timeout --token"
     elif [ -z $cur ]; then
-      opts="account alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert app app-create app-delete app-force-stop app-reload app-restart app-show app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage domain domain-create domain-delete domain-list domain-show domain-update git-clone logout port-forward server setup snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show tail threaddump"
+      opts="account alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert app app-create app-delete app-force-stop app-reload app-restart app-show app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage domain domain-create domain-delete domain-list domain-show domain-update env env-list env-set env-show env-unset git-clone logout port-forward server setup snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show tail threaddump"
     else
-      opts="account account-logout add-alias add-authorization add-cartridge add-sshkey alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert aliases app app-create app-delete app-force-stop app-reload app-restart app-show app-snapshot app-ssh app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list authorizations cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage cartridges create-app create-domain delete-all-authorization delete-app delete-authorization delete-cert-alias delete-domain domain domain-create domain-delete domain-list domain-show domain-update domains force-stop-app git-clone list-alias list-authorization list-cartridge list-domain list-sshkey logout port-forward reload-app reload-cartridge remove-alias remove-cartridge remove-sshkey restart-app restart-cartridge restore-snapshot save-snapshot scale-cartridge server setup show-app show-cartridge show-domain show-sshkey snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show start-app start-cartridge status-cartridge stop-app stop-cartridge storage-cartridge tail threaddump tidy-app update-cert-alias update-domain"
+      opts="account account-logout add-alias add-authorization add-cartridge add-sshkey alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert aliases app app-create app-delete app-env app-force-stop app-reload app-restart app-show app-snapshot app-ssh app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list authorizations cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage cartridges create-app create-domain delete-all-authorization delete-app delete-authorization delete-cert-alias delete-domain domain domain-create domain-delete domain-list domain-show domain-update domains env env-add env-list env-remove env-set env-show env-unset force-stop-app git-clone list-alias list-authorization list-cartridge list-domain list-env list-sshkey logout port-forward reload-app reload-cartridge remove-alias remove-cartridge remove-sshkey restart-app restart-cartridge restore-snapshot save-snapshot scale-cartridge server set-env setup show-app show-cartridge show-domain show-env show-sshkey snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show start-app start-cartridge status-cartridge stop-app stop-cartridge storage-cartridge tail threaddump tidy-app unset-env update-cert-alias update-domain"
     fi
   else
     prev="${COMP_WORDS[@]:0:COMP_CWORD}"
@@ -62,7 +62,7 @@ _rhc()
 
       "rhc add-cartridge")
         if [[ "$cur" == -* ]]; then
-          opts="--app --cartridge --namespace"
+          opts="--app --cartridge --env --namespace"
         else
           opts=""
         fi
@@ -176,13 +176,13 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="snapshot create delete start stop force-stop restart reload tidy show"
+          opts="snapshot env create delete start stop force-stop restart reload tidy show"
         fi
         ;;
 
       "rhc app create")
         if [[ "$cur" == -* ]]; then
-          opts="--app --dns --enable-jenkins --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --nogit --repo --scaling --type"
+          opts="--app --dns --enable-jenkins --env --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --nogit --repo --scaling --type"
         else
           opts=""
         fi
@@ -196,6 +196,14 @@ _rhc()
         fi
         ;;
 
+      "rhc app env")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --confirm --env --namespace"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc app force-stop")
         if [[ "$cur" == -* ]]; then
           opts="--app --namespace"
@@ -270,7 +278,7 @@ _rhc()
 
       "rhc app-create")
         if [[ "$cur" == -* ]]; then
-          opts="--app --dns --enable-jenkins --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --nogit --repo --scaling --type"
+          opts="--app --dns --enable-jenkins --env --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --nogit --repo --scaling --type"
         else
           opts=""
         fi
@@ -284,6 +292,14 @@ _rhc()
         fi
         ;;
 
+      "rhc app-env")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --confirm --env --namespace"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc app-force-stop")
         if [[ "$cur" == -* ]]; then
           opts="--app --namespace"
@@ -454,7 +470,7 @@ _rhc()
 
       "rhc cartridge add")
         if [[ "$cur" == -* ]]; then
-          opts="--app --cartridge --namespace"
+          opts="--app --cartridge --env --namespace"
         else
           opts=""
         fi
@@ -542,7 +558,7 @@ _rhc()
 
       "rhc cartridge-add")
         if [[ "$cur" == -* ]]; then
-          opts="--app --cartridge --namespace"
+          opts="--app --cartridge --env --namespace"
         else
           opts=""
         fi
@@ -638,7 +654,7 @@ _rhc()
 
       "rhc create-app")
         if [[ "$cur" == -* ]]; then
-          opts="--app --dns --enable-jenkins --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --nogit --repo --scaling --type"
+          opts="--app --dns --enable-jenkins --env --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --nogit --repo --scaling --type"
         else
           opts=""
         fi
@@ -788,6 +804,110 @@ _rhc()
         fi
         ;;
 
+      "rhc env")
+        if [[ "$cur" == -* ]]; then
+          opts=""
+        else
+          opts="add set remove unset list show"
+        fi
+        ;;
+
+      "rhc env add")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --confirm --env --namespace"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc env list")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --namespace --quotes --table"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc env remove")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --confirm --env --namespace"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc env set")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --confirm --env --namespace"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc env show")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --env --namespace --quotes --table"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc env unset")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --confirm --env --namespace"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc env-add")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --confirm --env --namespace"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc env-list")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --namespace --quotes --table"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc env-remove")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --confirm --env --namespace"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc env-set")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --confirm --env --namespace"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc env-show")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --env --namespace --quotes --table"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc env-unset")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --confirm --env --namespace"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc force-stop-app")
         if [[ "$cur" == -* ]]; then
           opts="--app --namespace"
@@ -836,6 +956,14 @@ _rhc()
         fi
         ;;
 
+      "rhc list-env")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --namespace --quotes --table"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc list-sshkey")
         if [[ "$cur" == -* ]]; then
           opts=""
@@ -948,6 +1076,14 @@ _rhc()
         fi
         ;;
 
+      "rhc set-env")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --confirm --env --namespace"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc setup")
         if [[ "$cur" == -* ]]; then
           opts="--autocomplete --clean --create-token --no-create-token --server"
@@ -980,6 +1116,14 @@ _rhc()
         fi
         ;;
 
+      "rhc show-env")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --env --namespace --quotes --table"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc show-sshkey")
         if [[ "$cur" == -* ]]; then
           opts=""
@@ -1180,6 +1324,14 @@ _rhc()
         fi
         ;;
 
+      "rhc unset-env")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --confirm --env --namespace"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc update-cert-alias")
         if [[ "$cur" == -* ]]; then
           opts="--app --certificate --namespace --passphrase --private-key"

data/bin/rhc

@@ -5,7 +5,7 @@ def get_args
   ARGV.shift
   args = ""
   ARGV.each do|a|
-    if ( a.to_s.strip.length == 0 || a.to_s.strip.match(/\s/) ); a = "'#{a}'" end    
+    if ( a.to_s.strip.length == 0 || a.to_s.strip.match(/\s/) ); a = "'#{a}'" end
     args += " #{a}"
   end
   args
@@ -13,7 +13,7 @@ end
 
 begin
   Signal.trap("PIPE", "EXIT") if Signal.list["PIPE"]
-  
+
   retcode = begin
     require 'rhc/cli'
     RHC::CLI.set_terminal

data/features/step_definitions/env_steps.rb

@@ -0,0 +1 @@
+include RHCHelper

data/features/support/platform_support.rb

@@ -2,7 +2,7 @@ if $target_os == 'fedora-18'
   CARTRIDGE_MAP = {
     "php"         => { type: "php-5.4", name: "PHP 5.4" },
     "mysql"       => { type: "mysql-5.1", name: "MySQL Database 5.1" },
-    "phpmyadmin"  => { type: "phpmyadmin-3.5", name: "phpMyAdmin 3.5" },
+    "phpmyadmin"  => { type: "phpmyadmin-3", name: "phpMyAdmin 3" },
     "mongodb"     => { type: "mongodb-2.2", name: "MongoDB NoSQL Database 2.2" },
     "postgresql"  => { type: "postgresql-9.2", name: "PostgreSQL Database 9.2" },
     "cron"        => { type: "cron-1.4", name: "Cron 1.4" },
@@ -12,7 +12,7 @@ elsif $target_os == 'fedora-19'
   CARTRIDGE_MAP = {
       "php"         => { type: "php-5.5", name: "PHP 5.5" },
       "mysql"       => { type: "mariadb-5.5", name: "MariaDB 5.5" },
-      "phpmyadmin"  => { type: "phpmyadmin-3.5", name: "phpMyAdmin 3.5" },
+      "phpmyadmin"  => { type: "phpmyadmin-3", name: "phpMyAdmin 3" },
       "mongodb"     => { type: "mongodb-2.2", name: "MongoDB NoSQL Database 2.2" },
       "postgresql"  => { type: "postgresql-9.2", name: "PostgreSQL Database 9.2" },
       "cron"        => { type: "cron-1.4", name: "Cron 1.4" },
@@ -22,11 +22,11 @@ else
   CARTRIDGE_MAP = {
     "php"         => { type: "php-5.3", name: "PHP 5.3" },
     "mysql"       => { type: "mysql-5.1", name: "MySQL Database 5.1" },
-    "phpmyadmin"  => { type: "phpmyadmin-3.4", name: "phpMyAdmin 3.4" },
+    "phpmyadmin"  => { type: "phpmyadmin-3", name: "phpMyAdmin 3" },
     "mongodb"     => { type: "mongodb-2.2", name: "MongoDB NoSQL Database 2.2" },
-    "postgresql"  => { type: "postgresql-8.4", name: "PostgreSQL Database 8.4" },    
+    "postgresql"  => { type: "postgresql-8.4", name: "PostgreSQL Database 8.4" },
     "cron"        => { type: "cron-1.4", name: "Cron 1.4" },
-    "haproxy"     => { type: "haproxy-1.4", name: "" }    
+    "haproxy"     => { type: "haproxy-1.4", name: "" }
   }
 end
 

data/lib/rhc/cartridge_helpers.rb

@@ -46,8 +46,8 @@ module RHC
       def match_cart(cart, search)
         search = search.to_s.downcase.gsub(/[_\-\s]/,' ')
         [
-           cart.name, 
-           cart.description, 
+           cart.name,
+           cart.description,
           (cart.tags || []).join(' '),
         ].compact.any?{ |s| s.present? && s.downcase.gsub(/[_\-\s]/,' ').include?(search) }
       end
@@ -83,9 +83,11 @@ module RHC
       def standalone_cartridges
         @standalone_cartridges ||= all_cartridges.select{ |c| c.type == 'standalone' }
       end
+
       def not_standalone_cartridges
         @not_standalone_cartridges ||= all_cartridges.select{ |c| c.type != 'standalone' }
       end
+
       def all_cartridges
         @all_cartridges = rest_client.cartridges
       end
@@ -95,6 +97,20 @@ module RHC
         carts.unshift ['==========', '=========']
         carts.unshift ['Short Name', 'Full name']
         say table(carts)
-      end    
+      end
+
+      def filter_jenkins_cartridges(tag)
+        cartridges = all_cartridges.select { |c| (c.tags || []).include?(tag) && c.name =~ /\Ajenkins/i }.sort
+        raise RHC::JenkinsNotInstalledOnServer if cartridges.empty?
+        cartridges
+      end
+
+      def jenkins_cartridges
+        @jenkins_cartridges ||= filter_jenkins_cartridges('ci')
+      end
+
+      def jenkins_client_cartridges
+        @jenkins_client_cartridges ||= filter_jenkins_cartridges('ci_builder')
+      end
   end
 end

data/lib/rhc/command_runner.rb

@@ -149,7 +149,7 @@ module RHC
 
           unless matches
             RHC::Helpers.error "The command '#{program :name} #{provided_arguments.join(' ')}' is not recognized.\n"
-            say "See '#{program :name} help' for a list of valid commands." 
+            say "See '#{program :name} help' for a list of valid commands."
             return 1
           end
 

data/lib/rhc/commands/app.rb

@@ -7,9 +7,9 @@ module RHC::Commands
   class App < Base
     summary "Commands for creating and managing applications"
     description <<-DESC
-      Creates and controls an OpenShift application.  To see the list of all 
-      applications use the rhc domain show command.  Note that delete is not 
-      reversible and will stop your application and then remove the application 
+      Creates and controls an OpenShift application.  To see the list of all
+      applications use the rhc domain show command.  Note that delete is not
+      reversible and will stop your application and then remove the application
       and repo from the remote server. No local changes are made.
       DESC
     syntax "<action>"
@@ -25,7 +25,7 @@ module RHC::Commands
 
       You can see a list of all valid cartridge types by running
       'rhc cartridge list'. OpenShift also supports downloading cartridges -
-      pass a URL in place of the cartridge name and we'll download 
+      pass a URL in place of the cartridge name and we'll download
       and install that cartridge into your app.  Keep in mind that
       these cartridges receive no security updates.  Note that not
       all OpenShift servers allow downloaded cartridges.
@@ -52,6 +52,7 @@ module RHC::Commands
     option ["-g", "--gear-size SIZE"], "Gear size controls how much memory and CPU your cartridges can use."
     option ["-s", "--scaling"], "Enable scaling for the web cartridge."
     option ["-r", "--repo DIR"], "Path to the Git repository (defaults to ./$app_name)"
+    option ["-e", "--env VARIABLE=VALUE"], "Environment variable(s) to be set on this app, or path to a file containing environment variables", :option_type => :list
     option ["--from-code URL"], "URL to a Git repository that will become the initial contents of the application"
     option ["--[no-]git"], "Skip creating the local Git repository."
     option ["--nogit"], "DEPRECATED: Skip creating the local Git repository.", :deprecated => {:key => :git, :value => false}
@@ -81,6 +82,8 @@ module RHC::Commands
         c.usage_rate? ? "#{c.short_name} (addtl. costs may apply)" : c.short_name
       end.join(', ')
 
+      environment_variables = collect_env_vars(options.env)
+
       paragraph do
         header "Application Options"
         table([["Namespace:", options.namespace],
@@ -88,6 +91,7 @@ module RHC::Commands
               (["Source Code:", options.from_code] if options.from_code),
                ["Gear Size:", options.gear_size || "default"],
                ["Scaling:", options.scaling ? "yes" : "no"],
+              (["Environment Variables:", environment_variables.map{|item| "#{item.name}=#{item.value}"}.join(', ')] if environment_variables.present?),
               ].compact
              ).each { |s| say "  #{s}" }
       end
@@ -96,7 +100,7 @@ module RHC::Commands
         say "Creating application '#{name}' ... "
 
         # create the main app
-        rest_app = create_app(name, cartridges, rest_domain, options.gear_size, options.scaling, options.from_code)
+        rest_app = create_app(name, cartridges, rest_domain, options.gear_size, options.scaling, options.from_code, environment_variables)
         success "done"
 
         paragraph{ indent{ success rest_app.messages.map(&:strip) } }
@@ -105,6 +109,7 @@ module RHC::Commands
       build_app_exists = rest_app.building_app
 
       if enable_jenkins?
+
         unless build_app_exists
           paragraph do
             say "Setting up a Jenkins application ... "
@@ -168,7 +173,7 @@ module RHC::Commands
       end
 
       output_issues(rest_app) if issues?
-            
+
       paragraph do
         say "Your application '#{rest_app.name}' is now available."
         paragraph do
@@ -177,7 +182,8 @@ module RHC::Commands
                 ['URL:', rest_app.app_url],
                 ['SSH to:', rest_app.ssh_string],
                 ['Git remote:', rest_app.git_url],
-                (['Cloned to:', repo_dir] if repo_dir)
+                (['Cloned to:', repo_dir] if repo_dir),
+                (['Environment variables:', environment_variables.map{|item| "#{item.name}=#{item.value}"}.sort.join(', ')] if environment_variables.present?)
               ].compact
           end
         end
@@ -280,10 +286,10 @@ module RHC::Commands
     summary "Show information about an application"
     description <<-DESC
       Display the properties of an application, including its URL, the SSH
-      connection string, and the Git remote URL.  Will also display any 
+      connection string, and the Git remote URL.  Will also display any
       cartridges, their scale, and any values they expose.
 
-      The '--state' option will retrieve information from each cartridge in 
+      The '--state' option will retrieve information from each cartridge in
       the application, which may include cartridge specific text.
 
       To see information about the individual gears within an application,
@@ -292,7 +298,7 @@ module RHC::Commands
       storage on each gear.
 
       If you want to run commands against individual gears, use:
-       
+
         rhc ssh <app> --gears '<command>'
 
       to run and display the output from each gear.
@@ -315,12 +321,12 @@ module RHC::Commands
         case options.gears
         when 'quota'
           opts = {:as => :gear, :split_cells_on => /\s*\t/, :header => ['Gear', 'Cartridges', 'Used', 'Limit'], :align => [nil, nil, :right, :right]}
-          table_from_gears('echo "$(du -s 2>/dev/null | cut -f 1)"', groups, opts) do |gear, data, group|
+          table_from_gears('echo "$(du --block-size=1 -s 2>/dev/null | cut -f 1)"', groups, opts) do |gear, data, group|
             [gear['id'], group.cartridges.collect{ |c| c['name'] }.join(' '), (human_size(data.chomp) rescue 'error'), human_size(group.quota)]
           end
         when 'ssh'
           groups.each{ |group| group.gears.each{ |g| say (ssh_string(g['ssh_url']) or raise NoPerGearOperations) } }
-        else 
+        else
           run_on_gears(ssh_command_for_op(options.gears), groups)
         end
 
@@ -429,12 +435,13 @@ module RHC::Commands
         result
       end
 
-      def create_app(name, cartridges, rest_domain, gear_size=nil, scale=nil, from_code=nil)
+      def create_app(name, cartridges, rest_domain, gear_size=nil, scale=nil, from_code=nil, environment_variables=nil)
         app_options = {:cartridges => Array(cartridges)}
         app_options[:gear_profile] = gear_size if gear_size
         app_options[:scale] = scale if scale
         app_options[:initial_git_url] = from_code if from_code
         app_options[:debug] = true if @debug
+        app_options[:environment_variables] = environment_variables.map{ |item| item.to_hash } if environment_variables.present?
         debug "Creating application '#{name}' with these options - #{app_options.inspect}"
         rest_app = rest_domain.add_application(name, app_options)
         debug "'#{rest_app.name}' created"
@@ -449,11 +456,11 @@ module RHC::Commands
       end
 
       def add_jenkins_app(rest_domain)
-        create_app(jenkins_app_name, "jenkins-1.4", rest_domain)
+        create_app(jenkins_app_name, jenkins_cartridge_name, rest_domain)
       end
 
       def add_jenkins_cartridge(rest_app)
-        rest_app.add_cartridge("jenkins-client-1.4")
+        rest_app.add_cartridge(jenkins_client_cartridge_name)
       end
 
       def add_jenkins_client_to(rest_app, messages)
@@ -528,6 +535,14 @@ module RHC::Commands
         end || "jenkins"
       end
 
+      def jenkins_cartridge_name
+        jenkins_cartridges.last.name
+      end
+
+      def jenkins_client_cartridge_name
+        jenkins_client_cartridges.last.name
+      end
+
       def run_nslookup(host)
         # :nocov:
         `nslookup #{host}`
@@ -586,7 +601,7 @@ WARNING:  Your application was created successfully but had problems during
 
     $ rhc app delete #{rest_app.name} --confirm
 
-  Please contact us if you are unable to successfully create your 
+  Please contact us if you are unable to successfully create your
   application:
 
     Support - https://www.openshift.com/support
@@ -624,6 +639,6 @@ WARNING_OUTPUT
 
     def issues?
       not @issues.nil?
-    end      
+    end
   end
 end

data/lib/rhc/commands/base.rb

@@ -53,11 +53,6 @@ class RHC::Commands::Base
 
     class InvalidCommand < StandardError ; end
 
-    def self.inherited(klass)
-      unless klass == RHC::Commands::Base
-      end
-    end
-
     def self.method_added(method)
       return if self == RHC::Commands::Base
       return if private_method_defined? method
@@ -128,7 +123,8 @@ class RHC::Commands::Base
                            :description => description,
                            :context_helper => options[:context],
                            :required => options[:required],
-                           :deprecated => options[:deprecated]
+                           :deprecated => options[:deprecated],
+                           :option_type => options[:option_type]
                           }
     end
 
@@ -157,17 +153,17 @@ class RHC::Commands::Base
       }));
     end
 
-    private
-      def self.options_metadata
-        options[:options] ||= []
-      end
-      def self.args_metadata
-        options[:args] ||= []
-      end
-      def self.aliases
-        options[:aliases] ||= []
-      end
-      def self.options
-        @options ||= {}
-      end
+  private
+    def self.options_metadata
+      options[:options] ||= []
+    end
+    def self.args_metadata
+      options[:args] ||= []
+    end
+    def self.aliases
+      options[:aliases] ||= []
+    end
+    def self.options
+      @options ||= {}
+    end
 end