templar 0.7.5 → 0.7.6

data/lib/tasks/templar_tasks.rake

@@ -1,6 +1,7 @@
 require 'templar'
 
 namespace :templar do
+  desc "use templar to update all templates"
   task :update do
     templar = Templar::Processor.new(:overrides => {:always_update => true})
   end

data/lib/templar/processor.rb

@@ -1,3 +1,4 @@
+require "yaml"
 require 'erubis'
 require 'templar/config'
 
@@ -17,7 +18,7 @@ module Templar
     ##
     # Get a new processor
     # @param [Hash] config_overrides these values will be merged on top of the defaults.
-    def initialize(settings = {})
+    def initialize(settings = { })
       defaults = {
           :print_format => "  templar: (update: %s) %s => %s"
       }
@@ -38,9 +39,13 @@ module Templar
     def process
       if @use_environments
         @environment ||= begin
-          return Rails.env if defined?(Rails)
-          return ENV['ENVIRONMENT'] if ENV['ENVIRONMENT']
-          nil
+          if defined?(Rails)
+            Rails.env
+          elsif ENV['ENVIRONMENT']
+            ENV['ENVIRONMENT']
+          else
+            nil
+          end
         end
         raise "Use Environments option is true, but environment is not set (#{@config.inspect})" if @use_environments && !@environment
         raise "Data is empty, missing environment?" unless @data[@environment.to_sym]
@@ -58,11 +63,11 @@ module Templar
     # @param [String] file the file to load
     # @param [Hash] overrides these values will be merged on top of the file data
     # @return [Templar::Config] contains the file as a config object
-    def load_yaml_file(file, settings = {})
+    def load_yaml_file(file, settings = { })
       raise "file #{file} does not exist" unless File.exists?(file)
-      data = settings[:defaults] || {}
-      data.merge!(YAML.load_file(file)||{})
-      data.merge!(settings[:overrides]||{})
+      data = settings[:defaults] || { }
+      data.merge!(YAML.load_file(file)||{ })
+      data.merge!(settings[:overrides]||{ })
       Templar::Config.new(data)
     end
 
@@ -71,11 +76,16 @@ module Templar
     # If #{directory}/data.yml exists, use that, otherwise use #{directory}/data.sample.yml
     # data.sample.yml should contain non-development template data.
     def data_file
-      #@data_file ||= File.exists?("#{@directory}/data.yml") ? "#{@directory}/data.yml" : "#{@directory}/data.sample.yml"
       @data_file ||= begin
-        return "#@directory/#@environment.yml" if @use_environments && File.exists?("#@directory/#@environment.yml")
-        return "#@directory/data.yml" if File.exists?("#@directory/data.yml")
-        "#@directory/data.sample.yml"
+        if @use_environments && File.exists?("#@directory/#@environment.yml")
+          "#@directory/#@environment.yml"
+        elsif File.exists?("#@directory/local.yml")
+          "#@directory/local.yml"
+        elsif File.exists?("#@directory/data.yml")
+          "#@directory/data.yml"
+        else
+          "#@directory/data.sample.yml"
+        end
       end
     end
 

data/lib/templar/version.rb

@@ -3,7 +3,7 @@ if !defined?(Templar::VERSION)
     module Version #:nodoc:
       MAJOR = 0
       MINOR = 7
-      TINY  = 5
+      TINY  = 6
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: templar
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
   prerelease: 
 platform: ruby
 authors:
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2792798898732996790
+      hash: -1269285896644966509
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2792798898732996790
+      hash: -1269285896644966509
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21