ra10ke 0.6.2 → 1.2.0

data/lib/ra10ke/git_repo.rb

@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+
+require 'tempfile'
+
+module Ra10ke
+  class GitRepo
+    attr_reader :url
+
+    REMOTE_REFS_CMD = 'git ls-remote --symref'
+    CLONE_CMD = 'git clone --no-tags'
+    CURRENT_BRANCH_CMD = 'git symbolic-ref --short HEAD'
+    SHOW_CMD = 'git show'
+
+    def initialize(url)
+      @url = url
+    end
+
+    # Get the current branch for a Git repo
+    # @param path [String] - The path to the repository to check
+    # @return [String] - The current active branch of the Git repo
+    def self.current_branch(path)
+      Dir.chdir(path) do
+        data, success = run_command(CURRENT_BRANCH_CMD)
+        return success ? data.strip : nil
+      end
+    end
+
+    # @return [Array] - the raw data from the git ls-remote command as lines array
+    # return empty array if url or command failed
+    def remote_refs
+      @remote_refs ||= begin
+        data, success = run_command("#{REMOTE_REFS_CMD} #{url}")
+        success ? data.lines : []
+      end
+    end
+
+    # @return [Boolean] true if the git url is valid
+    def valid_url?
+      !remote_refs.empty?
+    end
+
+    # @return [Boolean] - return true if the commit sha is valid
+    # @param url [String] - the git string either https or ssh url
+    # @param ref [String] - the sha id
+    def valid_commit?(sha)
+      return false if sha.nil? || sha.empty?
+      return true if valid_ref?(sha)
+
+      # cloning is a last resort if for some reason we cannot
+      # remotely get via ls-remote
+      Dir.mktmpdir do |dir|
+        run_command("#{CLONE_CMD} #{url} #{dir}", silent: true)
+        Dir.chdir(dir) do
+          _, status = run_command("#{SHOW_CMD} #{sha}", silent: true)
+          status
+        end
+      end
+    end
+
+    # @return [Boolean] - return true if the ref is valid
+    # @param url [String] - the git string either https or ssh url
+    # @param ref [String] - the ref object, branch name, tag name, or commit sha, defaults to HEAD
+    def valid_ref?(ref = 'HEAD')
+      return false if ref.nil?
+
+      found = all_refs.find do |data|
+        # we don't need to bother with these types
+        next if data[:type] == :pull || data[:type] == :merge_request
+
+        # is the name equal to the tag or branch?  Is the commit sha equal?
+        data[:name].eql?(ref) || data[:sha].slice(0, 8).eql?(ref.slice(0, 8))
+      end
+      !found.nil?
+    end
+
+    # @return [Array] - an array of all the refs associated with the remote repository
+    # @param url [String] - the git string either https or ssh url
+    # @example
+    #   [{:sha=>"0ec707e431367bbe2752966be8ab915b6f0da754", :ref=>"refs/heads/74110ac", :type=>:branch, :subtype=>nil, :name=>"74110ac"},
+    #     :sha=>"07bb5d2d94db222dca5860eb29c184e8970f36f4", :ref=>"refs/pull/74/head", :type=>:pull, :subtype=>:head, :name=>"74"},
+    #     :sha=>"156ca9a8ea69e056e86355b27d944e59d1b3a1e1", :ref=>"refs/heads/master", :type=>:branch, :subtype=>nil, :name=>"master"},
+    #     :sha=>"fcc0532bbc5a5b65f3941738339e9cc7e3d767ce", :ref=>"refs/pull/249/head", :type=>:pull, :subtype=>:head, :name=>"249"},
+    #     :sha=>"8d54891fa5df75890ee15d53080c2a81b4960f92", :ref=>"refs/pull/267/head", :type=>:pull, :subtype=>:head, :name=>"267"}]
+    def all_refs
+      @all_refs ||= begin
+        remote_refs.each_with_object([]) do |line, refs|
+          sha, ref = line.split("\t")
+          next refs if sha.eql?('ref: refs/heads/master')
+
+          _, type, name, subtype = ref.chomp.split('/')
+          next refs unless name
+
+          type = :tag if type.eql?('tags')
+          type = type.to_sym
+          subtype = subtype.to_sym if subtype
+          type = :branch if type.eql?(:heads)
+          refs << { sha: sha, ref: ref.chomp, type: type, subtype: subtype, name: name }
+        end
+      end
+    end
+
+    # useful for mocking easily
+    # @param cmd [String]
+    # @param silent [Boolean] set to true if you wish to send output to /dev/null, false by default
+    # @return [Array]
+    def self.run_command(cmd, silent: false)
+      out_args = silent ? '2>&1 > /dev/null' : '2>&1'
+      out = `#{cmd} #{out_args}`
+      [out, $CHILD_STATUS.success?]
+    end
+
+    def run_command(cmd, silent: false)
+      self.class.run_command(cmd, silent: silent)
+    end
+  end
+end

data/lib/ra10ke/puppetfile_parser.rb

@@ -12,6 +12,13 @@ module Ra10ke
         end
       end
 
+      # @return [Array] - returns a array of hashes that contain modules from the Forge
+      def forge_modules(file = puppetfile)
+        modules(file).reject do |mod|
+          mod[:args].key?(:git)
+        end
+      end
+
       # @param puppetfile [String] - the absolute path to the puppetfile
       # @return [Array] - returns an array of module hashes that represent the puppetfile
       # @example

data/lib/ra10ke/validate.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 require 'ra10ke/monkey_patches'
-require 'tempfile'
 require 'table_print'
 require 'ra10ke/puppetfile_parser'
 require 'English'
+require 'ra10ke/git_repo'
 
 module Ra10ke
   module Validate
@@ -13,7 +13,7 @@ module Ra10ke
     BAD_EMOJI = ENV['BAD_EMOJI'] || '😨'
 
     # Validate the git urls and refs
-    def define_task_validate(*args)
+    def define_task_validate(*)
       desc 'Validate the git urls and branches, refs, or tags'
       task :validate do
         gitvalididation = Ra10ke::Validate::Validation.new(get_puppetfile.puppetfile_path)
@@ -32,7 +32,7 @@ module Ra10ke
 
     class Validation
       include Ra10ke::PuppetfileParser
-      
+
       attr_reader :puppetfile
 
       def initialize(file)
@@ -41,69 +41,28 @@ module Ra10ke
         abort("Puppetfile does not exist at #{puppetfile}") unless File.readable?(puppetfile)
       end
 
-      # @return [Boolean] - return true if the ref is valid
-      # @param url [String] - the git string either https or ssh url
-      # @param ref [String] - the ref object, branch name, tag name, or commit sha, defaults to HEAD
-      def valid_ref?(url, ref = 'HEAD')
-        raise ArgumentError unless ref
-        found = all_refs(url).find do |data|
-          # we don't need to bother with these types
-          next if data[:type] == :pull || data[:type] == :merge_request     
-          # is the name equal to the tag or branch?  Is the commit sha equal?     
-          data[:name].eql?(ref) || data[:sha].slice(0,8).eql?(ref.slice(0,8))
-        end
-        !found.nil?
-      end
-
-      # @return [Hash] - a hash of all the refs associated with the remote repository
-      # @param url [String] - the git string either https or ssh url
-      # @example
-      # {"0ec707e431367bbe2752966be8ab915b6f0da754"=>{:ref=>"refs/heads/74110ac", :type=>:branch, :subtype=>nil, :name=>"74110ac"},
-        # "07bb5d2d94db222dca5860eb29c184e8970f36f4"=>{:ref=>"refs/pull/74/head", :type=>:pull, :subtype=>:head, :name=>"74"},
-        # "156ca9a8ea69e056e86355b27d944e59d1b3a1e1"=>{:ref=>"refs/heads/master", :type=>:branch, :subtype=>nil, :name=>"master"},
-        # "fcc0532bbc5a5b65f3941738339e9cc7e3d767ce"=>{:ref=>"refs/pull/249/head", :type=>:pull, :subtype=>:head, :name=>"249"},
-        # "8d54891fa5df75890ee15d53080c2a81b4960f92"=>{:ref=>"refs/pull/267/head", :type=>:pull, :subtype=>:head, :name=>"267"} }
-      def all_refs(url)
-        data = `git ls-remote --symref #{url}`
-        raise "Error downloading #{url}" unless $CHILD_STATUS.success?
-        data.lines.reduce([]) do |refs, line|
-          sha, ref = line.split("\t")
-          next refs if sha.eql?('ref: refs/heads/master')
-          _, type, name, subtype = ref.chomp.split('/')
-          next refs unless name 
-          type = :tag if type.eql?('tags')
-          type = type.to_sym
-          subtype = subtype.to_sym if subtype
-          type = :branch if type.eql?(:heads)
-          refs << { sha: sha, ref: ref.chomp, type: type, subtype: subtype, name: name }
-        end
-      end
-
-      # @return [Boolean] - return true if the commit sha is valid
-      # @param url [String] - the git string either https or ssh url
-      # @param ref [String] - the sha id
-      def valid_commit?(url, sha)
-        return false if sha.nil? || sha.empty?
-        return true if valid_ref?(url, sha)
-        Dir.mktmpdir do |dir|
-          `git clone --no-tags #{url} #{dir} 2>&1 > /dev/null`
-          Dir.chdir(dir) do
-            `git show #{sha} 2>&1 > /dev/null`
-            $CHILD_STATUS.success?
-          end
-        end
-      end
-
       # @return [Array[Hash]] array of module information and git status
       def all_modules
-        begin
+        @all_modules ||= begin
+          r10k_branch = Ra10ke::GitRepo.current_branch(File.dirname(puppetfile))
           git_modules(puppetfile).map do |mod|
-            ref = mod[:args][:ref] || mod[:args][:tag] || mod[:args][:branch]
-            valid_ref = valid_ref?(mod[:args][:git], ref) || valid_commit?(mod[:args][:git], mod[:args][:ref])
+            repo = Ra10ke::GitRepo.new(mod[:args][:git])
+            ref = mod[:args][:ref] || mod[:args][:tag] || mod[:args][:branch] || mod[:args][:commit]
+            # If using control_branch, try to guesstimate what the target branch should be
+            if ref == ':control_branch'
+              ref = ENV['CONTROL_BRANCH'] \
+                    || r10k_branch \
+                    || mod[:args][:default_branch_override] \
+                    || ENV['CONTROL_BRANCH_FALLBACK'] \
+                    || mod[:args][:default_branch] \
+                    || 'main'
+            end
+            valid_ref = repo.valid_ref?(ref) || repo.valid_commit?(mod[:args][:ref])
             {
               name: mod[:name],
-              url: mod[:args][:git],
+              url: repo.url,
               ref: ref,
+              valid_url?: repo.valid_url?,
               valid_ref?: valid_ref,
               status: valid_ref ? Ra10ke::Validate::GOOD_EMOJI : Ra10ke::Validate::BAD_EMOJI
             }

data/lib/ra10ke/version.rb

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

data/lib/ra10ke.rb

@@ -4,6 +4,8 @@ require 'ra10ke/version'
 require 'ra10ke/solve'
 require 'ra10ke/syntax'
 require 'ra10ke/dependencies'
+require 'ra10ke/deprecation'
+require 'ra10ke/duplicates'
 require 'ra10ke/install'
 require 'ra10ke/validate'
 require 'git'
@@ -14,6 +16,8 @@ module Ra10ke
     include Ra10ke::Solve
     include Ra10ke::Syntax
     include Ra10ke::Dependencies
+    include Ra10ke::Deprecation
+    include Ra10ke::Duplicates
     include Ra10ke::Install
     include Ra10ke::Validate
 
@@ -33,6 +37,8 @@ module Ra10ke
         define_task_solve_dependencies(*args)
         define_task_syntax(*args)
         define_task_dependencies(*args)
+        define_task_deprecation(*args)
+        define_task_duplicates(*args)
         define_task_install(*args)
         define_task_validate(*args)
       end
@@ -40,6 +46,8 @@ module Ra10ke
 
     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'))
     end
   end
 end

data/ra10ke.gemspec

@@ -14,14 +14,17 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files`.split($/)
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = '>= 2.1.0'
+  spec.required_ruby_version = '>= 2.4.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 'semverse', '>= 2.0'
   spec.add_dependency 'table_print', '~> 1.5.6'
   spec.add_development_dependency 'rspec', '~> 3.6'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'simplecov'
 end
+

data/spec/fixtures/Puppetfile

@@ -2,7 +2,9 @@
 
 forge 'http://forge.puppetlabs.com'
 
+mod 'choria/choria',          '0.26.2'
 mod 'puppetlabs/inifile',     '2.2.0'
+mod 'puppetlabs-ruby',        '1.0.1'
 mod 'puppetlabs/stdlib',      '4.24.0'
 mod 'puppetlabs/concat',      '4.0.0'
 mod 'puppetlabs/ntp',         '6.4.1'
@@ -40,7 +42,7 @@ mod 'dotfiles',
 
 mod 'splunk',
     git: 'https://github.com/cudgel/splunk.git',
-    branch: 'prod'
+    branch: 'dev'
 
 mod 'puppet',
     git: 'https://github.com/voxpupuli/puppet-module.git',

data/spec/fixtures/Puppetfile_with_bad_refs

@@ -7,4 +7,7 @@ mod 'gitlab',
 mod 'r10k',
   :git => 'https://github.com/acidprime/r10k',
   :tag => 'bad'
+  
+mod 'debug',
+  :git => 'https://github.com/nwops/typo'    
   

data/spec/fixtures/Puppetfile_with_commit

@@ -0,0 +1,3 @@
+mod 'ntp',
+  git: 'https://github.com/puppetlabs/puppetlabs-ntp',
+  commit: '81b34c6'

data/spec/fixtures/Puppetfile_with_control_branch

@@ -0,0 +1,23 @@
+mod 'puppet-hiera_master',
+  git: 'https://github.com/voxpupuli/puppet-hiera_master.git',
+  branch: master
+
+mod 'puppet-hiera_control',
+  git: 'https://github.com/voxpupuli/puppet-hiera_control.git',
+  branch: :control_branch
+
+mod 'puppet-hiera_controlwithdefault',
+  git: 'https://github.com/voxpupuli/puppet-hiera_control.git',
+  branch: :control_branch,
+  default_branch: 'master'
+
+mod 'puppet-hiera_controlwithdefaultoverride',
+  git: 'https://github.com/voxpupuli/puppet-hiera_control.git',
+  branch: :control_branch,
+  default_branch_override: 'master',
+  default_branch: 'devel'
+
+mod 'puppet-hiera_fakecontrol',
+  git: 'https://github.com/voxpupuli/puppet-hiera_fakecontrol.git',
+  branch: control_branch
+  

data/spec/fixtures/Puppetfile_with_duplicates

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+forge 'http://forge.puppetlabs.com'
+
+mod 'abstractit/puppet',      '2.4.1'
+mod 'puppet/gitlab',          '4.0.1'
+mod 'puppetlabs/inifile',     '2.2.0'
+mod 'puppetlabs/stdlib',      '4.24.0'
+mod 'puppetlabs/concat',      '4.0.0'
+mod 'puppetlabs/ntp',         '6.4.1'
+mod 'theforeman/puppet',      '12.0.1'
+
+# introduced for tomcat module collaboration with uws
+mod 'puppet-archive', '3.1.1'
+
+mod 'gitlab',
+    git: 'https://github.com/vshn/puppet-gitlab',
+    ref: '00397b86dfb3487d9df768cbd3698d362132b5bf' # master
+
+mod 'r10k',
+    git: 'https://github.com/acidprime/r10k',
+    tag: 'v3.1.1'
+
+mod 'gms',
+    git: 'https://github.com/npwalker/abrader-gms',
+    branch: 'gitlab_disable_ssl_verify_support'
+
+mod 'pltraining-rbac',
+    git: 'https://github.com/puppetlabs/pltraining-rbac',
+    ref: '2f60e1789a721ce83f8df061e13f8bf81cd4e4ce'
+
+mod 'puppet-acl',
+    git: 'https://github.com/dobbymoodge/puppet-acl.git',
+    branch: 'master'
+
+mod 'deploy',
+    git: 'https://github.com/cudgel/deploy.git',
+    branch: 'master'
+
+mod 'dotfiles',
+    git: 'https://github.com/cudgel/puppet-dotfiles.git',
+    branch: 'master'
+
+mod 'splunk',
+    git: 'https://github.com/cudgel/splunk.git',
+    branch: 'dev'
+
+mod 'puppet',
+    git: 'https://github.com/voxpupuli/puppet-module.git',
+    branch: 'master'