ra10ke 2.0.0 → 3.0.0

data/spec/ra10ke/git_repo_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe 'Ra10ke::GitRepo' do
     expect(Ra10ke::GitRepo.new(url)).to be_a Ra10ke::GitRepo
   end
 
-  it 'should not run_command more than once' do
+  it 'does not run_command more than once' do
     i = Ra10ke::GitRepo.new(url)
     expect(i).to receive(:run_command).with("git ls-remote --symref #{url}").once
     i.valid_url?
@@ -26,7 +26,7 @@ RSpec.describe 'Ra10ke::GitRepo' do
 
     let(:reflist) { File.read(File.join(fixtures_dir, 'refs', 'gitlab.txt')) }
 
-    before(:each) do
+    before do
       allow(instance).to receive(:run_command).with("git ls-remote --symref #{url}").and_return([reflist, true])
     end
 
@@ -68,22 +68,22 @@ RSpec.describe 'Ra10ke::GitRepo' do
       refs = instance.all_refs
       expect(refs).to be_a Array
       expect(refs.last).to eq(
-        { name: 'v5.0.0^{}', ref: 'refs/tags/v5.0.0^{}', sha: '1febd15f90d32e6b3d6c242a70db386b2ef1942c', subtype: nil, type: :tag }
+        { name: 'v5.0.0^{}', ref: 'refs/tags/v5.0.0^{}', sha: '1febd15f90d32e6b3d6c242a70db386b2ef1942c', subtype: nil,
+          type: :tag, },
       )
     end
   end
 
   describe 'bad url' do
     let(:url) { 'https://github.com/nwops/typo' }
-
-    before(:each) do
-      allow(instance).to receive(:run_command).with("git ls-remote --symref #{url}").and_return(['', false])
-    end
-
     let(:instance) do
       Ra10ke::GitRepo.new(url)
     end
 
+    before do
+      allow(instance).to receive(:run_command).with("git ls-remote --symref #{url}").and_return(['', false])
+    end
+
     it '#all_refs' do
       expect(instance.all_refs).to be_a Array
       expect(instance.all_refs).to eq []

data/spec/ra10ke/puppetfile_parser_spec.rb

@@ -2,110 +2,99 @@ require 'spec_helper'
 require 'ra10ke/puppetfile_parser'
 
 RSpec.describe 'Ra10ke::PuppetfileParser' do
-    include Ra10ke::PuppetfileParser
+  include Ra10ke::PuppetfileParser
 
-    let(:puppetfile) do
-      File.join(fixtures_dir, 'Puppetfile')
-    end
+  let(:puppetfile) do
+    File.join(fixtures_dir, 'Puppetfile')
+  end
 
-    let(:puppetfile_modules) do
-        [{:args=>{:version=>'0.26.2'}, :name=>'choria', :namespace=>nil},
-             {:args=>{:version=>"2.2.0"}, :name=>"inifile", :namespace=>"puppetlabs"},
-             {:args=>{:version=>"1.0.1"}, :name=>"ruby", :namespace=>"puppetlabs"},
-             {:args=>{:version=>"4.24.0"}, :name=>"stdlib", :namespace=>"puppetlabs"},
-             {:args=>{:version=>"4.0.0"}, :name=>"concat", :namespace=>"puppetlabs"},
-             {:args=>{:version=>"6.4.1"}, :name=>"ntp", :namespace=>"puppetlabs"},
-             {:args=>{:version=>"3.1.1"}, :name=>"archive", :namespace=>"puppet"},
-             {:args=>
-               {:git=>"https://github.com/vshn/puppet-gitlab",
-                :ref=>"00397b86dfb3487d9df768cbd3698d362132b5bf"},
-              :name=>"gitlab",
-              :namespace=>nil},
-             {:args=>{:git=>"https://github.com/acidprime/r10k", :tag=>"v3.1.1"},
-              :name=>"r10k",
-              :namespace=>nil},
-             {:args=>
-               {:branch=>"gitlab_disable_ssl_verify_support",
-                :git=>"https://github.com/npwalker/abrader-gms"},
-              :name=>"gms",
-              :namespace=>nil},
-             {:args=>
-               {:git=>"https://github.com/puppetlabs/pltraining-rbac",
-                :ref=>"2f60e1789a721ce83f8df061e13f8bf81cd4e4ce"},
-              :name=>"rbac",
-              :namespace=>"pltraining"},
-             {:args=>
-               {:branch=>"master", :git=>"https://github.com/dobbymoodge/puppet-acl.git"},
-              :name=>"acl",
-              :namespace=>"puppet"},
-             {:args=>{:branch=>"master", :git=>"https://github.com/cudgel/deploy.git"},
-              :name=>"deploy",
-              :namespace=>nil},
-             {:args=>
-               {:branch=>"master", :git=>"https://github.com/cudgel/puppet-dotfiles.git"},
-              :name=>"dotfiles",
-              :namespace=>nil},
-             {:args=>{:branch=>"dev", :git=>"https://github.com/cudgel/splunk.git"},
-              :name=>"splunk",
-              :namespace=>nil},
-             {:args=>{:branch=>"master", :git=>"https://github.com/voxpupuli/puppet-module.git"},
-              :name=>"puppet",
-              :namespace=>nil}]
-    end
+  let(:puppetfile_modules) do
+    [{ args: { version: '0.26.2' }, name: 'choria', namespace: nil },
+     { args: { version: '2.2.0' }, name: 'inifile', namespace: 'puppetlabs' },
+     { args: { version: '1.0.1' }, name: 'ruby', namespace: 'puppetlabs' },
+     { args: { version: '4.24.0' }, name: 'stdlib', namespace: 'puppetlabs' },
+     { args: { version: '4.0.0' }, name: 'concat', namespace: 'puppetlabs' },
+     { args: { version: '6.4.1' }, name: 'ntp', namespace: 'puppetlabs' },
+     { args: { version: '3.1.1' }, name: 'archive', namespace: 'puppet' },
+     { args: { git: 'https://github.com/vshn/puppet-gitlab',
+               ref: '00397b86dfb3487d9df768cbd3698d362132b5bf', },
+       name: 'gitlab',
+       namespace: nil, },
+     { args: { git: 'https://github.com/acidprime/r10k', tag: 'v3.1.1' },
+       name: 'r10k',
+       namespace: nil, },
+     { args: { branch: 'gitlab_disable_ssl_verify_support',
+               git: 'https://github.com/npwalker/abrader-gms', },
+       name: 'gms',
+       namespace: nil, },
+     { args: { git: 'https://github.com/puppetlabs/pltraining-rbac',
+               ref: '2f60e1789a721ce83f8df061e13f8bf81cd4e4ce', },
+       name: 'rbac',
+       namespace: 'pltraining', },
+     { args: { branch: 'master', git: 'https://github.com/dobbymoodge/puppet-acl.git' },
+       name: 'acl',
+       namespace: 'puppet', },
+     { args: { branch: 'master', git: 'https://github.com/cudgel/deploy.git' },
+       name: 'deploy',
+       namespace: nil, },
+     { args: { branch: 'master', git: 'https://github.com/cudgel/puppet-dotfiles.git' },
+       name: 'dotfiles',
+       namespace: nil, },
+     { args: { branch: 'dev', git: 'https://github.com/cudgel/splunk.git' },
+       name: 'splunk',
+       namespace: nil, },
+     { args: { branch: 'master', git: 'https://github.com/voxpupuli/puppet-module.git' },
+       name: 'puppet',
+       namespace: nil, },]
+  end
 
+  it '#modules' do
+    expect(modules(puppetfile)).to eq(puppetfile_modules)
+  end
 
-    it '#modules' do
-        expect(modules(puppetfile)).to eq(puppetfile_modules)
-    end
+  it '#git_modules' do
+    expected = [{ args: { git: 'https://github.com/vshn/puppet-gitlab',
+                          ref: '00397b86dfb3487d9df768cbd3698d362132b5bf', },
+                  name: 'gitlab',
+                  namespace: nil, },
+                { args: { git: 'https://github.com/acidprime/r10k', tag: 'v3.1.1' },
+                  name: 'r10k',
+                  namespace: nil, },
+                { args: { branch: 'gitlab_disable_ssl_verify_support',
+                          git: 'https://github.com/npwalker/abrader-gms', },
+                  name: 'gms',
+                  namespace: nil, },
+                { args: { git: 'https://github.com/puppetlabs/pltraining-rbac',
+                          ref: '2f60e1789a721ce83f8df061e13f8bf81cd4e4ce', },
+                  name: 'rbac',
+                  namespace: 'pltraining', },
+                { args: { branch: 'master', git: 'https://github.com/dobbymoodge/puppet-acl.git' },
+                  name: 'acl',
+                  namespace: 'puppet', },
+                { args: { branch: 'master', git: 'https://github.com/cudgel/deploy.git' },
+                  name: 'deploy',
+                  namespace: nil, },
+                { args: { branch: 'master', git: 'https://github.com/cudgel/puppet-dotfiles.git' },
+                  name: 'dotfiles',
+                  namespace: nil, },
+                { args: { branch: 'dev', git: 'https://github.com/cudgel/splunk.git' },
+                  name: 'splunk',
+                  namespace: nil, },
+                { args: { branch: 'master', git: 'https://github.com/voxpupuli/puppet-module.git' },
+                  name: 'puppet',
+                  namespace: nil, },]
+    expect(git_modules(puppetfile)).to eq(expected)
+  end
 
-    it '#git_modules' do
-        expected = [{:args=>
-            {:git=>"https://github.com/vshn/puppet-gitlab",
-             :ref=>"00397b86dfb3487d9df768cbd3698d362132b5bf"},
-           :name=>"gitlab",
-           :namespace=>nil},
-          {:args=>{:git=>"https://github.com/acidprime/r10k", :tag=>"v3.1.1"},
-           :name=>"r10k",
-           :namespace=>nil},
-          {:args=>
-            {:branch=>"gitlab_disable_ssl_verify_support",
-             :git=>"https://github.com/npwalker/abrader-gms"},
-           :name=>"gms",
-           :namespace=>nil},
-          {:args=>
-            {:git=>"https://github.com/puppetlabs/pltraining-rbac",
-             :ref=>"2f60e1789a721ce83f8df061e13f8bf81cd4e4ce"},
-           :name=>"rbac",
-           :namespace=>"pltraining"},
-          {:args=>
-            {:branch=>"master", :git=>"https://github.com/dobbymoodge/puppet-acl.git"},
-           :name=>"acl",
-           :namespace=>"puppet"},
-          {:args=>{:branch=>"master", :git=>"https://github.com/cudgel/deploy.git"},
-           :name=>"deploy",
-           :namespace=>nil},
-          {:args=>
-            {:branch=>"master", :git=>"https://github.com/cudgel/puppet-dotfiles.git"},
-           :name=>"dotfiles",
-           :namespace=>nil},
-          {:args=>{:branch=>"dev", :git=>"https://github.com/cudgel/splunk.git"},
-           :name=>"splunk",
-           :namespace=>nil},
-          {:args=>{:branch=>"master", :git=>"https://github.com/voxpupuli/puppet-module.git"},
-           :name=>"puppet",
-           :namespace=>nil}]
-        expect(git_modules(puppetfile)).to eq(expected)
-    end
+  it '#parse_modules_args' do
+    data = " 'puppet-acl',  :git => 'https://github.com/dobbymoodge/puppet-acl.git',  :branch => 'master'"
+    expect(parse_module_args(data)).to eq({ args: { branch: 'master',
+                                                    git: 'https://github.com/dobbymoodge/puppet-acl.git', },
+                                            name: 'acl', namespace: 'puppet', })
+  end
 
-    it '#parse_modules_args' do
-        data = " 'puppet-acl',  :git => 'https://github.com/dobbymoodge/puppet-acl.git',  :branch => 'master'"
-        expect(parse_module_args(data)).to eq({:args=>{:branch=>"master",
-             :git=>"https://github.com/dobbymoodge/puppet-acl.git"},
-              :name=>"acl", :namespace=>"puppet"})
-    end
-
-    it '#parse_modules_args when empty' do
-        data = ""
-        expect(parse_module_args(data)).to eq({})
-    end
+  it '#parse_modules_args when empty' do
+    data = ''
+    expect(parse_module_args(data)).to eq({})
+  end
 end

data/spec/ra10ke/validate_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe 'Ra10ke::Validate::Validation' do
     File.join(fixtures_dir, 'Puppetfile')
   end
 
-  before(:each) do
+  before do
     allow_any_instance_of(Ra10ke::GitRepo).to receive(:valid_ref?).and_return(true)
     allow_any_instance_of(Ra10ke::GitRepo).to receive(:valid_url?).and_return(true)
   end
@@ -25,7 +25,7 @@ RSpec.describe 'Ra10ke::Validate::Validation' do
 
     it '#data is a hash with values' do
       keys = instance.all_modules.first.values
-      expect(keys).to eq(["ntp", "https://github.com/puppetlabs/puppetlabs-ntp", "81b34c6", true, true, "👍"])
+      expect(keys).to eq(['ntp', 'https://github.com/puppetlabs/puppetlabs-ntp', '81b34c6', true, true, '👍'])
     end
   end
 
@@ -38,7 +38,7 @@ RSpec.describe 'Ra10ke::Validate::Validation' do
       File.join(fixtures_dir, 'Puppetfile_with_bad_refs')
     end
 
-    before(:each) do
+    before do
       working = double('Ra1ke::GitRepo', url: 'https://github.com/vshn/puppet-gitlab')
       expect(working).to receive(:valid_ref?).with('00397b86dfb3487d9df768cbd3698d362132b5bf').and_return(false)
       expect(working).to receive(:valid_commit?).with('00397b86dfb3487d9df768cbd3698d362132b5bf').and_return(true)
@@ -62,7 +62,7 @@ RSpec.describe 'Ra10ke::Validate::Validation' do
   end
 
   describe 'control_branch' do
-    before(:each) do
+    before do
       ENV.delete 'CONTROL_BRANCH'
       ENV.delete 'CONTROL_BRANCH_FALLBACK'
     end
@@ -99,7 +99,9 @@ RSpec.describe 'Ra10ke::Validate::Validation' do
     it 'correctly falls back to fallback if no current branch but default branch' do
       ENV['CONTROL_BRANCH_FALLBACK'] = 'env-control_branch_fallback'
       allow(Ra10ke::GitRepo).to receive(:current_branch).and_return(nil)
-      expect(instance.all_modules.find { |m| m[:name] == 'hiera_controlwithdefault' }[:ref]).to eq('env-control_branch_fallback')
+      expect(instance.all_modules.find do |m|
+               m[:name] == 'hiera_controlwithdefault'
+             end[:ref]).to eq('env-control_branch_fallback')
     end
 
     it 'correctly falls back to default_branch if no current branch with override' do
@@ -138,6 +140,6 @@ RSpec.describe 'Ra10ke::Validate::Validation' do
     keys = instance.all_modules.first.values
 
     expect(keys).to eq(['gitlab', 'https://github.com/vshn/puppet-gitlab',
-                        '00397b86dfb3487d9df768cbd3698d362132b5bf', true, true, '👍'])
+                        '00397b86dfb3487d9df768cbd3698d362132b5bf', true, true, '👍',])
   end
 end

data/spec/ra10ke_spec.rb

@@ -63,13 +63,13 @@ RSpec.describe 'Ra10ke::RakeTask' do
       File.join(fixtures_dir, 'Puppetfile_with_bad_refs')
     end
 
-    # I suspect rake is caching something here and the puppetfile is 
-    # not being sent correctly as it is not using the file I specify. 
+    # I suspect rake is caching something here and the puppetfile is
+    # not being sent correctly as it is not using the file I specify.
     # The output should be different.
     # Testing this by itself works
     it '#run_validate_task' do
       task2 = instance.define_task_validate(args)
-      expect(task2.invoke).to be nil
+      expect(task2.invoke).to be_nil
     end
   end
 end

data/spec/spec_helper.rb

@@ -27,5 +27,5 @@ end
 require 'rspec/core'
 
 def fixtures_dir
-    File.join(__dir__, 'fixtures')
+  File.join(__dir__, 'fixtures')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ra10ke
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Theo Chatzimichos
@@ -9,36 +9,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-18 00:00:00.000000000 Z
+date: 2023-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: puppet_forge
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: r10k
   requirement: !ruby/object:Gem::Requirement
@@ -46,6 +52,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -53,48 +62,69 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
-  name: git
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
-  name: solve
+  name: semverse
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: semverse
+  name: solve
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 4.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 4.0.4
 - !ruby/object:Gem::Dependency
   name: table_print
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +139,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.6
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -124,33 +168,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: voxpupuli-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 description: R10K and Puppetfile rake tasks
 email:
 - voxpupuli@groups.io
@@ -162,7 +206,8 @@ files:
 - ".github/workflows/release.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
-- ".ruby-version"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -215,7 +260,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.ruby-version

@@ -1 +0,0 @@
-2.5.7