modulesync 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aebcf942cd3e1d9ccef2339d17bd07e208ee279305ba0bb6e7ad0b615ff69af
-  data.tar.gz: d4a2d213c0ed6b96a3d7f616e3e5b4a26145e1d741246daea3e9b903df0ba380
+  metadata.gz: dab88d217406b70303f6514b14c56a6ec6652b962d3fa16fd967e36fdb17b0b4
+  data.tar.gz: 18f7c8f38c273f248f80005b2edd6fe5528138739aad2daf0ffe11f22fad40e6
 SHA512:
-  metadata.gz: cd56a2ab522debc6a002dceb8b84f5296d970bbbc8e57f242e913f0f7e9ba6dbdc8ca16005937d2d45d79df4991baaec4122c288cbed0be39ae28502f90752a3
-  data.tar.gz: 4301a8ace72c549965bec4438cf152c15bf7c4b4c9cda6a8ad14d3da8d2ff774fed8354ce9a13cdf94630cc18955d43bfdb520da3173501dc8e7aecdcfd36b9c
+  metadata.gz: 4be95c61128a95c5cb28689f6abe256f7c164a197ef44028a58963139a474568ec82aef11adc6608b3a9681b126014ccb699ea4b82686558563e41740d6608f0
+  data.tar.gz: 6341644230ec2cd827180917c692cbf6e6abc3c5e8866f5c72ba415d3079517a910ebee988fe9009f693b3d2dcd91b1e50c7403071088ab234b13157b0902c0d

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.5.0](https://github.com/voxpupuli/modulesync/tree/2.5.0) (2022-10-14)
+
+[Full Changelog](https://github.com/voxpupuli/modulesync/compare/2.4.0...2.5.0)
+
+**Implemented enhancements:**
+
+- Copy file permissions from template to target [\#257](https://github.com/voxpupuli/modulesync/pull/257) ([ekohl](https://github.com/ekohl))
+
 ## [2.4.0](https://github.com/voxpupuli/modulesync/tree/2.4.0) (2022-09-27)
 
 [Full Changelog](https://github.com/voxpupuli/modulesync/compare/2.3.1...2.4.0)

data/lib/modulesync/renderer.rb

@@ -10,13 +10,7 @@ module ModuleSync
       end
     end
 
-    def self.build(target_name)
-      template_file = if !File.exist?("#{target_name}.erb") && File.exist?(target_name)
-                        $stderr.puts "Warning: using '#{target_name}' as template without '.erb' suffix"
-                        target_name
-                      else
-                        "#{target_name}.erb"
-                      end
+    def self.build(template_file)
       template = File.read(template_file)
       erb_obj = if RUBY_VERSION >= '2.7'
                   ERB.new(template, trim_mode: '-')
@@ -36,9 +30,10 @@ module ModuleSync
       ForgeModuleFile.new(configs, metadata).render
     end
 
-    def self.sync(template, target_name)
+    def self.sync(template, target_name, mode = nil)
       FileUtils.mkdir_p(File.dirname(target_name))
       File.write(target_name, template)
+      File.chmod(mode, target_name) unless mode.nil?
     end
   end
 end

data/lib/modulesync.rb

@@ -31,7 +31,13 @@ module ModuleSync # rubocop:disable Metrics/ModuleLength
   end
 
   def self.local_file(config_path, file)
-    File.join(config_path, MODULE_FILES_DIR, file)
+    path = File.join(config_path, MODULE_FILES_DIR, file)
+    if !File.exist?("#{path}.erb") && File.exist?(path)
+      $stderr.puts "Warning: using '#{path}' as template without '.erb' suffix"
+      path
+    else
+      "#{path}.erb"
+    end
   end
 
   # List all template files.
@@ -88,9 +94,9 @@ module ModuleSync # rubocop:disable Metrics/ModuleLength
     if configs['delete']
       Renderer.remove(target_file)
     else
-      templatename = local_file(options[:configs], filename)
+      template_file = local_file(options[:configs], filename)
       begin
-        erb = Renderer.build(templatename)
+        erb = Renderer.build(template_file)
         # Meta data passed to the template as @metadata[:name]
         metadata = {
           :module_name => settings.additional_settings[:puppet_module],
@@ -99,7 +105,8 @@ module ModuleSync # rubocop:disable Metrics/ModuleLength
           :target_file => target_file,
         }
         template = Renderer.render(erb, configs, metadata)
-        Renderer.sync(template, target_file)
+        mode = File.stat(template_file).mode
+        Renderer.sync(template, target_file, mode)
       rescue StandardError
         $stderr.puts "#{puppet_module.given_name}: Error while rendering file: '#{filename}'"
         raise

data/modulesync.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name                  = 'modulesync'
-  spec.version               = '2.4.0'
+  spec.version               = '2.5.0'
   spec.authors               = ['Vox Pupuli']
   spec.email                 = ['voxpupuli@groups.io']
   spec.summary               = 'Puppet Module Synchronizer'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modulesync
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-27 00:00:00.000000000 Z
+date: 2022-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba