modulesync 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4914cfca898fe7b7183b87a1feaa7b4edbeb2a1d5b97d2d32f53ca7cde6adf1
-  data.tar.gz: 7b02e4e2a1a4b1d7108702f3c9108ef250b13ddace34f4946f11d11338de6f90
+  metadata.gz: 8aebcf942cd3e1d9ccef2339d17bd07e208ee279305ba0bb6e7ad0b615ff69af
+  data.tar.gz: d4a2d213c0ed6b96a3d7f616e3e5b4a26145e1d741246daea3e9b903df0ba380
 SHA512:
-  metadata.gz: 93c282023d9f20729b4c8ed253e8a6b7c312433291fede9db35ee4b1250e00933b8bd751225521b6613709d41bef216f6a366115569710576253fb3473f5a408
-  data.tar.gz: 8019fac3cd951a7001986fbca62d50b4404e8c4008357a4724652a177a49d61ff4826d52767c67c074e0236f67723fea1df38fb583a1292d2f1ae5db8be39ccb
+  metadata.gz: cd56a2ab522debc6a002dceb8b84f5296d970bbbc8e57f242e913f0f7e9ba6dbdc8ca16005937d2d45d79df4991baaec4122c288cbed0be39ae28502f90752a3
+  data.tar.gz: 4301a8ace72c549965bec4438cf152c15bf7c4b4c9cda6a8ad14d3da8d2ff774fed8354ce9a13cdf94630cc18955d43bfdb520da3173501dc8e7aecdcfd36b9c

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
@@ -12,6 +17,9 @@ AllCops:
     - 'Gemfile'
     - 'Rakefile'
 
+Style/FetchEnvVar:
+  Enabled: false
+
 Style/HashSyntax:
   Enabled: false
 
@@ -24,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.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)
+
+**Fixed bugs:**
+
+- Handle Ruby 3.1 ERB trim\_mode deprecation [\#252](https://github.com/voxpupuli/modulesync/pull/252) ([ekohl](https://github.com/ekohl))
+
 ## [2.3.0](https://github.com/voxpupuli/modulesync/tree/2.3.0) (2022-03-07)
 
 [Full Changelog](https://github.com/voxpupuli/modulesync/compare/2.2.0...2.3.0)

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

@@ -17,14 +17,19 @@ module ModuleSync
                       else
                         "#{target_name}.erb"
                       end
-      erb_obj = ERB.new(File.read(template_file), nil, '-')
+      template = File.read(template_file)
+      erb_obj = if RUBY_VERSION >= '2.7'
+                  ERB.new(template, trim_mode: '-')
+                else
+                  ERB.new(template, nil, '-')
+                end
       erb_obj.filename = template_file
       erb_obj.def_method(ForgeModuleFile, 'render()', template_file)
       erb_obj
     end
 
     def self.remove(file)
-      File.delete(file) if File.exist?(file)
+      FileUtils.rm_f(file)
     end
 
     def self.render(_template, configs = {}, metadata = {})

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

@@ -83,7 +83,6 @@ 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']
@@ -94,7 +93,8 @@ module ModuleSync # rubocop:disable Metrics/ModuleLength
         erb = Renderer.build(templatename)
         # 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,
         }
@@ -214,9 +214,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.0'
+  spec.version               = '2.4.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.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-07 00:00:00.000000000 Z
+date: 2022-09-27 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: []