svutil 0.9.2 → 0.9.3

data/lib/svutil.rb

@@ -6,5 +6,5 @@ require 'svutil/log'
 require 'svutil/process_manager'
 
 module SVUtil
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

data/lib/svutil/config.rb

@@ -146,7 +146,7 @@ module SVUtil
 
       # TODO: This should be moved out to a Validator class
       def err(message)
-        STDERR.puts(message)
+        Log.error(message)
         exit 1
       end
 

data/lib/svutil/process_manager.rb

@@ -1,9 +1,12 @@
 module SVUtil
   class ProcessManager
-    def initialize(klass, config)
-      @klass = klass
+    def initialize(klass_or_instance, config)
+      @server_instance = if klass_or_instance.instance_of?(Class)
+        klass_or_instance.new
+      else
+        klass_or_instance
+      end
       @config = config
-      @server_instance = @klass.new
 
       # TODO: Add ability for users to specify these signals
       Signal.trap("INT") { shutdown('Interupted', 1) }

data/test/test_process_manager.rb

@@ -11,7 +11,8 @@ class TestProcesManager < Test::Unit::TestCase
     Log.stubs(:info)
     @instance = mock()
     @klass = mock
-    @klass.expects(:new).returns(@instance)
+    @klass.stubs(:new).returns(@instance)
+    @klass.stubs(:instance_of?).with(Class).returns(true)
   end
   
   def test_initialize
@@ -19,6 +20,13 @@ class TestProcesManager < Test::Unit::TestCase
     ProcessManager.new(@klass, config)
   end
 
+  def test_initialize_and_start_with_server_instance
+    config = ServerConfig.new
+    pm = ProcessManager.new(@instance, config)
+    @instance.expects(:run)
+    assert_exit { pm.start }
+  end
+
   # TODO: Could probably test this better by actually forking
   def test_start_as_daemon
     config = ServerConfig.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svutil
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: newgem
-  requirement: &70111340337380 !ruby/object:Gem::Requirement
+  requirement: &70280236794800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.5.3
   type: :development
   prerelease: false
-  version_requirements: *70111340337380
+  version_requirements: *70280236794800
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70111340336180 !ruby/object:Gem::Requirement
+  requirement: &70280236793980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *70111340336180
+  version_requirements: *70280236793980
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70111336070020 !ruby/object:Gem::Requirement
+  requirement: &70280232222140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70111336070020
+  version_requirements: *70280232222140
 description: A simple managed process builder for Ruby projects
 email:
 - daniel@netfox.com