jettywrapper 1.1.0 → 1.2.0

data/History.txt

@@ -1,2 +1,6 @@
+1.2.0
+  Added per environment configuration
+  Fixes for JRuby
+
 1.1.0
   Added quiet mode, so you don't see log messages on jetty startup.

data/config/jetty.yml

@@ -1,5 +1,5 @@
-jetty_port: 8983
-java_opts:
-  - "-XX:MaxPermSize=128m" 
-  - "-Xmx256m"
-
+default:
+  jetty_port: 8983
+  java_opts:
+    - "-XX:MaxPermSize=128m" 
+    - "-Xmx256m"

data/lib/jettywrapper.rb

@@ -56,7 +56,8 @@ class Jettywrapper
         file ||= YAML.load_file(File.join(File.dirname(__FILE__),"../config/jetty.yml"))
         #raise "Unable to load: #{file}" unless file
       end
-      file.with_indifferent_access
+      config = file.with_indifferent_access
+      config[config_name] || config[:default]
     end
     
 
@@ -210,8 +211,7 @@ class Jettywrapper
         
    # What command is being run to invoke jetty? 
    def jetty_command
-     opts = (java_variables + java_opts).join(' ')
-     "java #{opts} -jar start.jar"
+     ["java", java_variables, java_opts, "-jar", "start.jar"].flatten
    end
 
    def java_variables
@@ -231,7 +231,7 @@ class Jettywrapper
      logger.debug "Starting jetty with these values: "
      logger.debug "jetty_home: #{@jetty_home}"
      logger.debug "solr_home: #{@solr_home}"
-     logger.debug "jetty_command: #{jetty_command}"
+     logger.debug "jetty_command: #{jetty_command.join(' ')}"
      
      # Check to see if we can start.
      # 1. If there is a pid, check to see if it is really running
@@ -263,7 +263,7 @@ class Jettywrapper
  
    def process
      @process ||= begin
-        process = ChildProcess.build(jetty_command)
+        process = ChildProcess.build(*jetty_command)
         if self.quiet
           process.io.stderr = File.open("jettywrapper.log", "w+")
           process.io.stdout = process.io.stderr
@@ -289,11 +289,12 @@ class Jettywrapper
    def stop    
      logger.debug "Instance stop method called for pid '#{pid}'"
      if pid
-       process = ChildProcess.new
-       process.instance_variable_set(:@pid, pid)
-       process.instance_variable_set(:@started, true)
+       if @process
+         @process.stop
+       else
+         Process.kill("KILL", pid) rescue nil
+       end
 
-       process.stop 
        begin
          File.delete(pid_path)
        rescue

data/lib/jettywrapper/version.rb

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

data/spec/lib/jettywrapper_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 require 'rubygems'
 
-module Hydra
   describe Jettywrapper do
     
     # JETTY1 = 
@@ -16,6 +15,34 @@ module Hydra
         :java_opts => ["-Xmx256mb"]
       }
     end
+
+    context "config" do
+      it "loads the application jetty.yml first" do
+        YAML.expects(:load_file).with('./config/jetty.yml').once.returns({})
+        config = Jettywrapper.load_config
+      end
+
+      it "falls back on the distributed jetty.yml" do
+        fallback_seq = sequence('fallback sequence')
+        YAML.expects(:load_file).in_sequence(fallback_seq).with('./config/jetty.yml').raises(Exception)
+        YAML.expects(:load_file).in_sequence(fallback_seq).with { |value| value =~ /jetty.yml/ }.returns({})
+        config = Jettywrapper.load_config
+      end
+
+      it "supports per-environment configuration" do
+        ENV['environment'] = 'test'
+        YAML.expects(:load_file).with('./config/jetty.yml').once.returns({:test => {:a => 2 }, :default => { :a => 1 }})
+        config = Jettywrapper.load_config
+        config[:a].should == 2
+      end
+
+      it "falls back on a 'default' environment configuration" do
+        ENV['environment'] = 'test'
+        YAML.expects(:load_file).with('./config/jetty.yml').once.returns({:default => { :a => 1 }})
+        config = Jettywrapper.load_config
+        config[:a].should == 1
+      end
+    end
     
     context "instantiation" do
       it "can be instantiated" do
@@ -223,4 +250,3 @@ module Hydra
       end
     end
   end
-end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jettywrapper
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Bess Sadler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-22 00:00:00 -06:00
+date: 2011-11-29 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency