nfagent 0.9.20 → 0.9.26

data/Manifest.txt

@@ -16,6 +16,7 @@ test/test_nfagent.rb
 test/test_payload.rb
 test/test_plugin.rb
 test/config
+sandbox/dumps/debug
 test/plugins/my_mapper.rb
 lib/nfagent.rb
 lib/nfagent
@@ -31,6 +32,7 @@ lib/nfagent/event.rb
 lib/nfagent/info.rb
 lib/nfagent/log.rb
 lib/nfagent/mapper_proxy.rb
+lib/nfagent/object_extra.rb
 lib/nfagent/payload.rb
 lib/nfagent/plugin.rb
 lib/nfagent/poller.rb

data/README.rdoc

@@ -4,7 +4,7 @@
 
 == DESCRIPTION:
 
-FIX (describe your package)
+Logging Agent for NetFox Online
 
 == FEATURES/PROBLEMS:
 
@@ -45,4 +45,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -15,7 +15,7 @@ $hoe = Hoe.spec 'nfagent' do
   self.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
   self.rubyforge_name       = self.name # TODO this is default value
   self.extra_deps         = [
-    ['svutil','>= 0.0.13'], ['eventmachine', '>= 0.12.8'], ['squiggle']
+    ['svutil','>= 0.1.2'], ['eventmachine', '>= 0.12.8'], ['squiggle', '>= 0.0.7']
   ]
 
 end

data/lib/nfagent.rb

@@ -14,6 +14,7 @@ require 'eventmachine'
 require 'em/timers'
 require 'rbconfig'
 
+require 'nfagent/object_extra'
 require 'nfagent/chunk'
 require 'nfagent/client'
 require 'nfagent/client_response'
@@ -34,5 +35,5 @@ require 'nfagent/cli'
 require 'nfagent/tests'
 
 module NFAgent
-  VERSION = '0.9.20'
+  VERSION = '0.9.26'
 end

data/lib/nfagent/chunk.rb

@@ -29,7 +29,7 @@ module NFAgent
     end
 
     def expired?
-      (Time.now - @created_at > Config.chunk_time_out) && !self.empty?
+      (Time.now - @created_at > Config.chunk_timeout) && !self.empty?
     end
 
     def dump(key = nil)

data/lib/nfagent/cli.rb

@@ -4,7 +4,7 @@ module NFAgent
     include SVUtil
 
     def initialize
-      Config.load_and_parse
+      Config.init
       if Config.test_mode?
         Tests.run
         exit 1

data/lib/nfagent/config.rb

@@ -16,15 +16,15 @@ module NFAgent
     # mapping: Class, this is a plugin class which must be stored in a file in the directory /etc/nfagent/plugins/
     # parse: (optional, default: 'remotely'): String, either 'remotely' or 'locally'
     #
-    class << self
-      def set_defaults
-        default('mode', 'normal')
-        default('parse', 'remotely')
-        default('chunk_time_out', 60)
-        default('time_zone', 'UTC')
-        default('plugin_directory', '/etc/nfagent/plugins/')
-      end
+    defaults do |c|
+      c.mode = 'normal'
+      c.parse = 'remotely'
+      c.chunk_timeout = 60
+      c.time_zone = 'UTC'
+      c.plugin_directory = '/etc/nfagent/plugins/'
+    end
 
+    class << self
       def validate
         unless dump_dir and File.exists?(dump_dir) and File.directory?(dump_dir)
           raise "Dump dir (#{dump_dir}) must exist and be a directory"

data/lib/nfagent/object_extra.rb

@@ -0,0 +1,5 @@
+class Object
+  def blank?
+    respond_to?(:empty?) ? empty? : !self
+  end
+end

data/lib/nfagent/plugin.rb

@@ -2,8 +2,9 @@ module NFAgent
   class Plugin
     class << self
       def load_plugins
-        unless Config.plugin_directory.blank?
+        if Config.plugin_directory && !Config.plugin_directory.empty? && File.exists?(Config.plugin_directory)
           Dir.glob(File.join(Config.plugin_directory, "*.rb")).each do |file|
+            Log.info("Loading plugin: #{file}")
             load(file)
           end
         end

data/lib/nfagent/server.rb

@@ -4,6 +4,9 @@ module NFAgent
       Log.info("Starting up")
       NFAgent::Plugin.load_plugins
 
+      Log.info("Parsing #{Config.parse}")
+      Log.info("Mode set to #{Config.mode}")
+
       chunk_handler = ChunkHandler.new
       poller = Poller.new
 

data/test/config

@@ -1,5 +1,5 @@
 client_key = 1234
-dump_dir = test/sandbox/dumps
-log_file = test/sandbox/debug
-pid_file = test/sandbox/nfagent.pid
+dump_dir = sandbox/dumps
+log_file = sandbox/debug
+pid_file = sandbox/nfagent.pid
 plugin_directory = test/plugins/

data/test/test_chunk.rb

@@ -4,7 +4,7 @@ require 'test/test_helper'
 class TestChunk < ActiveSupport::TestCase
   setup do
     NFAgent::Config.config_file = "test/config"
-    NFAgent::Config.load_and_parse
+    NFAgent::Config.init
     @logline = "1253604221  19 127.0.0.1 TCP_MISS/200 562 GET http://www.gravatar.com/blavatar/e81cfb9068d04d1cfd598533bb380e1f?s=16&d=http://s.wordpress.com/favicon.ico - NONE/- text/html"
   end
 
@@ -28,7 +28,6 @@ class TestChunk < ActiveSupport::TestCase
 
   test "won't expire if empty" do
     NFAgent::Config.chunk_time_out = 1
-    NFAgent::Config.validate
     chunk = NFAgent::Chunk.new
     assert !chunk.expired?
     Timecop.freeze(Time.now + 61) do

data/test/test_chunk_handler.rb

@@ -4,7 +4,7 @@ require 'test/test_helper'
 class TestChunkHandler < ActiveSupport::TestCase
   setup do
     NFAgent::Config.config_file = "test/config"
-    NFAgent::Config.load_and_parse
+    NFAgent::Config.init
     NFAgent::Config.plugin_directory = File.dirname(__FILE__) + '/../test/plugins/' 
     NFAgent::Plugin.load_plugins
     @logline = "1253604221  19 127.0.0.1 TCP_MISS/200 562 GET http://www.gravatar.com/blavatar/e81cfb9068d04d1cfd598533bb380e1f?s=16&d=http://s.wordpress.com/favicon.ico dan NONE/- text/html"
@@ -30,7 +30,6 @@ class TestChunkHandler < ActiveSupport::TestCase
     NFAgent::Config.parse = 'locally'
     NFAgent::Config.mode = 'multi'
     NFAgent::Config.mapper = 'MyMapper'
-    NFAgent::Config.validate
     chunk_handler = NFAgent::ChunkHandler.new
     chunk_handler.append(@logline)
     assert chunk_handler.chunk_group.has_key?('acme')
@@ -46,7 +45,6 @@ class TestChunkHandler < ActiveSupport::TestCase
     NFAgent::Config.parse = 'locally'
     NFAgent::Config.mode = 'multi'
     NFAgent::Config.mapper = 'MyMapper'
-    NFAgent::Config.validate
     NFAgent::Submitter.any_instance.expects(:perform).times(2)
     chunk_handler = NFAgent::ChunkHandler.new
     chunk_handler.append(@logline)
@@ -73,7 +71,6 @@ class TestChunkHandler < ActiveSupport::TestCase
     NFAgent::Config.parse = 'locally'
     NFAgent::Config.mode = 'multi'
     NFAgent::Config.mapper = 'MyMapper'
-    NFAgent::Config.validate
     NFAgent::Submitter.any_instance.expects(:perform).times(2)
     chunk_handler = NFAgent::ChunkHandler.new(:chunk_size => 10)
     9.times { chunk_handler.append(@logline) }

data/test/test_config.rb

@@ -3,14 +3,15 @@ require 'test/test_helper'
 
 class TestConfig < ActiveSupport::TestCase
   setup do
-    NFAgent::Config.config_file = "test/config"
-    NFAgent::Config.load_and_parse
+    NFAgent::Config.attrs.clear
   end
 
   test "defaults" do
+    puts "HHHHHH"
+    p NFAgent::Config.attrs
     assert_equal "normal", NFAgent::Config.mode
     assert_equal "remotely", NFAgent::Config.parse
-    assert_equal 60, NFAgent::Config.chunk_time_out
+    assert_equal 60, NFAgent::Config.chunk_timeout
     assert_equal 'UTC',  NFAgent::Config.time_zone
     assert_equal '/etc/nfagent/plugins/', NFAgent::Config.plugin_directory
   end
@@ -21,6 +22,10 @@ class TestConfig < ActiveSupport::TestCase
   end
 
   test "validates mapping with multi" do
+    NFAgent::Config.attrs.clear
+    NFAgent::Config.config_file = "test/config"
+    NFAgent::Config.init
+
     NFAgent::Config.mode = 'multi'
     assert_raises(RuntimeError) { NFAgent::Config.validate }
     NFAgent::Config.mapper = 'AccountMapper'
@@ -30,6 +35,10 @@ class TestConfig < ActiveSupport::TestCase
   end
 
   test "validates valid parse option" do
+    NFAgent::Config.attrs.clear
+    NFAgent::Config.config_file = "test/config"
+    NFAgent::Config.init
+
     NFAgent::Config.parse = 'some stupid thing'
     assert_raises(RuntimeError) { NFAgent::Config.validate }
     NFAgent::Config.parse = 'locally'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 20
-  version: 0.9.20
+  - 26
+  version: 0.9.26
 platform: ruby
 authors: 
 - Daniel Draper
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-06 00:00:00 +10:30
+date: 2011-02-08 00:00:00 +10:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +26,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 0
-        - 13
-        version: 0.0.13
+        - 1
+        - 2
+        version: 0.1.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -54,11 +54,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 0
+        - 7
+        version: 0.0.7
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: hoe
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
@@ -66,26 +68,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 0
         - 4
-        version: 2.0.4
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 6
         - 0
-        version: 2.6.0
+        version: 2.4.0
   type: :development
-  version_requirements: *id005
-description: FIX (describe your package)
+  version_requirements: *id004
+description: Logging Agent for NetFox Online
 email: 
 - daniel@netfox.com
 executables: 
@@ -118,6 +106,7 @@ files:
 - test/test_payload.rb
 - test/test_plugin.rb
 - test/config
+- sandbox/dumps/debug
 - test/plugins/my_mapper.rb
 - lib/nfagent.rb
 - lib/nfagent/base64.rb
@@ -132,6 +121,7 @@ files:
 - lib/nfagent/info.rb
 - lib/nfagent/log.rb
 - lib/nfagent/mapper_proxy.rb
+- lib/nfagent/object_extra.rb
 - lib/nfagent/payload.rb
 - lib/nfagent/plugin.rb
 - lib/nfagent/poller.rb
@@ -174,7 +164,7 @@ rubyforge_project: nfagent
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: FIX (describe your package)
+summary: Logging Agent for NetFox Online
 test_files: 
 - test/test_chunk.rb
 - test/test_chunk_handler.rb