centroid 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10f06b65f1456f1c80523a64b22127d10ab533da
-  data.tar.gz: eae5193fb97114d3b0f763c99e23dd4a15446115
+  metadata.gz: 17dae74acaa307129c3a44df4923fd0eee4df0d9
+  data.tar.gz: 6e5b172c4094b07f90ebeccc7333e35373c8b354
 SHA512:
-  metadata.gz: c17ec252c370dce8e8d4d8eaf23e1ba5e1f0c844cd08e52b2564b5e7b1d19f36f1b07581bb59d94a07397c543608a2d6b94b84f747cb171aa5c29f88e78dac14
-  data.tar.gz: e2572359d37785b43f36a1739f86df98d267a8a4fc669f97e56f229a8cd09e8a245d86f0c28e8ad5b1135240e3fcad9d9de0135edf3ce34555ac440cd29d2cf8
+  metadata.gz: 292194f27184d2fae1e258c9554e8610ef3f41a20d38f841d18ffc4c540ce0c7e4823de7769224a876479eb3019a17b69362572ea8aa89469bd28ba70a8bad74
+  data.tar.gz: 95fdde661f2b0c77678c0501f63476f2a8737bdf3f2c7d0e1ab6baa16ac61609084380bb695b4afafc6e8d7a7e86e9f23b3664bfb2f1083cab15d5c6b8c7e35d

data/README.md

@@ -44,11 +44,14 @@ In the `Config` instance, you can use the `for_environment` instance method to r
 
 If you specify an environment in `for_environment`, Centroid will merge the requested environment's configuration values with the values in *all*. Refer to [Examples in the Centroid document] (../README.md#examples) for information on creating an environment-based JSON configuration file. 
 
+To maintain environment awareness, this call adds an `environment` configuration value, unless your JSON contains an `environment` (case-insensitive) property already.
+
 With the following example, Centroid will merge the configuration for *prod* with the configuration for *all*; the result is then available from a new instance of `Config`.
 
 ```rb
 # for_enviroment.rb
 config = Centroid::Config.from_file("config.json").for_environment("prod")
+environment = config.environment # => "prod"
 server = config.some_resource.server # => "resource-prod.local"
 solution_path = config.keys.ssh # => "path/to/id_rsa.pub"
 ```

data/centroid.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'centroid'
-  s.version = '1.2.0'
+  s.version = '1.2.1'
   s.summary = 'A centralizaed paradigm to configuration management.'
   s.description = 'Centroid is a tool for loading configuration values declared in JSON, and accessing those configuration values using object properties.'
   s.author = 'Resource Data, Inc'

data/lib/centroid.rb

@@ -59,14 +59,19 @@ module Centroid
 
     def for_environment(env)
       env_json = raw_config[env]
-      env_json["environment"] = env
       all_key = actual_key("all")
       if all_key.nil?
-        Config.new(env_json)
+        config = Config.new(env_json)
       else
         all_json = raw_config[all_key]
-        Config.new(deep_merge(all_json, env_json))
+        config = Config.new(deep_merge(all_json, env_json))
       end
+
+      if !config.has_key?('environment')
+        config.raw_config['environment'] = env
+      end
+
+      config
     end
 
     def self.from_file(filename)

data/test/centroid_test.rb

@@ -95,6 +95,18 @@ class ConfigTests < Test::Unit::TestCase
     assert_equal(config.shared, "production!")
   end
 
+  def test_environment_specific_config_has_environment_property
+    config = Centroid::Config.new('{"Prod": {"Shared": "production!"}, "All": {"Shared": "none"}}')
+    config = config.for_environment("Prod")
+    assert_equal(config.environment, "Prod")
+  end
+
+  def test_environment_specific_config_no_environment_property_if_has_environment_config_json
+    config = Centroid::Config.new('{"Prod": {"Environment": "production!"}, "All": {"Shared": "none"}}')
+    config = config.for_environment("Prod")
+    assert_equal(config.environment, "production!")
+  end
+
   def test_indexing_json_array
     config = Centroid::Config.new(json_config_with_array)
     assert_equal(config.the_array[0].the_key, "Value1")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: centroid
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Resource Data, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies: []
 description: Centroid is a tool for loading configuration values declared in JSON,
   and accessing those configuration values using object properties.