greased-rails 0.0.7 → 0.0.8

data/README.md

@@ -38,6 +38,17 @@ If you don't create your own file, Greased will use the file in the "templates"
     * config/greased_settings.yml
     * config/greased/settings.yml
 
+#### Partial Settings - greased_partial.yml
+
+This is a YAML serialization of settings you want to override in greased_settings.yml. This is useful if you let Greased load the default template and only want to override a few settings without copying the whole template file over.
+
+Save your file to one of the following locations:
+
+    * greased_partial.yml (in the root of your Rails application)
+    * greased/partial.yml
+    * config/greased_partial.yml
+    * config/greased/partial.yml
+
 ### Environment Variables - greased_variables.yml
 
 This is a YAML serialization of your environment variables. You can easily share environment variables across environments.

data/lib/greased/applicator.rb

@@ -5,10 +5,18 @@ require 'active_support/core_ext/hash/deep_merge'
 module Greased
   class Applicator
     
+    # settings applied to application environment
     APP_SETTINGS_FILENAME_BASE  = "settings.yml"
     APP_SETTINGS_FILENAME       = "greased_#{APP_SETTINGS_FILENAME_BASE}"
+    # additional settings applied to application environment 
+    # after default Greased (template) settings are applied 
+    # or custom settings file is applied.
+    APP_PATCH_FILENAME_BASE     = "partial.yml"
+    APP_PATCH_FILENAME          = "greased_#{APP_PATCH_FILENAME_BASE}"
+    # environment variables to load into ENV
     ENV_VARS_FILENAME_BASE      = "variables.yml"
     ENV_VARS_FILENAME           = "greased_#{ENV_VARS_FILENAME_BASE}"
+    # default Greased template with application settings
     DEFAULT_SETTINGS_FILE       = Pathname.new(File.join(File.dirname(__FILE__), '..', '..', 'templates', APP_SETTINGS_FILENAME)).realpath
     DEFAULT_ENV                 = "development"
     
@@ -36,6 +44,12 @@ module Greased
             File.join(::Rails.root, "config", "greased", APP_SETTINGS_FILENAME_BASE),
             DEFAULT_SETTINGS_FILE
           ],
+          :partial_filename => [
+            File.join(::Rails.root, APP_PATCH_FILENAME), 
+            File.join(::Rails.root, "greased", APP_PATCH_FILENAME_BASE),
+            File.join(::Rails.root, "config", APP_PATCH_FILENAME), 
+            File.join(::Rails.root, "config", "greased", APP_PATCH_FILENAME_BASE)
+          ],
           :env_filename => [
             File.join(::Rails.root, ENV_VARS_FILENAME),
             File.join(::Rails.root, "greased", ENV_VARS_FILENAME_BASE),
@@ -89,7 +103,7 @@ module Greased
     def variables(options = {})
       options             = @options.merge(options)
       groups              = Array.wrap(options[:groups])
-      grouped_variables   = load_settings(@options[:env_filename])
+      grouped_variables   = load_settings(options[:env_filename])
       
       groups.inject({}) do |all, group|
         all.merge grouped_variables.fetch(options[:env], {}).fetch(group, {})
@@ -97,8 +111,12 @@ module Greased
     end
     
     def settings(options = {})
-      options = @options.merge(options)
-      config  = load_settings(options[:app_filename], options).fetch(env, {})
+      options = @options.merge(:env => env).merge(options)
+      # get settings for application environment
+      config = load_settings(options[:app_filename], options).fetch(options[:env], {})
+      # add partial settings for environment
+      config.deep_merge! load_settings(options[:partial_filename], options).fetch(options[:env], {})
+      
       Settings.new(app, env, config)
     end
     
@@ -122,6 +140,5 @@ module Greased
       all || {}
     end
     
-    
   end
 end

data/lib/greased/rails/engine.rb

@@ -26,7 +26,7 @@ module Greased
         
         options     = Applicator.rails_options.merge(:app => application)
         applicator  = Applicator.new(options)
-        variables   = applicator.variables(options).except("RACK_ENV", "RAILS_ENV")
+        variables   = applicator.variables.except("RACK_ENV", "RAILS_ENV")
         
         variables.each do |key, value|
           ENV[key.to_s] = value.to_s

data/lib/greased/rails/version.rb

@@ -1,5 +1,5 @@
 module Greased
   module Rails
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/templates/greased_partial.yml

@@ -0,0 +1,30 @@
+# 
+# Create a file like this in your application if you want to use the default 
+# greased_settings.yml template in your application and only specify a couple changes 
+# without creating a whole new greased_settings.yml file.
+#
+# The settings in this file will be applied after the greased_settings.yml file 
+# is applied to the application environment.
+# 
+# *** NOTE ***
+# 
+# For the "defaults" section to have any effect, you have to specify the environment 
+# that should inherit from the defaults when loading these settings. Otherwise 
+# the settings will be ignored rather than be applied to all environments.
+# 
+
+defaults: &defaults
+  config:
+    # suppose you want to use all defaults in greased_settings.yml 
+    # and only change the SSL settings for all environments
+    force_ssl: true
+    
+development:
+  <<: *defaults
+
+staging:
+  <<: *defaults
+
+production:
+  <<: *defaults
+

data/templates/greased_settings.yml

@@ -1,3 +1,9 @@
+# 
+# Create a file like this in your application to specify your own default settings. 
+# By default, this template file will be loaded into your environment unless you 
+# create your own file. (You could create a blank file so no changes are loaded.)
+# 
+
 defaults: &defaults
   config:
     force_ssl: false

data/templates/greased_variables.yml

@@ -1,3 +1,9 @@
+# 
+# This is an example of how you could organize your environment variables. 
+# Currently only the "application" group is loaded. The "deployment" group 
+# may be used in Rake tasks eventually.
+# 
+
 defaults: &defaults
   deployment:
     HEROKU_APP:       my-app-name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: greased-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -67,6 +67,7 @@ files:
 - lib/greased/settings.rb
 - release.sh
 - tasks/greased.rake
+- templates/greased_partial.yml
 - templates/greased_settings.yml
 - templates/greased_variables.yml
 homepage: http://github.com/joelvh/greased-rails