configuration_manager 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e58571651ad2b507c43f085876783f1a6c5b7aee
+  data.tar.gz: c46ce375821dc0254bfe8b8e2d06326ebb258549
+SHA512:
+  metadata.gz: cf0f54e581a31ba62c535eb7bd40a37e85a6a60338a0fc2f19d019bcf79bbec7fce3c4577ec3f5e7249f2817a8fb5b18c7ca56840612035a245735e8746925a1
+  data.tar.gz: 23c31c0f23d5a5334d799e037cdf31efbc1729bf7b7f3fe8b89b5370ac79a777489885d91b5ab6a3e19982f702921e624a29ce8bcd6f6b4be58d1e83f19919a3

data/configuration_manager.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "activesupport"
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

data/lib/configuration_manager/merger.rb

@@ -0,0 +1,32 @@
+module ConfigurationManager
+  class Merger
+    class << self
+
+      def write(theme_name)
+        File.open("#{Rails.root}/config/application.yml", "w") do |file|
+          file.write config(theme_name).to_yaml
+        end
+      end
+
+      def config(theme_name)
+        common = YAML.load_file "#{Rails.root}/config/application.common.dev.yml"
+        theme = YAML.load_file "#{Rails.root}/config/application.#{theme_name}.dev.yml"
+
+        {
+          "development" => get(common, "development").deep_merge( get(theme, "development") ),
+          "test" => get(common, "test").deep_merge( get(theme, "test") )
+        }
+      end
+
+      private
+
+      def get(config, env_name)
+        common = config["common"] || {}
+        env = config[env_name] || {}
+
+        common.deep_merge(env)
+      end
+
+    end
+  end
+end

data/lib/configuration_manager/version.rb

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

data/lib/configuration_manager.rb

@@ -1,4 +1,5 @@
 require "configuration_manager/configuration"
+require "configuration_manager/merger"
 require "configuration_manager/railtie"
 require "configuration_manager/version"
 
@@ -12,16 +13,13 @@ module ConfigurationManager
   end
 
   def check_configuration_freshness
-    current = "application.yml"
-    reference = "application.#{AppConfig.theme}.dev.yml"
+    current = YAML.load_file("#{Rails.root}/config/application.yml")
+    generated = Merger.config(AppConfig.current_theme)
 
-    current_path = "#{Rails.root}/config/#{current}"
-    reference_path = "#{Rails.root}/config/#{reference}"
-
-    different = configs_different? current_path, reference_path
+    different = configs_different? current, generated
 
     if different && !AppConfig['allow_custom_configuration']
-      raise "Current configuration #{current} does not match #{reference}. " +
+      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."
     end
@@ -29,10 +27,7 @@ module ConfigurationManager
 
   private
 
-  def configs_different?(path_one, path_two)
-    one = YAML.load_file(path_one)
-    two = YAML.load_file(path_two)
-
+  def configs_different?(one, two)
     relevant_configs_one = relevant_configs(one)
     relevant_configs_two = relevant_configs(two)
 

data/lib/tasks/config.rake

@@ -1,10 +1,13 @@
+require_relative '../configuration_manager/merger'
+
 namespace :config do
-  desc "Switch configurations to another theme, specieid by THEME"
+
+  desc "Switch configurations to another theme, specified by THEME"
   task :switch do
     theme = ENV['THEME']
 
     puts "= Switching to the #{theme} configuration"
-    copy_theme(theme)
+    ConfigurationManager::Merger.write(theme)
 
     puts "= Clearing temp files"
     Rake::Task["tmp:clear"].invoke
@@ -15,13 +18,7 @@ namespace :config do
     theme = AppConfig.theme
 
     puts "= Updating config, using the #{theme} configuration"
-    copy_theme(theme)
+    ConfigurationManager::Merger.write(theme)
   end
 
-  def copy_theme(theme)
-    source = "#{Rails.root}/config/application.#{theme}.dev.yml"
-    dest = "#{Rails.root}/config/application.yml"
-
-    system "cp #{source} #{dest}"
-  end
 end

metadata

@@ -1,20 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: configuration_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Bruz Marzolf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-03-18 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
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,17 +41,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Manage development configurations for themed apps
@@ -58,38 +67,32 @@ files:
 - configuration_manager.gemspec
 - lib/configuration_manager.rb
 - lib/configuration_manager/configuration.rb
+- lib/configuration_manager/merger.rb
 - lib/configuration_manager/railtie.rb
 - lib/configuration_manager/version.rb
 - lib/tasks/config.rake
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 912823216979744525
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 912823216979744525
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Themed app configuration management
 test_files: []