simp-rake-helpers 5.24.0 → 6.0.0

data/lib/simp/rake/build/upload.rb

@@ -1,132 +1,123 @@
 #!/usr/bin/rake -T
+# frozen_string_literal: true
+
 require 'open3'
 require 'simp/rpm'
 require 'simp/rake/build/constants'
 
 module Simp; end
 module Simp::Rake; end
-module Simp::Rake::Build
-
-  class Upload < ::Rake::TaskLib
-    include Simp::Rake::Build::Constants
 
-    def initialize( base_dir )
-      init_member_vars( base_dir )
+class Simp::Rake::Build::Upload < Rake::TaskLib
+  include Simp::Rake::Build::Constants
 
-      define_tasks
-    end
+  def initialize(base_dir)
+    init_member_vars(base_dir)
 
-    def define_tasks
+    define_tasks
+  end
 
-      namespace :upload do
-        task :prep do
-          if $simp6
-            @build_dir = $simp6_build_dir || @distro_build_dir
-          end
+  def define_tasks
+    namespace :upload do
+      task :prep do
+        if $simp6
+          @build_dir = $simp6_build_dir || @distro_build_dir
         end
+      end
 
-        ##############################################################################
-        # Helper methods
-        ##############################################################################
-
-        # Get a list of all packages that have been updated since the passed
-        # date or git identifier (tag, branch, or commit).
+      ##############################################################################
+      # Helper methods
+      ##############################################################################
 
-        def get_updated_packages(start,script_format)
-          pkg_info = Hash.new
-          printed_info = false
+      # Get a list of all packages that have been updated since the passed
+      # date or git identifier (tag, branch, or commit).
 
-          to_check = []
-          # Find all static RPMs and GPGKEYS that we may need to update so
-          # that we can see if we have newer versions to upload!
-          Find.find(@build_dir) do |file|
-            next if file == @build_dir
-            Find.prune if file !~ /^#{@build_dir}\/(Ext.*(\.rpm)?|GPGKEYS)/
-            to_check << file if File.file?(file)
-          end
+      def get_updated_packages(start, script_format)
+        pkg_info = {}
+        printed_info = false
 
-          # Smash in all of the file files!
-          to_check += Dir.glob("#{@spec_dir}/*.spec")
-          to_check += Dir.glob("#{@src_dir}/puppet/modules/*/pkg/*.spec")
-
-          to_check.each do |file|
-
-            is_commit = false
-            oldstart = start
-            humanstart = ''
-            # Before changing the directory, see if we've got a commit or a
-            # date. If we've got a tag or branch from the top level, then we
-            # need to get the date from there and use it later.
-            Dir.chdir(@spec_dir) do
-              stdin,stdout,stderr = Open3.popen3('git','rev-list',start)
-              stderr.read !~ /^fatal:/ and is_commit = true
-
-              if is_commit
-                # Snag the date.
-                start, humanstart = `git log #{start} --pretty=format:"%ct##%cd" --max-count=1`.chomp.split('##')
-              else
-                printed_info = true
-              end
-            end
+        to_check = []
+        # Find all static RPMs and GPGKEYS that we may need to update so
+        # that we can see if we have newer versions to upload!
+        Find.find(@build_dir) do |file|
+          next if file == @build_dir
 
-            !printed_info and puts "Info: Comparing to '#{humanstart}' based on input of '#{oldstart}'"
-
-            Dir.chdir(File.dirname(file)) do
-              # Get the file HEAD commit
-              # If we're not in a git repo, this will explode, but that's just
-              # fine.
-              current_head = `git rev-list HEAD --max-count=1`.chomp
-
-              begin
-                # Convert the spec files to something more human readable...
-                pkg_info[file] = {
-                  :is_new => false
-                }
-                pkg_info[file][:alias] = file
-                if file =~ /.spec$/
-                  if script_format
-                    pkg_info[file][:alias] = "#{@build_dir}/RPMS/#{Simp::RPM.new(file).name}*.rpm"
-                  else
-                    pkg_info[file][:alias] = Simp::RPM.new(file).name
-                  end
-                end
-              rescue
-                raise "Error: There was an issue getting information from #{file}"
-              end
+          Find.prune unless %r{^#{@build_dir}/(Ext.*(\.rpm)?|GPGKEYS)}.match?(file)
+          to_check << file if File.file?(file)
+        end
 
-              commit_head = nil
-              # It turns out that an invalid date will just return
-              # everything
-              commit_head = `git log --before="#{start}" --pretty=format:%H --max-count=1 #{File.basename(file)}`.chomp
+        # Smash in all of the file files!
+        to_check += Dir.glob("#{@spec_dir}/*.spec")
+        to_check += Dir.glob("#{@src_dir}/puppet/modules/*/pkg/*.spec")
+
+        to_check.each do |file|
+          is_commit = false
+          oldstart = start
+          humanstart = ''
+          # Before changing the directory, see if we've got a commit or a
+          # date. If we've got a tag or branch from the top level, then we
+          # need to get the date from there and use it later.
+          Dir.chdir(@spec_dir) do
+            _, _, stderr = Open3.popen3('git', 'rev-list', start)
+            stderr.read !~ %r{^fatal:} and is_commit = true
+
+            if is_commit
+              # Snag the date.
+              start, humanstart = `git log #{start} --pretty=format:"%ct##%cd" --max-count=1`.chomp.split('##')
+            else
+              printed_info = true
+            end
+          end
 
-              # Did we find something different?
-              if commit_head.empty?
-                pkg_info[file][:is_new] = true
-              else
-                pkg_info[file][:is_new] = !system('git','diff','--quiet',commit_head,File.basename(file))
+          !printed_info and puts "Info: Comparing to '#{humanstart}' based on input of '#{oldstart}'"
+
+          Dir.chdir(File.dirname(file)) do
+            # Get the file HEAD commit
+            # If we're not in a git repo, this will explode, but that's just
+            # fine.
+            `git rev-list HEAD --max-count=1`.chomp
+
+            begin
+              # Convert the spec files to something more human readable...
+              pkg_info[file] = {
+                :is_new => false
+              }
+              pkg_info[file][:alias] = file
+              if %r{.spec$}.match?(file)
+                pkg_info[file][:alias] = if script_format
+                                           "#{@build_dir}/RPMS/#{Simp::RPM.new(file).name}*.rpm"
+                                         else
+                                           Simp::RPM.new(file).name
+                                         end
               end
+            rescue StandardError
+              raise "Error: There was an issue getting information from #{file}"
             end
-          end
+            # It turns out that an invalid date will just return
+            # everything
+            commit_head = `git log --before="#{start}" --pretty=format:%H --max-count=1 #{File.basename(file)}`.chomp
 
-          return pkg_info
+            # Did we find something different?
+            pkg_info[file][:is_new] = (commit_head.empty? || !system('git', 'diff', '--quiet', commit_head, File.basename(file)))
+          end
         end
 
-=begin
-        desc <<-EOM
-          Get a list of modified packages.
+        pkg_info
+      end
 
-          The package list is created from the given date or git identifier (tag, branch, or hash)
-        EOM
-=end
-        task :get_modified,[:start,:script_format] => [:prep] do |t,args|
-          args.with_defaults(:script_format => false)
+      #         desc <<-EOM
+      #           Get a list of modified packages.
+      #
+      #           The package list is created from the given date or git identifier (tag, branch, or hash)
+      #         EOM
+      task :get_modified, [:start, :script_format] => [:prep] do |_t, args|
+        args.with_defaults(:script_format => false)
 
-          args.start or raise "Error: You must specify a 'start'"
+        args.start or raise "Error: You must specify a 'start'"
 
-          updated_pkgs = get_updated_packages(args.start, args.script_format)
-          updated_pkgs.keys.sort.each do |k|
-            updated_pkgs[k][:is_new] and puts "Updated: #{updated_pkgs[k][:alias]}"
-          end
+        updated_pkgs = get_updated_packages(args.start, args.script_format)
+        updated_pkgs.keys.sort.each do |k|
+          updated_pkgs[k][:is_new] and puts "Updated: #{updated_pkgs[k][:alias]}"
         end
       end
     end

data/lib/simp/rake/fixtures.rb

@@ -1,87 +1,90 @@
+# frozen_string_literal: true
+
 require 'rake/tasklib'
 
 module Simp; end
-module Simp::Rake
-  class Fixtures < ::Rake::TaskLib
-    def initialize( dir )
-       @base_dir = dir
-       ###::CLEAN.include( '.fixtures.yml.local' )
-       define
-    end
 
-    def define
-      namespace :fixtures do
-        def flatten_fixtures_hash(_f)
-          _f
-            .map{|k,v| v.values}
-            .flatten
-            .reduce({}){|h,pairs|
-              pairs.each{|k,v|
-                (h[k] ||= []) << v
-              }; h
-            }
-            .keys
-            .uniq
-            .sort
-        end
+class Simp::Rake::Fixtures < Rake::TaskLib
+  def initialize(dir)
+    @base_dir = dir
+    # ##::CLEAN.include( '.fixtures.yml.local' )
+    define
+  end
 
-        def fixtures_yml_local(_f)
-          _f_m  = flatten_fixtures_hash(_f)
+  def define
+    namespace :fixtures do
+      def flatten_fixtures_hash(_f)
+        _f
+          .map { |_k, v| v.values }
+          .flatten
+          .each_with_object({}) { |pairs, h|
+            pairs.each do |k, v|
+              (h[k] ||= []) << v
+            end
+          }
+          .keys
+          .uniq
+          .sort
+      end
 
-          _s = Hash[_f_m.map{|k|
-            v= _f['fixtures']['repositories'].key?(k) ? "#\{source_dir\}/../#{k}": _f['fixtures']['symlinks'].fetch(k)
-            [k, v ]}
-          ]
+      def fixtures_yml_local(_f)
+        _f_m = flatten_fixtures_hash(_f)
 
-          {'fixtures'=> {'symlinks'=> _s }}
+        _s = _f_m.to_h do |k|
+          v = _f['fixtures']['repositories'].key?(k) ? "#\{source_dir}/../#{k}" : _f['fixtures']['symlinks'].fetch(k)
+          [k, v]
         end
 
-        desc 'generate .fixtures.yml.local formm the entries in .fixtures.yml'
-        task :generate do
-          pwd = File.expand_path(@base_dir)
-          _f  = YAML.load_file(File.join(pwd,'.fixtures.yml'))
-          _l  = clean_yaml(fixtures_yml_local( _f ).to_yaml)
-          _o  = File.join(pwd,'.fixtures.yml.local')
-          File.open( _o,'w'){|f| puts _l; f.puts _l}
-          puts
-          puts "# written to '#{_o}'"
-        end
+        { 'fixtures' => { 'symlinks' => _s } }
+      end
 
+      desc 'generate .fixtures.yml.local formm the entries in .fixtures.yml'
+      task :generate do
+        pwd = File.expand_path(@base_dir)
+        _f  = YAML.load_file(File.join(pwd, '.fixtures.yml'))
+        _l  = clean_yaml(fixtures_yml_local(_f).to_yaml)
+        _o  = File.join(pwd, '.fixtures.yml.local')
+        File.open(_o, 'w') do |f|
+          puts _l
+          f.puts _l
+        end
+        puts
+        puts "# written to '#{_o}'"
+      end
 
-        desc "check for missing .fixture modules"
-        task :diff do
-          require 'yaml'
-          pwd = File.expand_path(@base_dir)
-          _f  = YAML.load_file(File.join(pwd,'.fixtures.yml'))
+      desc 'check for missing .fixture modules'
+      task :diff do
+        require 'yaml'
+        pwd = File.expand_path(@base_dir)
+        _f  = YAML.load_file(File.join(pwd, '.fixtures.yml'))
 
-          unless File.file?(File.join(pwd,'.fixtures.yml.local'))
-            fail "ERROR: Can't diff fixtures without a `.fixtures.yml.local` file"
-          end
+        unless File.file?(File.join(pwd, '.fixtures.yml.local'))
+          raise "ERROR: Can't diff fixtures without a `.fixtures.yml.local` file"
+        end
 
-          _fl = YAML.load_file(File.join(pwd,'.fixtures.yml.local'))
+        _fl = YAML.load_file(File.join(pwd, '.fixtures.yml.local'))
 
-          # reduce modules
-          _f_m  = flatten_fixtures_hash(_f)
-          _fl_m = flatten_fixtures_hash(_fl)
-          _f_u  = (_f_m-_fl_m)
-          _fl_u = (_fl_m-_f_m)
+        # reduce modules
+        _f_m  = flatten_fixtures_hash(_f)
+        _fl_m = flatten_fixtures_hash(_fl)
+        _f_u  = (_f_m - _fl_m)
+        _fl_u = (_fl_m - _f_m)
 
-          if (_f_u.size + _fl_u.size) > 0
+        if (_f_u.size + _fl_u.size).positive?
+          warn ''
+          warn 'WARNING: .fixtures.yml & .fixtures.yml.local have different files!'
+          warn ''
+          if _f_u.size.positive?
+            warn 'Unique modules to .fixtures.yml:'
+            _f_u.each { |x| warn "  - #{x}" }
             warn ''
-            warn "WARNING: .fixtures.yml & .fixtures.yml.local have different files!"
+          end
+          if _fl_u.size.positive?
+            warn 'Unique modules to .fixtures.yml.local:'
+            _fl_u.each { |x| warn "  - #{x}" }
             warn ''
-            if _f_u.size > 0
-              warn 'Unique modules to .fixtures.yml:'
-              _f_u.each{|x| warn "  - #{x}"}
-              warn ''
-            end
-            if _fl_u.size > 0
-              warn 'Unique modules to .fixtures.yml.local:'
-              _fl_u.each{|x| warn "  - #{x}"}
-              warn ''
-            end
-            exit 1
           end
+          exit 1
         end
       end
     end

data/lib/simp/rake/helpers/rpm_spec.rb

@@ -1,25 +1,28 @@
+# frozen_string_literal: true
+
 module Simp; end
 module Simp::Rake; end
+
 class Simp::Rake::Helpers
   module Simp::Rake::Helpers::RPMSpec
     require 'simp/rake/build/constants'
 
     include Simp::Rake::Build::Constants
 
-    def rpm_template(simp_version=nil)
+    def rpm_template(simp_version = nil)
       simp_version = ENV.fetch('SIMP_BUILD_version', simp_version)
 
-      if simp_version
-        simp_main_version = simp_version.split('.').first
-      else
-        simp_main_version = 'default'
-      end
+      simp_main_version = if simp_version
+                            simp_version.split('.').first
+                          else
+                            'default'
+                          end
 
       template_file = File.join(File.dirname(__FILE__), 'assets', 'rpm_spec', "simp#{simp_main_version}.spec")
 
       raise "Error: Could not find template for SIMP version #{simp_version}" unless File.exist?(template_file)
 
-      return File.read(template_file)
+      File.read(template_file)
     end
   end
 end

data/lib/simp/rake/helpers/version.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Simp; end
 module Simp::Rake; end
 
 class Simp::Rake::Helpers
-  VERSION = '5.24.0'
+  VERSION = '6.0.0'
 end

data/lib/simp/rake/helpers.rb

@@ -1,23 +1,25 @@
+# frozen_string_literal: true
+
 require File.expand_path('pkg', File.dirname(__FILE__))
 require File.expand_path('fixtures', File.dirname(__FILE__))
 
 module Simp; end
 module Simp::Rake; end
-class Simp::Rake::Helpers
 
+class Simp::Rake::Helpers
   # dir = top-level of project,
-  def initialize( dir = Dir.pwd )
-    Simp::Rake::Pkg.new( dir ) do | t |
+  def initialize(dir = Dir.pwd)
+    Simp::Rake::Pkg.new(dir) do |t|
       t.clean_list << "#{t.base_dir}/spec/fixtures/hieradata/hiera.yaml"
     end
 
-    Simp::Rake::Fixtures.new( dir )
+    Simp::Rake::Fixtures.new(dir)
   end
 
   def self.check_required_commands(required_commands)
     require 'facter'
 
-    invalid_commands = Array.new
+    invalid_commands = []
 
     Array(required_commands).each do |command|
       unless Array(command).find { |x| Facter::Core::Execution.which(x) }
@@ -25,16 +27,16 @@ class Simp::Rake::Helpers
       end
     end
 
-    unless invalid_commands.empty?
-      errmsg = <<-EOM
+    return if invalid_commands.empty?
+
+    errmsg = <<-EOM
 Error: The following required commands were not found on your system:
 
   * #{invalid_commands.join("\n  * ")}
 
 Please update your system and try again.
-      EOM
+    EOM
 
-      raise(errmsg)
-    end
+    raise(errmsg)
   end
 end