foreman_templates 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93bf3ba6264276231731d04135d565544b718db2
-  data.tar.gz: dbc56dbd3b5b992dc9537c043eea071e61085140
+  metadata.gz: 405fd0e87a4cc0a5444b3bb95b0313df4618e607
+  data.tar.gz: 41e1005f524034615387b4640dc92d871d2b9ecf
 SHA512:
-  metadata.gz: d1887e56355692e0edc5a4961237763a7dca030bc3326ef10874ed8e51541b9809add0ac9c340dae9ec5634fb5cbd0d8e8eb339fde42b86ef91a7b93827eed97
-  data.tar.gz: d10d1091249e6ec67815f36903049c570c04fcfe109ba9520c2a173bc54667f6eaca8cd7027d1bceaa692fb959313b92b6d348a8071ce9f0b874ceb80c9528e3
+  metadata.gz: 4d9f281b4d709925c932f78a62e20de8729da61dec8f73501d0fbdb69b7ba25c6d08063481b016888f7d4cdb6f04e49e7c39fbfe4d7334abb5980a4d3817f80d
+  data.tar.gz: 6ba2b0f1bc1a70a9e40d32ef683ba27ddd780510e54a5a47458c13827d9c670c26c168093150e4d16d94e835ab065fcd7e686bd3e10887094b9ac93a82e63d9c

data/app/models/concerns/foreman_templates/ptable_import.rb

@@ -20,9 +20,10 @@ module ForemanTemplates::PtableImport
       id_string = ('id' + ptable.id) rescue ''
 
       if (metadata['associate'] == 'new' && ptable.new_record?) || (metadata['associate'] == 'always')
-        data[:os_family]        = oses.map(&:family).uniq.first
-        data[:location_ids]     = locations.map(&:id)
-        data[:organization_ids] = organizations.map(&:id)
+        data[:operatingsystem_ids] = oses.map(&:id)
+        data[:os_family]           = oses.map(&:family).uniq.first
+        data[:location_ids]        = locations.map(&:id)
+        data[:organization_ids]    = organizations.map(&:id)
       end
 
       if data[:layout] != ptable.layout
@@ -34,6 +35,7 @@ module ForemanTemplates::PtableImport
         status  = ptable.update_attributes(data)
         result  = "  #{c_or_u} Ptable #{id_string}:#{name}"
         result += "\n    Operatingsystem Family:\n    - #{oses.map(&:family).uniq.first}" unless oses.empty?
+        result += "\n    Operatingsystem Associations:\n    - #{oses.map(&:fullname).join("\n    - ")}" unless oses.empty?
         result += "\n    Organizations Associations:\n    - #{organizations.map(&:name).join("\n    - ")}" unless organizations.empty?
         result += "\n    Location Associations:\n    - #{locations.map(&:name).join("\n    - ")}" unless locations.empty?
       elsif data[:os_family] || data[:location_ids] || data[:organization_ids]
@@ -41,6 +43,7 @@ module ForemanTemplates::PtableImport
         status  = ptable.update_attributes(data)
         result  = "  #{c_or_u} Ptable Associations #{id_string}:#{name}"
         result += "\n    Operatingsystem Family:\n    - #{oses.map(&:family).uniq.first}" unless oses.empty?
+        result += "\n    Operatingsystem Associations:\n    - #{oses.map(&:fullname).join("\n    - ")}" unless oses.empty?
         result += "\n    Organizations Associations:\n    - #{organizations.map(&:name).join("\n    - ")}" unless organizations.empty?
         result += "\n    Location Associations:\n    - #{locations.map(&:name).join("\n    - ")}" unless locations.empty?
       else

data/app/services/foreman_templates/action.rb

@@ -34,7 +34,7 @@ module ForemanTemplates
     end
 
     def git_repo?
-      @repo.start_with?('http://', 'https://', 'git://')
+      @repo.start_with?('http://', 'https://', 'git://', 'ssh://', 'git+ssh://', 'ssh+git://')
     end
 
     def get_absolute_repo_path

data/app/services/foreman_templates/cleaner.rb

@@ -0,0 +1,13 @@
+module ForemanTemplates
+  class Cleaner
+    def clean_up!
+      remove_settings
+    end
+
+    private
+
+    def remove_settings
+      Setting::TemplateSync.destroy_all
+    end
+  end
+end

data/lib/foreman_templates/version.rb

@@ -1,3 +1,3 @@
 module ForemanTemplates
-  VERSION = '4.0.1'.freeze
+  VERSION = '4.0.2'.freeze
 end

data/lib/tasks/foreman_templates_tasks.rake

@@ -57,6 +57,13 @@ namespace :templates do
     }).purge!
   end
 
+  desc 'Clean default data created by this plugin, this will permanently delete the data!'
+  task :cleanup => :environment do
+    puts 'Cleaning data...'
+    ForemanTemplates::Cleaner.new.clean_up!
+    puts 'Clean up finished, you can now remove the plugin from your system'
+  end
+
 end
 
 # Tests

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_templates
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -54,6 +54,7 @@ files:
 - app/models/concerns/foreman_templates/template_import.rb
 - app/models/setting/template_sync.rb
 - app/services/foreman_templates/action.rb
+- app/services/foreman_templates/cleaner.rb
 - app/services/foreman_templates/template_exporter.rb
 - app/services/foreman_templates/template_importer.rb
 - lib/foreman_templates.rb
@@ -80,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Template-syncing engine for Foreman