jettywrapper 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01602817841a3f916ff81e9320bebab07cedcd10
-  data.tar.gz: cce2362589cd1daca45205ac8acbc111018a199d
+  metadata.gz: 3a613e5aa0a63b38a1e25e7d87e1230b12615893
+  data.tar.gz: 1e9c07594df4c1cbbaf652d38eda69b8e4ce4104
 SHA512:
-  metadata.gz: 149fef090d853b74b5d3baa6ae1b633ffcc79b53b7315d1ba4d36970cae281da50500acd91a168a6bd1626b8287abedb9057a728c26c03cba53c0795444ca649
-  data.tar.gz: d2fe99a58105b4f832520579d706ecb3e5970adf0fddac6c7566970b5097763c7504a9a497ae7c912c41666a9b7436ffaacbe7ff67745527923a0cc2f782d9aa
+  metadata.gz: ff59581c3305d9f8a77198c58ac79c3d9653a37ac2945cdce5bc751084cde6298cb4d120b13c1ba66be7798499f0ffd55eee14dc2a131f31cae3215581f1256b
+  data.tar.gz: 62878ce4da7dfd256133f8aa5e5c0f5e38f565deef13fca8f7262f729f906c36b25ac2ff1705c7cec31f288559040586b4eb2c7c90a40ce4ceafa83d4b200dd5

data/lib/jettywrapper.rb

@@ -98,6 +98,7 @@ class Jettywrapper
 
     def reset_config
       @app_root = nil
+      @env = nil
       @url = nil
       @hydra_jetty_version = nil
     end
@@ -110,10 +111,11 @@ class Jettywrapper
     end
 
     def env
-      defined?(Rails) ? Rails.env : ENV['environment'] 
+      @env ||= defined?(Rails) ? Rails.env : ENV['environment'] || 'development'
     end
     
     def load_config(config_name = env)
+      @env = config_name
       jetty_file = "#{app_root}/config/jetty.yml"
 
       unless File.exists?(jetty_file)

data/lib/jettywrapper/version.rb

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

data/spec/lib/jettywrapper_spec.rb

@@ -18,11 +18,11 @@ require 'rubygems'
       Jettywrapper.logger.level=3
     end
 
-    context "downloading" do
-      after do
-        Jettywrapper.reset_config
-      end
+    before do
+      Jettywrapper.reset_config
+    end
 
+    context "downloading" do
       context "with default file" do
         it "should download the zip file" do
           Jettywrapper.should_receive(:system).with('curl -L https://github.com/projecthydra/hydra-jetty/archive/v7.0.0.zip -o tmp/v7.0.0.zip').and_return(system ('true'))
@@ -122,7 +122,6 @@ require 'rubygems'
       subject {Jettywrapper}
       context "When rails is present" do
         before do
-          Jettywrapper.reset_config
           class Rails
             def self.root
               'rails_root'
@@ -131,7 +130,6 @@ require 'rubygems'
         end
         after do
           Object.send(:remove_const, :Rails)
-          Jettywrapper.reset_config
         end
         its(:app_root) {should == 'rails_root'}
       end
@@ -141,7 +139,6 @@ require 'rubygems'
         end
         after do
           Object.send(:remove_const, :APP_ROOT)
-          Jettywrapper.reset_config
         end
         its(:app_root) {should == 'custom_root'}
       end
@@ -151,6 +148,8 @@ require 'rubygems'
     end
 
     context "config" do
+      before do
+      end
       it "loads the application jetty.yml first" do
         IO.should_receive(:read).with('./config/jetty.yml').and_return("default:\n")
         config = Jettywrapper.load_config
@@ -175,10 +174,11 @@ require 'rubygems'
         config[:a].should == 2
       end
 
-      it "should take the env as an argument to load_config" do
+      it "should take the env as an argument to load_config and the env should be sticky" 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
+        expect(Jettywrapper.env).to eq 'foo'
       end
 
       it "falls back on a 'default' environment configuration" do
@@ -265,9 +265,6 @@ require 'rubygems'
         swp.stop
       end
       
-      it "checks to see if its pid files are stale"
-      
-      # 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.stub(:process).and_return(double('proc', :start => nil, :pid=>12345))
@@ -307,9 +304,20 @@ require 'rubygems'
         (File.file? swp.pid_path).should eql(false)
       end
       
-      it "knows what its pid file should be called" do
-        ts = Jettywrapper.configure(@jetty_params) 
-        ts.pid_file.should eql("_path_to_jetty_test.pid")
+      describe "creates a pid file" do
+        let(:ts) { Jettywrapper.configure(@jetty_params) }
+        describe "when the environment isn't set" do
+          before { ENV['environment'] = nil }
+          it "should have the path and env in the name" do
+            ts.pid_file.should eql("_path_to_jetty_development.pid")
+          end
+        end
+        describe "when the environment is set" do
+          before { ENV['environment'] = 'test' }
+          it "should have the path and env in the name" do
+            ts.pid_file.should eql("_path_to_jetty_test.pid")
+          end
+        end
       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.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Chris Beer