ra10ke 1.0.0 → 2.0.0

data/spec/ra10ke/puppetfile_parser_spec.rb

@@ -9,7 +9,9 @@ RSpec.describe 'Ra10ke::PuppetfileParser' do
     end
 
     let(:puppetfile_modules) do
-        [{:args=>{:version=>"2.2.0"}, :name=>"inifile", :namespace=>"puppetlabs"},
+        [{: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"},

data/spec/ra10ke/validate_spec.rb

@@ -9,40 +9,112 @@ RSpec.describe 'Ra10ke::Validate::Validation' do
     Ra10ke::Validate::Validation.new(puppetfile)
   end
 
-  let(:result) do
-    double
+  let(:puppetfile) do
+    File.join(fixtures_dir, 'Puppetfile')
   end
 
   before(:each) do
-    allow(result).to receive(:success?).and_return(true)
-    # allow(instance).to receive(:`).with(anything).and_return(result)
-    allow($CHILD_STATUS).to receive(:success?).and_return(true)
-    allow(instance).to receive(:`).with(anything)
-    .and_return(File.read(File.join(fixtures_dir, 'reflist.txt')))
+    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
 
-  let(:puppetfile) do
-    File.join(fixtures_dir, 'Puppetfile')
-  end
+  describe 'with commit' do
+    let(:puppetfile) do
+      File.join(fixtures_dir, 'Puppetfile_with_commit')
+    end
 
-  it '#new' do
-    expect(instance).to be_a Ra10ke::Validate::Validation
+    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, "👍"])
+    end
   end
 
-  it '#valid_ref?' do
-    expect(instance.valid_ref?('https://www.example.com', 'master')).to be true
+  describe 'bad url' do
+    let(:instance) do
+      Ra10ke::Validate::Validation.new(puppetfile)
+    end
+
+    let(:puppetfile) do
+      File.join(fixtures_dir, 'Puppetfile_with_bad_refs')
+    end
+
+    before(:each) 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)
+      expect(working).to receive(:valid_url?).and_return(true)
+      bad_tag = double('Ra1ke::GitRepo', url: 'https://github.com/acidprime/r10k')
+      expect(bad_tag).to receive(:valid_ref?).with('bad').and_return(false)
+      expect(bad_tag).to receive(:valid_commit?).with(nil).and_return(false)
+      expect(bad_tag).to receive(:valid_url?).and_return(true)
+      bad_url = double('Ra1ke::GitRepo', url: 'https://github.com/nwops/typo')
+      expect(bad_url).to receive(:valid_ref?).with(nil).and_return(false)
+      expect(bad_url).to receive(:valid_commit?).with(nil).and_return(false)
+      expect(bad_url).to receive(:valid_url?).and_return(false)
+
+      expect(Ra10ke::GitRepo).to receive(:new).and_return(working, bad_tag, bad_url)
+    end
+
+    it 'details mods that are bad' do
+      expect(instance.all_modules.find { |m| !m[:valid_url?] }).to be_a Hash
+      expect(instance.all_modules.find_all { |m| !m[:valid_ref?] }.count).to eq(2)
+    end
   end
 
-  it '#valid_commit?' do
-    expect(instance.valid_commit?('https://www.example.com', 'master')).to be true
+  describe 'control_branch' do
+    before(:each) do
+      ENV.delete 'CONTROL_BRANCH'
+      ENV.delete 'CONTROL_BRANCH_FALLBACK'
+    end
+
+    let(:instance) do
+      Ra10ke::Validate::Validation.new(puppetfile)
+    end
+
+    let(:puppetfile) do
+      File.join(fixtures_dir, 'Puppetfile_with_control_branch')
+    end
+
+    it 'correctly replaces control branch' do
+      ENV['CONTROL_BRANCH'] = 'env-control_branch'
+      expect(instance.all_modules.find { |m| m[:name] == 'hiera_control' }[:ref]).to eq('env-control_branch')
+    end
+
+    it 'correctly detects current branch' do
+      allow(Ra10ke::GitRepo).to receive(:current_branch).and_return('current_branch-control_branch')
+      expect(instance.all_modules.find { |m| m[:name] == 'hiera_control' }[:ref]).to eq('current_branch-control_branch')
+    end
+
+    it 'correctly falls back if no current 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_control' }[:ref]).to eq('env-control_branch_fallback')
+    end
+
+    it 'correctly falls back to default_branch if no current branch' do
+      allow(Ra10ke::GitRepo).to receive(:current_branch).and_return(nil)
+      expect(instance.all_modules.find { |m| m[:name] == 'hiera_controlwithdefault' }[:ref]).to eq('master')
+    end
+
+    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')
+    end
+
+    it 'correctly falls back to default_branch if no current branch with override' do
+      allow(Ra10ke::GitRepo).to receive(:current_branch).and_return(nil)
+      expect(instance.all_modules.find { |m| m[:name] == 'hiera_controlwithdefaultoverride' }[:ref]).to eq('master')
+    end
+
+    it 'correctly falls back to main if no current branch and no fallback' do
+      allow(Ra10ke::GitRepo).to receive(:current_branch).and_return(nil)
+      expect(instance.all_modules.find { |m| m[:name] == 'hiera_control' }[:ref]).to eq('main')
+    end
   end
 
-  it '#bad_mods?' do
-    allow(instance).to receive(:`).with(anything)
-    .and_return(File.read(File.join(fixtures_dir, 'reflist.txt')))
-    # because we can't test every single module we return the same result set
-    # which only passes for a single module, while others fail.
-    expect(instance.bad_mods?).to be true
+  it '#new' do
+    expect(instance).to be_a Ra10ke::Validate::Validation
   end
 
   it '#all_modules is an array' do
@@ -59,22 +131,13 @@ RSpec.describe 'Ra10ke::Validate::Validation' do
 
   it '#data is a hash with keys' do
     keys = instance.all_modules.first.keys
-    expect(keys).to eq(%i[name url ref valid_ref? status])
+    expect(keys).to eq(%i[name url ref valid_url? valid_ref? status])
   end
 
   it '#data is a hash with values' do
     keys = instance.all_modules.first.values
 
     expect(keys).to eq(['gitlab', 'https://github.com/vshn/puppet-gitlab',
-                        '00397b86dfb3487d9df768cbd3698d362132b5bf', true, '👍'])
-  end
-
-  it '#all_refs' do
-    refs = instance.all_refs('https://www.example.com')
-    expect(refs).to be_a Array
-    expect(refs.first).to eq(
-      {:sha=>"0ec707e431367bbe2752966be8ab915b6f0da754",:name=>"74110ac", :ref=>"refs/heads/74110ac", :subtype=>nil, :type=>:branch}
-    )
-
+                        '00397b86dfb3487d9df768cbd3698d362132b5bf', true, true, '👍'])
   end
 end

data/spec/ra10ke_spec.rb

@@ -6,7 +6,7 @@ require 'spec_helper'
 RSpec.describe 'Ra10ke::RakeTask' do
   let(:instance) do
     Ra10ke::RakeTask.new do |t|
-        t.puppetfile_path = puppetfile
+      t.puppetfile_path = puppetfile
     end
   end
 
@@ -50,6 +50,9 @@ RSpec.describe 'Ra10ke::RakeTask' do
 
   describe 'run tasks with good refs' do
     it '#run_validate_task' 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)
+
       task = instance.define_task_validate(args)
       expect(task.invoke).to be_a Array
     end
@@ -59,14 +62,13 @@ RSpec.describe 'Ra10ke::RakeTask' do
     let(:puppetfile) 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. 
     # The output should be different.
     # Testing this by itself works
     it '#run_validate_task' do
-      t =  Ra10ke::RakeTask.new
-      task2 = t.define_task_validate(args)
+      task2 = instance.define_task_validate(args)
       expect(task2.invoke).to be nil
     end
   end

data/spec/spec_helper.rb

@@ -1,3 +1,31 @@
+# frozen_string_literal: true
+
+begin
+  require 'simplecov'
+  require 'simplecov-console'
+  require 'codecov'
+rescue LoadError
+else
+  SimpleCov.start do
+    track_files 'lib/**/*.rb'
+
+    add_filter '/spec'
+
+    enable_coverage :branch
+
+    # do not track vendored files
+    add_filter '/vendor'
+    add_filter '/.vendor'
+  end
+
+  SimpleCov.formatters = [
+    SimpleCov::Formatter::Console,
+    SimpleCov::Formatter::Codecov,
+  ]
+end
+
+require 'rspec/core'
+
 def fixtures_dir
     File.join(__dir__, 'fixtures')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ra10ke
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Theo Chatzimichos
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-08 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.5
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: simplecov
+  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'
 description: R10K and Puppetfile rake tasks
 email:
 - voxpupuli@groups.io
@@ -130,17 +158,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- HISTORY.md
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/ra10ke.rb
 - lib/ra10ke/dependencies.rb
+- lib/ra10ke/deprecation.rb
 - lib/ra10ke/duplicates.rb
+- lib/ra10ke/git_repo.rb
 - lib/ra10ke/install.rb
 - lib/ra10ke/monkey_patches.rb
 - lib/ra10ke/puppetfile_parser.rb
@@ -150,11 +184,21 @@ files:
 - lib/ra10ke/version.rb
 - ra10ke.gemspec
 - spec/fixtures/Puppetfile
+- spec/fixtures/Puppetfile_deprecation_issue
+- spec/fixtures/Puppetfile_git_conversion
 - spec/fixtures/Puppetfile_test
 - spec/fixtures/Puppetfile_with_bad_refs
+- spec/fixtures/Puppetfile_with_commit
+- spec/fixtures/Puppetfile_with_control_branch
 - spec/fixtures/Puppetfile_with_duplicates
-- spec/fixtures/reflist.txt
+- spec/fixtures/refs/debug.txt
+- spec/fixtures/refs/gitlab.txt
+- spec/fixtures/refs/r10k.txt
+- spec/fixtures/refs/reflist.txt
+- spec/ra10ke/dependencies_spec.rb
+- spec/ra10ke/deprecation_spec.rb
 - spec/ra10ke/duplicates_spec.rb
+- spec/ra10ke/git_repo_spec.rb
 - spec/ra10ke/puppetfile_parser_spec.rb
 - spec/ra10ke/validate_spec.rb
 - spec/ra10ke_spec.rb
@@ -171,15 +215,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Syntax check for the Puppetfile, check for outdated installed puppet modules