modulesync 2.3.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 592e73854b4792850a6696971ca1a28a441bd04c195f548933cc1ec01ba6b433
-  data.tar.gz: 8eb8d8b165bc87a633fe90feea07e713bdcf4b6ccaf3fd6ba8cce5d57053c7b7
+  metadata.gz: dab88d217406b70303f6514b14c56a6ec6652b962d3fa16fd967e36fdb17b0b4
+  data.tar.gz: 18f7c8f38c273f248f80005b2edd6fe5528138739aad2daf0ffe11f22fad40e6
 SHA512:
-  metadata.gz: 9329c73bc685a734e5e1fe8387c4ad202a9468f502aed86cdbf32362d9e0079eb5385b2a1c3d0a155912f049945702a9e8eca6d465a79b5aa458dde735784a96
-  data.tar.gz: 506630e05453bcb84783d326bbb81d69f4bfe653d1b80f6d5416814c9d3d1b6f2802e0c560e5c8f80a4377f82d1e0403bda1933ad658c3915590d125af1d51f0
+  metadata.gz: 4be95c61128a95c5cb28689f6abe256f7c164a197ef44028a58963139a474568ec82aef11adc6608b3a9681b126014ccb699ea4b82686558563e41740d6608f0
+  data.tar.gz: 6341644230ec2cd827180917c692cbf6e6abc3c5e8866f5c72ba415d3079517a910ebee988fe9009f693b3d2dcd91b1e50c7403071088ab234b13157b0902c0d

data/.rubocop.yml

@@ -1,5 +1,10 @@
 inherit_from: .rubocop_todo.yml
 
+require:
+  - rubocop-performance
+  - rubocop-rake
+  - rubocop-rspec
+
 AllCops:
   TargetRubyVersion: 2.5
   NewCops: enable
@@ -27,6 +32,9 @@ Style/TrailingCommaInArrayLiteral:
 Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: comma
 
+Layout/LineContinuationLeadingSpace:
+  Enabled: false
+
 # sane line length
 Layout/LineLength:
   Max: 120

data/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 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)
+
+**Implemented enhancements:**
+
+- Expose namespace in metadata [\#254](https://github.com/voxpupuli/modulesync/pull/254) ([ekohl](https://github.com/ekohl))
+
+**Merged pull requests:**
+
+- Fix Rubocop and add additional rubocop plugins [\#255](https://github.com/voxpupuli/modulesync/pull/255) ([ekohl](https://github.com/ekohl))
+
 ## [2.3.1](https://github.com/voxpupuli/modulesync/tree/2.3.1) (2022-05-05)
 
 [Full Changelog](https://github.com/voxpupuli/modulesync/compare/2.3.0...2.3.1)

data/features/update.feature

@@ -717,6 +717,7 @@ Feature: update
     And a file named "moduleroot/test.erb" with:
       """
       module: <%= @metadata[:module_name] %>
+      namespace: <%= @metadata[:namespace] %>
       target: <%= @metadata[:target_file] %>
       workdir: <%= @metadata[:workdir] %>
       """
@@ -724,6 +725,7 @@ Feature: update
     Then the file named "modules/fakenamespace/puppet-test/test" should contain:
       """
       module: puppet-test
+      namespace: fakenamespace
       target: modules/fakenamespace/puppet-test/test
       workdir: modules/fakenamespace/puppet-test
       """

data/lib/modulesync/git_service/base.rb

@@ -41,7 +41,7 @@ module ModuleSync
       # - file:///path/to/repo.git/
       # - any invalid URL
       def self.extract_hostname(url)
-        return nil if url.start_with?('/') || url.start_with?('file://') # local path (e.g. file:///path/to/repo)
+        return nil if url.start_with?('/', 'file://') # local path (e.g. file:///path/to/repo)
 
         unless url.start_with?(%r{[a-z]+://}) # SSH notation does not contain protocol (e.g. user@server:path/to/repo/)
           pattern = /^(?<user>.*@)?(?<hostname>[\w|.]*):(?<repo>.*)$/ # SSH path (e.g. user@server:repo)

data/lib/modulesync/hook.rb

@@ -32,7 +32,7 @@ module ModuleSync
     end
 
     def deactivate
-      File.delete(hook_file) if File.exist?(hook_file)
+      FileUtils.rm_f(hook_file)
     end
   end
 end

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: '-')
@@ -29,16 +23,17 @@ module ModuleSync
     end
 
     def self.remove(file)
-      File.delete(file) if File.exist?(file)
+      FileUtils.rm_f(file)
     end
 
     def self.render(_template, configs = {}, metadata = {})
       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/repository.rb

@@ -31,7 +31,7 @@ module ModuleSync
     end
 
     def default_branch
-      symbolic_ref = repo.branches.find { |b| b.full =~ %r{remotes/origin/HEAD} }
+      symbolic_ref = repo.branches.find { |b| b.full.include?('remotes/origin/HEAD') }
       return unless symbolic_ref
 
       %r{remotes/origin/HEAD\s+->\s+origin/(?<branch>.+?)$}.match(symbolic_ref.full)[:branch]

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.
@@ -83,23 +89,24 @@ module ModuleSync # rubocop:disable Metrics/ModuleLength
   end
 
   def self.manage_file(puppet_module, filename, settings, options)
-    module_name = settings.additional_settings[:puppet_module]
     configs = settings.build_file_configs(filename)
     target_file = puppet_module.path(filename)
     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 => module_name,
+          :module_name => settings.additional_settings[:puppet_module],
+          :namespace => settings.additional_settings[:namespace],
           :workdir => puppet_module.working_directory,
           :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
@@ -214,9 +221,7 @@ module ModuleSync # rubocop:disable Metrics/ModuleLength
         message = "Command execution failed ('#{@options[:command_args].join ' '}': #{$CHILD_STATUS})"
         raise Thor::Error, message if @options[:fail_fast]
 
-        errors.merge!(
-          puppet_module.given_name => message,
-        )
+        errors[puppet_module.given_name] = message
         $stderr.puts message
       end
 

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.3.1'
+  spec.version               = '2.5.0'
   spec.authors               = ['Vox Pupuli']
   spec.email                 = ['voxpupuli@groups.io']
   spec.summary               = 'Puppet Module Synchronizer'
@@ -14,7 +14,6 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'aruba', '>= 0.14', '< 2'
@@ -23,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop', '~> 1.2'
+  spec.add_development_dependency 'rubocop-performance'
   spec.add_development_dependency 'rubocop-rake'
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'simplecov'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modulesync
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-05 00:00:00.000000000 Z
+date: 2022-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -100,6 +100,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        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-rake
   requirement: !ruby/object:Gem::Requirement
@@ -305,26 +319,4 @@ rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Puppet Module Synchronizer
-test_files:
-- features/cli.feature
-- features/execute.feature
-- features/hook.feature
-- features/push.feature
-- features/reset.feature
-- features/step_definitions/git_steps.rb
-- features/support/env.rb
-- features/update.feature
-- features/update/bad_context.feature
-- features/update/bump_version.feature
-- features/update/dot_sync.feature
-- features/update/pull_request.feature
-- spec/helpers/faker.rb
-- spec/helpers/faker/puppet_module_remote_repo.rb
-- spec/spec_helper.rb
-- spec/unit/modulesync/git_service/factory_spec.rb
-- spec/unit/modulesync/git_service/github_spec.rb
-- spec/unit/modulesync/git_service/gitlab_spec.rb
-- spec/unit/modulesync/git_service_spec.rb
-- spec/unit/modulesync/settings_spec.rb
-- spec/unit/modulesync/source_code_spec.rb
-- spec/unit/modulesync_spec.rb
+test_files: []