configuration_manager 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e58571651ad2b507c43f085876783f1a6c5b7aee
-  data.tar.gz: c46ce375821dc0254bfe8b8e2d06326ebb258549
+  metadata.gz: 4cfe3eee60ccfaac66522d3c9b4375aa394b239d
+  data.tar.gz: cd9ed91e55160f76c9eadd6913dbf30f88cf30dd
 SHA512:
-  metadata.gz: cf0f54e581a31ba62c535eb7bd40a37e85a6a60338a0fc2f19d019bcf79bbec7fce3c4577ec3f5e7249f2817a8fb5b18c7ca56840612035a245735e8746925a1
-  data.tar.gz: 23c31c0f23d5a5334d799e037cdf31efbc1729bf7b7f3fe8b89b5370ac79a777489885d91b5ab6a3e19982f702921e624a29ce8bcd6f6b4be58d1e83f19919a3
+  metadata.gz: 876c42b3a0adb9bdef2cab6f4dcc157875523f353a4a17eaa18e7a4da725ae76ad2ad7e0b9941eb7fe8acd32d14d68f376b012268792177b69776b5007968795
+  data.tar.gz: ba4fb48a5563a93481c2c43e2c8ec65660aa8218412463eee22cba124b3438cc1778afc7b63124a37b7df586a62f12358a7ec4d9565535059b27fcfc0a6e0468

data/lib/configuration_manager/version.rb

@@ -1,3 +1,3 @@
 module ConfigurationManager
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/configuration_manager.rb

@@ -16,22 +16,22 @@ module ConfigurationManager
     current = YAML.load_file("#{Rails.root}/config/application.yml")
     generated = Merger.config(AppConfig.current_theme)
 
-    different = configs_different? current, generated
+    differences = differing_configs(current, generated)
 
-    if different && !AppConfig['allow_custom_configuration']
+    if differences.any? && !AppConfig['allow_custom_configuration']
       raise "Current application.yml does not match the default for #{AppConfig.current_theme}. " +
         "Either run `rake config:update` or set allow_custom_configuration to true" +
-        " in your application.yml."
+        " in your application.yml. Differences: #{differences}"
     end
   end
 
   private
 
-  def configs_different?(one, two)
+  def differing_configs(one, two)
     relevant_configs_one = relevant_configs(one)
     relevant_configs_two = relevant_configs(two)
 
-    relevant_configs_one != relevant_configs_two
+    deep_diff(relevant_configs_one, relevant_configs_two)
   end
 
   def relevant_configs(data)
@@ -45,4 +45,18 @@ module ConfigurationManager
 
     data
   end
+
+  # https://gist.github.com/henrik/146844, modified to not use monkey patching
+  def deep_diff(a, b)
+    (a.keys | b.keys).inject({}) do |diff, k|
+      if a[k] != b[k]
+        if a[k].is_a?(Hash) && b[k].is_a?(Hash)
+          diff[k] = deep_diff(a[k], b[k])
+        else
+          diff[k] = [a[k], b[k]]
+        end
+      end
+      diff
+    end
+  end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: configuration_manager
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Bruz Marzolf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Manage development configurations for themed apps
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -81,18 +81,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Themed app configuration management
 test_files: []
+has_rdoc: