avrolution 0.4.0.rc0 → 0.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1927a0ffec1ea39c555e51d324281899ca9142ff
-  data.tar.gz: 91f7c6723e95df2ef2562f9dd3a33d725c458a8e
+  metadata.gz: 6828c0755e2ea2576aa2b0e5cdcc45cc76e32d04
+  data.tar.gz: 06f859b1c6b91e4b2feb61f7fa30607b66f2c469
 SHA512:
-  metadata.gz: 91842dec6fd051daecbf2c51f67f16b94feee0acfb764f10b9499516f5357738e9c3b81b9fa0cf7a8cedede8a7764bdf2087f9c7b462c7168ee14866b5478de0
-  data.tar.gz: 10602cc66b3dd61bfba1db610f5faf9c070586e3fb2eb4c3ee88161eecfc4d40d38231cdc8bcf4fdefb68189dafadb7ac2db588c120bf1825e5f51561e583662
+  metadata.gz: fac16048c96d048c2642c80882cac45f496d4ad779da7b2e8cb75d4fa428bdf42f071b918fcfe6394b2c1c0eddbf28b28a1e9e505c458ee6974496b33230e771
+  data.tar.gz: 14471e54f6de841e73b7f831a1e899ace19df23de9639fcb2a6e9a8ab9877a097c1ec9f147b762f27e1580027ea8e19cfa8377c0fe3c2b7dc53ccad8db7e1fb6

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 ## v0.4.0
 - Support a Proc for the configuration of `compatibility_schema_registry_url`
   and `deployment_schema_registry_url`.
+- Environment variables now take priority over assigned values for
+  `Avrolution.compatibility_schema_registry_url` and
+  `Avrolution.deployment_schema_registry_url`.
 
 ## v0.3.0
 - Add rake task to register new schema versions.

data/README.md

@@ -39,11 +39,11 @@ The gem supports the following configuration:
 * `compatibility_breaks_file` - The path to the compability breaks file. Defaults
   to `#{Avrolution}.root/avro_compatibility_breaks.txt`.
 * `compatibility_schema_registry_url` - The URL for the schema registry to use
-  for compatibility checking. `ENV['COMPATIBILITY_SCHEMA_REGISTRY_URL']` is used
-  as the default.
+  for compatibility checking, or a Proc to determine the value.
+  `ENV['COMPATIBILITY_SCHEMA_REGISTRY_URL']` overrides this value if set.
 * `deployment_schema_registry_url` - The URL for the schema registry to use
-  when registering new schema version. `ENV['DEPLOYMENT_SCHEMA_REGISTRY_URL']`
-  is used as the default.
+  when registering new schema version, or a Proc to determine the value.
+  `ENV['DEPLOYMENT_SCHEMA_REGISTRY_URL']` overrides this value if set.
 * `logger` - A logger used by the rake tasks in this gem. This does _NOT_ default
   to `Rails.logger` in Rails applications.
 
@@ -59,8 +59,8 @@ defined via a Railtie.
 
 This task does not require any arguments. It checks the
 compatibility of all Avro JSON schemas found recursively under `Avrolution.root`
-against the schema registry `Avroluion.compatibility_schema_registry_url` or
-`ENV['COMPATIBILITY_SCHEMA_REGISTRY_URL']`.
+against the schema registry `ENV['COMPATIBILITY_SCHEMA_REGISTRY_URL']` or
+`Avroluion.compatibility_schema_registry_url`.
 
 ```bash
 rake avro:check_compatibility
@@ -92,8 +92,8 @@ rake avro:register_schemas schemas=/app/avro/schemas/one.avsc,/app/avro/schema/t
 ```
 
 Schemas are registered against the schema registry
-`Avroluion.deployment_schema_registry_url` or
-`ENV['DEPLOYMENT_SCHEMA_REGISTRY_URL']`.
+`ENV['DEPLOYMENT_SCHEMA_REGISTRY_URL']` or
+`Avroluion.deployment_schema_registry_url`.
 
 The `Avrolution.compatibility_breaks_file` is consulted prior to registering the
 schema, and if an entry is found then the specified compatibility settings are

data/lib/avrolution/configuration.rb

@@ -1,8 +1,5 @@
 module Avrolution
 
-  COMPATIBILITY_SCHEMA_REGISTRY_URL = 'COMPATIBILITY_SCHEMA_REGISTRY_URL'.freeze
-  DEPLOYMENT_SCHEMA_REGISTRY_URL = 'DEPLOYMENT_SCHEMA_REGISTRY_URL'.freeze
-
   class << self
     # Root directory to search for schemas, and default location for
     # compatibility breaks file
@@ -21,6 +18,22 @@ module Avrolution
     attr_writer :deployment_schema_registry_url
 
     attr_accessor :logger
+
+    def fetch_url(label)
+      env_name = "#{label.upcase}_SCHEMA_REGISTRY_URL"
+      ivar_name = "@#{env_name.downcase}"
+      env_value = ENV[env_name]
+      result = if env_value
+                 env_value
+               elsif instance_variable_get(ivar_name)
+                 ivar_value = instance_variable_get(ivar_name)
+                 ivar_value = instance_variable_set(ivar_name, ivar_value.call) if ivar_value.is_a?(Proc)
+                 ivar_value
+               end
+
+      raise "#{env_name.downcase} must be set" if result.blank?
+      result
+    end
   end
 
   self.logger = Avrolution::PassthruLogger.new($stdout)
@@ -34,17 +47,11 @@ module Avrolution
   end
 
   def self.compatibility_schema_registry_url
-    @compatibility_schema_registry_url = @compatibility_schema_registry_url.call if @compatibility_schema_registry_url.is_a?(Proc)
-    @compatibility_schema_registry_url ||= ENV.fetch(COMPATIBILITY_SCHEMA_REGISTRY_URL) do
-      raise 'compatibility_schema_registry_url must be set'
-    end
+    fetch_url('compatibility')
   end
 
   def self.deployment_schema_registry_url
-    @deployment_schema_registry_url = @deployment_schema_registry_url.call if @deployment_schema_registry_url.is_a?(Proc)
-    @deployment_schema_registry_url ||= ENV.fetch(DEPLOYMENT_SCHEMA_REGISTRY_URL) do
-      raise 'deployment_schema_registry_url must be set'
-    end
+    fetch_url('deployment')
   end
 
   def self.configure

data/lib/avrolution/version.rb

@@ -1,3 +1,3 @@
 module Avrolution
-  VERSION = '0.4.0.rc0'.freeze
+  VERSION = '0.4.0.rc1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avrolution
 version: !ruby/object:Gem::Version
-  version: 0.4.0.rc0
+  version: 0.4.0.rc1
 platform: ruby
 authors:
 - Salsify, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler