foreman_templates 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51de5fa77409a6ab12be3efe3f653215118edad9
-  data.tar.gz: 10d6f8bcf9680670d7fee1ff8b40278f8402f22a
+  metadata.gz: c93fb9f63e065e944c894b5eee5c54a32861ee11
+  data.tar.gz: b12db24a9e3518c844f2a46ca0714088ba470139
 SHA512:
-  metadata.gz: e63a4884b56adc0157813d20d3ead11c532046ff641f6d382cb032273bb6a41d33daa10091edc1247aa3093233ffe95cc1f47792b29400bde06a62aced4b89f5
-  data.tar.gz: b6c7f79969381f0bfd46203ee974dca796966a9fe36c9e62f4a1a113619eac07a229b1ca5a6dfa6d297aea45eb29cbb318e28df4000ac0b90f8fdd33bde50fbd
+  metadata.gz: a58d817020f22029463c89edfb7ebde7444e22a6d14492762fd50c11b63b93eb4b9adaf4f14c378fb9a9ef09f540807cf8ff80507c1cf8272cc2201a08ae2cd0
+  data.tar.gz: 6bb6a5454bf2bf53b455a7d663815868e44842a736092e4a3c72c839b9bc4489f24ab87c1e5aca754d00da6c35688be81c35827e0da38f8bff4e82f94c9f7422

data/lib/foreman_templates/version.rb

@@ -1,3 +1,3 @@
 module ForemanTemplates
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
 end

data/lib/templates.rake

@@ -1,24 +1,33 @@
+require 'fileutils'
 require 'yaml'
 require 'diffy'
 
 class NoKindError < Exception ; end
 
+def db_oses
+  @db_oses || Operatingsystem.all
+end
+
+def metadata(text)
+  # Pull out the first erb comment only - /m is for a multiline regex
+  extracted = text.match(/<%\#(.+?)%>/m)
+  extracted == nil ? {} : YAML.load(extracted[1])
+end
+
 def map_oses
   oses = if @metadata['oses']
            @metadata['oses'].map do |os|
-             @db_oses.map { |db| db.to_label =~ /^#{os}/ ? db : nil}
+             db_oses.map { |db| db.to_label =~ /^#{os}/ ? db : nil}
            end.flatten.compact
          else
            []
          end
-  puts "  Operatingsystem Associations: #{oses.map(&:fullname).join(',')}" if verbose
   return oses
 end
 
 def update_template
   # Get template type
   unless kind = TemplateKind.find_by_name(@metadata['kind'])
-    puts "  Error: Unknown template type '#{@metadata['kind']}'"
     raise NoKindError
   end
 
@@ -29,46 +38,49 @@ def update_template
     :template_kind_id => kind.id
   }
 
+  oses = map_oses
   if db_template.new_record?
-    data[:operatingsystem_ids] = map_oses.map(&:id)
+    data[:operatingsystem_ids] = oses.map(&:id)
     string = "Created"
   else
     string = "Updated"
   end
 
   if @text == db_template.template
-    puts "  No change to Template #{ ( 'id' + db_template.id ) rescue ''}:#{@name}"
+    diff    = nil
+    status  = true
+    result  = "  No change to Template #{ ( 'id' + db_template.id ) rescue ''}:#{@name}"
   else
-    update = Diffy::Diff.new(db_template.template, @text, :include_diff_info => true).to_s(:color)
-    db_template.update_attributes(data)
-    puts "  #{string} Template #{ 'id' + db_template.id rescue ''}:#{@name}"
-    puts update if !db_template.new_record? and verbose
+    diff    = Diffy::Diff.new(db_template.template, @text, :include_diff_info => true).to_s(:color)
+    status  = db_template.update_attributes(data)
+    result  = "  #{string} Template #{ 'id' + db_template.id rescue ''}:#{@name}"
+    result += "\n    Operatingsystem Associations:\n    - #{oses.map(&:fullname).join("\n    - ")}" if !oses.empty?
   end
+  { :diff => diff, :status => status, :result => result }
 end
 
 def update_ptable
-  oses = map_oses
-
   db_ptable = Ptable.find_or_initialize_by_name(@name)
   data = { :layout => @text }
+
+  oses = map_oses
   if db_ptable.new_record?
     data[:os_family] = oses.map(&:family).uniq.first
-    #no idea why this fails...
-    #data[:operatingsystems] = oses,
     string = "Created"
   else
     string = "Updated"
   end
 
   if @text == db_ptable.layout
-    puts "  No change to Ptable #{ ( 'id' + db_ptable.id ) rescue ''}:#{@name}"
+    diff    = nil
+    status  = true
+    result  = "  No change to Ptable #{ ( 'id' + db_ptable.id ) rescue ''}:#{@name}"
   else
-    update = Diffy::Diff.new(db_ptable.layout, @text, :include_diff_info => true).to_s(:color)
-    db_ptable.update_attributes(data)
-    puts "  #{string} Ptable #{ ( 'id' + db_ptable.id ) rescue ''}:#{@name}"
-    puts update if !db_ptable.new_record? and verbose
+    diff    = Diffy::Diff.new(db_ptable.layout, @text, :include_diff_info => true).to_s(:color)
+    status  = db_ptable.update_attributes(data)
+    result  = "  #{string} Ptable #{ ( 'id' + db_ptable.id ) rescue ''}:#{@name}"
   end
-
+  { :diff => diff, :status => status, :result => result }
 end
 
 def update_snippet
@@ -80,13 +92,15 @@ def update_snippet
   string = db_snippet.new_record? ? "Created" : "Updated"
 
   if @text == db_snippet.template
-    puts "  No change to Snippet #{ 'id' + db_snippet.id rescue ''}:#{@name}" if verbose
+    diff    = nil
+    status  = true
+    result  = "  No change to Snippet #{ 'id' + db_snippet.id rescue ''}:#{@name}"
   else
-    update = Diffy::Diff.new(db_snippet.template, @text, :include_diff_info => true).to_s(:color)
-    db_snippet.update_attributes(data)
-    puts "  #{string} Snippet #{ ('id' + db_snippet.id) rescue ''}:#{@name}" if verbose
-    puts update if !db_snippet.new_record? and verbose
+    diff    = Diffy::Diff.new(db_snippet.template, @text, :include_diff_info => true).to_s(:color)
+    status  = db_snippet.update_attributes(data)
+    result  = "  #{string} Snippet #{ ('id' + db_snippet.id) rescue ''}:#{@name}"
   end
+  { :diff => diff, :status => status, :result => result }
 end
 
 desc <<-END_DESC
@@ -102,65 +116,82 @@ namespace :templates do
     #* dirname => The directory within the git tree containing the templates [/]
     #* filter  => Import names matching this regex (case-insensitive; snippets are not filtered)
 
-    verbose = ( ENV['verbose'] and ENV['verbose'] != 'false' ) ? true : false
+    @verbose = ( ENV['verbose'] and ENV['verbose'] != 'false' ) ? true : false
     repo    = ENV['repo'] ? ENV['repo'] : "https://github.com/theforeman/community-templates.git"
     branch  = ENV['branch'] ? "-b #{ENV['branch']}" : ""
-    prefix  = ENV['prefix'] ? ENV['prefix'] : 'Community'
+    prefix  = ENV['prefix'] ? ENV['prefix'] : nil
     dirname = ENV['dirname'] ? ENV['dirname'] : '/'
     filter  = ENV['filter'] ? ENV['filter'] : nil
 
     # Check out the community templates to a temp location
-    dir     = Dir.mktmpdir
-    command = "git clone #{branch} #{repo} #{dir}"
-
-    status = `#{command}`
-    puts "#{status}" if verbose
-
-    # Cache the list of OSes
-    @db_oses = Operatingsystem.all
-
-    # Build a list of ERB files to parse
-    Dir["#{dir}#{dirname}/**/*.erb"].each do |template|
-      # Parse Metadata in the template
-      options=""
-      strip_metadata=""
-      File.readlines(template).each do |line|
-        if line =~ /^#/
-          strip_metadata += line
-          options        += line[1..-1]
-        else
-          break
-        end
-      end
-      @metadata = options == "" ? {} : YAML.load(options)
-      @text = File.read(template).gsub(/#{strip_metadata}/,'')
+    begin
+      dir     = Dir.mktmpdir
+      command = "git clone #{branch} #{repo} #{dir}"
 
-      # Get the name and filter
-      filename = template.split('/').last
-      title    = filename.split('.').first
-      @name    = @metadata ['name']    || "#{prefix} #{title}"
-      next if filter and not name.match(/#{filter}/i)
+      status = `#{command}`
+      puts "#{status}" if @verbose
 
-      puts "Parsing: " + template.gsub(/#{dir}#{dirname}/,'') if verbose
+      # Build a list of ERB files to parse
+      Dir["#{dir}#{dirname}/**/*.erb"].each do |template|
+        @text = File.read(template)
+        @metadata = metadata(@text)
 
-      unless @metadata['kind']
-        puts "  Error: Must specify template kind"
-        next
-      end
+        # Get the name and filter
+        filename = template.split('/').last
+        title    = filename.split('.').first
+        @name    = @metadata ['name'] || title
+        @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
+        end
 
-      case @metadata['kind']
-      when 'ptable'
-        update_ptable
-      when 'snippet'
-        update_snippet
-      else
         begin
-          update_template
+          case @metadata['kind']
+          when 'ptable'
+            data = update_ptable
+          when 'snippet'
+            data = update_snippet
+          else
+            data = update_template
+          end
+
+          if data[:status] == true && @verbose
+            puts data[:result]
+            puts data[:diff]
+          elsif data[:status] == false
+            puts "Error with #{@name}"
+            puts data[:result]
+          end
         rescue NoKindError
+          puts "  Error: Unknown template type '#{@metadata['kind']}'"
           next
         end
       end
+    ensure
+      FileUtils.remove_entry_secure(dir)
     end
 
   end
 end
+
+# Setup Tests
+namespace :test do
+  desc "Test ForemanTemplates plugin"
+  Rake::TestTask.new(:templates) do |t|
+    test_dir = File.join(File.dirname(__FILE__), '..', 'test')
+    t.libs << ["test",test_dir]
+    t.pattern = "#{test_dir}/**/*_test.rb"
+  end
+end
+Rake::Task[:test].enhance do
+  Rake::Task['test:templates'].invoke
+end
+load 'tasks/jenkins.rake'
+Rake::Task["jenkins:unit"].enhance do
+  Rake::Task['test:templates'].invoke
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_templates
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Greg Sutcliffe