onering-client 0.1.2 → 0.1.3

data/bin/onering

@@ -6,6 +6,8 @@ require 'rainbow'
 require 'pp'
 
 plugins = Onering::CLI.submodules.collect{|i| i.name.split('::').last.downcase }
+exclude_plugins = %w{devices}
+
 global = Trollop::options do
   banner <<-EOS
 onering command line client utility - version #{Onering::Client::VERSION}
@@ -13,6 +15,9 @@ onering command line client utility - version #{Onering::Client::VERSION}
 Usage:
     onering [global] [plugin] [subcommand] [options]
 
+Plugins (onering <plugin> --help for usage details):
+  #{(plugins - exclude_plugins).sort.join(', ')}
+
 where [global] options are:
 EOS
 
@@ -25,6 +30,7 @@ EOS
   opt :nosslverify, "Disable verification of the server SSL certificate", :type => :boolean
   opt :apikey,      "The API token to use for authentication", :short => '-k', :type => :string
   opt :quiet,       "Suppress standard output", :short => '-q'
+  opt :separator,   "A string used to separate output values of delimited tabular data", :short => '-S', :default => "\t"
   opt :verbosity,   "Set the log level (fatal, error, warn, info, debug)", :short => '-v', :type => :string, :default => 'warn'
 
   stop_on plugins

data/lib/onering.rb

@@ -2,7 +2,7 @@ $: << File.expand_path(File.dirname(__FILE__))
 
 module Onering
   module Client
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
 
     class Error < Exception; end
     class FatalError < Error; end

data/lib/onering/cli.rb

@@ -26,15 +26,20 @@ module Onering
 
     def self.output(data, format)
       return nil if @_args[:quiet]
+      return nil if data.nil?
 
       Onering::Logger.debug("Outputting data as #{format}:", "Onering::CLI")
 
       case format
-      when 'text'
+      when 'text', 'txt'
         if data.is_a?(Hash)
           data.coalesce.each do |k,v|
             puts k.to_s+': '+v.to_s
           end
+
+        elsif data.is_a?(Array) and data.first.is_a?(Array)
+          puts data.collect{|i| i.map(&:to_s).join(@_args.get(:separator, "\t")) }.sort.join("\n")
+
         else
           [*data].each do |d|
             if d.is_a?(Hash)
@@ -48,7 +53,7 @@ module Onering
         end
 
       when 'json'
-        puts MultiJson.dump(data)
+        puts MultiJson.dump(data, :pretty => true)
 
       when 'yaml'
         puts YAML.dump(data)
@@ -57,7 +62,7 @@ module Onering
         Onering::Logger.error("Unknown output format #{format.inspect}", "Onering::CLI")
       end
 
-      nil
+      return nil
     end
   end
 end

data/lib/onering/cli/assets.rb

@@ -0,0 +1,106 @@
+module Onering
+  module CLI
+    module Assets
+      def self.configure(global={})
+        @api = Onering::CLI.connect(global).assets
+
+        @opts = ::Trollop::options do
+          banner <<-EOS
+Search for, manipulate, and list values from one or more Onering assets.
+
+Usage:
+    onering [global] assets [options] [subcommands]
+
+Subcommands:
+    find <urlquery>
+    get  <property> [property2 ..]
+    list <property> [property2 ..]
+    save
+    set  <property> <value>
+    show <
+
+Options:
+EOS
+
+          opt :query, "The Onering urlquery to filter devices by", :short => '-f', :type => :string
+          opt :id,    "The node ID of the device to operate on", :short => '-i', :type => :string
+
+        # subcommands
+          stop_on %w{show get set list find save}
+        end
+      end
+
+      def self.run(args)
+        sc = args.shift
+
+        case (sc.downcase.to_sym rescue nil)
+# -----------------------------------------------------------------------------
+        when :show
+          return @api.assets.show(args[0])
+
+# -----------------------------------------------------------------------------
+        when :get
+          Onering::Logger.fatal!("Expected 1 parameter, got #{args.length}", "Onering::CLI::Devices") unless args.length == 1
+
+          if @opts[:query_given]
+          # doing this until a bulk field query endpoint is built
+            return @api.list('id', {
+              :filter => @opts[:query]
+            }).collect{|i| @api.get_field(i, args[0])}
+
+          elsif @opts[:id_given]
+            return @api.get_field(@opts[:id], args[0])
+
+          end
+
+# -----------------------------------------------------------------------------
+        when :set
+          Onering::Logger.fatal!("Expected 2 parameters, got #{args.length}", "Onering::CLI::Devices") unless args.length == 2
+
+          if @opts[:query]
+          # doing this until a bulk field set endpoint is built
+            return @api.list('id', {
+              :filter => @opts[:query]
+            }).collect{|i| @api.set_field(i, args[0])}
+
+          elsif @opts[:id]
+            return @api.set_field(@opts[:id], args[0], args[1])
+
+          end
+
+# -----------------------------------------------------------------------------
+        when :list
+          Onering::Logger.fatal!("Expected 1 parameter, got #{args.length}", "Onering::CLI::Devices") unless args.length >= 1
+          return @api.list(args, {
+            :filter => @opts[:query]
+          }.compact)
+
+# -----------------------------------------------------------------------------
+        when :find
+          Onering::Logger.fatal!("Expected 1 parameter, got #{args.length}", "Onering::CLI::Devices") unless args.length == 1
+          return @api.find(args[0])
+
+# -----------------------------------------------------------------------------
+        when :save
+          rv = @api.save(args[0] || @opts[:id]) do
+          # read from pipe
+            if not STDIN.tty?
+              STDIN.read()
+
+          # read from specified file
+            elsif (File.readable?(args[1]) rescue false)
+              File.read(args[1])
+
+            else
+              Onering::Logger.fatal!("Cannot save data, no input data specified", "Onering::CLI::Devices")
+            end
+          end
+
+          rv.parsed_response
+        else
+          Onering::Logger.fatal!("Unknown subcommand #{sc.inspect}", "Onering::CLI::Devices")
+        end
+      end
+    end
+  end
+end

data/lib/onering/cli/devices.rb

@@ -2,10 +2,15 @@ module Onering
   module CLI
     module Devices
       def self.configure(global={})
-        @api = Onering::CLI.connect(global).devices
+        @api = Onering::CLI.connect(global).assets
 
         @opts = ::Trollop::options do
           banner <<-EOS
+[DEPRECATED in 0.1.3] Use the 'assets' plugin from now on.
+
+Usage:
+    onering [global] report [options]
+
 Options:
 EOS
 

data/lib/onering/cli/reporter.rb

@@ -1,7 +1,10 @@
 module Onering
   module CLI
     module Report
+      DEFAULT_CACHE_MAXAGE=600
+
       def self.configure(global={})
+
         @api = (Onering::CLI.connect(global.merge({
           :autoconnect => false
         })) rescue nil)
@@ -20,17 +23,82 @@ EOS
           opt :save,           "Save the report output to the configured Onering server"
           opt :timeout,        "The maximum amount of time to wait for a report to be generated", :type => :integer, :default => 60
           opt :plugin_timeout, "The maximum amount of time to wait for a report plugin to return data", :type => :integer, :default => 10
+          opt :local,          "Do not attempt to contact a remote server for retrieving values not found locally", :type => :boolean, :default => false
+          opt :cachefile,      "Use the specified file as a local report cache", :type => :string, :short => '-F'
+          opt :nocache,        "Do not attempt to use a cache file for report generation", :type => :boolean, :default => false
+          opt :maxage,         "Maxmimum age (in seconds) of the cache before it is automatically regenerated", :type => :integer, :default => DEFAULT_CACHE_MAXAGE
+
+          stop_on %w{get save}
         end
 
       # initialize report generator with user options
         Onering::Reporter.setup({
           :id             => @opts[:id],
           :timeout        => @opts[:timeout],
-          :plugin_timeout => @opts[:plugin_timeout]
+          :plugin_timeout => @opts[:plugin_timeout],
+          :nocache        => @opts[:nocache],
+          :cachefile      => @opts[:cachefile],
+          :maxage         => @opts[:maxage]
         }.compact)
       end
 
       def self.run(args)
+        report = _report()
+        
+      # pull overrides from CLI arguments
+        @opts[:fields].each do |field|
+          key, value = field.split('=', 2)
+          Onering::Logger.debug("Override value #{key} from command line argument", "Onering::CLI::Report")
+
+          value = nil if ['null', '', '-'].include?(value.to_s.strip.chomp)
+          report = report.set(key, value)
+        end
+
+      # save if specified
+        if @opts[:save] === true
+          _save(report)
+
+        else
+          sc = args.shift
+
+          case (sc.downcase.to_sym rescue nil)
+  # -----------------------------------------------------------------------------
+          when :save
+            _save(report)
+            return nil
+
+          when :get
+            Onering::Logger.fatal!("Expected at least 1 parameter, got #{args.length}", "Onering::CLI::Devices") unless args.length >= 1
+
+            rv = report.get("properties.#{args[0]}", report.get(args[0], args[1]))
+            
+          # attempt to get the value remotely if not found locally
+            if rv.nil? and not @opts[:local]
+              hid = Onering::Util.fact(:hardwareid)
+
+              if not hid.nil?
+                Onering::Logger.debug("Getting remote value #{args[0]} for asset #{hid}")
+                @api.connect()
+                return @api.assets.get_field(hid, args[0], args[1])
+              end
+            end
+
+            return rv
+          end
+        end
+
+        return report
+      end
+
+    private
+      def self._save(report)
+        @api.connect()
+        @api.assets.save(report['id']) do
+          MultiJson.dump(report)
+        end
+      end
+
+      def self._report()
         begin
           Onering::Logger.debug("Gathering local data for report", "Onering::CLI::Report")
           report = Onering::Reporter.report().stringify_keys()
@@ -50,24 +118,6 @@ EOS
             end
           end
 
-        # pull overrides from CLI arguments
-          @opts[:fields].each do |field|
-            key, value = field.split('=', 2)
-            Onering::Logger.debug("Override value #{key} from command line argument", "Onering::CLI::Report")
-
-            value = nil if ['null', '', '-'].include?(value.to_s.strip.chomp)
-            report = report.set(key, value)
-          end
-
-
-        # save if specified
-          if @opts[:save] === true
-            @api.connect()
-            @api.devices.save(report['id']) do
-              MultiJson.dump(report)
-            end
-          end
-
           return report
         rescue Timeout::Error
           Onering::Logger.fatal!("Report took too long to generate, exiting...", "Onering::CLI::Report")

data/lib/onering/plugins/{devices.rb → assets.rb}

@@ -1,13 +1,15 @@
 module Onering
   class API
-    class Devices < API
+    class Assets < API
       def show(id)
         get("/devices/#{id}").parsed_response
       end
 
-      def get_field(id, field)
+      def get_field(id, field, fallback=nil)
         rv = get("/devices/#{id}/get/#{field}")
-        rv.parsed_response rescue rv.response.body
+        rv = (rv.parsed_response rescue rv.response.body)
+        return fallback if rv.nil? or rv.strip.chomp.empty?
+        return rv
       end
 
       def set_field(id, field, value)
@@ -24,7 +26,7 @@ module Onering
           :q => make_filter(options[:filter])
         } if options[:filter]
 
-        rv = get("/devices/list/#{field}", {
+        rv = get("/devices/list/#{[*field].join('/')}", {
           :query => qs
         }).parsed_response
 

data/lib/onering/plugins/reporter.rb

@@ -23,6 +23,9 @@ module Onering
       '/etc/facter'
     ]
 
+    DEFAULT_CACHE_FILE='/var/tmp/.onering-report-cache.json'
+    DEFAULT_CACHE_MAXAGE=600
+
     class<<self
       include Onering::Util
 
@@ -143,29 +146,96 @@ module Onering
         @id = (@options[:id] || Onering::Util.fact('hardwareid', nil))
 
         if not @id.nil?
-          Timeout.timeout((@options[:timeout] || 60).to_i) do
-            hostname = (Facter.value('fqdn') rescue %x{hostname -f}.strip.chomp)
-
-            @_report = {
-              :id           => @id,
-              :name         => hostname,
-              :aliases      => @options[:aliases],
-              :tags         => @options[:tags],
-              :status       => (@options[:status] || 'online'),
-              :inventory    => true,
-              :properties   => {}
-            }
-
-          # loads plugins and populates @_report
-            load_plugins
-
-            return @_report.stringify_keys()
+          if @options[:nocache]
+            return _generated_report()
+          else
+            rv = _cached_report()
+            return _generated_report() if rv.nil? or rv.empty?
+            return rv
           end
         else
           Onering::Logger.fatal!("Cannot generate report without a hardware ID", "Onering::Reporter")
         end
 
-        {}
+        return {}
+      end
+
+
+      def _generated_report()
+        Timeout.timeout((@options[:timeout] || 60).to_i) do
+          hostname = (Facter.value('fqdn') rescue %x{hostname -f}.strip.chomp)
+
+          @_report = {
+            :id           => @id,
+            :name         => hostname,
+            :aliases      => @options[:aliases],
+            :tags         => @options[:tags],
+            :status       => (@options[:status] || 'online'),
+            :inventory    => true,
+            :properties   => {}
+          }
+
+        # loads plugins and populates @_report
+          load_plugins
+
+          return @_report.stringify_keys()
+        end
+
+        return {}
+      end
+
+      def _cached_report()
+        cachefile = (@options[:cachefile] || DEFAULT_CACHE_FILE)
+
+        catch(:retry) do
+          if File.readable?(cachefile)
+            Onering::Logger.debug("Loading cache file at #{cachefile}", "Onering::Reporter")
+            cache = File.read(cachefile)
+            cache = (MultiJson.load(cache) rescue {})
+
+            if _cache_expired?(cache, @options[:maxage])
+              Onering::Logger.debug("Cache expired, regenerating...", "Onering::Reporter")
+              throw :retry if _update_cache_file(cachefile)  
+            end
+
+          # remove cached_at key
+            Onering::Logger.debug("Using cached data (#{Time.now.to_i - Time.parse(cache.get('cached_at')).to_i} seconds old)", "Onering::Reporter")
+            cache.delete('cached_at')
+            return cache
+          else
+            Onering::Logger.debug("Report cache file could not be read at #{cachefile}", "Onering::Reporter")
+            throw :retry if _update_cache_file(cachefile)
+          end
+        end
+
+        return {}
+      end
+
+
+      def _update_cache_file(cachefile=DEFAULT_CACHE_FILE)
+        begin
+          File.open(cachefile, 'w+') do |file|
+            Onering::Logger.debug("Regenerating cache file at #{cachefile}", "Onering::Reporter")
+            report = _generated_report()
+            report['cached_at'] = Time.now.strftime('%Y-%m-%dT%H:%M:%S%z')
+            json = MultiJson.dump(report, :pretty => true)
+            file.puts(json)
+          end
+
+          return true
+        rescue Exception => e
+          Onering::Logger.warn("Error while writing cache file #{cachefile}: #{e.class.name} - #{e.message}", "Onering::Reporter")
+          return false
+        end
+      end
+
+
+      def _cache_expired?(cache, age=DEFAULT_CACHE_MAXAGE)
+        if cache.is_a?(Hash)
+          return (Time.parse(cache.get('cached_at')) < (Time.now - age) rescue true)
+        else
+          return true
+        end
       end
     end
   end

data/lib/onering/util.rb

@@ -94,7 +94,16 @@ module Onering
         if name.downcase == 'all'
           return Facter.to_hash
         else
-          fact = Facter.value(name)
+          case name.to_sym
+          when :hardwareid
+            if File.exists?('/etc/hardware.id')
+              fact = File.read('/etc/hardware.id').lines.first.strip.chomp
+            else
+              fact = Facter.value(name)
+            end
+          else
+            fact = Facter.value(name)
+          end
 
         # short circuit nil responses
           return default if fact.nil?
@@ -140,4 +149,10 @@ class Module
   def submodules
     constants.collect {|const_name| const_get(const_name)}.select {|const| const.class == Module}
   end
+end
+
+class NilClass
+  def <=>(*args)
+    return 1
+  end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: onering-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
   prerelease: 
+  version: 0.1.3
 platform: ruby
 authors:
 - Gary Hetzel
@@ -12,104 +12,149 @@ cert_chain: []
 date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: facter
-  requirement: &11003660 !ruby/object:Gem::Requirement
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.2
     none: false
+  prerelease: false
+  name: facter
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.7.2
+    none: false
+- !ruby/object:Gem::Dependency
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    none: false
   prerelease: false
-  version_requirements: *11003660
-- !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: &11019380 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.0.0
+    none: false
+- !ruby/object:Gem::Dependency
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.3.5
+    none: false
   prerelease: false
-  version_requirements: *11019380
-- !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &11018780 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.3.5
+    none: false
+- !ruby/object:Gem::Dependency
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+    none: false
   prerelease: false
-  version_requirements: *11018780
-- !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &11018280 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.11.0
+    none: false
+- !ruby/object:Gem::Dependency
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.35
+    none: false
   prerelease: false
-  version_requirements: *11018280
-- !ruby/object:Gem::Dependency
   name: hashlib
-  requirement: &11017620 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.35
+    none: false
+- !ruby/object:Gem::Dependency
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.9
+    none: false
   prerelease: false
-  version_requirements: *11017620
-- !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &11016940 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.7.9
+    none: false
+- !ruby/object:Gem::Dependency
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+    none: false
   prerelease: false
-  version_requirements: *11016940
-- !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &11016220 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - <=
       - !ruby/object:Gem::Version
         version: 1.1.4
+    none: false
+- !ruby/object:Gem::Dependency
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    none: false
   prerelease: false
-  version_requirements: *11016220
-- !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &11015380 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: '2.0'
+    none: false
+- !ruby/object:Gem::Dependency
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+    none: false
   prerelease: false
-  version_requirements: *11015380
-- !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &11013900 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *11013900
+    none: false
 description: A Ruby wrapper for Onering
 email: ghetzel@outbrain.com
 executables:
@@ -125,14 +170,14 @@ files:
 - lib/onering/util.rb
 - lib/onering/plugins/authentication.rb
 - lib/onering/plugins/reporter.rb
-- lib/onering/plugins/devices.rb
 - lib/onering/plugins/config.rb
 - lib/onering/plugins/automation.rb
+- lib/onering/plugins/assets.rb
 - lib/onering/cli/reporter.rb
 - lib/onering/cli/devices.rb
-- lib/onering/cli/config.rb
 - lib/onering/cli/automation.rb
 - lib/onering/cli/fact.rb
+- lib/onering/cli/assets.rb
 - lib/onering/cli/call.rb
 - bin/onering
 homepage: https://github.com/outbrain/onering-ruby
@@ -142,20 +187,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.28
 signing_key: 
 specification_version: 3
 summary: Onering client API and utilities

data/lib/onering/cli/config.rb

@@ -1,55 +0,0 @@
-module Onering
-  module CLI
-    module Config
-      def self.configure(global={})
-        Onering::Reporter.setup()
-        @api = Onering::CLI.connect(global)
-
-        @opts = ::Trollop::options do
-          banner <<-EOS
-Options:
-EOS
-
-          opt :id,    "The node ID of the device to operate on", :short => '-i', :type => :string, :default => Onering::Util.fact('hardwareid')
-
-        # subcommands
-          stop_on %w{get set test}
-        end
-      end
-
-      def self.run(args)
-        sc = args.shift
-
-        case (sc.downcase.to_sym rescue nil)
-# -----------------------------------------------------------------------------
-        when :get
-          raise "Expected 1 parameter, got #{args.length}" unless args.length >= 1
-
-          begin
-            rv = @api.request(@opts[:method], "devices/#{@opts[:id]}/config/#{args[0].gsub('.','/')}")
-            return (rv.parsed_response rescue rv.response.body)
-          rescue Onering::API::Errors::NotFound
-            if args[1].nil? and not STDIN.tty?
-              args[1] = STDIN.read()
-            end
-
-            return (MultiJson.load(args[1]) rescue args[1])
-          end
-
-# -----------------------------------------------------------------------------
-        when :set
-          raise "Expected 2 parameters, got #{args.length}" unless args.length == 2
-
-          return @api.set_field(@opts[:id], "config.#{args[0]}", args[1])
-
-# -----------------------------------------------------------------------------
-        when :test
-          raise "Expected 1 parameter, got #{args.length}" unless args.length >= 1
-
-        else
-          raise "Unknown subcommand #{sc.inspect}"
-        end
-      end
-    end
-  end
-end