simp-cli 1.0.12 → 1.0.17

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MGNhMzQ0NTM3Y2Q2MWM2NTRhNmE5NjdkYzk2ZjcxZmUzZTBmMjBhMA==
-  data.tar.gz: !binary |-
-    YTUyY2E3M2JmNDYwNTMwMDU0MmVkZmUwMzk5NjBhZjQ3MjI1ZDYzNA==
+SHA1:
+  metadata.gz: c00f1a66b228c83d906fc95be29996b521bb4bc2
+  data.tar.gz: 288f511795f8e390be8299c28bde9cf86650d8a9
 SHA512:
-  metadata.gz: !binary |-
-    ZDM3ZTEwNzkyZDA4N2E5ZDZlYmU1NzQ2ZWIxYzMwMWZkODQ3NDZlOTM0OTMw
-    ZTlhNTJkOTU4ZDFiMTQ3YjcwMDZlMTQyZjRlY2ZhZWE5YmJmMmE3ZTVhOWNi
-    ZTVmYmY4ZThmYjdkZjc4Yjc4M2ZlMDVkOWNkYWUzOGNjZTI0YWQ=
-  data.tar.gz: !binary |-
-    OWIxODU0MGNjYjVlMWY1Nzk3YjVlMjA1Y2UxZWRlZGM1OWQ0MzdmZGFjZWU0
-    ZTFkMzQ1ODIxYmI2NzBhNWY4M2VhN2UxMjAzZjAwNzlhMWYwOTA3ZjY4MDZk
-    YjQ5Njg3ZWQzOGI2NmQ4N2MzYjUxOTFjNzE5NjkxZjdiNTUxYTM=
+  metadata.gz: 3e3d45b70867323215dd05c5c2b43325c55976f63b7bf039876ed86356eb92eccadf7e66c79cc7b8a0d4cebe71090fad79b8998a483c6ac2635def9785064e71
+  data.tar.gz: 791d38e9d4bca5aa79e3426f39eee29e2aa48a1be50d98c61a74e67accdbf358e91b8c7dc89d31057656cb0dee56c9f3bfcb33ced90aea49e18937ccd0077030

data/README.md

@@ -30,11 +30,8 @@ Displays SIMP documentation in elinks.
 Controls user passwords.
 
 #### Recently deprecated
-##### `check` _(removed)_
-Validates various subsystems
-
 ##### `cleancerts` _(deprecated - use `puppet cert clean CERTNAME` instead)_
-Revokes and removed Puppet certificates from a list of hosts.
+Revokes and removes Puppet certificates from a list of hosts.
 
 ##### `runpuppet`_(deprecated - use [mcollective](http://puppetlabs.com/mcollective) instead._
 Runs puppet on a list of hosts.

data/lib/simp/cli.rb

@@ -5,7 +5,7 @@ module Simp; end
 
 # namespace for SIMP CLI commands
 class Simp::Cli
-  VERSION = '1.0.12'
+  VERSION = '1.0.17'
 
   require 'optparse'
   require 'simp/cli/lib/utils'

data/lib/simp/cli/commands/bootstrap.rb

@@ -143,7 +143,7 @@ class Simp::Cli::Commands::Bootstrap < Simp::Cli
         end
       end
 
-      FileUtils.ln_s('simp','production')
+      FileUtils.ln_s('simp','production') unless File.exist?('production')
     end
 
     linecounts = Array.new
@@ -234,7 +234,7 @@ class Simp::Cli::Commands::Bootstrap < Simp::Cli
       # At this point, we should be connected to LDAP properly.
       # Run puppet up to 3 additional times if we can't verify that we're actually connected!
       j = 0
-      while (j < 3) && !system('getent group administrators') do
+      while (j < 3) && !system('getent group administrators >& /dev/null') do
         track_output("#{pupcmd}")
         j = j + 1
       end

data/lib/simp/cli/config/item/certificates.rb

@@ -27,7 +27,7 @@ module Simp::Cli::Config
 
       if !(
         File.exist?("#{@dirs[:keydist]}/#{hostname}/#{hostname}.pub") &&
-        File.exist?("#{@dirs[:fake_ca]}/#{hostname}/#{hostname}.pem")
+        File.exist?("#{@dirs[:keydist]}/#{hostname}/#{hostname}.pem")
       )
         say_green "INFO: No certificates were found for '#{hostname}, generating..." if !@silent
         Simp::Cli::Config::Utils.generate_certificates([hostname], @dirs[:fake_ca])

data/lib/simp/cli/config/item/common_runlevel_default.rb

@@ -8,7 +8,7 @@ module Simp::Cli::Config
   class Item::CommonRunLevelDefault < Item
     def initialize
       super
-      @key         = 'common::runlevel'
+      @key         = 'simplib::runlevel'
       @description = %Q{The default system runlevel (1-5).}
     end
 

data/lib/simp/cli/config/item/network_conf.rb

@@ -40,7 +40,7 @@ module Simp::Cli::Config
         cmd += %Q@ipaddr => '#{ipaddress}', @
         cmd += %Q@netmask => '#{netmask}', @
         cmd += %Q@gateway => '#{gateway}' } @
-        cmd += %Q@class{ 'common::resolv': @
+        cmd += %Q@class{ 'simplib::resolv': @
         cmd += %Q@resolv_domain => '#{resolv_domain}', @
         cmd += %Q@nameservers => #{ format_puppet_array( dns_servers ) }, @
         cmd += %Q@search => #{ format_puppet_array( dns_search ) }, @

data/lib/simp/cli/config/item/sssd_domains.rb

@@ -0,0 +1,35 @@
+require 'highline/import'
+require 'puppet'
+require File.expand_path( '../item', File.dirname(__FILE__) )
+require File.expand_path( '../utils', File.dirname(__FILE__) )
+
+module Simp; end
+class Simp::Cli; end
+module Simp::Cli::Config
+  class Item::SssdDomains < ListItem
+    def initialize
+      super
+      @key         = 'sssd::domains'
+      @description = %Q{
+        A list of domains for SSSD to use.
+        `simp config` will automativcally populate this field with `FQDN` if
+        `use_fqdn` is true, otherwise it will comment out the field.
+      }.gsub(/^\s+/, '' )
+    end
+
+
+    def validate_item( x )
+      x =~ /[-a-z]/i ? true : false
+    end
+
+    def query_ask
+      use_ldap   = @config_items.fetch( 'use_ldap' ).value
+      if use_ldap
+        @value = ['LDAP']
+      else
+        @skip_yaml = true
+        @value = []
+      end
+    end
+  end
+end

data/lib/simp/cli/config/item_list_factory.rb

@@ -42,6 +42,10 @@ class Simp::Cli::Config::ItemListFactory
       #     - ItemE
       #     - ItemF
       # - ItemG
+      #
+      # modifers:
+      #   USERAPPLY = execute apply() even when running non-privileged
+      #   SILENT    = set the Item's .silent flag to true
       ---
       # ==== network ====
       - UseFips
@@ -65,7 +69,7 @@ class Simp::Cli::Config::ItemListFactory
              - Gateway      SILENT
              - DNSServers   SILENT
              - DNSSearch    SILENT
-         false:                    # don't configure network (but get network info)
+         false:                    # don't configure network (but ask for info)
          - Hostname
          - IPAddress
          - Netmask
@@ -121,6 +125,7 @@ class Simp::Cli::Config::ItemListFactory
           - LdapUri
          false:
           - RemoveLdapFromHiera
+      - SssdDomains
 
       # ==== rsync ====
       - RsyncBase

data/spec/lib/simp/cli/config/item/sssd_domains_spec.rb

@@ -0,0 +1,48 @@
+require 'simp/cli/config/item/sssd_domains'
+require 'simp/cli/config/item/use_ldap'
+require 'rspec/its'
+require_relative( 'spec_helper' )
+
+describe Simp::Cli::Config::Item::SssdDomains do
+  before :each do
+    @ci = Simp::Cli::Config::Item::SssdDomains.new
+    @ci.silent = true
+  end
+
+  describe "#value" do
+    it "when `use_fqdn` is `true`" do
+      item = Simp::Cli::Config::Item::UseLdap.new
+      item.value = true
+      @ci.config_items[item.key] = item
+      @ci.query
+      expect( @ci.value ).to eq ['LDAP']
+    end
+
+    it "when `use_fqdn` is `false`" do
+      item = Simp::Cli::Config::Item::UseLdap.new
+      item.value = false
+      @ci.config_items[item.key] = item
+      @ci.query
+      expect( @ci.value ).to eq []
+    end
+  end
+
+  describe "#to_yaml_s" do
+    it "when `use_fqdn` is `true`" do
+      item = Simp::Cli::Config::Item::UseLdap.new
+      item.value = true
+      @ci.config_items[item.key] = item
+      @ci.query
+      expect( @ci.to_yaml_s ).to match( %r{^"?sssd::domains"?} )
+    end
+
+    it "when `use_fqdn` is `false`" do
+      item = Simp::Cli::Config::Item::UseLdap.new
+      item.value = false
+      @ci.config_items[item.key] = item
+      @ci.query
+      expect( @ci.to_yaml_s ).to match( %r{^#(#| )*"?sssd::domains"?} )
+    end
+  end
+  it_behaves_like "a child of Simp::Cli::Config::Item"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.17
 platform: ruby
 authors:
 - Trevor Vaughan
@@ -13,200 +13,184 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.6.1
-- !ruby/object:Gem::Dependency
-  name: puppet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: facter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: guard-shell
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-doc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.29'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.29'
-description: ! '    simp-cli provides the ''simp'' command to configure and manage
-  SIMP.
-
-'
+description: |2
+      simp-cli provides the 'simp' command to configure and manage SIMP.
 email: simp@simp-project.org
 executables:
 - simp
@@ -219,7 +203,6 @@ files:
 - bin/simp
 - lib/simp/cli.rb
 - lib/simp/cli/commands/bootstrap.rb
-- lib/simp/cli/commands/check.rb
 - lib/simp/cli/commands/cleancerts.rb
 - lib/simp/cli/commands/config.rb
 - lib/simp/cli/commands/doc.rb
@@ -276,6 +259,7 @@ files:
 - lib/simp/cli/config/item/rsync_timeout.rb
 - lib/simp/cli/config/item/set_grub_password.rb
 - lib/simp/cli/config/item/simp_yum_servers.rb
+- lib/simp/cli/config/item/sssd_domains.rb
 - lib/simp/cli/config/item/use_auditd.rb
 - lib/simp/cli/config/item/use_fips.rb
 - lib/simp/cli/config/item/use_iptables.rb
@@ -286,7 +270,6 @@ files:
 - lib/simp/cli/config/questionnaire.rb
 - lib/simp/cli/config/utils.rb
 - lib/simp/cli/lib/utils.rb
-- lib/simp/simp.rb
 - spec/lib/simp/cli/commands/config_spec.rb
 - spec/lib/simp/cli/config/item/add_ldap_to_hiera_spec.rb
 - spec/lib/simp/cli/config/item/answers_yaml_file_writer_spec.rb
@@ -350,6 +333,7 @@ files:
 - spec/lib/simp/cli/config/item/set_grub_password_spec.rb
 - spec/lib/simp/cli/config/item/simp_yum_servers_spec.rb
 - spec/lib/simp/cli/config/item/spec_helper.rb
+- spec/lib/simp/cli/config/item/sssd_domains_spec.rb
 - spec/lib/simp/cli/config/item/use_auditd_spec.rb
 - spec/lib/simp/cli/config/item/use_fips_spec.rb
 - spec/lib/simp/cli/config/item/use_iptables_spec.rb
@@ -372,12 +356,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:

data/lib/simp/cli/commands/check.rb

@@ -1,163 +0,0 @@
-module Simp::Cli::Commands; end
-
-class Simp::Cli::Commands::Check < Simp::Cli
-  @opt_parser = OptionParser.new do |opts|
-    opts.banner = "*Options*"
-
-    opts.on("-A", "--all", "Run all checks, equivalent to -nkl") do
-      @check_network = true
-      @check_keys = true
-      @check_ldap = true
-    end
-
-    opts.on("-p", "--pre", "Run checks that should pass before first run, equivalent to -nk") do
-      @check_network = true
-      @check_keys = true
-    end
-
-    opts.on("-n", "--network", "Check network items") do
-      @check_network = true
-    end
-
-    opts.on("-k", "--keys", "Check that keys have been generated for the host") do
-      @check_keys = true
-    end
-
-    opts.on("-l", "--ldap", "Check validity of ldap passwords") do
-      @check_ldap = true
-    end
-
-    opts.on("-v", "--verbose", "Run verbosely") do
-      @verbose = true
-    end
-
-    opts.on("-r", "--report FILE", "Create a report in FILE. NOTE: if FILE exists, it will be overwritten!") do |file|
-      @report_file = file
-    end
-
-    opts.on("-h", "--help", "Print this message") do
-      puts opts
-      exit
-    end
-  end
-
-  def self.run(args)
-    raise "simp check Requires Arguments" if args.empty?
-
-    super
-
-    @version = Simp.version
-
-    report = []
-
-    system('clear')
-
-    if @check_network
-      report.push "\n***Starting Network Check***\n"
-
-      hostname = `hostname`.gsub!(/\s+/, '')
-
-      begin
-        network_hostname = `grep HOSTNAME /etc/sysconfig/network`.strip.match(/HOSTNAME\s*=\s*([^ ]*)/)[1]
-      rescue
-        report.push "ERROR: No hostname in /etc/sysconfig/network"
-      end
-
-      if hostname == network_hostname
-        report.push "Hostname matches hostname in /etc/sysconfig/network"
-      else
-        report.push "ERROR: Hostname does not match hostname in /etc/sysconfig/network"
-      end
-
-      if `grep ^127.0.0.1 /etc/hosts`.split("\n").any? { |line| line =~ /localhost.localdomain[\s+\z]/ and line =~ /localhost[\s+\z]/ }
-        report.push "Found valid entry for 127.0.0.1 in /etc/hosts"
-      else
-        report.push "ERROR: Did not find valid entry for 127.0.0.1 in /etc/hosts"
-      end
-
-      if `grep ^::1 /etc/hosts`.split("\n").any? { |line| line =~ /localhost6\.localdomain6(\s+|$)/ and line =~ /localhost6(\s+|$)/ }
-        report.push "Found valid entry for ::1 in /etc/hosts"
-      else
-        report.push "ERROR: Did not find valid entry for ::1 in /etc/hosts"
-      end
-    end
-
-    if @check_keys
-      report.push "\n***Starting Keys Check***\n"
-
-      key_count = 0
-      valid_key_count = 0
-
-      Dir.foreach("/etc/puppet/keydist") do |host|
-        if (host !~ /\A\.+\z/) and (host !~ /\Acacerts\z/) and File::directory?("/etc/puppet/keydist/#{host}")
-          Dir.foreach("/etc/puppet/keydist/#{host}") do |key|
-            if key =~ /\.pem\z/ or key =~ /\.pub\z/
-              key_count += 1
-
-              if `openssl verify -CApath /etc/puppet/keydist/cacerts /etc/puppet/keydist/#{host}/#{key}`.strip =~ /\s+OK\z/
-                valid_key_count += 1
-                report.push "Key /etc/puppet/keydist/#{host}/#{key} validated\n"
-              else
-                report.push "ERROR: Key /etc/puppet/keydist/#{host}/#{key} did not validate\n"
-              end
-            end
-          end
-        end
-      end
-
-      if key_count == 0
-        report.push "ERROR: No keys found (recursively) in /etc/puppet/keydist\n"
-      else
-        report.push "#{valid_key_count}/#{key_count} keys validated\n"
-      end
-    end
-
-    if @check_ldap
-      report.push "\n***Starting Ldap Check***\n"
-
-      binddn = ""
-      bindpw = ""
-      host = ""
-      base = ""
-
-      ldap_conf = '/etc/ldap.conf'
-      ldap_conf = '/etc/pam_ldap.conf' unless File.file?(ldap_conf)
-
-      File.open(ldap_conf).each_line do |line|
-        if (line =~ /\Abinddn\s+/) != nil
-          binddn = line.gsub(/\Abinddn\s+/, "").chomp
-        elsif (line =~ /\Abindpw\s+/) != nil
-          bindpw = line.gsub(/\Abindpw\s+/, "").chomp
-        elsif (line =~ /\Auri\s+/) != nil
-          host = line.gsub(/\Auri\s+/, "").chomp
-        elsif (line =~ /\Anss_base_passwd\s+/) != nil
-          base = line.gsub(/\Anss_base_passwd\s+/, "").chomp.gsub(/\?.*/, "")
-        end
-      end
-
-      exit_code = `ldapsearch -Z -LLLL -D "#{binddn}" -x -w "#{bindpw}" -H "#{host}" -b "#{base}" -s one uid sshPublidKey`.to_i
-
-      if exit_code == 0
-        report.push "Ldap appears to be working\n"
-      else
-        report.push "ERROR: Ldap does not appear to be working; ldapsearch exited with code #{exit_code}\n"
-      end
-    end
-
-    report = report.select { |line| line =~ /\A(\*\*\*|WARNING|ERROR)/ } unless @verbose
-
-    report = report.join("\n")
-
-    unless @report_file.nil?
-      begin
-        f = File.open(File.expand_path(@report_file), 'w')
-        f.puts report
-        f.close
-      rescue
-        raise "An error occurred while writing the report:#{$!}"
-      end
-    end
-
-    puts report
-  end
-end

data/lib/simp/simp.rb

@@ -1,77 +0,0 @@
-#!/usr/bin/env ruby
-class Simp
-  current_dir = File.dirname(File.expand_path(__FILE__)) + '/simp'
-
-  require 'optparse'
-  require current_dir + '/lib/utils'
-
-  protected
-  def self.menu
-    puts "Usage: simp [command]"
-    puts
-    puts "  Commands"
-    @commands.each do |command_name, command_class|
-      puts "    - " + command_name
-    end
-      puts "    - help [command]"
-    puts
-  end
-
-  def self.help
-    puts @opt_parser.to_s
-    puts
-  end
-
-  def self.run(args = [])
-    @opt_parser.parse!
-  end
-
-  private
-  def self.version
-    begin
-      %x{rpm -q simp}.split(/\n/).last.match(/([0-9]+\.[0-9]+\.?[0-9]*)/)[1]
-    rescue
-      #raise "Simp is not installed!"
-      '4.1'
-    end
-  end
-
-  # load the commands from commands/*.rb and grab the classes that are simp commands
-  Dir.glob(current_dir + '/commands/*.rb').sort_by(&:to_s).each do |command_file|
-    require command_file
-  end
-
-  @commands = Simp::Commands::constants.inject({}) do |commands, constant|
-    obj = Simp::Commands.const_get(constant)
-    if obj.respond_to?(:superclass) and obj.superclass == Simp
-      commands[constant.to_s.downcase] = obj
-    end
-    commands
-  end
-  @commands['version'] = self
-
-  if ARGV.length == 0 or (ARGV.length == 1 and ARGV[0] == 'help')
-    menu
-  elsif ARGV[0] == 'version'
-    puts version
-  elsif ARGV[0] == 'help'
-    if (command = @commands[ARGV[1]]).nil?
-      puts "\n\033[31m#{ARGV[1]} is not a recognized command\033[39m\n\n"
-      menu
-    elsif ARGV[1] == 'version'
-      puts "Display the current version of SIMP."
-    else
-      command.help
-    end
-  elsif (command = @commands[ARGV[0]]).nil?
-    puts "\n\033[31m#{ARGV[0]} is not a recognized command\033[39m\n\n"
-    menu
-  else
-    begin
-      command.run(ARGV.drop(1))
-    rescue => e
-      puts "\n\033[31m#{e.message}\033[39m\n\n"
-      e.backtrace.first(10).each{|l| puts l }
-    end
-  end
-end