jettywrapper 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9284e993f34211bfbb920de74e13dbfc8327f20e
-  data.tar.gz: ab277642364c2c6e17534b3d58b1464fcf863b06
+  metadata.gz: 813ec58e9127d32a6aaed77b56e1c2cb31d1bdbb
+  data.tar.gz: 753964035ecaa0ed84892a19b1aab2b46b2895f8
 SHA512:
-  metadata.gz: fd363055dde9350b69f31265f7c5fe2b101e5ffb6b9221ff8d494875acf99c511ad7f84691bde03e38148ce59a81142f21cd9eb4a5f0906813a7c3433c269aaf
-  data.tar.gz: 0ade95cc7176e3bc4fb237bd23169307f74667c890bb6b46aee03753db7f8cdd209a27efd6c1d1555d0f4e8540b9ce5bbd03f31718b28b979af3220c42abfa7a
+  metadata.gz: aa1910b5f5bc64b14dafde8a86ab1e0350b6058b6c23f5a584c55ff284409d48533c148cf6bf218408a7d6c1587b4194e4895bb56da948ce496ab09427fbe67b
+  data.tar.gz: 38a177af1bf449317caa58cf8af91b2b5818a4b9cb7d48df7cb80ab79710dc37afe56042dcf97b89a0af7918ff56785fd9c6717b560f517af06b8dbbf2cb5d50

data/lib/jettywrapper.rb

@@ -39,7 +39,8 @@ class Jettywrapper
   # Methods outside the class << self block must be called on Jettywrapper.instance, as instance methods.
   class << self
 
-    attr_writer :hydra_jetty_version, :url, :tmp_dir, :jetty_dir
+    attr_writer :hydra_jetty_version, :url, :tmp_dir, :jetty_dir, :env
+
     def hydra_jetty_version
       @hydra_jetty_version ||= 'v7.0.0'
     end
@@ -54,7 +55,7 @@ class Jettywrapper
     end
 
     def zip_file
-      File.join tmp_dir, url.split('/').last
+      ENV['JETTY_ZIP'] || File.join(tmp_dir, url.split('/').last)
     end
 
     def jetty_dir
@@ -105,13 +106,30 @@ class Jettywrapper
 
     def app_root
       return @app_root if @app_root
-      @app_root = Rails.root if defined?(Rails.root)
+      @app_root = Rails.root if defined?(Rails) and defined?(Rails.root)
       @app_root ||= APP_ROOT if defined?(APP_ROOT)
       @app_root ||= '.'
     end
 
     def env
-      @env ||= defined?(Rails) ? Rails.env : ENV['environment'] || 'development'
+      @env ||= begin
+        case 
+        when ENV['JETTYWRAPPER_ENV'] 
+          ENV['JETTYWRAPPER_ENV']
+        when defined?(Rails) && Rails.respond_to?(:env)
+          Rails.env
+        when ENV['RAILS_ENV'] 
+          ENV['RAILS_ENV'] 
+        when ENV['environment'] 
+          ENV['environment'] 
+        else
+          default_environment
+        end
+      end
+    end
+    
+    def default_environment
+      'development'
     end
     
     def load_config(config_name = env)

data/lib/jettywrapper/version.rb

@@ -1,3 +1,3 @@
 class Jettywrapper
-  VERSION = "1.6.0"
+  VERSION = "1.7.0"
 end

data/spec/lib/jettywrapper_spec.rb

@@ -162,6 +162,47 @@ require 'rubygems'
         its(:app_root) {should == '.'}
       end
     end
+    
+    describe "env" do
+      before do
+        ENV.delete('JETTYWRAPPER_ENV')
+        ENV.delete('RAILS_ENV')
+        ENV.delete('environment')
+      end
+      
+      it "should have a setter" do
+        Jettywrapper.env = "abc"
+        expect(Jettywrapper.env).to eq "abc"  
+      end
+      
+      it "should load the ENV['JETTYWRAPPER_ENV']" do
+        ENV['JETTYWRAPPER_ENV'] = 'test'
+        ENV['RAILS_ENV'] = 'test2'
+        ENV['environment'] = 'test3'
+        expect(Jettywrapper.env).to eq "test"
+      end
+      
+      it "should be the Rails environment" do
+        Rails = double(env: 'test')
+        expect(Jettywrapper.env).to eq "test"
+      end
+      
+      it "should use the ENV['RAILS_ENV']" do
+        ENV['RAILS_ENV'] = 'test2'
+        ENV['environment'] = 'test3'
+        expect(Jettywrapper.env).to eq "test2"
+      end
+      
+      it "should load the ENV['environment']" do
+        ENV['environment'] = 'test3'
+        expect(Jettywrapper.env).to eq "test3"
+      end
+      
+      it "should default to 'development'" do
+        expect(Jettywrapper.env).to eq "development"
+      end
+      
+    end
 
     context "config" do
       before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jettywrapper
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Chris Beer