cartage-rack 2.1 → 2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2ff5b79fccc786f315f9269e5b4029dc3712210
-  data.tar.gz: a926ac738731f626e7aef89051432d0f2ddeea0f
+  metadata.gz: 2465d098dc1c5b15660734a754de4665cff292af
+  data.tar.gz: e48adff2eed98b3ce4c5ce3e0079535882bb7c02
 SHA512:
-  metadata.gz: 195ad85dddd5128cced2f1104502d103d864c8a0d569ee5bfd2daf77d010a72294410db537febd1095c3d3fa5ab373227a6155854634bd9ca62de9e74769d7f7
-  data.tar.gz: d6e8ba01329def7fe85668577434553b5749a7d79f7852eb4a95c8906cd57faaf1b6721ade8cebe2048ab6520b0ff9323fce290357fca1ccc4de20d7611165f7
+  metadata.gz: 3bce5c5f612e32ba55a271b64629632f89ba59a1c063d6a314af921698fb1dcad47d24ec2d9d965f3d4fc55016fe6cf916d583ba6396c749f79972fb32fb7f23
+  data.tar.gz: 487205fedd6cb0ad42a54a36c2c1fe0f6f17f9dcc73156ca1d9ad02923b613885ecb2c5194cf5b1b8a20a706aa5f3c698d523c6d7ac28131b052349e49badb7e

data/Contributing.md

@@ -59,6 +59,7 @@ Here's the most direct way to get your work merged into the project:
 ### Contributors
 
 *   Austin Ziegler created cartage-rack.
+*   Jesse Mignac added support for `$APP_ENV`.
 
 [Minitest]: https://github.com/seattlerb/minitest
 [quality commit messages]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html

data/History.md

@@ -1,3 +1,7 @@
+### 2.2 / 2018-03-23
+
+*   Add support for ENV['APP_ENV'] per Sinatra documentation recommendations.
+
 ### 2.1 / 2016-06-28
 
 *   Fix default env issue where ENV['RAILS_ENV'] nor ENV['RACK_ENV'] is set

data/Rakefile

@@ -54,16 +54,15 @@ module Hoe::Publish #:nodoc:
   end
 end
 
-namespace :test do
-  if File.exist?('.simplecov-prelude.rb')
+if File.exist?('.simplecov-prelude.rb')
+  namespace :test do
     task :coverage do
       spec.test_prelude = 'load ".simplecov-prelude.rb"'
-
       Rake::Task['test'].execute
     end
-  end
 
-  CLOBBER << 'coverage'
+    CLOBBER << 'coverage'
+  end
 end
 
 CLOBBER << 'tmp'

data/lib/cartage/rack.rb

@@ -15,7 +15,7 @@ class Cartage
   # +application/json+ value, or as a +text/plain+ string if called with
   # +.text+ or +.txt+.
   class Rack
-    VERSION = '2.1' #:nodoc:
+    VERSION = '2.2' #:nodoc:
 
     class << self
       # When +true+, Cartage::Rack and Cartage::Rack::Simple will raise an
@@ -23,7 +23,7 @@ class Cartage
       # +release_hashref+). May be explicitly turned off.
       #
       # Defaults to +true+ except in development or test environments (based on
-      # <tt>$RAILS_ENV</tt> and <tt>$RACK_ENV</tt>).
+      # <tt>$RAILS_ENV</tt>, <tt>$APP_ENV</tt> and <tt>$RACK_ENV</tt>).
       def require_metadata(value = (arg = false; nil)) # rubocop:disable Style/Semicolon
         @require_metadata = value unless arg == false
         @require_metadata || default_require_metadata
@@ -32,7 +32,7 @@ class Cartage
       private
 
       def default_require_metadata
-        environment = ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
+        environment = ENV['RAILS_ENV'] || ENV['APP_ENV'] || ENV['RACK_ENV'] || 'development'
         environment !~ /\A(?:development|test)\z/i
       end
     end

data/lib/cartage/rack/metadata.rb

@@ -53,7 +53,7 @@ class Cartage::Rack::Metadata
 
   def application_env
     @application_env ||= {
-      'env' => { 'name' => ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'UNKNOWN' }
+      'env' => { 'name' => ENV['RAILS_ENV'] || ENV['APP_ENV'] || ENV['RACK_ENV'] || 'UNKNOWN' }
     }
   end
 

data/test/test_cartage_rack.rb

@@ -48,7 +48,9 @@ describe Cartage::Rack do
 
   context 'application environment' do
     it 'uses $RAILS_ENV first' do
-      stub_env 'RAILS_ENV' => 'vne_sliar', 'RACK_ENV' => 'vne_kcar' do
+      stub_env 'RAILS_ENV' => 'vne_sliar',
+               'APP_ENV'   => 'vne_ppa',
+               'RACK_ENV'  => 'vne_kcar' do
         get '/'
 
         metadata['env'] = { 'name' => 'vne_sliar' }
@@ -59,8 +61,20 @@ describe Cartage::Rack do
       end
     end
 
-    it 'uses $RACK_ENV second' do
-      stub_env 'RAILS_ENV' => nil, 'RACK_ENV' => 'vne_kcar' do
+    it 'uses $APP_ENV second' do
+      stub_env 'RAILS_ENV' => nil, 'APP_ENV' => 'vne_ppa', 'RACK_ENV' => 'vne_kcar' do
+        get '/'
+
+        metadata['env'] = { 'name' => 'vne_ppa' }
+
+        assert last_response.ok?
+        assert_equal metadata.to_json, last_response.body
+        assert_equal 'application/json', last_response.header['Content-Type']
+      end
+    end
+
+    it 'uses $RACK_ENV third' do
+      stub_env 'RAILS_ENV' => nil, 'APP_ENV' => nil, 'RACK_ENV' => 'vne_kcar' do
         get '/'
 
         metadata['env'] = { 'name' => 'vne_kcar' }
@@ -71,8 +85,8 @@ describe Cartage::Rack do
       end
     end
 
-    it 'falls through to UNKNOWN without either $RAILS_ENV or $RACK_ENV' do
-      stub_env 'RAILS_ENV' => nil, 'RACK_ENV' => nil do
+    it 'falls through to UNKNOWN without either $RAILS_ENV, $APP_ENV or $RACK_ENV' do
+      stub_env 'RAILS_ENV' => nil, 'APP_ENV' => nil, 'RACK_ENV' => nil do
         get '/'
 
         metadata['env'] = { 'name' => 'UNKNOWN' }

data/test/test_cartage_rack_simple.rb

@@ -57,7 +57,9 @@ describe Cartage::Rack::Simple do
 
   context 'application environment' do
     it 'uses $RAILS_ENV first' do
-      stub_env 'RAILS_ENV' => 'vne_sliar', 'RACK_ENV' => 'vne_kcar' do
+      stub_env 'RAILS_ENV' => 'vne_sliar',
+               'APP_ENV'   => 'vne_ppa',
+               'RACK_ENV'  => 'vne_kcar' do
         get '/'
 
         assert last_response.ok?
@@ -66,8 +68,18 @@ describe Cartage::Rack::Simple do
       end
     end
 
-    it 'uses $RACK_ENV second' do
-      stub_env 'RAILS_ENV' => nil, 'RACK_ENV' => 'vne_kcar' do
+    it 'uses $APP_ENV second' do
+      stub_env 'RAILS_ENV' => nil, 'APP_ENV' => 'vne_ppa', 'RACK_ENV' => 'vne_kcar' do
+        get '/'
+
+        assert last_response.ok?
+        assert_equal 'vne_ppa: d0cb1ff (19851027104200)', last_response.body
+        assert_equal 'text/plain', last_response.header['Content-Type']
+      end
+    end
+
+    it 'uses $RACK_ENV third' do
+      stub_env 'RAILS_ENV' => nil, 'APP_ENV' => nil, 'RACK_ENV' => 'vne_kcar' do
         get '/'
 
         assert last_response.ok?
@@ -76,8 +88,8 @@ describe Cartage::Rack::Simple do
       end
     end
 
-    it 'falls through to UNKNOWN without either $RAILS_ENV or $RACK_ENV' do
-      stub_env 'RAILS_ENV' => nil, 'RACK_ENV' => nil do
+    it 'falls through to UNKNOWN without either $RAILS_ENV, $APP_ENV or $RACK_ENV' do
+      stub_env 'RAILS_ENV' => nil, 'APP_ENV' => nil, 'RACK_ENV' => nil do
         get '/'
 
         assert last_response.ok?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cartage-rack
 version: !ruby/object:Gem::Version
-  version: '2.1'
+  version: '2.2'
 platform: ruby
 authors:
 - Austin Ziegler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.11'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -254,14 +254,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
 description: |-
   cartage-rack is a plug-in for {cartage}[https://github.com/KineticCafe/cartage]
   to provide a Rack application that reports on release metadata.
@@ -317,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: cartage-rack is a plug-in for {cartage}[https://github.com/KineticCafe/cartage]