kunoichi 0.0.1 → 0.0.2

data/bin/kunoichi

@@ -2,8 +2,8 @@
 
 require 'kunoichi'
 
-# Hash for commandline flags that override configuration
-@override_config = Hash.new
+# Hash for commandline flags
+@config = Hash.new
 
 # Default configuration placement
 @conf_files = [ 'config.yml', '/etc/kunoichi/config.yml' ]
@@ -12,7 +12,7 @@ begin
   opts = GetoptLong.new(
     [ '--config-file', '-c', GetoptLong::REQUIRED_ARGUMENT ],
     [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
-    [ '--dry_run', '-n', GetoptLong::NO_ARGUMENT ],
+    [ '--dry-run', '-n', GetoptLong::NO_ARGUMENT ],
     [ '--import', '-i', GetoptLong::REQUIRED_ARGUMENT ],
     [ '--generate-config', '-g', GetoptLong::OPTIONAL_ARGUMENT ],
     [ '--debug', '-d', GetoptLong::NO_ARGUMENT ],
@@ -31,15 +31,15 @@ begin
       when '--config-file'
         @conf_files = [ arg ]
       when '--dry-run'
-        @override_config['no_kill'] = true
-        @override_config['no_kill_ppid'] = true
+        @config['no_kill'] = true
+        @config['no_kill_ppid'] = true
       when '--debug'
-        @override_config['daemon'] = false
-        @override_config['syslog'] = false
-        @override_config['logfile'] = false
-        @override_config['debug'] = true
+        @config['daemon'] = false
+        @config['syslog'] = false
+        @config['logfile'] = false
+        @config['debug'] = true
       when '--pid-file'
-        @override_config['pidfile'] = arg
+        @config['pidfile'] = arg
       when '--import'
         puts import_conf arg
         exit
@@ -64,18 +64,11 @@ end
 end
 
 # If we're done attempting ad have no @config it means none could be loaded
-unless @config.is_a? Hash
+unless @config[:loaded]
   puts 'Could not find any configuration files. Tried to load: ' + @conf_files.to_s
   exit
 end
 
-# Handle commandline overrides in configuration
-[ 'debug', 'no_kill', 'no_kill_ppid', 'daemon', 'syslog', 'logfile', 'pidfile' ].each do |flag|
-  unless @override_config[flag].nil?
-    @config[flag] = @override_config[flag]
-  end
-end
-
 # Start kunoichi
 begin
   Kunoichi::Daemon.new @config

data/lib/kunoichi/cli.rb

@@ -15,11 +15,13 @@ end
 # Try to include yaml configuration
 def include_conf(file)
   begin
-    raise 'empty file' unless @config = YAML.load_file(file)
+    raise 'empty file' unless readconf = YAML.load_file(file)
   rescue => e
     puts "Cannot load configuration: #{e.message}"
     exit
   end
+  @config = readconf.merge! @config
+  @config[:loaded] = true
 end
 
 # Parse a ninja configuration file and return kunoichi yaml configuration

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kunoichi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,27 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: logger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.8
 - !ruby/object:Gem::Dependency
   name: syslog-logger
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2156506320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,12 +21,7 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.8
+  version_requirements: *2156506320
 description: A Ruby rewrite of Tom Rune Flo's Ninja, a privilege escalation monitor.
 email:
 - alessandro@aggro.it
@@ -52,11 +31,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/extensions/object.rb
-- lib/kunoichi.rb
 - lib/kunoichi/cli.rb
 - lib/kunoichi/kunoichi.rb
 - lib/kunoichi/proctable.rb
-- bin/kunoichi
+- lib/kunoichi.rb
+- !binary |-
+  YmluL2t1bm9pY2hp
 homepage: https://github.com/xstasi/kunoichi
 licenses: []
 post_install_message: 
@@ -77,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Process privilege escalation monitor