templar 0.7.2 → 0.7.3

data/lib/tasks/templar_tasks.rake

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

data/lib/templar/capistrano.rb

@@ -15,12 +15,21 @@ configuration.load do
 
   puts "  * initializing templar..."
 
-  @templar = Templar::Processor.new
-  @templar.config.environment = ARGV[0] if @templar.config.use_environments
-  @templar.config.print_format = "    templar: (update: %s) %s => %s"
+  @templar = Templar::Processor.new(:overrides => {:print_format => "    templar: (update: %s) %s => %s"})
+  if @templar.config.use_environments
+    @templar.environment = begin
+      if defined?(Rails)
+        Rails.env
+      elsif ENV['ENVIRONMENT']
+        ENV['ENVIRONMENT']
+      else
+        ARGV[0]
+      end
+    end
+  end
 
   begin
-    [ARGV[0], ARGV[1]].each do |arg|
+    [@templar.environment].each do |arg|
       task arg do
         nil
       end
@@ -30,6 +39,7 @@ configuration.load do
   end
 
   def run_templar(opts={})
+    puts " ** using environment: #{@templar.environment}" if @templar.config.use_environments
     @templar.process
   end
 

data/lib/templar/engine.rb

@@ -7,15 +7,17 @@ module Templar
     engine_name "templar"
   end
 
-  def self.init(overrides = {})
-    @@processor ||= Templar::Processor.new(overrides)
-  end
+  class << self
+    def init(overrides = {})
+      @processor ||= Templar::Processor.new(:overrides => overrides)
+    end
 
-  def self.data
-    @@processor.data
-  end
+    def data
+      @processor.data
+    end
 
-  def self.config
-    @@processor.config
+    def config
+      @processor.config
+    end
   end
 end

data/lib/templar/processor.rb

@@ -8,43 +8,75 @@ module Templar
   # This is the implementation of template processing.
   class Processor
     # @return [Templar::Config] contains the templar configuration data, usually config/templar.yml
-    attr_accessor :config
+    attr_reader :config
     # @return [Templar::Config] contains the data loaded from the YAML data file, usually config/templar/data.yml
-    attr_accessor :data
+    attr_reader :data
+    # @return [String] the environment Templar is using
+    attr_accessor :environment
 
     ##
     # Get a new processor
     # @param [Hash] config_overrides these values will be merged on top of the defaults.
-    def initialize(config_overrides = {})
-      {:print_format => "  templar: (update: %s) %s => %s"}.merge(config_overrides)
-      yaml_hash = YAML.load_file('config/templar.yml') || {}
-      config_hash = yaml_hash.merge(config_overrides)
-      @config    = Templar::Config.new(config_hash)
-      @directory = @config.directory
-      @templates = @config.templates || []
-
-      data_hash  = YAML::load_file(data_file) || {}
-      @data      = Templar::Config.new(data_hash)
+    def initialize(settings = {})
+      defaults = {
+          :print_format => "  templar: (update: %s) %s => %s"
+      }
+
+      @config           = load_yaml_file("config/templar.yml", :defaults => defaults, :overrides => settings[:overrides])
+      @use_environments = @config.use_environments
+      @directory        = @config.directory
+      @templates        = @config.templates || []
+
+      @data = load_yaml_file(data_file)
+
+      raise "Data is empty. Missing environment in data settings?" unless @data
     end
 
     ##
     # Process configuration templates
     # @raise [TemplarException] Raises exception when it cannot find files
     def process
-      @use_environments = @config.use_environments
-      @environment = @config.environment
-      raise "Use Environments option is true, but environment is not set (#{config_hash.inspect})" if @use_environments && !@environment
+      if @use_environments
+        @environment ||= begin
+          return Rails.env if defined?(Rails)
+          return ENV['ENVIRONMENT'] if ENV['ENVIRONMENT']
+          nil
+        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]
+        @data = @data[@environment.to_sym]
+      end
 
+      raise "Data is empty, please check configuration" unless @data
       process_templates
     end
 
+    private
+
+    ##
+    # load yaml file into config object
+    # @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 = {})
+      raise "file #{file} does not exist" unless File.exists?(file)
+      data = settings[:defaults] || {}
+      data.merge!(YAML.load_file(file)||{})
+      data.merge!(settings[:overrides]||{})
+      Templar::Config.new(data)
+    end
 
     ##
     # Determine the data file to use.
     # 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 ||= 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"
+      end
     end
 
     ##
@@ -80,8 +112,8 @@ module Templar
       if update
         template_data = File.read(source)
         erb           = Erubis::Eruby.new(template_data)
-        substitutions =  @use_environments && @data[@environment.to_sym] ? @data[@environment.to_sym] : @data
-        dest_data     = erb.evaluate(:T => substitutions, :templar => @config)
+        substitutions = @data
+        dest_data     = erb.evaluate(:T => substitutions, :templar => self)
         #  dest_data = ERB.new(template_data).result b
         File.open(dest, 'w') { |f| f.write(dest_data) }
       end

data/lib/templar/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: templar
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Shawn Catanzarite
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-27 00:00:00 Z
+date: 2012-05-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -29,8 +29,8 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  prerelease: false
   requirement: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: erubis
   version_requirements: &id002 !ruby/object:Gem::Requirement 
@@ -43,8 +43,8 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  prerelease: false
   requirement: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: yard
   version_requirements: &id003 !ruby/object:Gem::Requirement 
@@ -57,8 +57,8 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   requirement: *id003
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: sqlite3
   version_requirements: &id004 !ruby/object:Gem::Requirement 
@@ -71,8 +71,8 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   requirement: *id004
+  prerelease: false
 description: "[config] templar allows you to manage development environment configuration files as templates."
 email: 
 - scatanzarite@gmail.com
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: "[config] templar allows you to manage development environment configuration files as templates."