foreman_templates 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b73812edc9e1e160c23eb201ca2b207488ef2857
-  data.tar.gz: 1b6def802713308391f6bd3439dd0d15c362cc51
+  metadata.gz: acae354280dfe45ef7fffd417add76632686f5c6
+  data.tar.gz: 64324ccdd05c546ff663fa2eb2f2059a0f809e54
 SHA512:
-  metadata.gz: d227eb8fd8b8765b07e1910df3956ca8dbac472312cce92fa078ff4784f0288701ebc4eef10abb218eed8bb4f7017a325e0bc8c500b3679ba0ffed411b0393ad
-  data.tar.gz: 5dde067950478119a01ae2e35ff9bc3859f9f86303c758b97281f49fb31ac00af41aa144dc89d8cd77f23dc8bda079ba491950f8e9498f70a7ec04c9617a46e1
+  metadata.gz: a96282ae4f045fc3642df1f532cfa113c93bd7960b0ad8a1b79a8eb5d022d1908174231c0834fd338dbeca4d9248cf28a7786c8f755faf9afb8a1e3e2390abab
+  data.tar.gz: 0c30b8e9eb049e4c8f510efd7e97b795b5b4d17445697bb6a58bc1f2b7b57af9baf4a8b2931516d62d784b9a607b1118a7891b7010f8973de1b681809439a575

data/README.md

@@ -44,6 +44,7 @@ template will be automatically associated with the OS
 
 * verbose => Print extra information during the run [false]
 * repo    => Sync templates from a different Git repo [https://github.com/theforeman/community-templates]
+* branch  => Branch in Git repo [default branch]
 * prefix  => The string all imported templates should begin with [Community]
 * dirname => The directory within the git tree containing the templates [/]
 * filter  => Import names matching this regex (case-insensitive; snippets are not filtered)

data/lib/foreman_templates/engine.rb

@@ -1,3 +1,5 @@
+require 'diffy'
+
 module ForemanTemplates
   #Inherit from the Rails module of the parent app (Foreman), not the plugin.
   #Thus, inhereits from ::Rails::Engine and not from Rails::Engine

data/lib/foreman_templates/version.rb

@@ -1,3 +1,3 @@
 module ForemanTemplates
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
 end

data/lib/templates.rake

@@ -1,114 +1,166 @@
-require 'open4'
+require 'yaml'
+require 'diffy'
+
+class NoKindError < Exception ; end
+
+def map_oses
+  oses = if @metadata['oses']
+           @metadata['oses'].map do |os|
+             @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
+
+  db_template = ConfigTemplate.find_or_initialize_by_name(@name)
+  data = {
+    :template         => @text,
+    :snippet          => false,
+    :template_kind_id => kind.id
+  }
+
+  if db_template.new_record?
+    data[:operatingsystem_ids] = map_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}"
+  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
+  end
+end
+
+def update_ptable
+  oses = map_oses
+
+  db_ptable = Ptable.find_or_initialize_by_name(@name)
+  data = { :layout => @text }
+  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}"
+  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
+  end
+
+end
+
+def update_snippet
+  db_snippet = ConfigTemplate.find_or_initialize_by_name(@name)
+  data = {
+    :template => @text,
+    :snippet => true
+  }
+  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
+  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
+  end
+end
 
 desc <<-END_DESC
 Synchronize templates from a git repo
 END_DESC
 namespace :templates do
   task :sync => :environment do
-
     # Available options:
     #* verbose => Print extra information during the run [false]
     #* repo    => Sync templates from a different Git repo [https://github.com/theforeman/community-templates]
+    #* branch  => Branch in Git repo [default branch]
     #* prefix  => The string all imported templates should begin with [Community]
     #* 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
     repo    = ENV['repo'] ? ENV['repo'] : "https://github.com/theforeman/community-templates.git"
+    branch  = ENV['branch'] ? "-b #{ENV['branch']}" : ""
     prefix  = ENV['prefix'] ? ENV['prefix'] : 'Community'
     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 #{repo} #{dir}"
+    command = "git clone #{branch} #{repo} #{dir}"
 
     status = `#{command}`
     puts "#{status}" if verbose
 
-    TemplateKind.all.each do |kind|
-      Dir["#{dir}#{dirname}/**/*#{kind.name}.erb"].each do |template|
-        os       = File.expand_path('../..',template).split('/').last.capitalize
-        release  = File.expand_path('..',template).split('/').last.capitalize
-        filename = template.split('/').last
-        title    = filename.split('.').first
-        name     = "#{prefix} #{os}(#{release}) #{title}"
-        next if filter and not name.match(/#{filter}/i)
-
-        oses = begin
-          by_type = Operatingsystem.find_all_by_type(os)
-          by_type.empty? ? Operatingsystem.where("name LIKE ?", os) : by_type
-        rescue
-          []
-        end.delete_if {|o| !(o.major =~ /#{release}/i or o.release_name =~ /#{release}/i )}
-
-        osfamily = oses.map{|o|o.type}.uniq.first
-
-        db_template = ConfigTemplate.find_or_initialize_by_name(name)
-        data = {
-          :template         => File.read(template),
-          :snippet          => false,
-          :template_kind_id => kind.id
-        }
-        if db_template.new_record?
-          data[:operatingsystem_ids] = oses.map {|o| o.id}
-          string = "Created"
+    # 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
-          string = "Updated"
+          break
         end
-
-        puts "#{string} Template id #{db_template.id || "new"}:#{name}" if verbose
-        db_template.update_attributes(data)
       end
-    end
+      @metadata = options == "" ? {} : YAML.load(options)
+      @text = File.read(template).gsub(/#{strip_metadata}/,'')
 
-    Dir["#{dir}#{dirname}/**/*disklayout.erb"].each do |ptable|
-      os       = File.expand_path('../..',ptable).split('/').last.capitalize
-      release  = File.expand_path('..',ptable).split('/').last.capitalize
-      filename = ptable.split('/').last
+      # Get the name and filter
+      filename = template.split('/').last
       title    = filename.split('.').first
-      name     = "#{prefix} #{os}(#{release}) #{title}"
+      @name    = @metadata ['name']    || "#{prefix} #{title}"
       next if filter and not name.match(/#{filter}/i)
 
-      oses = begin
-        by_type = Operatingsystem.find_all_by_type(os)
-        by_type.empty? ? Operatingsystem.where("name LIKE ?", os) : by_type
-      rescue
-        []
-      end.delete_if {|o| !(o.major =~ /#{release}/i or o.release_name =~ /#{release}/i )}
-
-      osfamily = oses.map{|o|o.type}.uniq.first
-
-      db_ptable = Ptable.find_or_initialize_by_name(name)
-      data = { :layout => File.read(ptable) }
-      if db_ptable.new_record?
-        data[:os_family] = osfamily
-        data[:operatingsystems] = oses
-        string = "Created"
-      else
-        string = "Updated"
-      end
+      puts "Parsing: " + template.gsub(/#{dir}#{dirname}/,'') if verbose
 
-      puts "#{string} Ptable id #{db_ptable.id || 'new'}:#{name}" if verbose
-      db_ptable.update_attributes(data)
-    end
-
-    Dir["#{dir}#{dirname}/snippets/*.erb"].each do |snippet|
-      name = snippet.split('/').last.gsub(/.erb$/,'')
-
-      db_snippet = ConfigTemplate.find_or_initialize_by_name(name)
-      data = {
-        :template => File.read(snippet),
-        :snippet => true
-      }
-      string = db_snippet.new_record? ? "Created" : "Updated"
+      unless @metadata['kind']
+        puts "  Error: Must specify template kind"
+        next
+      end
 
-      puts "#{string} Snippet id #{db_snippet.id || 'new'}:#{name}" if verbose
-      db_snippet.update_attributes(data)
+      case @metadata['kind']
+      when 'ptable'
+        update_ptable
+      when 'snippet'
+        update_snippet
+      else
+        begin
+          update_template
+        rescue NoKindError
+          next
+        end
+      end
     end
 
-    # TODO do this in ruby
-    `rm -rf #{dir}`
-
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: foreman_templates
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: open4
+  name: diffy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Template-syncing engine for Foreman