jettywrapper 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b12e576520a009e9adb542062694b56d04b43c90
-  data.tar.gz: c8457e8e27503f15772bf164cd30dc066c1a06ec
+  metadata.gz: 01602817841a3f916ff81e9320bebab07cedcd10
+  data.tar.gz: cce2362589cd1daca45205ac8acbc111018a199d
 SHA512:
-  metadata.gz: b3c49d92028f96b1d15db964f83f6cf87bfe06c397262dcad6a1a2441644801eae350b28b92770f162492f57697a39253c7f67becb234e0517603ec70bea6193
-  data.tar.gz: 5c8bd9fda2a2017a27e3d82409d93051278034dd9290497e90b4c473bac2ba9db857a047e414ad97628c8cd591b4b2d88c3b5a0afab2ccd31019b0457e49bfb8
+  metadata.gz: 149fef090d853b74b5d3baa6ae1b633ffcc79b53b7315d1ba4d36970cae281da50500acd91a168a6bd1626b8287abedb9057a728c26c03cba53c0795444ca649
+  data.tar.gz: d2fe99a58105b4f832520579d706ecb3e5970adf0fddac6c7566970b5097763c7504a9a497ae7c912c41666a9b7436ffaacbe7ff67745527923a0cc2f782d9aa

data/jettywrapper.gemspec

@@ -32,8 +32,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'yard'#, '0.6.5'  # Yard > 0.6.5 won't generate docs.
                                                 # I don't know why & don't have time to 
                                                 # debug it right now
-  
-  s.add_development_dependency 'RedCloth'
-
 end
 

data/lib/jettywrapper.rb

@@ -108,14 +108,12 @@ class Jettywrapper
       @app_root ||= APP_ROOT if defined?(APP_ROOT)
       @app_root ||= '.'
     end
-    
-    def load_config
-      if defined? Rails 
-        config_name =  Rails.env 
-      else 
-        config_name =  ENV['environment']
-      end
 
+    def env
+      defined?(Rails) ? Rails.env : ENV['environment'] 
+    end
+    
+    def load_config(config_name = env)
       jetty_file = "#{app_root}/config/jetty.yml"
 
       unless File.exists?(jetty_file)
@@ -124,23 +122,23 @@ class Jettywrapper
       end
 
       begin
-        @jetty_erb = ERB.new(IO.read(jetty_file)).result(binding)
-      rescue Exception => e
+        jetty_erb = ERB.new(IO.read(jetty_file)).result(binding)
+      rescue
         raise("jetty.yml was found, but could not be parsed with ERB. \n#{$!.inspect}")
       end
 
       begin
-        @jetty_yml = YAML::load(@jetty_erb)
-      rescue StandardError => e
+        jetty_yml = YAML::load(jetty_erb)
+      rescue
         raise("jetty.yml was found, but could not be parsed.\n")
       end
 
-      if @jetty_yml.nil? || !@jetty_yml.is_a?(Hash)
+      if jetty_yml.nil? || !jetty_yml.is_a?(Hash)
         raise("jetty.yml was found, but was blank or malformed.\n")
       end
 
-      config = @jetty_yml.with_indifferent_access
-      config[config_name] || config[:default]
+      config = jetty_yml.with_indifferent_access
+      config[config_name] || config['default'.freeze]
     end
     
 
@@ -414,10 +412,9 @@ class Jettywrapper
     #    /usr/local/jetty1 => _usr_local_jetty1.pid
     def jetty_home_to_pid_file(jetty_home)
       begin
-        jetty_home.gsub(/\//,'_') << ".pid"
-      rescue
-        raise "Couldn't make a pid file for jetty_home value #{jetty_home}"
-        raise $!
+        jetty_home.gsub(/\//,'_') << "_#{self.class.env}" << ".pid"
+      rescue Exception => e
+        raise "Couldn't make a pid file for jetty_home value #{jetty_home}\n  Caused by: #{e}"
       end
     end
 

data/lib/jettywrapper/version.rb

@@ -1,3 +1,3 @@
 class Jettywrapper
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/spec/lib/jettywrapper_spec.rb

@@ -175,6 +175,12 @@ require 'rubygems'
         config[:a].should == 2
       end
 
+      it "should take the env as an argument to load_config" do
+        IO.should_receive(:read).with('./config/jetty.yml').and_return("default:\n  a: 1\nfoo:\n  a: 2")
+        config = Jettywrapper.load_config('foo')
+        config[:a].should == 2
+      end
+
       it "falls back on a 'default' environment configuration" do
         ENV['environment'] = 'test'
         IO.should_receive(:read).with('./config/jetty.yml').and_return("default:\n  a: 1")
@@ -255,7 +261,7 @@ require 'rubygems'
         Jettywrapper.any_instance.stub(:process).and_return(double('proc', :start => nil, :pid=>2323))
         swp = Jettywrapper.start(jetty_params)
         swp.pid.should eql(2323)
-        swp.pid_file.should eql("_tmp.pid")
+        swp.pid_file.should eql("_tmp_test.pid")
         swp.stop
       end
       
@@ -303,7 +309,7 @@ require 'rubygems'
       
       it "knows what its pid file should be called" do
         ts = Jettywrapper.configure(@jetty_params) 
-        ts.pid_file.should eql("_path_to_jetty.pid")
+        ts.pid_file.should eql("_path_to_jetty_test.pid")
       end
       
       it "knows where its pid file should be written" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jettywrapper
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Chris Beer
@@ -10,132 +10,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mediashelf-loggable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: RedCloth
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Spin up a jetty instance (e.g., the one at https://github.com/projecthydra/hydra-jetty)
@@ -146,10 +132,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".gitmodules"
+- ".rspec"
+- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - History.txt
@@ -174,17 +160,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Convenience tasks for working with jetty from within a ruby project.