greased-rails 0.0.10 → 0.0.11

data/greased-rails.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "activesupport", ">= 3.2.0"
   gem.add_dependency "railties", ">= 3.2.0"
+  gem.add_dependency "minigit", ">= 0.0.3"
   #figaro
   
   gem.files         = `git ls-files`.split($/)

data/lib/greased/applicator.rb

@@ -8,7 +8,7 @@ module Greased
     attr_accessor :app, :env, :groups
     
     def initialize(application, options = {})
-      @options  = Options.defaults.merge(options)
+      @options  = Options.default_options.merge(options)
       @app      = application#@options[:app]
       @env      = @options[:env]
       @groups   = @options[:groups]

data/lib/greased/options.rb

@@ -18,26 +18,38 @@ module Greased
     ENV_VARS_FILENAME_BASE      = "variables.yml"
     ENV_VARS_FILENAME           = "greased_#{ENV_VARS_FILENAME_BASE}"
     # options to load from YAML
-    OPTIONS_FILENAME            = "greased.yml"
-    DEFAULT_OPTIONS_FILE        = Greased.file_path(File.dirname(__FILE__), '..', '..', 'templates', OPTIONS_FILENAME)
+    CONFIG_FILENAME             = "greased.yml"
+    DEFAULT_CONFIG_FILENAME     = Greased.file_path(File.dirname(__FILE__), '..', '..', 'templates', CONFIG_FILENAME)
     # default Greased template with application settings
     DEFAULT_SETTINGS_FILE       = Greased.file_path(File.dirname(__FILE__), '..', '..', 'templates', APP_SETTINGS_FILENAME)
     DEFAULT_ENV                 = "development"
     
     class << self
       
-      def defaults
-        load_options(DEFAULT_OPTIONS_FILE).deep_merge!(:app_filename => DEFAULT_SETTINGS_FILE)
+      def default_config
+        load_options(DEFAULT_CONFIG_FILENAME)
       end
       
-      def find(path)
+      def default_options
+        default_config[:options].deep_merge!(:app_filename => DEFAULT_SETTINGS_FILE)
+      end
+      
+      def find(path, options = {})
         #Greased.logger.debug "Find application options in: #{path}"
         
-        options = defaults
+        merged_options = default_options
         
         if Dir.exists? path
+          # load custom config
+          config = load_options([
+            Greased.file_path(path, CONFIG_FILENAME), 
+            Greased.file_path(path, "greased", CONFIG_FILENAME),
+            Greased.file_path(path, "config", CONFIG_FILENAME), 
+            Greased.file_path(path, "config", "greased", CONFIG_FILENAME)
+          ])
+          
           # load rails defaults
-          options = merge_options options, {
+          default_paths = {
             #:env => ::Rails.env || DEFAULT_ENV,
             #:groups => ["application"],
             :app_filename => [
@@ -59,17 +71,14 @@ module Greased
               Greased.file_path(path, "config", ENV_VARS_FILENAME),
               Greased.file_path(path, "config", "greased", ENV_VARS_FILENAME_BASE)
             ]
-          },
-          # load custom options
-          load_options([
-            Greased.file_path(path, OPTIONS_FILENAME), 
-            Greased.file_path(path, "greased", OPTIONS_FILENAME),
-            Greased.file_path(path, "config", OPTIONS_FILENAME), 
-            Greased.file_path(path, "config", "greased", OPTIONS_FILENAME)
-          ])
+          }
+          
+          # use custom options
+          merged_options = merge_options(merged_options, default_paths, config[:options])
+          
         end
         
-        options
+        merged_options.merge(options)
       end
       
       protected

data/lib/greased/rails/version.rb

@@ -1,5 +1,5 @@
 module Greased
   module Rails
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

data/templates/greased.yml

@@ -1,19 +1,19 @@
-
-# Where to look for the environment settings file(s).
-# By default, Greased will try several file path permuations to find the file dynamically.
-# app_filename:     <%= File.join(Rails.root, 'greased_settings.yml') %>
-
-# Where to look for the environment settings override file(s).
-# By default, Greased will try several file path permuations to find the file dynamically.
-# partial_filename: <%= File.join(Rails.root, 'greased_partial.yml') %>
-
-# Where to look for the environment variable file(s).
-# By default, Greased will try several file path permuations to find the file dynamically.
-# env_filename:     <%= File.join(Rails.root, 'greased_variables.yml') %>
-
-# Envirionment (e.g. development, staging, production)
-env:              <%= ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development" %>
-
-# Groups within the environment variables to load up.
-groups:           ["application"]
-
+options:
+  # Where to look for the environment settings file(s).
+  # By default, Greased will try several file path permuations to find the file dynamically.
+  # app_filename:     <%= File.join(Rails.root, 'greased_settings.yml') %>
+  
+  # Where to look for the environment settings override file(s).
+  # By default, Greased will try several file path permuations to find the file dynamically.
+  # partial_filename: <%= File.join(Rails.root, 'greased_partial.yml') %>
+  
+  # Where to look for the environment variable file(s).
+  # By default, Greased will try several file path permuations to find the file dynamically.
+  # env_filename:     <%= File.join(Rails.root, 'greased_variables.yml') %>
+  
+  # Envirionment (e.g. development, staging, production)
+  env:              <%= ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development" %>
+  
+  # Groups within the environment variables to load up.
+  groups:           ["application"]
+    

data/templates/greased_settings.yml

@@ -236,6 +236,9 @@ production:
   config:
     # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
     force_ssl: false
+    # eager load lib directory in threadsafe mode
+    eager_load_paths +=:
+      - "<%= Rails.root %>/lib"
     lograge:
       # more concise logging (one line per request)
       enabled: true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: greased-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-07 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: minigit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 description: Reusable default application settings, environment variables, and deployment
   tasks.
 email:
@@ -96,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Replicate common Rails application settings and environment variables using