jettywrapper 0.0.6 → 0.0.7

data/.gitignore

@@ -7,3 +7,4 @@ coverage.data
 *~
 .yardoc
 doc
+tmp/

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "jetty1"]
+	path = jetty1
+	url = git://github.com/projecthydra/hydra-jetty.git

data/jettywrapper.gemspec

@@ -19,6 +19,9 @@ Gem::Specification.new do |s|
   
   s.required_rubygems_version = ">= 1.3.6"
   
+  s.add_dependency "logger"
+  s.add_dependency "loggable"
+  
   # Bundler will install these gems too if you've checked this out from source from git and run 'bundle install'
   # It will not add these as dependencies if you require lyber-core for other projects
   s.add_development_dependency "ruby-debug"

data/lib/jettywrapper.rb

@@ -1,10 +1,14 @@
 # Jettywrapper is a Singleton class, so you can only create one jetty instance at a time.
+require 'rubygems'
+require 'logger'
+require 'loggable'
+require 'singleton'
+require 'ftools'
 
 class Jettywrapper
   
-  require 'singleton'
   include Singleton
-  require 'ftools'
+  include Loggable
   
   attr_accessor :pid          # If Jettywrapper is running, what pid is it running as? 
   attr_accessor :port         # What port should jetty start on? Default is 8888
@@ -13,15 +17,19 @@ class Jettywrapper
   attr_accessor :quiet        # Keep quiet about jetty output?
   attr_accessor :solr_home    # Where is solr located? Default is jetty_home/solr
   attr_accessor :fedora_home  # Where is fedora located? Default is jetty_home/fedora
+  attr_accessor :logger       # Where should logs be written?
+  attr_accessor :base_path    # The root of the application. Used for determining where log files and PID files should go.
   
   # configure the singleton with some defaults
   def initialize(params = {})
-    @pid = nil
+    # @pid = nil
     if defined?(Rails.root)
       @base_path = Rails.root
     else
       @base_path = "."
     end
+    @logger = Logger.new("#{@base_path}/tmp/jettywrapper-debug.log")
+    @logger.debug 'Initializing jettywrapper'
   end
   
   class << self
@@ -93,9 +101,10 @@ class Jettywrapper
 
       return error
     end
-     
-   end #end of class << self
-   
+    
+    end #end of class << self
+    
+        
    # What command is being run to invoke jetty? 
    def jetty_command
      "java -Djetty.port=#{@port} -Dsolr.solr.home=#{@solr_home} -Dfedora.home=#{@fedora_home} -jar start.jar"
@@ -103,18 +112,19 @@ class Jettywrapper
    
    # Start the jetty server. Check the pid file to see if it is running already, 
    # and stop it if so. After you start jetty, write the PID to a file. 
-
    def start
-     puts "jetty_home: #{@jetty_home}"
-     puts "solr_home: #{@solr_home}"
-     puts "fedora_home: #{@fedora_home}"
-     puts "jetty_command: #{jetty_command}"
+     @logger.debug "Starting jetty with these values: "
+     @logger.debug "jetty_home: #{@jetty_home}"
+     @logger.debug "solr_home: #{@solr_home}"
+     @logger.debug "fedora_home: #{@fedora_home}"
+     @logger.debug "jetty_command: #{jetty_command}"
+          
      if pid
        begin
          Process.kill(0,pid)
          raise("Server is already running with PID #{pid}")
        rescue Errno::ESRCH
-         STDERR.puts("Removing stale PID file at #{pid_path}")
+         @logger.warn "Removing stale PID file at #{pid_path}"
          File.delete(pid_path)
        end
      end
@@ -129,15 +139,16 @@ class Jettywrapper
      end
      f.puts "#{@pid}"
      f.close
+     @logger.debug "Wrote pid file to #{pid_path} with value #{@pid}"
    end
  
    def stop
-     puts "stopping"
+     @logger.warn "stopping jetty... "
      if pid
        begin
          self.send "#{platform}_stop".to_sym
        rescue Errno::ESRCH
-         STDERR.puts("Removing stale PID file at #{pid_path}")
+         @logger.warn "Removing stale PID file at #{pid_path}"
        end
        FileUtils.rm(pid_path)
      end
@@ -164,17 +175,19 @@ class Jettywrapper
 
    def nix_process
      @pid = fork do
-       STDERR.close if @quiet
+       # STDERR.close if @quiet
        exec jetty_command
      end
    end
 
-   # stop a running solr server
+   # stop jetty the windows way
    def win_stop
-     Process.kill(1, @pid)
+     Process.kill(1, pid)
    end
 
+   # stop jetty the *nix way
    def nix_stop
+     @logger.debug "Killing process #{pid}"
      Process.kill('TERM',pid)
    end
 
@@ -182,16 +195,25 @@ class Jettywrapper
      File.join(pid_dir, pid_file)
    end
 
+   # The file where the process ID will be written
    def pid_file
      @pid_file || 'hydra-jetty.pid'
    end
 
+   # The directory where the pid_file will be written
    def pid_dir
      File.expand_path(@pid_dir || File.join(@base_path,'tmp','pids'))
    end
+   
+   # Check to see if there is a pid file already
+   # @return true if the file exists, otherwise false
+   def pid_file?
+      return true if File.exist?(pid_path)
+      false
+   end
 
    def pid
-     @pid || File.open( pid_path ) { |f| return f.gets.to_i } if File.exist?(pid_path)
+      @pid || File.open( pid_path ) { |f| return f.gets.to_i } if File.exist?(pid_path)
    end
-
+   
 end

data/lib/jettywrapper/version.rb

@@ -1 +1 @@
-GEMVERSION = "0.0.6"
+GEMVERSION = "0.0.7"

data/spec/lib/jettywrapper_integration_spec.rb

@@ -0,0 +1,59 @@
+require File.join(File.dirname(__FILE__), "/../spec_helper")
+require File.join(File.dirname(__FILE__), "/../../lib/jettywrapper")
+require 'rubygems'
+require 'ruby-debug'
+require 'uri'
+
+module Hydra
+  describe Jettywrapper do    
+    context "integration" do
+      before(:all) do
+        $stderr.reopen("/dev/null", "w")
+      end
+      
+      it "starts" do
+        
+        jetty_params = {
+          :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty1")
+        
+        }
+        Jettywrapper.configure(jetty_params) 
+        ts = Jettywrapper.instance
+        ts.logger.debug "Stopping jetty from rspec."
+        ts.stop
+        ts.start      
+        ts.logger.debug "Jetty started from rspec at #{ts.pid}"
+        pid_from_file = File.open( ts.pid_path ) { |f| f.gets.to_i }
+        ts.pid.should eql(pid_from_file)
+        sleep 15 # give jetty time to start
+      
+        # Can we connect to solr?
+        require 'net/http' 
+        response = Net::HTTP.get_response(URI.parse("http://localhost:8888/solr/admin/"))
+        response.code.should eql("200")
+        ts.stop
+      
+      end
+      
+      it "won't start if it's already running" do
+        jetty_params = {
+          :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty1")
+        
+        }
+        Jettywrapper.configure(jetty_params) 
+        ts = Jettywrapper.instance
+        ts.logger.debug "Stopping jetty from rspec."
+        ts.stop
+        ts.start
+        sleep 15
+        ts.logger.debug "Jetty started from rspec at #{ts.pid}"
+        response = Net::HTTP.get_response(URI.parse("http://localhost:8888/solr/admin/"))
+        response.code.should eql("200")
+        lambda { ts.start }.should raise_exception(/Server is already running/)
+        ts.stop
+      end
+      
+    end
+    
+  end
+end

data/spec/lib/jettywrapper_spec.rb

@@ -1,5 +1,7 @@
 require File.join(File.dirname(__FILE__), "/../spec_helper")
 require File.join(File.dirname(__FILE__), "/../../lib/jettywrapper")
+require 'rubygems'
+require 'ruby-debug'
 
 module Hydra
   describe Jettywrapper do
@@ -74,8 +76,56 @@ module Hydra
         ts.pid.should eql(5454)
       end
       
+      it "knows what its pid file should be called" do
+        ts = Jettywrapper.configure(@jetty_params) 
+        ts.pid_file.should eql("hydra-jetty.pid")
+      end
+      
+      it "knows where its pid file should be written" do
+        ts = Jettywrapper.configure(@jetty_params) 
+        ts.pid_dir.should eql(File.expand_path("#{ts.base_path}/tmp/pids"))
+      end
+      
+      it "writes a pid to a file when it is started" do
+        jetty_params = {
+          :jetty_home => '/tmp'
+        }
+        ts = Jettywrapper.configure(jetty_params) 
+        Jettywrapper.any_instance.stubs(:fork).returns(2222)
+        FileUtils.rm(ts.pid_path)
+        ts.pid_file?.should eql(false)
+        ts.start
+        ts.pid.should eql(2222)
+        ts.pid_file?.should eql(true)
+        pid_from_file = File.open( ts.pid_path ) { |f| f.gets.to_i }
+        pid_from_file.should eql(2222)
+      end
+      
+      it "checks to see if jetty is running already before it starts" do
+        jetty_params = {
+          :jetty_home => '/tmp'
+        }
+        ts = Jettywrapper.configure(jetty_params) 
+        Jettywrapper.any_instance.stubs(:fork).returns(3333)
+        FileUtils.rm(ts.pid_path)
+        ts.pid_file?.should eql(false)
+        ts.start
+        ts.pid.should eql(3333)
+        Jettywrapper.any_instance.stubs(:fork).returns(4444)
+        ts.start
+        ts.pid.should eql(4444)
+      end
+      
     end # end of instantiation context
     
+    context "logging" do
+      it "has a logger" do
+        ts = Jettywrapper.configure(@jetty_params) 
+        ts.logger.should be_kind_of(Logger)
+      end
+      
+    end # end of logging context 
+    
     context "wrapping a task" do
       it "wraps another method" do
         Jettywrapper.any_instance.stubs(:start).returns(true)
@@ -110,7 +160,6 @@ module Hydra
         error.message.should eql("foo")
       end
       
-    end
-    
+    end # end of wrapping context
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jettywrapper
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Bess Sadler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-21 00:00:00 -07:00
+date: 2011-06-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,8 +29,8 @@ dependencies:
         - 0
         version: "0"
   requirement: *id001
-  type: :development
-  name: ruby-debug
+  type: :runtime
+  name: logger
   prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
@@ -43,11 +43,39 @@ dependencies:
         - 0
         version: "0"
   requirement: *id002
+  type: :runtime
+  name: loggable
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
+  type: :development
+  name: ruby-debug
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
   type: :development
   name: ruby-debug-base
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
@@ -57,12 +85,12 @@ dependencies:
         - 2
         - 0
         version: "2.0"
-  requirement: *id003
+  requirement: *id005
   type: :development
   name: rspec
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
@@ -73,12 +101,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  requirement: *id004
+  requirement: *id006
   type: :development
   name: rspec-rails
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -87,12 +115,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  requirement: *id007
   type: :development
   name: mocha
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -103,12 +131,12 @@ dependencies:
         - 8
         - 5
         version: 0.8.5
-  requirement: *id006
+  requirement: *id008
   type: :development
   name: cucumber
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -117,12 +145,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id007
+  requirement: *id009
   type: :development
   name: cucumber-rails
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -131,12 +159,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id008
+  requirement: *id010
   type: :development
   name: gherkin
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -145,12 +173,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id009
+  requirement: *id011
   type: :development
   name: rcov
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -161,12 +189,12 @@ dependencies:
         - 6
         - 5
         version: 0.6.5
-  requirement: *id010
+  requirement: *id012
   type: :development
   name: yard
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -175,7 +203,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id011
+  requirement: *id013
   type: :development
   name: RedCloth
   prerelease: false
@@ -190,6 +218,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .gitmodules
 - .rvmrc
 - Gemfile
 - README.textile
@@ -197,6 +226,7 @@ files:
 - jettywrapper.gemspec
 - lib/jettywrapper.rb
 - lib/jettywrapper/version.rb
+- spec/lib/jettywrapper_integration_spec.rb
 - spec/lib/jettywrapper_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true