foreman_templates 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c669b6868924fc6003aecafca559599be38dd4b8
-  data.tar.gz: 1e323edb9c5b367b4293819e5a14706f7f8bac85
+  metadata.gz: 0c88da13b131f090eecf394afa3476bc1ea4a741
+  data.tar.gz: a94453ad5d7b5bfd93af2f682b23b017f31ac736
 SHA512:
-  metadata.gz: dd64dea1440a113cb204688a1376086603d93bbcba2d74dde567b73e87b55f94f908a0b311c6bbffebcd902d012d9b34a36b5d27765c8821d0fa990a00a99f1b
-  data.tar.gz: c6a87ccb612fdae74c14a9477d7db1601f08165ed1626bd5105104c1c75b4359e195b442276fc7ffdcd4a872a25d4023088dd26fa43937fb2474451fae02373b
+  metadata.gz: d225ed09a20895ed2f4266788fabe274a33e9b4796dd9e59ae44ba28ae92d8ecda51fae819eee908d408caad65322ee7462a09f5cc5347519d6408a178d682d2
+  data.tar.gz: 8dbcc358c09dae4602088c2238f9ce8ffc07d150b4cac374d47b5c45690784cf74a1d8354eaae8c13e2f6eb3fc44b3d884477df4e7465a21db1d8fdb6731031e

data/lib/foreman_templates/engine.rb

@@ -5,6 +5,11 @@ module ForemanTemplates
   #Thus, inhereits from ::Rails::Engine and not from Rails::Engine
   class Engine < ::Rails::Engine
 
+    initializer 'foreman_templates.register_plugin', :after=> :finisher_hook do |app|
+      Foreman::Plugin.register :foreman_templates do
+      end if (Rails.env == "development" or defined? Foreman::Plugin)
+    end
+
     rake_tasks do
       load "templates.rake"
     end

data/lib/foreman_templates/version.rb

@@ -1,3 +1,3 @@
 module ForemanTemplates
-    VERSION = "1.3.2"
+    VERSION = "1.4.0"
 end

data/lib/templates.rake

@@ -10,7 +10,7 @@ end
 
 def metadata(text)
   # Pull out the first erb comment only - /m is for a multiline regex
-  extracted = text.match(/<%\#(.+?)%>/m)
+  extracted = text.match(/<%\#(.+?).-?%>/m)
   extracted == nil ? {} : YAML.load(extracted[1])
 end
 
@@ -134,6 +134,8 @@ namespace :templates do
       # Build a list of ERB files to parse
       Dir["#{dir}#{dirname}/**/*.erb"].each do |template|
         @text = File.read(template)
+        puts "Parsing: " + template.gsub(/#{dir}#{dirname}/,'') if @verbose
+
         @metadata = metadata(@text)
 
         # Get the name and filter
@@ -143,8 +145,6 @@ namespace :templates do
         @name    = [prefix, @name].compact.join(' ')
         next if filter and not @name.match(/#{filter}/i)
 
-        puts "Parsing: " + template.gsub(/#{dir}#{dirname}/,'') if @verbose
-
         unless @metadata['kind']
           puts "  Error: Must specify template kind"
           next

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: foreman_templates
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
   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'
 description: Engine to sychronise provisioning templates from GitHub
@@ -32,13 +32,13 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
+- LICENSE
+- README.md
+- Rakefile
 - lib/foreman_templates.rb
-- lib/templates.rake
 - lib/foreman_templates/engine.rb
 - lib/foreman_templates/version.rb
-- LICENSE
-- Rakefile
-- README.md
+- lib/templates.rake
 homepage: http://github.com/theforeman/foreman_templates
 licenses:
 - GPL-3
@@ -49,17 +49,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Template-syncing engine for Foreman