foreman_templates 7.0.5 → 7.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 773f26f24c7e56569b70ae180164487a804c89a6
-  data.tar.gz: 13138a1fd87a675c222333e57e7c2ea78a1489c0
+SHA256:
+  metadata.gz: 40c303f1207307e582859933360b3e2e9b2deb5793ff7816bf2fe2ccdd17b678
+  data.tar.gz: e25c5b35b84061c38f7051097e5c184a5369a1ba18974c40ae137e9828da3617
 SHA512:
-  metadata.gz: eecbb9e4993ab19b071dfa052290e45b9ee14d50e62b99984de31ea8f28a3a9c48b19bbc06ce17ccab1fdccd325e8016dbc2e1ea7d1a5c13c9520fbd096498d0
-  data.tar.gz: c2091508b18ecb0396564782b809e0e9e69c1489389a0cee5397c7c9a39dab1c2e46954486efd75de2f41b41a01090d8b0db03984b60dc392edf923c9d41b9fc
+  metadata.gz: 78989629db36f53ca6aa96c396c3d32c02ed5176c3cf5026ccafb4ddc06aae85538ae8d68cdcd443bd9c8d8355c7bee507115606d7d9077d9c6d853052204286
+  data.tar.gz: 5ff10abf7e6c88946d008a17f6afe9fd8e5880b141d6b7ac9f833c2e789d40a42b03043aabc8024c02c473e18eb79fbaf0bde2dfd4d31c8adfee9d399dc7222c

data/app/services/foreman_templates/parse_result.rb

@@ -14,6 +14,7 @@ module ForemanTemplates
         :changed => changed?,
         :imported => @imported,
         :additional_errors => @additional_errors,
+        :additional_info => @additional_info,
         :exception => @exception ? @exception.message : nil,
         :validation_errors => errors.to_h,
         :file => @template_file,

data/app/services/foreman_templates/template_exporter.rb

@@ -33,8 +33,13 @@ module ForemanTemplates
       dump_files!
       git_repo.add
 
-      status = git_repo.status
-      if status.added.any? || status.changed.any? || status.deleted.any? || status.untracked.any?
+      new_repo = false
+      begin
+        status = git_repo.status
+      rescue Git::GitExecuteError # no HEAD for repo without commits, git diff-index HEAD fails
+        new_repo = true
+      end
+      if new_repo || status.added.any? || status.changed.any? || status.deleted.any? || status.untracked.any?
         git_repo.commit "Templates export made by Foreman user #{foreman_git_user}"
         git_repo.push 'origin', branch
         @export_result.exported = true
@@ -50,13 +55,13 @@ module ForemanTemplates
 
     def setup_git_branch(git_repo)
       logger.debug "checking out branch '#{@branch}'"
-      if git_repo.is_branch?(@branch)
+      if git_repo.is_branch?(@branch) # local branch
         git_repo.checkout(@branch)
-      else
+      elsif git_repo.is_remote_branch?(@branch) # if we work with remote branch, checkout and sync
         git_repo.branch(@branch).checkout
-        if git_repo.is_remote_branch?(@branch) # if we work with remote branch we need to sync it first
-          git_repo.reset_hard("origin/#{@branch}")
-        end
+        git_repo.reset_hard("origin/#{@branch}")
+      else # neither local nor remote
+        git_repo.checkout(@branch, :new_branch => true)
       end
     end
 

data/lib/foreman_templates/version.rb

@@ -1,3 +1,3 @@
 module ForemanTemplates
-  VERSION = '7.0.5'.freeze
+  VERSION = '7.0.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_templates
 version: !ruby/object:Gem::Version
-  version: 7.0.5
+  version: 7.0.6
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Template-syncing engine for Foreman