jettywrapper 1.0.4 → 1.1.0

data/History.txt

@@ -0,0 +1,2 @@
+1.1.0
+  Added quiet mode, so you don't see log messages on jetty startup.

data/lib/jettywrapper/version.rb

@@ -1 +1 @@
-GEMVERSION = "1.0.4"
+GEMVERSION = "1.1.0"

data/lib/jettywrapper.rb

@@ -70,6 +70,7 @@ class Jettywrapper
     # @param [Symbol] :java_opts A list of options to pass to the jvm 
     def configure(params = {})
       hydra_server = self.instance
+      hydra_server.reset_process!
       hydra_server.quiet = params[:quiet].nil? ? true : params[:quiet]
       if defined?(Rails.root)
        base_path = Rails.root
@@ -247,8 +248,7 @@ class Jettywrapper
        end
      end
      Dir.chdir(@jetty_home) do
-       process = build_process
-       @pid = process.pid
+       process.start
      end
      FileUtils.makedirs(pid_dir) unless File.directory?(pid_dir)
      begin
@@ -256,16 +256,29 @@ class Jettywrapper
      rescue Errno::ENOENT, Errno::EACCES
        f = File.new(File.join(@base_path,'tmp',pid_file),"w")
      end
-     f.puts "#{@pid}"
+     f.puts "#{process.pid}"
      f.close
-     logger.debug "Wrote pid file to #{pid_path} with value #{@pid}"
+     logger.debug "Wrote pid file to #{pid_path} with value #{process.pid}"
    end
  
-   def build_process
-     process = ChildProcess.build(jetty_command)
-     process.io.inherit!
-     process.detach = true
-     process.start
+   def process
+     @process ||= begin
+        process = ChildProcess.build(jetty_command)
+        if self.quiet
+          process.io.stderr = File.open("jettywrapper.log", "w+")
+          process.io.stdout = process.io.stderr
+           logger.warn "Logging jettywrapper stdout to #{File.expand_path(process.io.stderr.path)}"
+        else
+          process.io.inherit!
+        end
+        process.detach = true
+
+        process
+      end
+   end
+
+   def reset_process!
+     @process = nil
    end
    # Instance stop method. Must be called on Jettywrapper.instance
    # You're probably better off using Jettywrapper.stop(:jetty_home => "/path/to/jetty")
@@ -279,6 +292,7 @@ class Jettywrapper
        process = ChildProcess.new
        process.instance_variable_set(:@pid, pid)
        process.instance_variable_set(:@started, true)
+
        process.stop 
        begin
          File.delete(pid_path)

data/spec/lib/jettywrapper_integration_spec.rb

@@ -76,9 +76,7 @@ module Hydra
         lambda{ ts.start }.should raise_exception
         ts.stop
       end
-      
-      
+
     end
-    
   end
 end

data/spec/lib/jettywrapper_spec.rb

@@ -73,7 +73,7 @@ module Hydra
           :jetty_home => '/tmp'
         }
         ts = Jettywrapper.configure(jetty_params) 
-        Jettywrapper.any_instance.stubs(:build_process).returns(stub('proc', :pid=>5454))
+        Jettywrapper.any_instance.stubs(:process).returns(stub('proc', :start => nil, :pid=>5454))
         ts.stop
         ts.start
         ts.pid.should eql(5454)
@@ -86,7 +86,7 @@ module Hydra
         }
         ts = Jettywrapper.configure(jetty_params) 
         ts.stop
-        Jettywrapper.any_instance.stubs(:build_process).returns(stub('proc', :pid=>2323))
+        Jettywrapper.any_instance.stubs(:process).returns(stub('proc', :start => nil, :pid=>2323))
         swp = Jettywrapper.start(jetty_params)
         swp.pid.should eql(2323)
         swp.pid_file.should eql("_tmp.pid")
@@ -100,7 +100,7 @@ module Hydra
       # return true if it's running, otherwise return false
       it "can get the status for a given jetty instance" do
         # Don't actually start jetty, just fake it
-        Jettywrapper.any_instance.stubs(:build_process).returns(stub('proc', :pid=>12345))
+        Jettywrapper.any_instance.stubs(:process).returns(stub('proc', :start => nil, :pid=>12345))
         
         jetty_params = {
           :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty")
@@ -114,7 +114,7 @@ module Hydra
       
       it "can get the pid for a given jetty instance" do
         # Don't actually start jetty, just fake it
-        Jettywrapper.any_instance.stubs(:build_process).returns(stub('proc', :pid=>54321))
+        Jettywrapper.any_instance.stubs(:process).returns(stub('proc', :start => nil, :pid=>54321))
         jetty_params = {
           :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty")
         }
@@ -129,7 +129,7 @@ module Hydra
         jetty_params = {
           :jetty_home => '/tmp', :jetty_port => 8777
         }
-        Jettywrapper.any_instance.stubs(:build_process).returns(stub('proc', :pid=>2323))
+        Jettywrapper.any_instance.stubs(:process).returns(stub('proc', :start => nil, :pid=>2323))
         swp = Jettywrapper.start(jetty_params)
         (File.file? swp.pid_path).should eql(true)
         
@@ -152,7 +152,7 @@ module Hydra
           :jetty_home => '/tmp'
         }
         ts = Jettywrapper.configure(jetty_params) 
-        Jettywrapper.any_instance.stubs(:build_process).returns(stub('proc', :pid=>2222))
+        Jettywrapper.any_instance.stubs(:process).returns(stub('proc', :start => nil, :pid=>2222))
         ts.stop
         ts.pid_file?.should eql(false)
         ts.start
@@ -206,5 +206,21 @@ module Hydra
       end
       
     end # end of wrapping context
+
+    context "quiet mode", :quiet => true do
+      it "inherits the current stderr/stdout in 'loud' mode" do
+        ts = Jettywrapper.configure(@jetty_params.merge(:quiet => false))
+        process = ts.process
+        process.io.stderr.should == $stderr
+        process.io.stdout.should == $stdout
+      end
+
+      it "redirect stderr/stdout to a log file in quiet mode" do
+        ts = Jettywrapper.configure(@jetty_params.merge(:quiet => true))
+        process = ts.process
+        process.io.stderr.should_not == $stderr
+        process.io.stdout.should_not == $stdout
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jettywrapper
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 4
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors: 
 - Bess Sadler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-11 00:00:00 -06:00
+date: 2011-11-22 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -177,6 +177,7 @@ files:
 - .gitmodules
 - .rvmrc
 - Gemfile
+- History.txt
 - README.textile
 - Rakefile
 - TODO.txt