modulesync 2.5.0 → 2.7.0

data/spec/unit/modulesync/git_service/factory_spec.rb

@@ -4,13 +4,19 @@ require 'modulesync/git_service/factory'
 describe ModuleSync::GitService::Factory do
   context 'when instantiate a GitHub service without credentials' do
     it 'raises an error' do
-      expect { ModuleSync::GitService::Factory.instantiate(type: :github, endpoint: nil, token: nil) }.to raise_error(ModuleSync::GitService::MissingCredentialsError)
+      expect do
+        ModuleSync::GitService::Factory.instantiate(type: :github, endpoint: nil,
+                                                    token: nil)
+      end.to raise_error(ModuleSync::GitService::MissingCredentialsError)
     end
   end
 
   context 'when instantiate a GitLab service without credentials' do
     it 'raises an error' do
-      expect { ModuleSync::GitService::Factory.instantiate(type: :gitlab, endpoint: nil, token: nil) }.to raise_error(ModuleSync::GitService::MissingCredentialsError)
+      expect do
+        ModuleSync::GitService::Factory.instantiate(type: :gitlab, endpoint: nil,
+                                                    token: nil)
+      end.to raise_error(ModuleSync::GitService::MissingCredentialsError)
     end
   end
 end

data/spec/unit/modulesync/git_service/github_spec.rb

@@ -4,8 +4,8 @@ require 'modulesync/git_service/github'
 
 describe ModuleSync::GitService::GitHub do
   context '::open_pull_request' do
-    before(:each) do
-      @client = double()
+    before do
+      @client = double
       allow(Octokit::Client).to receive(:new).and_return(@client)
       @it = ModuleSync::GitService::GitHub.new('test', 'https://api.github.com')
     end
@@ -28,53 +28,51 @@ describe ModuleSync::GitService::GitHub do
     it 'submits PR when --pr is set' do
       allow(@client).to receive(:pull_requests)
         .with(args[:repo_path],
-              :state => 'open',
-              :base => 'master',
-              :head => "#{args[:namespace]}:#{args[:source_branch]}"
-             ).and_return([])
+              state: 'open',
+              base: 'master',
+              head: "#{args[:namespace]}:#{args[:source_branch]}").and_return([])
       expect(@client).to receive(:create_pull_request)
         .with(args[:repo_path],
               'master',
               args[:source_branch],
               args[:title],
-              args[:message]
-             ).and_return({"html_url" => "http://example.com/pulls/22"})
+              args[:message]).and_return({ 'html_url' => 'http://example.com/pulls/22' })
       expect { @it.open_pull_request(**args) }.to output(/Submitted PR/).to_stdout
     end
 
     it 'skips submitting PR if one has already been issued' do
       pr = {
-        "title" => "Test title",
-        "html_url" => "https://example.com/pulls/44",
-        "number" => "44"
+        'title' => 'Test title',
+        'html_url' => 'https://example.com/pulls/44',
+        'number' => '44',
       }
 
       expect(@client).to receive(:pull_requests)
         .with(args[:repo_path],
-              :state => 'open',
-              :base => 'master',
-              :head => "#{args[:namespace]}:#{args[:source_branch]}"
-             ).and_return([pr])
+              state: 'open',
+              base: 'master',
+              head: "#{args[:namespace]}:#{args[:source_branch]}").and_return([pr])
       expect { @it.open_pull_request(**args) }.to output("Skipped! 1 PRs found for branch 'test'\n").to_stdout
     end
 
     context 'when labels are set' do
-      let(:labels) { %w{HELLO WORLD} }
+      let(:labels) { %w[HELLO WORLD] }
 
       it 'adds labels to PR' do
-        allow(@client).to receive(:create_pull_request).and_return({"html_url" => "http://example.com/pulls/22", "number" => "44"})
+        allow(@client).to receive(:create_pull_request).and_return({ 'html_url' => 'http://example.com/pulls/22',
+                                                                     'number' => '44', })
         allow(@client).to receive(:pull_requests)
           .with(args[:repo_path],
-                :state => 'open',
-                :base => 'master',
-                :head => "#{args[:namespace]}:#{args[:source_branch]}"
-               ).and_return([])
+                state: 'open',
+                base: 'master',
+                head: "#{args[:namespace]}:#{args[:source_branch]}").and_return([])
         expect(@client).to receive(:add_labels_to_an_issue)
           .with(args[:repo_path],
-                "44",
-                ["HELLO", "WORLD"]
-               )
-        expect { @it.open_pull_request(**args) }.to output(/Attaching the following labels to PR 44: HELLO, WORLD/).to_stdout
+                '44',
+                %w[HELLO WORLD])
+        expect do
+          @it.open_pull_request(**args)
+        end.to output(/Attaching the following labels to PR 44: HELLO, WORLD/).to_stdout
       end
     end
   end

data/spec/unit/modulesync/git_service/gitlab_spec.rb

@@ -4,8 +4,8 @@ require 'modulesync/git_service/gitlab'
 
 describe ModuleSync::GitService::GitLab do
   context '::open_pull_request' do
-    before(:each) do
-      @client = double()
+    before do
+      @client = double
       allow(Gitlab::Client).to receive(:new).and_return(@client)
       @it = ModuleSync::GitService::GitLab.new('test', 'https://gitlab.com/api/v4')
     end
@@ -28,62 +28,59 @@ describe ModuleSync::GitService::GitLab do
     it 'submits MR when --pr is set' do
       allow(@client).to receive(:merge_requests)
         .with(args[:repo_path],
-              :state => 'opened',
-              :source_branch => args[:source_branch],
-              :target_branch => 'master',
-             ).and_return([])
+              state: 'opened',
+              source_branch: args[:source_branch],
+              target_branch: 'master').and_return([])
 
       expect(@client).to receive(:create_merge_request)
         .with(args[:repo_path],
               args[:title],
-              :labels => [],
-              :source_branch => args[:source_branch],
-              :target_branch => 'master',
-             ).and_return({"html_url" => "http://example.com/pulls/22"})
+              labels: [],
+              source_branch: args[:source_branch],
+              target_branch: 'master').and_return({ 'html_url' => 'http://example.com/pulls/22' })
 
       expect { @it.open_pull_request(**args) }.to output(/Submitted MR/).to_stdout
     end
 
     it 'skips submitting MR if one has already been issued' do
       mr = {
-        "title" => "Test title",
-        "html_url" => "https://example.com/pulls/44",
-        "iid" => "44"
+        'title' => 'Test title',
+        'html_url' => 'https://example.com/pulls/44',
+        'iid' => '44',
       }
 
       expect(@client).to receive(:merge_requests)
         .with(args[:repo_path],
-              :state => 'opened',
-              :source_branch => args[:source_branch],
-              :target_branch => 'master',
-             ).and_return([mr])
+              state: 'opened',
+              source_branch: args[:source_branch],
+              target_branch: 'master').and_return([mr])
 
       expect { @it.open_pull_request(**args) }.to output("Skipped! 1 MRs found for branch 'test'\n").to_stdout
     end
 
     context 'when labels are set' do
-      let(:labels) { %w{HELLO WORLD} }
+      let(:labels) { %w[HELLO WORLD] }
 
       it 'adds labels to MR' do
-        mr = double()
-        allow(mr).to receive(:iid).and_return("42")
+        mr = double
+        allow(mr).to receive(:iid).and_return('42')
 
         expect(@client).to receive(:create_merge_request)
           .with(args[:repo_path],
                 args[:title],
-                :labels => ["HELLO", "WORLD"],
-                :source_branch => args[:source_branch],
-                :target_branch => 'master',
-               ).and_return(mr)
+                labels: %w[HELLO WORLD],
+                source_branch: args[:source_branch],
+                target_branch: 'master').and_return(mr)
 
         allow(@client).to receive(:merge_requests)
           .with(args[:repo_path],
-                :state => 'opened',
-                :source_branch => args[:source_branch],
-                :target_branch => 'master',
-               ).and_return([])
+                state: 'opened',
+                source_branch: args[:source_branch],
+                target_branch: 'master').and_return([])
 
-        expect { @it.open_pull_request(**args) }.to output(/Attached the following labels to MR 42: HELLO, WORLD/).to_stdout
+        expect do
+          @it.open_pull_request(**args)
+        end.to output(/Attached the following labels to MR 42: HELLO, WORLD/).to_stdout
       end
     end
   end

data/spec/unit/modulesync/git_service_spec.rb

@@ -4,9 +4,9 @@ require 'modulesync/git_service'
 describe ModuleSync::GitService do
   before do
     options = ModuleSync.config_defaults.merge({
-      git_base: 'file:///tmp/dummy',
-    })
-    ModuleSync.instance_variable_set '@options', options
+                                                 git_base: 'file:///tmp/dummy',
+                                               })
+    ModuleSync.instance_variable_set :@options, options
   end
 
   context 'when guessing the git service configuration' do
@@ -31,10 +31,10 @@ describe ModuleSync::GitService do
 
       it 'build git service arguments from configuration entry' do
         expect(ModuleSync::GitService.configuration_for(sourcecode: sourcecode)).to eq({
-          type: :gitlab,
-          endpoint: 'https://vcs.example.com/api/v4',
-          token: 'secret',
-        })
+                                                                                         type: :gitlab,
+                                                                                         endpoint: 'https://vcs.example.com/api/v4',
+                                                                                         token: 'secret',
+                                                                                       })
       end
     end
 
@@ -56,10 +56,10 @@ describe ModuleSync::GitService do
             .and_return('secret')
 
           expect(ModuleSync::GitService.configuration_for(sourcecode: sourcecode)).to eq({
-            type: :gitlab,
-            endpoint: 'https://vcs.example.com/api/v4',
-            token: 'secret',
-          })
+                                                                                           type: :gitlab,
+                                                                                           endpoint: 'https://vcs.example.com/api/v4',
+                                                                                           token: 'secret',
+                                                                                         })
         end
       end
 
@@ -70,20 +70,20 @@ describe ModuleSync::GitService do
             .and_return('secret')
 
           expect(ModuleSync::GitService.configuration_for(sourcecode: sourcecode)).to eq({
-            type: :gitlab,
-            endpoint: 'https://git.example.com/api/v4',
-            token: 'secret',
-          })
+                                                                                           type: :gitlab,
+                                                                                           endpoint: 'https://git.example.com/api/v4',
+                                                                                           token: 'secret',
+                                                                                         })
         end
       end
 
       context 'without any environment variable sets' do
         it 'returns a nil token' do
           expect(ModuleSync::GitService.configuration_for(sourcecode: sourcecode)).to eq({
-            type: :gitlab,
-            endpoint: 'https://git.example.com/api/v4',
-            token: nil,
-          })
+                                                                                           type: :gitlab,
+                                                                                           endpoint: 'https://git.example.com/api/v4',
+                                                                                           token: nil,
+                                                                                         })
         end
       end
     end
@@ -103,20 +103,20 @@ describe ModuleSync::GitService do
               .and_return('secret')
 
             expect(ModuleSync::GitService.configuration_for(sourcecode: sourcecode)).to eq({
-              type: :gitlab,
-              endpoint: 'https://gitlab.example.com/api/v4',
-              token: 'secret',
-            })
+                                                                                             type: :gitlab,
+                                                                                             endpoint: 'https://gitlab.example.com/api/v4',
+                                                                                             token: 'secret',
+                                                                                           })
           end
         end
 
         context 'without a GITLAB_TOKEN environment variable sets' do
           it 'returns a nil token' do
             expect(ModuleSync::GitService.configuration_for(sourcecode: sourcecode)).to eq({
-              type: :gitlab,
-              endpoint: 'https://gitlab.example.com/api/v4',
-              token: nil,
-            })
+                                                                                             type: :gitlab,
+                                                                                             endpoint: 'https://gitlab.example.com/api/v4',
+                                                                                             token: nil,
+                                                                                           })
           end
         end
       end
@@ -135,10 +135,10 @@ describe ModuleSync::GitService do
               .and_return('secret')
 
             expect(ModuleSync::GitService.configuration_for(sourcecode: sourcecode)).to eq({
-              type: :github,
-              endpoint: 'https://vcs.example.com',
-              token: 'secret',
-            })
+                                                                                             type: :github,
+                                                                                             endpoint: 'https://vcs.example.com',
+                                                                                             token: 'secret',
+                                                                                           })
           end
         end
 
@@ -152,7 +152,7 @@ describe ModuleSync::GitService do
               .with('GITLAB_TOKEN')
               .and_return('secret')
 
-            expect{ModuleSync::GitService.configuration_for(sourcecode: sourcecode)}
+            expect { ModuleSync::GitService.configuration_for(sourcecode: sourcecode) }
               .to raise_error ModuleSync::Error
           end
         end
@@ -163,31 +163,32 @@ describe ModuleSync::GitService do
   RSpec.shared_examples 'hostname_extractor' do |url, hostname|
     context "with '#{url}' URL" do
       subject { ModuleSync::GitService::Base.extract_hostname(url) }
-      it "should extract #{hostname.nil? ? 'nil' : "'#{hostname}'"} as hostname" do
+
+      it "extracts #{hostname.nil? ? 'nil' : "'#{hostname}'"} as hostname" do
         expect(subject).to eq(hostname)
       end
     end
   end
 
-  context '#extract_hostname' do
+  describe '#extract_hostname' do
     [
       %w[ssh://user@host.xz:4444/path/to/repo.git/ host.xz],
-      %w[ssh://user@host.xz:/path/to/repo.git/     host.xz],
-      %w[ssh://host.xz/path/to/repo.git/           host.xz],
+      %w[ssh://user@host.xz:/path/to/repo.git/ host.xz],
+      %w[ssh://host.xz/path/to/repo.git/ host.xz],
 
-      %w[git://host.xz/path/to/repo.git/           host.xz],
-      %w[git://host.xz/path/to/repo/               host.xz],
-      %w[git://host.xz/path/to/repo                host.xz],
+      %w[git://host.xz/path/to/repo.git/ host.xz],
+      %w[git://host.xz/path/to/repo/ host.xz],
+      %w[git://host.xz/path/to/repo host.xz],
 
-      %w[user@host.xz:path/to/repo.git/            host.xz],
-      %w[user@host.xz:path/to/repo.git             host.xz],
-      %w[user@host.xz:path/to/repo                 host.xz],
-      %w[host.xz:path/to/repo.git/                 host.xz],
+      %w[user@host.xz:path/to/repo.git/ host.xz],
+      %w[user@host.xz:path/to/repo.git host.xz],
+      %w[user@host.xz:path/to/repo host.xz],
+      %w[host.xz:path/to/repo.git/ host.xz],
 
-      %w[https://host.xz:8443/path/to/repo.git/    host.xz],
-      %w[https://host.xz/path/to/repo.git/         host.xz],
+      %w[https://host.xz:8443/path/to/repo.git/ host.xz],
+      %w[https://host.xz/path/to/repo.git/ host.xz],
 
-      %w[ftp://host.xz/path/to/repo/               host.xz],
+      %w[ftp://host.xz/path/to/repo/ host.xz],
 
       ['/path/to/repo.git/',                       nil],
 
@@ -195,7 +196,7 @@ describe ModuleSync::GitService do
 
       ['something-invalid',                        nil],
     ].each do |url, hostname|
-      it_should_behave_like 'hostname_extractor', url, hostname
+      it_behaves_like 'hostname_extractor', url, hostname
     end
   end
 end

data/spec/unit/modulesync/settings_spec.rb

@@ -9,7 +9,7 @@ describe ModuleSync::Settings do
       { 'Rakefile' => { 'unmanaged' => true },
         :global => { 'global' => 'value' },
         'Gemfile' => { 'key' => 'value' }, },
-      {}
+      {},
     )
   end
 

data/spec/unit/modulesync/source_code_spec.rb

@@ -1,17 +1,15 @@
 require 'spec_helper'
 
 describe ModuleSync::SourceCode do
-  before do
-    options = ModuleSync.config_defaults.merge({
-      git_base: 'file:///tmp/dummy',
-    })
-    ModuleSync.instance_variable_set '@options', options
-  end
-
   subject do
     ModuleSync::SourceCode.new('namespace/name', nil)
   end
 
+  before do
+    options = ModuleSync.config_defaults.merge({ git_base: 'file:///tmp/dummy' })
+    ModuleSync.instance_variable_set :@options, options
+  end
+
   it 'has a repository namespace sets to "namespace"' do
     expect(subject.repository_namespace).to eq 'namespace'
   end

metadata

@@ -1,49 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: modulesync
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-14 00:00:00.000000000 Z
+date: 2023-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.14'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.14'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -87,49 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !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
-    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-rspec
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: voxpupuli-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -188,16 +126,22 @@ dependencies:
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: puppet-blacksmith
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +151,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -217,7 +161,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -241,6 +185,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".config/cucumber.yml"
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".github/workflows/release.yml"
 - ".gitignore"
@@ -308,14 +253,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Puppet Module Synchronizer