foreman_git_templates 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 729e821be3f45858b7f6f550b00cc1fa5c16302af89d40d9b1299347bf66e79c
-  data.tar.gz: b203308bfad970fa2e32d99d80dbde8a051d9165542379fa7c63f5ed67aca48a
+  metadata.gz: ef1542116b039a0e33811e4eaa3c65b3c05da618735f47f9f30fe5dd9b243599
+  data.tar.gz: fbbd7adb1894aac45862a92653cc2e84667a1ea14a19c2a1e17ab44d882e6358
 SHA512:
-  metadata.gz: 814e986644701059b7380b4e85107d64ba43dafff0cb8dff04bcf47687ab8f2e3016310293abf62bec513aff1376b0d68120d61d14aebb40ce050589be9ca121
-  data.tar.gz: d60e8ad34972fe49fb6f646eafc9e7681aa13793b8938e60da1d9045b8374e421f2ddf965f60704ec37f6026e1d6ead841784bef58d9c591b92a28313a3dbfb3
+  metadata.gz: 3ba5ffceb6a9049d268589824b73bcf9c1d135d05db12242e08473abe3a2aa47fe4aa21129baf27e646e42d1ce7cddad8d7272b23d173c8a3bb82a75d64dec43
+  data.tar.gz: 9539d07fd4eee73f05d467a5a5f3e2b83d3ff34337b155a96913c53cc69006b25840010d07df79b90ae2f0d219a986e341d094bc4c06b3b80b89525d28938fab

data/app/helpers/foreman_git_templates/application_helper.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module ForemanGitTemplates
+  module ApplicationHelper
+    extend ActiveSupport::Concern
+
+    module Overrides
+      def display_link_if_authorized(name, options = {}, html_options = {})
+        # rubocop:disable Rails/HelperInstanceVariable
+
+        return if @host&.repository_path && options[:use_route] == 'edit_provisioning_template'
+
+        # rubocop:enable Rails/HelperInstanceVariable
+
+        super
+      end
+    end
+
+    included do
+      prepend Overrides
+    end
+  end
+end

data/app/lib/foreman_git_templates/renderer.rb

@@ -2,14 +2,22 @@
 
 module ForemanGitTemplates
   module Renderer
-    def get_source(klass: Foreman::Renderer::Source::Database, template:, **args)
+    REPOSITORY_SOURCE_CLASS = ForemanGitTemplates::Renderer::Source::Repository
+
+    # rubocop:disable Metrics/PerceivedComplexity
+    def get_source(klass: nil, template:, **args)
+      return super if klass && klass != REPOSITORY_SOURCE_CLASS
+
       repository_path = repository_path(args[:host])
       if repository_path
-        ForemanGitTemplates::Renderer::Source::Repository.new(template, repository_path)
+        REPOSITORY_SOURCE_CLASS.new(template, repository_path)
+      elsif !repository_path && Gem::Version.new(SETTINGS[:version].version) < Gem::Version.new('1.23')
+        super(klass: klass || Foreman::Renderer::Source::Database, template: template, **args)
       else
         super
       end
     end
+    # rubocop:enable Metrics/PerceivedComplexity
 
     private
 

data/app/services/foreman_git_templates/repository_reader.rb

@@ -9,6 +9,7 @@ module ForemanGitTemplates
 
     def call
       raise MissingFileError, "The #{file} file is missing" if content.nil?
+
       content
     end
 
@@ -30,6 +31,7 @@ module ForemanGitTemplates
       @content ||= Tar.untar(repository_path) do |tar|
         return tar.each do |entry|
           next unless entry.file? && entry.full_name.end_with?(file)
+
           break entry.read.tap do |entry_content|
             raise EmptyFileError, "The #{file} file is empty" if entry_content.nil?
           end

data/lib/foreman_git_templates/engine.rb

@@ -30,6 +30,7 @@ module ForemanGitTemplates
       HostParameter.include(ForemanGitTemplates::HostParameterExtensions)
       Nic::Managed.include(ForemanGitTemplates::Orchestration::TFTP)
       UnattendedController.include(ForemanGitTemplates::UnattendedControllerExtensions)
+      ::ApplicationHelper.include(ForemanGitTemplates::ApplicationHelper)
     rescue StandardError => e
       Rails.logger.warn "ForemanGitTemplates: skipping engine hook (#{e})"
     end

data/lib/foreman_git_templates/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanGitTemplates
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/lib/tasks/foreman_git_templates_tasks.rake

@@ -2,46 +2,19 @@
 
 require 'rake/testtask'
 
-# Tasks
-namespace :foreman_git_templates do
-  namespace :example do
-    desc 'Example Task'
-    task task: :environment do
-      # Task goes here
-    end
-  end
-end
-
 # Tests
 namespace :test do
   desc 'Test ForemanGitTemplates'
   Rake::TestTask.new(:foreman_git_templates) do |t|
-    test_dir = File.join(File.dirname(__FILE__), '../..', 'test')
+    test_dir = File.join(ForemanGitTemplates::Engine.root, 'test')
     t.libs << ['test', test_dir]
-    t.pattern = "#{test_dir}/**/*_test.rb"
+    t.pattern = File.join(test_dir, '**', '*_test.rb')
     t.verbose = true
     t.warning = false
   end
 end
 
-namespace :foreman_git_templates do
-  task :rubocop do
-    begin
-      require 'rubocop/rake_task'
-      RuboCop::RakeTask.new(:rubocop_foreman_git_templates) do |task|
-        task.patterns = ["#{ForemanGitTemplates::Engine.root}/app/**/*.rb",
-                         "#{ForemanGitTemplates::Engine.root}/lib/**/*.rb",
-                         "#{ForemanGitTemplates::Engine.root}/test/**/*.rb"]
-      end
-    rescue StandardError
-      puts 'Rubocop not loaded.'
-    end
-
-    Rake::Task['rubocop_foreman_git_templates'].invoke
-  end
-end
-
 Rake::Task[:test].enhance ['test:foreman_git_templates']
 
 load 'tasks/jenkins.rake'
-Rake::Task['jenkins:unit'].enhance ['test:foreman_git_templates', 'foreman_git_templates:rubocop'] if Rake::Task.task_defined?(:'jenkins:unit')
+Rake::Task['jenkins:unit'].enhance ['test:foreman_git_templates'] if Rake::Task.task_defined?(:'jenkins:unit')

data/test/models/concerns/foreman_git_templates/orchestration/tftp_test.rb

@@ -65,6 +65,7 @@ class TFTPOrchestrationTest < ActiveSupport::TestCase
 
     context 'host is in build mode' do
       setup do
+        host.primary_interface.expects(:valid?).returns(true) if Gem::Version.new(SETTINGS[:version].notag) >= Gem::Version.new('2.0')
         host.update(build: true)
       end
 
@@ -105,6 +106,7 @@ class TFTPOrchestrationTest < ActiveSupport::TestCase
 
     context 'host is in build mode' do
       setup do
+        host.primary_interface.expects(:valid?).returns(true) if Gem::Version.new(SETTINGS[:version].notag) >= Gem::Version.new('2.0')
         host.update(build: true)
       end
 

data/test/models/foreman_git_templates/host_test.rb

@@ -34,12 +34,23 @@ module ForemanGitTemplates
       end
 
       context 'with valid template_url' do
+        setup do
+          ProxyAPI::TFTP.any_instance.expects(:set).returns(true)
+
+          if Gem::Version.new(SETTINGS[:version].notag) >= Gem::Version.new('2.0')
+            ProxyAPI::TFTP.any_instance.expects(:bootServer).returns('127.0.0.1')
+            ProxyAPI::DHCP.any_instance.expects(:set).returns(true)
+            ProxyAPI::DHCP.any_instance.expects(:record).with(host.subnet.network, host.dhcp_records.first.mac).returns(host.dhcp_records.first)
+            ProxyAPI::DHCP.any_instance.expects(:records_by_ip).with(host.subnet.network, host.provision_interface.ip).returns([host.dhcp_records.first])
+            ProxyAPI::DHCP.any_instance.expects(:delete).returns(true)
+          end
+        end
+
         context 'when host is in build mode' do
           let(:host) { FactoryBot.create(:host, :with_tftp_orchestration, :with_template_url, operatingsystem: os, build: true) }
 
           it 'updates the host' do
-            ProxyAPI::Resource.any_instance.stubs(:post).returns(true)
-            ProxyAPI::TFTP.any_instance.stubs(:fetch_boot_file).returns(true)
+            ProxyAPI::TFTP.any_instance.expects(:fetch_boot_file).twice.returns(true)
 
             Dir.mktmpdir do |dir|
               stub_repository host.params['template_url'], "#{dir}/repo.tar.gz" do |tar|
@@ -56,8 +67,6 @@ module ForemanGitTemplates
           let(:host) { FactoryBot.create(:host, :with_tftp_orchestration, :with_template_url, operatingsystem: os, build: false) }
 
           it 'updates the host' do
-            ProxyAPI::TFTP.any_instance.stubs(:set).returns(true)
-
             Dir.mktmpdir do |dir|
               stub_repository host.params['template_url'], "#{dir}/repo.tar.gz" do |tar|
                 tar.add_file_simple('templates/PXEGrub2/default_local_boot.erb', 644, host.name.length) { |io| io.write(host.name) }
@@ -73,6 +82,12 @@ module ForemanGitTemplates
       context 'with invalid template_url' do
         setup do
           stub_request(:get, host.params['template_url']).to_return(status: 404)
+
+          if Gem::Version.new(SETTINGS[:version].notag) >= Gem::Version.new('2.0')
+            ProxyAPI::TFTP.any_instance.expects(:bootServer).returns('127.0.0.1')
+            ProxyAPI::DHCP.any_instance.expects(:record).with(host.subnet.network, host.dhcp_records.first.mac).returns(host.dhcp_records.first)
+            ProxyAPI::DHCP.any_instance.expects(:records_by_ip).with(host.subnet.network, host.provision_interface.ip).returns([host.dhcp_records.first])
+          end
         end
 
         let(:expected_errors) { ["No PXEGrub2 template was found for host #{host.name}. Repository url: #{host.params['template_url']}"] }

data/test/unit/foreman/renderer_test.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+class RendererTest < ActiveSupport::TestCase
+  describe '.get_source' do
+    subject { Foreman::Renderer.get_source(template: template, host: host, klass: source_klass) }
+
+    let(:template) { FactoryBot.create(:provisioning_template) }
+
+    context 'when the host has a template_url defined' do
+      let(:host) { FactoryBot.create(:host, :with_template_url) }
+
+      context 'when the source class is not passed' do
+        let(:source_klass) { nil }
+
+        it 'uses ForemanGitTemplates::Renderer::Source::Repository' do
+          Dir.mktmpdir do |dir|
+            stub_repository host.params['template_url'], "#{dir}/repo.tar.gz"
+
+            assert_equal ForemanGitTemplates::Renderer::Source::Repository, subject.class
+          end
+        end
+      end
+
+      context 'when the source class is implicitly passed' do
+        let(:source_klass) { Foreman::Renderer::Source::Database }
+
+        it { assert_equal Foreman::Renderer::Source::Database, subject.class }
+      end
+    end
+
+    context 'when the host has no template_url defined' do
+      let(:host) { FactoryBot.create(:host) }
+      let(:source_klass) { nil }
+
+      it { assert_equal Foreman::Renderer::Source::Database, subject.class }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_git_templates
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - dmTECH GmbH
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-10 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -56,17 +56,31 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.54.0
-description: 
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description:
 email:
 - opensource@dm.de
 executables: []
@@ -77,6 +91,7 @@ files:
 - README.md
 - Rakefile
 - app/controllers/concerns/foreman_git_templates/unattended_controller_extensions.rb
+- app/helpers/foreman_git_templates/application_helper.rb
 - app/lib/foreman_git_templates/renderer.rb
 - app/lib/foreman_git_templates/renderer/source/repository.rb
 - app/lib/foreman_git_templates/tar.rb
@@ -106,13 +121,14 @@ files:
 - test/models/foreman_git_templates/snippet_repository_template_test.rb
 - test/test_plugin_helper.rb
 - test/unit/foreman/renderer/source/repository_test.rb
+- test/unit/foreman/renderer_test.rb
 - test/unit/repository_fetcher_test.rb
 - test/unit/repository_reader_test.rb
 homepage: https://github.com/dm-drogeriemarkt/foreman_git_templates
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -127,13 +143,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Adds support for using templates from Git repositories
 test_files:
 - test/unit/repository_fetcher_test.rb
 - test/unit/foreman/renderer/source/repository_test.rb
+- test/unit/foreman/renderer_test.rb
 - test/unit/repository_reader_test.rb
 - test/models/foreman_git_templates/snippet_repository_template_test.rb
 - test/models/foreman_git_templates/host_test.rb