envied 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 803c704396a34b45112c1e893d902f616146d826
-  data.tar.gz: 2886267c88374d9b75d02920f55ca0df9e025244
+  metadata.gz: 1eae6e996d1e0a70624b7c24167eccd631a5d9a0
+  data.tar.gz: d9df438b52137f7a22592b468a44895f7cd5a99d
 SHA512:
-  metadata.gz: 721fa2f72d8fbba07714eaf8efdaa93bd48b045defb67fdd4d2e0a56e7d78fe132e152a68762fe1586138b6624b6c2ea16a80ab9cd16f13b7bb22f8b26750c64
-  data.tar.gz: 44567081a050048fc3eec30c4c7746999aaf9d5a26cb6c6f80480d3b4464ae88caa3be21aa1247a96c6304c0050575759bb631bfefa118a0e6ee57b939efb140
+  metadata.gz: 6e770306eb9e9fb37130e5a3fb69be59d3c25443bbd1c36ab09303a9575ad884f0f4569755827f7e0f1362e05621d0c7ac6455d2eb438b620b2bd48e4f6ac3fb
+  data.tar.gz: 6a49f0e90abb416a73e3199961df26b4cdef5e83fa8c0b60e9053f46f4ed18cec7608faddb9b82fdaa726a9329922981135eb05c6a85043ae4052ca34ddff7bb

data/.travis.yml

@@ -3,14 +3,13 @@ language: ruby
 before_install:
   - gem update --system
   - gem install bundler
-  - gem update bundler
 
 rvm:
-  - 2.1.9
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
-  - jruby-9.0.5.0
+  - 2.1.10
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
+  - jruby-9.1.12.0
   - jruby-head
 
 cache: bundler

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.9.1 / 2017-07-06
+
+* Updates `envied check:heroku` to support multiline ENV variables [#42](../../pull/42)
+
 ## 0.9.0 / 2017-03-01
 
 * Support multiple groups [#16](../../pull/16)

data/README.md

@@ -95,7 +95,7 @@ The following types are supported:
 
 ### Groups
 
-Groups give you more flexibility to define when variables are needed.
+Groups give you more flexibility to define when variables are needed.  
 It's similar to groups in a Gemfile:
 
 ```ruby
@@ -147,7 +147,7 @@ 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.
+Please remember that ENVied only **reads** from ENV; it doesn't mutate ENV.  
 Don't let setting a default for, say `RAILS_ENV`, give you the impression that `ENV['RAILS_ENV']` is set.
 As a rule of thumb you should only use defaults:
 * for local development
@@ -192,7 +192,7 @@ It assumes a standard project layout (see the default value for the globs-option
 The easiest/quickest is to run:
 
 ```
-$ heroku config | bundle exec envied check:heroku
+$ heroku config --json | bundle exec envied check:heroku
 ```
 
 This is equivalent to having the heroku config as your local environment and running `envied check:heroku --groups default production`.

data/lib/envied.rb

@@ -2,6 +2,7 @@ require 'envied/version'
 require 'envied/cli'
 require 'envied/env_proxy'
 require 'envied/coercer'
+require 'envied/coercer/envied_string'
 require 'envied/variable'
 require 'envied/configuration'
 

data/lib/envied/cli.rb

@@ -1,4 +1,5 @@
 require 'thor'
+require 'json'
 require 'envied/env_var_extractor'
 
 class ENVied
@@ -84,7 +85,7 @@ INIT
 
       The Heroku config should be piped to this task:
 
-      heroku config | bundle exec envied check:heroku
+      heroku config --json | bundle exec envied check:heroku
 
       Use the check:heroku:binstub-task to turn this into a bash-script.
 
@@ -96,16 +97,12 @@ INIT
     define_method "check:heroku" do
       if STDIN.tty?
         error <<-ERR
-Please pipe the contents of `heroku config` to this task.
-I.e. `heroku config | bundle exec envied check:heroku`"
+Please pipe the contents of `heroku config --json` to this task.
+I.e. `heroku config --json | bundle exec envied check:heroku`"
 ERR
         exit 1
       end
-      config = STDIN.read
-      heroku_env = Hash[config.split("\n")[1..-1].each_with_object([]) do |i, res|
-        res << i.split(":", 2).map(&:strip)
-      end]
-
+      heroku_env = JSON.parse(STDIN.read)
       ENV.replace({}).update(heroku_env)
 
       requested_groups = ENV['ENVIED_GROUPS'] || options[:groups]
@@ -119,7 +116,7 @@ ERR
     long_desc <<-LONG
       Generates a shell script to check the Heroku config against the local Envfile.
 
-      The same as the check:heroku-task, but all in one script (no need to pipe `heroku config` to it etc.).
+      The same as the check:heroku-task, but all in one script (no need to pipe `heroku config --json` to it etc.).
 
     LONG
     option :dest, banner: "where to put the script", desc: "Default: bin/<app>-env-check or bin/heroku-env-check"

data/lib/envied/coercer.rb

@@ -2,23 +2,6 @@ require 'coercible'
 
 # Responsible for all string to type coercions.
 class ENVied::Coercer
-  module CoercerExts
-    def to_array(str)
-      str.split(/(?<!\\),/).map{|i| i.gsub(/\\,/,',') }
-    end
-
-    def to_hash(str)
-      require 'cgi'
-      ::CGI.parse(str).map { |key, values| [key, values[0]] }.to_h
-    end
-
-    def to_uri(str)
-      require 'uri'
-      ::URI.parse(str)
-    end
-  end
-  Coercible::Coercer::String.send(:include, CoercerExts)
-
   # Coerce strings to specific type.
   #
   # @param string [String] the string to be coerced
@@ -69,7 +52,7 @@ class ENVied::Coercer
   end
 
   def coercer
-    @coercer ||= Coercible::Coercer.new[String]
+    @coercer ||= Coercible::Coercer.new[ENViedString]
   end
 
   def coerced?(value)

data/lib/envied/coercer/envied_string.rb

@@ -0,0 +1,23 @@
+require 'coercible'
+
+class ENVied::Coercer::ENViedString < Coercible::Coercer::String
+  def to_array(str)
+    str.split(/(?<!\\),/).map{|i| i.gsub(/\\,/,',') }
+  end
+
+  def to_hash(str)
+    require 'cgi'
+    ::CGI.parse(str).map { |key, values| [key, values[0]] }.to_h
+  end
+
+  def to_uri(str)
+    require 'uri'
+    ::URI.parse(str)
+  end
+
+  def to_integer(str)
+    Integer(str)
+  rescue ArgumentError
+    raise_unsupported_coercion(str, __method__)
+  end
+end

data/lib/envied/templates/heroku-env-check.tt

@@ -3,7 +3,7 @@
 # Check the config of a Heroku app against the defined variables in `Envfile`
 
 <%- if @app %>
-HEROKU_APP=<%= @app %> exec heroku config | bundle exec envied check:heroku --groups <%= @groups.join(" ") %>
+HEROKU_APP=<%= @app %> exec heroku config --json | bundle exec envied check:heroku --groups <%= @groups.join(" ") %>
 <%- else %>
-exec heroku config | bundle exec envied check:heroku --groups <%= @groups.join(" ") %>
+exec heroku config --json | bundle exec envied check:heroku --groups <%= @groups.join(" ") %>
 <%- end %>

data/lib/envied/version.rb

@@ -1,3 +1,3 @@
 class ENVied
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/spec/coercer_spec.rb

@@ -10,8 +10,8 @@ describe ENVied::Coercer do
       ->(str){ coercer.coerce(str, type) }
     end
 
-    describe 'string coercion' do
-      let(:coerce){ coerce_to(:String) }
+    describe 'to string' do
+      let(:coerce){ coerce_to(:string) }
 
       it 'yields the input untouched' do
         expect(coerce['1']).to eq '1'
@@ -19,17 +19,23 @@ describe ENVied::Coercer do
       end
     end
 
-    describe 'integer coercion' do
-      let(:coerce){ coerce_to(:Integer) }
+    describe 'to integer' do
+      let(:coerce){ coerce_to(:integer) }
 
       it 'converts strings to integers' do
         expect(coerce['1']).to eq 1
         expect(coerce['-1']).to eq(-1)
       end
+
+      it 'fails for float' do
+        expect {
+          coerce['1.23']
+        }.to raise_error(Coercible::UnsupportedCoercion)
+      end
     end
 
-    describe 'float coercion' do
-      let(:coerce){ coerce_to(:Float) }
+    describe 'to float' do
+      let(:coerce){ coerce_to(:float) }
 
       it 'converts strings to floats' do
         expect(coerce['1.05']).to eq 1.05
@@ -37,8 +43,8 @@ describe ENVied::Coercer do
       end
     end
 
-    describe 'boolean coercion' do
-      let(:coerce){ coerce_to(:Boolean) }
+    describe 'to boolean' do
+      let(:coerce){ coerce_to(:boolean) }
 
       it "converts 'true' and 'false'" do
         expect(coerce['true']).to eq true
@@ -51,8 +57,8 @@ describe ENVied::Coercer do
       end
     end
 
-    describe 'symbol coercion' do
-      let(:coerce){ coerce_to(:Symbol) }
+    describe 'to symbol' do
+      let(:coerce){ coerce_to(:symbol) }
 
       it 'converts strings to symbols' do
         expect(coerce['a']).to eq :a
@@ -60,24 +66,24 @@ describe ENVied::Coercer do
       end
     end
 
-    describe 'date coercion' do
-      let(:coerce){ coerce_to(:Date) }
+    describe 'to date' do
+      let(:coerce){ coerce_to(:date) }
 
       it 'converts strings to date' do
         expect(coerce['2014-12-25']).to eq Date.parse('2014-12-25')
       end
     end
 
-    describe 'time coercion' do
-      let(:coerce){ coerce_to(:Time) }
+    describe 'to time' do
+      let(:coerce){ coerce_to(:time) }
 
       it 'converts strings to time' do
         expect(coerce['4:00']).to eq Time.parse('4:00')
       end
     end
 
-    describe 'array coercion' do
-      let(:coerce){ coerce_to(:Array) }
+    describe 'to array' do
+      let(:coerce){ coerce_to(:array) }
 
       it 'converts strings to array' do
         {
@@ -90,8 +96,8 @@ describe ENVied::Coercer do
       end
     end
 
-    describe 'hash coercion' do
-      let(:coerce){ coerce_to(:Hash) }
+    describe 'to hash' do
+      let(:coerce){ coerce_to(:hash) }
 
       it 'converts strings to hashes' do
         {
@@ -105,8 +111,8 @@ describe ENVied::Coercer do
       end
     end
 
-    describe 'uri coercion' do
-      let(:coerce){ coerce_to(:Uri) }
+    describe 'to uri' do
+      let(:coerce){ coerce_to(:uri) }
 
       it 'converts strings to uris' do
         expect(coerce['http://www.google.com']).to be_a(URI)

data/spec/envied_spec.rb

@@ -70,7 +70,7 @@ describe ENVied do
     end
 
     it 'responds to configured variables' do
-      configured_with(a: :Integer).and_ENV({'a' => '1'})
+      configured_with(a: :integer).and_ENV({'a' => '1'})
       envied_require
 
       expect(described_class).to respond_to :a
@@ -84,14 +84,14 @@ describe ENVied do
     end
 
     it 'sets ENVied.config' do
-      configured_with(a: :Integer).and_ENV({'a' => '1'})
+      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 }
+      before { configured_with(a: :integer).and_no_ENV }
 
       specify do
         expect {
@@ -101,19 +101,19 @@ describe ENVied do
     end
 
     context 'ENV variables are not coercible' do
-      before { configured_with(A: :Integer).and_ENV('A' => 'NaN') }
+      before { configured_with(A: :integer).and_ENV('A' => 'NaN') }
 
       specify do
         expect {
           envied_require
-        }.to raise_error(/A \('NaN' can't be coerced to Integer/)
+        }.to raise_error(/A \('NaN' can't be coerced to integer/)
       end
     end
 
     context 'configuring' do
       it 'raises error when configuring variable of unknown type' do
         expect {
-          configured_with(A: :Fixnum)
+          configured_with(A: :fixnum)
         }.to raise_error(ArgumentError, /Variable type \(of A\) should be one of \[/)
       end
     end
@@ -121,7 +121,7 @@ describe ENVied do
     context 'bug: default value "false" is not coercible' do
       before {
         configure(enable_defaults: true) do
-          variable :FORCE_SSL, :Boolean, default: true
+          variable :FORCE_SSL, :boolean, default: true
         end
       }
 
@@ -169,7 +169,7 @@ describe ENVied do
       describe 'assigning' do
         it 'can be a value' do
           configure(enable_defaults: true) do
-            variable :A, :Integer, default: '1'
+            variable :A, :integer, default: '1'
           end
           envied_require
 
@@ -178,7 +178,7 @@ describe ENVied do
 
         it 'can be a Proc' do
           configure(enable_defaults: true) do
-            variable :A, :Integer, default: proc { "1" }
+            variable :A, :integer, default: proc { "1" }
           end
           envied_require
 
@@ -187,7 +187,7 @@ describe ENVied do
 
         it 'is ignored if defaults are disabled' do
           configure(enable_defaults: false) do
-            variable :A, :Integer, default: "1"
+            variable :A, :integer, default: "1"
           end.and_no_ENV
 
           expect {
@@ -197,7 +197,7 @@ describe ENVied do
 
         it 'is ignored if ENV is provided' do
           configure(enable_defaults: true) do
-            variable :A, :Integer, default: "1"
+            variable :A, :integer, default: "1"
           end.and_ENV('A' => '2')
           envied_require
 
@@ -206,8 +206,8 @@ describe ENVied do
 
         it 'can be defined in terms of other variables' do
           configure(enable_defaults: true) do
-            variable :A, :Integer
-            variable :B, :Integer, default: proc {|env| env.A * 2 }
+            variable :A, :integer
+            variable :B, :integer, default: proc {|env| env.A * 2 }
           end.and_ENV('A' => '1')
           envied_require
 
@@ -320,8 +320,8 @@ describe ENVied do
       describe 'Hashable' do
         before do
           configure do
-            variable :foo, :Hash
-            variable :bar, :Hash
+            variable :foo, :hash
+            variable :bar, :hash
           end.and_ENV('foo' => 'a=1&b=&c', 'bar' => '')
           envied_require
         end
@@ -337,7 +337,7 @@ describe ENVied do
         context 'with defaults enabled' do
           before do
             configure(enable_defaults: true) do
-              variable :baz, :Hash
+              variable :baz, :hash
             end.and_no_ENV
           end
 
@@ -352,7 +352,7 @@ describe ENVied do
       describe 'Arrayable' do
         before do
           configure do
-            variable :moar, :Array
+            variable :moar, :array
           end.and_ENV('moar' => 'a, b, and\, c')
           envied_require
         end
@@ -365,7 +365,7 @@ describe ENVied do
       describe 'URIable' do
         before do
           configure do
-            variable :site_url, :Uri
+            variable :site_url, :uri
           end.and_ENV('site_url' => 'https://www.google.com')
           envied_require
         end

data/spec/variable_spec.rb

@@ -10,6 +10,6 @@ describe ENVied::Variable do
   end
 
   describe 'an instance' do
-    subject { variable(:A, :String) }
+    subject { variable(:A, :string) }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envied
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Gert Goet
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coercible
@@ -104,6 +104,7 @@ files:
 - lib/envied.rb
 - lib/envied/cli.rb
 - lib/envied/coercer.rb
+- lib/envied/coercer/envied_string.rb
 - lib/envied/configuration.rb
 - lib/envied/env_proxy.rb
 - lib/envied/env_var_extractor.rb
@@ -137,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Ensure presence and type of ENV-variables