ra10ke 1.2.0 → 3.0.0

data/lib/ra10ke/syntax.rb

@@ -1,18 +1,16 @@
 module Ra10ke::Syntax
   def define_task_syntax(*_args)
-    desc "Syntax check Puppetfile"
+    desc 'Syntax check Puppetfile'
     task :syntax do
       require 'r10k/action/puppetfile/check'
 
       puppetfile = R10K::Action::Puppetfile::Check.new({
-        :root => @basedir,
-        :moduledir => @moduledir,
-        :puppetfile => @puppetfile_path
-      }, '')
+                                                         root: @basedir,
+                                                         moduledir: @moduledir,
+                                                         puppetfile: @puppetfile_path,
+                                                       }, '')
 
-      unless puppetfile.call
-        abort("Puppetfile syntax check failed")
-      end
+      abort('Puppetfile syntax check failed') unless puppetfile.call
     end
   end
 end

data/lib/ra10ke/validate.rb

@@ -8,7 +8,6 @@ require 'ra10ke/git_repo'
 
 module Ra10ke
   module Validate
-
     GOOD_EMOJI = ENV['GOOD_EMOJI'] || '👍'
     BAD_EMOJI = ENV['BAD_EMOJI'] || '😨'
 
@@ -64,7 +63,7 @@ module Ra10ke
               ref: ref,
               valid_url?: repo.valid_url?,
               valid_ref?: valid_ref,
-              status: valid_ref ? Ra10ke::Validate::GOOD_EMOJI : Ra10ke::Validate::BAD_EMOJI
+              status: valid_ref ? Ra10ke::Validate::GOOD_EMOJI : Ra10ke::Validate::BAD_EMOJI,
             }
           end
         end

data/lib/ra10ke/version.rb

@@ -1,3 +1,3 @@
 module Ra10ke
-  VERSION = "1.2.0"
+  VERSION = '3.0.0'
 end

data/lib/ra10ke.rb

@@ -41,13 +41,15 @@ module Ra10ke
         define_task_duplicates(*args)
         define_task_install(*args)
         define_task_validate(*args)
+        define_task_print_git_conversion(*args)
       end
     end
 
     def get_puppetfile
       R10K::Puppetfile.new(@basedir, @moduledir, @puppetfile_path, @puppetfile_name, @force)
     rescue ArgumentError # R10k < 2.6.0
-      R10K::Puppetfile.new(@basedir, @moduledir, @puppetfile_path || File.join(@basedir, @puppetfile_name || 'Puppetfile'))
+      R10K::Puppetfile.new(@basedir, @moduledir,
+                           @puppetfile_path || File.join(@basedir, @puppetfile_name || 'Puppetfile'))
     end
   end
 end

data/ra10ke.gemspec

@@ -1,30 +1,30 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ra10ke/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "ra10ke"
+  spec.name          = 'ra10ke'
   spec.version       = Ra10ke::VERSION
-  spec.authors       = ["Theo Chatzimichos", "Vox Pupuli"]
-  spec.email         = ["voxpupuli@groups.io"]
-  spec.description   = %q{R10K and Puppetfile rake tasks}
-  spec.summary       = %q{Syntax check for the Puppetfile, check for outdated installed puppet modules}
-  spec.homepage      = "https://github.com/voxpupuli/ra10ke"
-  spec.license       = "MIT"
+  spec.authors       = ['Theo Chatzimichos', 'Vox Pupuli']
+  spec.email         = ['voxpupuli@groups.io']
+  spec.description   = 'R10K and Puppetfile rake tasks'
+  spec.summary       = 'Syntax check for the Puppetfile, check for outdated installed puppet modules'
+  spec.homepage      = 'https://github.com/voxpupuli/ra10ke'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
-  spec.require_paths = ["lib"]
-  spec.required_ruby_version = '>= 2.4.0'
+  spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.7.0'
 
-  spec.add_dependency "rake"
-  spec.add_dependency "puppet_forge"
-  spec.add_dependency "r10k"
-  spec.add_dependency "git"
-  spec.add_dependency "solve"
-  spec.add_dependency 'semverse', '>= 2.0'
+  spec.add_dependency 'git', '~> 1.18'
+  spec.add_dependency 'puppet_forge', '~> 5.0', '>= 5.0.1'
+  spec.add_dependency 'r10k', '>= 2.6.5', '< 5'
+  spec.add_dependency 'rake', '~> 13.0', '>= 13.0.6'
+  spec.add_dependency 'semverse', '>= 2.0', '< 4'
+  spec.add_dependency 'solve', '~> 4.0', '>= 4.0.4'
   spec.add_dependency 'table_print', '~> 1.5.6'
+  spec.add_development_dependency 'pry', '~> 0.14.2'
   spec.add_development_dependency 'rspec', '~> 3.6'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'simplecov', '~> 0.22.0'
+  spec.add_development_dependency 'voxpupuli-rubocop', '~> 2.0.0'
 end
-

data/spec/fixtures/Puppetfile_deprecation_issue

@@ -0,0 +1,78 @@
+# used in profiles
+mod 'puppet/systemd', :latest
+mod 'puppet/lldpd', :latest
+mod 'puppet/ferm', :latest
+mod 'puppet/borg', :latest
+mod 'puppet/wireguard', :latest
+mod 'puppet/bird', :latest
+mod 'puppet/augeasproviders_pam', :latest
+mod 'puppet/augeasproviders_shellvar', :latest
+mod 'puppetlabs/vcsrepo', :latest
+mod 'saz/ssh', :latest
+mod 'puppet/r10k', :latest
+mod 'puppet/dbbackup', :latest
+mod 'puppet/mosquitto', :latest
+mod 'puppet/grafana', :latest
+mod 'puppet/nginx', :latest
+mod 'puppet/ssh_keygen', :latest
+mod 'puppet/unbound', :latest
+mod 'puppetlabs/inifile', :latest
+mod 'puppet/prometheus', :latest
+mod 'theforeman/foreman', :latest
+mod 'theforeman/puppet', :latest
+mod 'theforeman/foreman_proxy', :latest
+mod 'puppet/nftables', :latest
+mod 'puppet/augeasproviders_sysctl', :latest
+mod 'puppet/catalog_diff', :latest
+mod 'puppet/unattended_upgrades', :latest
+mod 'puppet/selinux', :latest
+mod 'choria/choria', :latest
+mod 'puppet/archive', :latest
+mod 'puppet/elasticsearch', :latest
+mod 'jsok/vault',
+  git: 'https://github.com/bastelfreak/puppet-vault',
+  ref: 'test'
+
+# dependencies
+mod 'puppet/augeasproviders_core', :latest
+mod 'puppetlabs/stdlib', :latest
+mod 'choria/mcollective', :latest
+mod 'puppetlabs/concat', :latest
+mod 'puppetlabs/apt', :latest
+mod 'puppetlabs/apache', :latest
+mod 'puppetlabs/postgresql', :latest
+mod 'puppet/extlib', :latest
+mod 'puppet/redis', :latest
+mod 'puppet/epel', :latest
+mod 'theforeman/puppetserver_foreman', :latest
+mod 'richardc/datacat', :latest
+mod 'theforeman/dns', :latest
+mod 'theforeman/dhcp', :latest
+mod 'theforeman/tftp', :latest
+mod 'puppetlabs/xinetd', :latest
+mod 'choria-mcollective_choria', :latest
+mod 'choria/mcollective_agent_puppet', :latest
+mod 'choria/mcollective_agent_package', :latest
+mod 'choria/mcollective_agent_service', :latest
+mod 'choria/mcollective_agent_filemgr', :latest
+mod 'choria/mcollective_agent_shell', :latest
+mod 'choria/mcollective_agent_nettest', :latest
+mod 'choria/mcollective_agent_puppetca', :latest
+mod 'choria/mcollective_agent_bolt_tasks', :latest
+mod 'choria/mcollective_agent_iptables', :latest
+mod 'choria/mcollective_agent_process', :latest
+mod 'choria/mcollective_util_actionpolicy', :latest
+mod 'optiz0r/mcollective_agent_puppet_env', :latest
+mod 'jay7x/mcollective_agent_query', :latest
+mod 'choria/mcollective_data_sysctl', :latest
+mod 'puppet/yum', :latest
+mod 'puppetlabs/java', :latest
+mod 'puppet/elastic_stack', :latest
+mod 'puppet/hashi_stack', :latest
+
+# core modules are not vendored on Gentoo
+mod 'puppetlabs-sshkeys_core', :latest
+mod 'puppetlabs-mount_core', :latest
+mod 'puppetlabs-augeas_core', :latest
+mod 'puppetlabs-selinux_core', :latest
+mod 'puppetlabs-yumrepo_core', :latest

data/spec/fixtures/Puppetfile_git_conversion

@@ -0,0 +1,28 @@
+mod 'choria',
+  :git => 'https://github.com/choria-io/puppet-choria',
+  :ref => '0.26.2'
+
+mod 'inifile',
+  :git => 'https://github.com/puppetlabs/puppetlabs-inifile',
+  :ref => '2.2.0'
+
+mod 'ruby',
+  :git => 'https://github.com/puppetlabs/puppetlabs-ruby.git',
+  :ref => 'v1.0.1'
+
+mod 'stdlib',
+  :git => 'https://github.com/puppetlabs/puppetlabs-stdlib',
+  :ref => '4.24.0'
+
+mod 'concat',
+  :git => 'https://github.com/puppetlabs/puppetlabs-concat',
+  :ref => '4.0.0'
+
+mod 'ntp',
+  :git => 'https://github.com/puppetlabs/puppetlabs-ntp',
+  :ref => '6.4.1'
+
+mod 'archive',
+  :git => 'https://github.com/voxpupuli/puppet-archive',
+  :ref => 'v3.1.1'
+

data/spec/ra10ke/dependencies_spec.rb

@@ -1,50 +1,74 @@
 # frozen_string_literal: true
 
+require 'r10k/puppetfile'
 require 'spec_helper'
 require 'ra10ke/dependencies'
+require 'ra10ke'
+
 RSpec::Mocks.configuration.allow_message_expectations_on_nil = true
 
 RSpec.describe 'Ra10ke::Dependencies::Verification' do
-  after(:each) do
-    # reset version formats
-    formats = Ra10ke::Dependencies.class_variable_get(:@@version_formats)
-    Ra10ke::Dependencies.class_variable_set(:@@version_formats, formats.select { |k, _v| k == :semver } )
+  let(:instance) do
+    pfile = R10K::Puppetfile.new(File.basename(puppetfile), nil, puppetfile, nil, false)
+    Ra10ke::Dependencies::Verification.new(pfile)
+  end
+
+  let(:puppetfile) do
+    File.join(fixtures_dir, 'Puppetfile')
   end
 
   context 'register_version_format' do
     it 'default contains semver' do
-      expect(Ra10ke::Dependencies.class_variable_get(:@@version_formats)).to have_key(:semver)
+      expect(Ra10ke::Dependencies::Verification.version_formats).to have_key(:semver)
     end
+
     it 'add new version format' do
-      Ra10ke::Dependencies.register_version_format(:test) do |tags|
+      Ra10ke::Dependencies::Verification.register_version_format(:test) do |_tags|
         nil
       end
-      expect(Ra10ke::Dependencies.class_variable_get(:@@version_formats)).to have_key(:test)
+      expect(Ra10ke::Dependencies::Verification.version_formats).to have_key(:test)
     end
   end
 
-  context 'get_latest_ref' do
+  context 'show output in table format' do
     let(:instance) do
-      class DependencyDummy
-        include Ra10ke::Dependencies
-      end.new
+      pfile = R10K::Puppetfile.new(File.basename(puppetfile), nil, puppetfile, nil, false)
+      Ra10ke::Dependencies::Verification.new(pfile)
     end
 
+    let(:puppetfile) do
+      File.join(fixtures_dir, 'Puppetfile')
+    end
+
+    let(:processed_modules) do
+      instance.outdated
+    end
+
+    it 'have dependencies array' do
+      expect(processed_modules).to be_a Array
+    end
+
+    it 'show dependencies as table' do
+      instance.print_table(processed_modules)
+    end
+  end
+
+  context 'get_latest_ref' do
     context 'find latest semver tag' do
       let(:latest_tag) do
-          'v1.1.0'
+        'v1.1.0'
       end
       let(:test_tags) do
         {
-          'v1.0.0'   => nil,
+          'v1.0.0' => nil,
           latest_tag => nil,
         }
       end
 
       it do
         expect(instance.get_latest_ref({
-          'tags' => test_tags,
-        })).to eq(latest_tag)
+                                         'tags' => test_tags,
+                                       })).to eq(latest_tag)
       end
     end
 
@@ -54,18 +78,29 @@ RSpec.describe 'Ra10ke::Dependencies::Verification' do
       end
       let(:test_tags) do
         {
-          'dev'      => nil,
+          'dev' => nil,
           latest_tag => nil,
         }
       end
 
       it do
-        Ra10ke::Dependencies.register_version_format(:number) do |tags|
+        Ra10ke::Dependencies::Verification.register_version_format(:number) do |tags|
           tags.detect { |tag| tag == latest_tag }
         end
         expect(instance.get_latest_ref({
-          'tags' => test_tags,
-        })).to eq(latest_tag)
+                                         'tags' => test_tags,
+                                       })).to eq(latest_tag)
+      end
+    end
+
+    context 'convert to ref' do
+      it 'run rake task' do
+        output_conversion = File.read(File.join(fixtures_dir, 'Puppetfile_git_conversion'))
+        require 'ra10ke'
+        Ra10ke::RakeTask.new do |t|
+          t.basedir = fixtures_dir
+        end
+        expect { Rake::Task['r10k:print_git_conversion'].invoke }.to output(output_conversion).to_stdout
       end
     end
   end

data/spec/ra10ke/deprecation_spec.rb

@@ -14,24 +14,38 @@ RSpec.describe 'Ra10ke::Deprecation::Validation' do
   end
 
   it 'only checks forge modules' do
-    expect(PuppetForge::Module).to_not receive(:find).with('puppet')
+    expect(PuppetForge::Module).not_to receive(:find).with('puppet')
     allow(PuppetForge::Module).to receive(:find).and_raise(Faraday::ResourceNotFound.new(nil))
     expect(instance.deprecated_modules.count).to eq(0)
   end
 
   it 'handles deprecated modules' do
-    expect(PuppetForge::Module).to receive(:find).with('puppetlabs-ruby').and_return(double(slug: 'puppetlabs-ruby', deprecated_at: '2021-04-22 10:29:42 -0700'))
+    expect(PuppetForge::Module).to receive(:find).with('puppetlabs-ruby').and_return(double(slug: 'puppetlabs-ruby',
+                                                                                            deprecated_at: '2021-04-22 10:29:42 -0700'))
     allow(PuppetForge::Module).to receive(:find).and_return(double(slug: 'module-module', deprecated_at: nil))
 
     expect(instance.bad_mods?).to eq(true)
-    expect(instance.deprecated_modules.first).to eq(name: 'puppetlabs-ruby', deprecated_at: Time.parse('2021-04-22 10:29:42 -0700'))
+    expect(instance.deprecated_modules.first).to eq(name: 'puppetlabs-ruby',
+                                                    deprecated_at: Time.parse('2021-04-22 10:29:42 -0700'))
   end
 
   it 'handles missing modules' do
-    expect(PuppetForge::Module).to receive(:find).with('choria-choria').and_return(double(slug: 'choria-choria', deprecated_at: nil))
+    expect(PuppetForge::Module).to receive(:find).with('choria-choria').and_return(double(slug: 'choria-choria',
+                                                                                          deprecated_at: nil))
     expect(PuppetForge::Module).to receive(:find).with('puppetlabs-ruby').and_raise(Faraday::ResourceNotFound.new(nil))
     allow(PuppetForge::Module).to receive(:find).and_return(double(slug: 'module-module', deprecated_at: nil))
 
     expect(instance.bad_mods?).to eq(false)
   end
+
+  describe 'handles large puppetfile' do
+    let(:puppetfile) do
+      File.join(fixtures_dir, 'Puppetfile_deprecation_issue')
+    end
+
+    it 'deprecated modules' do
+      expect(instance.bad_mods?).to eq(false)
+      expect(instance.deprecated_modules.count).to eq(0)
+    end
+  end
 end

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
 
@@ -38,6 +38,10 @@ RSpec.describe 'Ra10ke::GitRepo' do
       expect(instance.remote_refs.first).to eq("1b3322d525e96bf7d0565b08703e2a44c90e7b4a\tHEAD\n")
     end
 
+    it '#get_ref_like' do
+      expect(instance.get_ref_like('8.0.0'))
+    end
+
     it '#valid_ref?' do
       expect(instance.valid_ref?('master')).to be true
     end
@@ -64,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