foreman_templates 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c88da13b131f090eecf394afa3476bc1ea4a741
-  data.tar.gz: a94453ad5d7b5bfd93af2f682b23b017f31ac736
+  metadata.gz: 13dc963ac08604e046539bf41fe0b6d8221d94c5
+  data.tar.gz: 6e037a128dd982bd13f9d0f793040973995f094e
 SHA512:
-  metadata.gz: d225ed09a20895ed2f4266788fabe274a33e9b4796dd9e59ae44ba28ae92d8ecda51fae819eee908d408caad65322ee7462a09f5cc5347519d6408a178d682d2
-  data.tar.gz: 8dbcc358c09dae4602088c2238f9ce8ffc07d150b4cac374d47b5c45690784cf74a1d8354eaae8c13e2f6eb3fc44b3d884477df4e7465a21db1d8fdb6731031e
+  metadata.gz: f25a1b7948860f422816ff98683f80b7ac8bbd38b73e6d246dd66f1ea145b88c45a4278535a2ca9ba90c62c66b71eb6311c6fc479f31300ebe280d75eb9d94a8
+  data.tar.gz: b952bb1305484cfdab98352740bd6b7ddf42d94b0e4b291ff8292a46209b0227bd31a8b926eaa2eb551c9e6f0a480d5318f25e0a0414f41847d5dbea74a7cfe7

data/README.md

@@ -39,12 +39,17 @@ template will be automatically associated with the OS
 
 # Rake 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   => 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 [_see note below_]
+* 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)
+* associate => Associate to OS, "always", when "new" or "never"  [new]
+
+The `branch` default will use *develop* if you're on Foreman-nightly; or the
+matching *1.X-stable* branch for your version of Foreman (if it exists); or
+finally it will remain on the default branch as a fallback.
 
 ## Examples
 

data/lib/foreman_templates/engine.rb

@@ -1,4 +1,5 @@
 require 'diffy'
+require 'git'
 
 module ForemanTemplates
   #Inherit from the Rails module of the parent app (Foreman), not the plugin.

data/lib/foreman_templates/version.rb

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

data/lib/templates.rake

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'yaml'
 require 'diffy'
+require 'git'
 
 class NoKindError < Exception ; end
 
@@ -37,24 +38,27 @@ def update_template
     :snippet          => false,
     :template_kind_id => kind.id
   }
+  string = db_template.new_record? ? "Created" : "Updated"
 
   oses = map_oses
-  if db_template.new_record?
+  if (@associate == 'new' and db_template.new_record?) or (@associate == 'always')
     data[:operatingsystem_ids] = oses.map(&:id)
-    string = "Created"
-  else
-    string = "Updated"
   end
 
-  if @text == db_template.template
-    diff    = nil
-    status  = true
-    result  = "  No change to Template #{ ( 'id' + db_template.id ) rescue ''}:#{@name}"
-  else
+  if @text != db_template.template
     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?
+  elsif data[:operatingsystem_ids]
+    diff    = nil
+    status  = db_template.update_attributes(data)
+    result  = "  #{string} Template Associations #{ 'id' + db_template.id rescue ''}:#{@name}"
+    result += "\n    Operatingsystem Associations:\n    - #{oses.map(&:fullname).join("\n    - ")}" if !oses.empty?
+  else
+    diff    = nil
+    status  = true
+    result  = "  No change to Template #{ ( 'id' + db_template.id ) rescue ''}:#{@name}"
   end
   { :diff => diff, :status => status, :result => result }
 end
@@ -62,23 +66,26 @@ end
 def update_ptable
   db_ptable = Ptable.find_or_initialize_by_name(@name)
   data = { :layout => @text }
+  string = db_ptable.new_record? ? "Created" : "Updated"
 
   oses = map_oses
-  if db_ptable.new_record?
+  if (@associate == 'new' and db_ptable.new_record?) or (@associate == 'always')
     data[:os_family] = oses.map(&:family).uniq.first
-    string = "Created"
-  else
-    string = "Updated"
   end
 
-  if @text == db_ptable.layout
-    diff    = nil
-    status  = true
-    result  = "  No change to Ptable #{ ( 'id' + db_ptable.id ) rescue ''}:#{@name}"
-  else
+  if @text != db_ptable.layout
     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}"
+  elsif data[:os_family]
+    diff    = nil
+    status  = db_ptable.update_attributes(data)
+    result  = "  #{string} Ptable Associations #{ ( 'id' + db_ptable.id ) rescue ''}:#{@name}"
+    result += "\n    Operatingsystem Family:\n    - #{oses.map(&:family).uniq.first}" if !oses.empty?
+  else
+    diff    = nil
+    status  = true
+    result  = "  No change to Ptable #{ ( 'id' + db_ptable.id ) rescue ''}:#{@name}"
   end
   { :diff => diff, :status => status, :result => result }
 end
@@ -91,45 +98,56 @@ def update_snippet
   }
   string = db_snippet.new_record? ? "Created" : "Updated"
 
-  if @text == db_snippet.template
-    diff    = nil
-    status  = true
-    result  = "  No change to Snippet #{ 'id' + db_snippet.id rescue ''}:#{@name}"
-  else
+  if @text != db_snippet.template
     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}"
+  else
+    diff    = nil
+    status  = true
+    result  = "  No change to Snippet #{ 'id' + db_snippet.id rescue ''}:#{@name}"
   end
   { :diff => diff, :status => status, :result => result }
 end
 
+def get_default_branch(repo)
+  branch_names = repo.branches.map(&:name).uniq
+
+  # Always use develop on Foreman-nightly, if present, or else relevant stable branch
+  target = SETTINGS[:version].tag == 'develop' ? 'develop' : "#{SETTINGS[:version].short}-stable"
+  return target if branch_names.include?(target)
+
+  # stay on default branch as fallback
+  return nil
+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'] : nil
-    dirname = ENV['dirname'] ? ENV['dirname'] : '/'
-    filter  = ENV['filter'] ? ENV['filter'] : nil
+    #* 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)
+    #* associate => Associate to OS, always, new or never  [new]
+
+    @verbose   = ( ENV['verbose'] and ENV['verbose'] != 'false' ) ? true : false
+    @associate = ENV['associate'] ? ENV['associate'] : 'new'
+    prefix     = ENV['prefix'] ? ENV['prefix'] : nil
+    dirname    = ENV['dirname'] ? ENV['dirname'] : '/'
+    filter     = ENV['filter'] ? ENV['filter'] : nil
+    repo       = ENV['repo'] ? ENV['repo'] : "https://github.com/theforeman/community-templates.git"
 
     # Check out the community templates to a temp location
     begin
       dir     = Dir.mktmpdir
-      command = "git clone #{branch} #{repo} #{dir}"
-
-      status = `#{command}`
-      puts "#{status}" if @verbose
+      gitrepo = Git.clone(repo, dir)
+      branch = ENV['branch'] ? ENV['branch'] : get_default_branch(gitrepo)
+      gitrepo.checkout(branch) if branch
 
       # Build a list of ERB files to parse
       Dir["#{dir}#{dirname}/**/*.erb"].each do |template|
@@ -142,7 +160,7 @@ namespace :templates do
         filename = template.split('/').last
         title    = filename.split('.').first
         @name    = @metadata ['name'] || title
-        @name    = [prefix, @name].compact.join(' ')
+        @name    = [prefix, @name].compact.join()
         next if filter and not @name.match(/#{filter}/i)
 
         unless @metadata['kind']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_templates
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: git
+  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
 email: gsutclif@redhat.com
 executables: []
@@ -59,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Template-syncing engine for Foreman