envied 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d25c3d2c51229b8d12b11c07e31924a88114d2d1
-  data.tar.gz: 051c4d8bf0056995e60bfcf79e727d5263b72812
+  metadata.gz: 9d96082d1dc1fedf685dc01443f880342727f980
+  data.tar.gz: 15edf9b6d7d41abd5f694a534ff092e422cffa4f
 SHA512:
-  metadata.gz: e1e84ad9166cd60b9f024f042ad9d77fcb5ebedbfa3cc1263a9f7f611dc7d943458ac974fe57d8f05201279a7a091a839c10ca21597b7e1f9e0ff382c17d1ffd
-  data.tar.gz: 8cf40ec2c6baf773b65eb3e447cb97ec5896e5731a3a33a86b19734bd6e6fe239dc59b89c709dc504803fe41d4d570ef2dfa045ab1074cf5df75eadd115d8186
+  metadata.gz: 34036deeaaf2f1bb339b645ea3f6680aa72323a2e0f3c71d84da130ac8fe2d2b685cdc5f208d5c84bb7b6008d108cc121256a0c9e4806f24512cad2aa77a2e9b
+  data.tar.gz: f6768c4c9a2deab86218b9579b41af302ecd18fdd0567a94041067b8d9c4bd4ef17337fa7b1738c78f1402b8ce67a3a4f2ca0cbc7ca8e361de4d3e276dfc4f5d

data/.rspec

@@ -1 +1,3 @@
 --warnings
+--format documentation
+--color

data/.travis.yml

@@ -1,5 +1,20 @@
+language: ruby
+
+before_install:
+  - gem update --system
+  - gem install bundler
+  - gem update bundler
+
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
-  - jruby
+  - 2.1.9
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
+  - jruby-9.0.5.0
+  - jruby-head
+
+cache: bundler
+sudo: false
+fast_finish: true

data/CHANGELOG.md

@@ -1,14 +1,39 @@
 ## unreleased
 
+...
+
+## 0.8.2 / 2017-02-21
+
+### Added
+
+ * Rails 5 support
+
+### Fixed
+
+ * Envfile: type string is also correctly implied when providing a default.
+
+## 0.8.1 / 2014-10-18
+
 ### Added
 
  * the `check` task uses ENV['ENVIED_GROUPS'] as default groups-option if present
 
 ### Fixed
 
+ * Rails: you can use ENVied now in config/application.rb and config/environments/*.rb
+
+    For existing projects: rerun the `init:rails`-task
+
  * running `check:heroku` takes Heroku's value of ENVIED_GROUPS into account
  * calling `enable_defaults!` without arguments now does what it says
 
+### Deprecated
+
+ * doing `ENVied.require` in `config/initializers/envied.rb` (as previously generated by `init:rails`-task)
+   is not recommended anymore. It triggers a deprecation warning.
+
+    It's recommended to rerun the `init:rails`-task.
+
 ## 0.8.0 / 2014-10-04
 
 ### Added
@@ -16,7 +41,7 @@
  * the `check:heroku:binstub` task uses ENV['HEROKU_APP'] as app-option if present
  * the `check` and `check:heroku` task now have a `--quiet` option
 
-    This prevents output on STDOUT for a successful check.  
+    This prevents output on STDOUT for a successful check.
     Handy for wrapper-scripts:
 
         # some bash-script 'ensure-env'
@@ -114,7 +139,7 @@
 
  * groups added
 
-    This allows for more fine-grained requiring.  
+    This allows for more fine-grained requiring.
     See the section in the [README](https://github.com/eval/envied/tree/v0.4.0#groups).
 
  * configuring is now simpler:
@@ -129,7 +154,7 @@
 
  * Deprecate lowercase methods for uppercase ENV-variables.
 
-    `ENV['RACK_ENV']` is no longer accessible as `ENVied.rack_env`, only as `ENVied.RACK_ENV`.  
+    `ENV['RACK_ENV']` is no longer accessible as `ENVied.rack_env`, only as `ENVied.RACK_ENV`.
     This is not only what you would expect, but it also reduces the chance of clashing with existing class-methods.
 
 ## 0.3.0 / 2014-03-14

data/README.md

@@ -137,8 +137,8 @@ Note that 'easily bootstrap' is quite the opposite of 'fail-fast when not all EN
 # Envfile
 enable_defaults! { ENV['RACK_ENV'] == 'development' }
 
-variable :FORCE_SSL, :Boolean, default: false
-variable :PORT, :Integer, default: proc {|envied| envied.FORCE_SSL ? 443 : 80 }
+variable :FORCE_SSL, :boolean, default: 'false'
+variable :PORT, :integer, default: proc {|envied| envied.FORCE_SSL ? 443 : 80 }
 ```
 
 Please remember that ENVied only **reads** from ENV; it doesn't mutate ENV.
@@ -152,13 +152,6 @@ As a rule of thumb you should only use defaults:
 * See the [examples](/examples)-folder for a more extensive Envfile
 * See [the Envfile](https://github.com/eval/bunny_drain/blob/c54d7d977afb5e23a92da7a2fd0d39f6a7e29bf1/Envfile) for the bunny_drain application
 
-## Rails & Spring
-
-Long story short: Checking the presence of ENV variables using `ENVied.require` *will* work (use the `init:rails`-task and you're all set).  
-What won't work: relying on values from `ENV` (and thus `ENVied`) somewhere in `config/**/*.rb` **if these values vary between environments**.
-
-See this [wiki-page](https://github.com/eval/envied/wiki/Spring-gotchas) for more background info.
-
 ## Command-line interface
 
 For help on a specific command, use `envied help <command>`.
@@ -184,7 +177,7 @@ Commands:
 $ bundle exec envied extract
 ```
 
-This comes in handy when you're not using ENVied yet. It will find all `ENV['EKY']` and `ENV.fetch('KEY')` statements in your project.
+This comes in handy when you're not using ENVied yet. It will find all `ENV['KEY']` and `ENV.fetch('KEY')` statements in your project.
 
 It assumes a standard project layout (see the default value for the globs-option).
 

data/Rakefile

@@ -3,6 +3,7 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec) do |s|
   s.ruby_opts = %w(-w)
+  s.rspec_opts = '--format progress'
 end
 
 desc "Run the specs"

data/envied.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'envied/version'
+require "envied/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "envied"
@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 1.9.3'
-  spec.add_dependency "coercible", '~> 1.0'
-  spec.add_dependency "rack", "~> 1.4"
+  spec.required_ruby_version = ">= 1.9.3"
+  spec.add_dependency "coercible", "~> 1.0"
+  spec.add_dependency "rack", ">= 1.4", (RUBY_VERSION < "2.2.2" ? "< 2" : "< 3")
   spec.add_dependency "thor", "~> 0.15"
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", '~> 3.0'
+  spec.add_development_dependency "rspec", "~> 3.0"
 end

data/examples/extensive_envfile

@@ -10,8 +10,8 @@ enable_defaults!(&not_production_nor_ci)
 # we want it to be present though; heck, we're using it in this file!
 variable :RACK_ENV
 
-variable :FORCE_SSL, :boolean, default: false
-variable :PORT, :integer, default: 3000
+variable :FORCE_SSL, :boolean, default: 'false'
+variable :PORT, :integer, default: '3000'
 # generate the default value using the value of PORT:
 variable :PUBLIC_HOST_WITH_PORT, :string, default: proc {|envied| "localhost:#{envied.PORT}" }
 
@@ -27,7 +27,7 @@ end
 group :not_ci do
   # CI needs no puma-threads, and sidekiq-stuff etc.
   # Define that here:
-  variable :MIN_THREADS, :integer, default: 1
+  variable :MIN_THREADS, :integer, default: '1'
   # more...
 end
 

data/lib/envied.rb

@@ -23,9 +23,9 @@ class ENVied
 
   def self.env!(requested_groups, options = {})
     @env = begin
-      config = options.fetch(:config) { Configuration.load }
+      @config = options.fetch(:config) { Configuration.load }
       groups = required_groups(*requested_groups)
-      EnvProxy.new(config, groups: groups)
+      EnvProxy.new(@config, groups: groups)
     end
   end
 

data/lib/envied/configuration.rb

@@ -33,7 +33,10 @@ class ENVied
         @defaults_enabled
     end
 
-    def variable(name, type = :String, options = {})
+    def variable(name, *args)
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      type = args.first || :string
+
       unless coercer.supported_type?(type)
         raise ArgumentError,
           "Variable type (of #{name}) should be one of #{coercer.supported_types}"

data/lib/envied/variable.rb

@@ -15,4 +15,9 @@ class ENVied::Variable
   def default_value(*args)
     default.respond_to?(:call) ? default[*args] : default
   end
+
+  def ==(other)
+    self.class == other.class &&
+      [name, type, group, default] == [other.name, other.type, other.group, other.default]
+  end
 end

data/lib/envied/version.rb

@@ -1,3 +1,3 @@
 class ENVied
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

data/spec/configuration_spec.rb

@@ -6,8 +6,25 @@ describe ENVied::Configuration do
   it { is_expected.to respond_to :defaults_enabled? }
 
   describe '#variable' do
+    def with_envfile(&block)
+      @config = described_class.new(&block)
+    end
+    attr_reader :config
+
     it 'results in an added variable' do
+      with_envfile do
+        variable :foo, :boolean
+      end
+
+      expect(config.variables).to include ENVied::Variable.new(:foo, :boolean)
+    end
+
+    it 'sets string as type when no type is given' do
+      with_envfile do
+        variable :bar, default: 'bar'
+      end
 
+      expect(config.variables).to include ENVied::Variable.new(:bar, :string, default: 'bar')
     end
   end
 

data/spec/envied_spec.rb

@@ -12,6 +12,7 @@ describe ENVied do
 
   before do
     reset_env
+    reset_envied_config
     reset_configuration
   end
 
@@ -23,6 +24,10 @@ describe ENVied do
     ENVied.instance_eval { @env = nil }
   end
 
+  def reset_envied_config
+    ENVied.instance_eval { @config = nil }
+  end
+
   context 'configured' do
 
     def unconfigured
@@ -78,6 +83,13 @@ describe ENVied do
       expect(described_class).to_not respond_to :B
     end
 
+    it 'sets ENVied.config' do
+      configured_with(a: :Integer).and_ENV({'a' => '1'})
+      envied_require
+
+      expect(ENVied.config).to_not be(nil)
+    end
+
     context 'ENV contains not all configured variables' do
       before { configured_with(a: :Integer).and_no_ENV }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: envied
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Gert Goet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coercible
@@ -28,16 +28,22 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -149,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ensure presence and type of ENV-variables