envied 0.10.0.alpha1 → 0.10.0.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 995cd4c0c3790b6eabd16fe27f110ddde99d9efcd52863bc0fdfec9fc7d9ac7f
-  data.tar.gz: 2ae7aebddb419a142c77d2ff3ac878ee22428356ed1d26d1b7b0396741760c14
+  metadata.gz: cc20ae0af7bca2b583c878ded0e20158ec97bf6083f5bd9ed87df439ccdbebcb
+  data.tar.gz: e0077f4db12320110b8bf27187e5ed159555aee466fae4db2d954f9405717e40
 SHA512:
-  metadata.gz: cc80db096389ad6e7f0d66d615a7697d85a550e10307314ebf98d14cb01172f31a2e29684eb47da2c5693c68e0266fd84cbcc44b1345567e81086fe4ffb690d4
-  data.tar.gz: '08d2dc26b39cc8bd52ed5b40293dff4df06301f645ee5d3d56e52f10c9b6176c9792b2e48a0fc7a0b5358a2805a0a5319555f969ea27913ebcfd02489a10552b'
+  metadata.gz: a11a5d9fe26fb430da05d832ca8df370f0ce08f1d455e6fc739d94d5d486777fd456f98257b69922c7f61a3bd9687a19ee4d74e8812009ffb186219520f216b0
+  data.tar.gz: da77c7a1f2753f961ae2806878b7189e4278367448b175dea9d03711899988c0ce721d47baf83967c26c319e7c8bd823a9bd6c5a2da20553ff69d0cd37453071

data/lib/envied.rb

@@ -16,6 +16,7 @@ class ENVied
   def self.require(*args, **options)
     requested_groups = (args && !args.empty?) ? args : ENV['ENVIED_GROUPS']
     env!(requested_groups, options)
+    error_on_duplicate_variables!(options)
     error_on_missing_variables!(options)
     error_on_uncoercible_variables!(options)
 
@@ -28,8 +29,20 @@ class ENVied
     @env = EnvProxy.new(@config, groups: required_groups(*requested_groups))
   end
 
+  def self.error_on_duplicate_variables!(options)
+    var_types_by_name = env.variables.reduce({}) do |acc, v|
+      (acc[v.name] ||= []).push v.type
+      acc
+    end
+    dups = var_types_by_name.select {|name, types| types.uniq.count > 1 }
+
+    if dups.any?
+      raise "The following variables are defined more than once with different types: #{dups.keys.join(', ')}"
+    end
+  end
+
   def self.error_on_missing_variables!(**options)
-    names = env.missing_variables.map(&:name)
+    names = env.missing_variables.map(&:name).uniq.sort
     if names.any?
       msg = "The following environment variables should be set: #{names.join(', ')}."
       msg << "\nPlease make sure to stop Spring before retrying." if spring_enabled? && !options[:via_spring]
@@ -55,7 +68,7 @@ class ENVied
   end
 
   def self.env_keys_to_intercept
-    config.variables.select {|var| var.type == :env }.map{|var| var.name.to_s }
+    env.variables.select{|v| v.type == :env }.map{|var| var.name.to_s }
   end
 
   def self.intercept_env_vars!

data/lib/envied/env_proxy.rb

@@ -30,6 +30,10 @@ class ENVied
       return env_value_of(var) unless env_value_of(var).nil?
     end
 
+    def variables
+      @variables ||= config.variables.select {|v| groups.include?(v.group) }
+    end
+
     private
 
     def coerce(var)
@@ -62,10 +66,6 @@ class ENVied
       value_to_coerce(var).nil?
     end
 
-    def variables
-      @variables ||= config.variables.select {|v| groups.include?(v.group) }
-    end
-
     def variables_by_name
       @variables_by_name ||= variables.map {|v| [v.name, v] }.to_h
     end

data/lib/envied/version.rb

@@ -1,3 +1,3 @@
 class ENVied
-  VERSION = '0.10.0.alpha1'
+  VERSION = '0.10.0.alpha3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: envied
 version: !ruby/object:Gem::Version
-  version: 0.10.0.alpha1
+  version: 0.10.0.alpha3
 platform: ruby
 authors:
 - Gert Goet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2019-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor