simp-rake-helpers 5.24.0 → 6.0.0

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

@@ -1,150 +1,147 @@
+# frozen_string_literal: true
+
 require 'simp/rake'
 require 'simp/rake/build/constants'
 
 module Simp; end
 module Simp::Rake; end
-module Simp::Rake::Build
 
-  class Code < ::Rake::TaskLib
-    include Simp::Rake
-    include Simp::Rake::Build::Constants
+class Simp::Rake::Build::Code < Rake::TaskLib
+  include Simp::Rake
+  include Simp::Rake::Build::Constants
 
-    def initialize( base_dir )
-      init_member_vars( base_dir )
-      define_tasks
-    end
+  def initialize(base_dir)
+    init_member_vars(base_dir)
+    define_tasks
+  end
 
-    def define_tasks
-      namespace :code do
-        desc "Show some basic stats. Uses git to figure out what has changed.
+  def define_tasks
+    namespace :code do
+      desc "Show some basic stats. Uses git to figure out what has changed.
        * :since - Do not include any stats before this date.
        * :until - Do not include any stats after this date."
-        task :stats,[:since,:until] do |t,args|
-          cur_branch = %x{git rev-parse --abbrev-ref HEAD}.chomp
-
-          if cur_branch.empty?
-            fail "Error: Could not find branch ID!"
-          end
-
-          changed = 0
-          new = 0
-          removed = 0
-
-          cmd = "git log --shortstat --reverse --pretty=oneline"
-
-          if args.since
-            cmd = cmd + " --since=#{args.since}"
-          end
-          if args.until
-            cmd = cmd + " --until=#{args.until}"
+      task :stats, [:since, :until] do |_t, args|
+        cur_branch = `git rev-parse --abbrev-ref HEAD`.chomp
+
+        if cur_branch.empty?
+          raise 'Error: Could not find branch ID!'
+        end
+
+        changed = 0
+        new = 0
+        removed = 0
+
+        cmd = 'git log --shortstat --reverse --pretty=oneline'
+
+        if args.since
+          cmd += " --since=#{args.since}"
+        end
+        if args.until
+          cmd += " --until=#{args.until}"
+        end
+
+        `#{cmd}`.each_line do |line|
+          next unless encode_line(line) =~ %r{(\d+) files changed, (\d+) insertions\(\+\), (\d+) del.*}
+
+          changed += ::Regexp.last_match(1).to_i
+          new += ::Regexp.last_match(2).to_i
+          removed += ::Regexp.last_match(3).to_i
+        end
+
+        cmd = 'git submodule foreach git log --shortstat --reverse --pretty=oneline'
+
+        if args.since
+          cmd += " --since=#{args.since}"
+        end
+        if args.until
+          cmd += " --until=#{args.until}"
+        end
+
+        `#{cmd}`.each_line do |line|
+          next unless encode_line(line) =~ %r{(\d+) files changed, (\d+) insertions\(\+\), (\d+) del.*}
+
+          changed += ::Regexp.last_match(1).to_i
+          new += ::Regexp.last_match(2).to_i
+          removed += ::Regexp.last_match(3).to_i
+        end
+
+        puts "Code Stats for #{cur_branch}:"
+        printf "  Files Changed: %6d\n", changed
+        printf "  New Lines:     %6d\n", new
+        printf "  Removed Lines: %6d\n", removed
+      end
+
+      desc "Show line count. Prints a report of the lines of code in the source.
+       * :show_unknown - Flag for displaying any file extensions not expected."
+      task :count, [:show_unknown] do |_t, args|
+        require 'find'
+
+        loc = {}
+        loc['rake'] = 0
+        loc['pp'] = 0
+        loc['rb'] = 0
+        loc['erb'] = 0
+        loc['sh'] = 0
+        loc['csh'] = 0
+        loc['html'] = 0
+        loc['spec'] = 0
+        loc['other'] = 0
+
+        File.open("#{@base_dir}/Rakefile", 'r').each { |line|
+          unless %r{^\s*$}.match?(encode_line(line))
+            loc['rake'] = loc['rake'] + 1
           end
-
-          %x{#{cmd}}.each_line do |line|
-            if encode_line(line) =~ /(\d+) files changed, (\d+) insertions\(\+\), (\d+) del.*/
-              changed = changed + $1.to_i
-              new = new + $2.to_i
-              removed = removed + $3.to_i
-            end
+        }.close
+
+        other_ext = []
+
+        Find.find(@src_dir) do |path|
+          if (File.basename(path)[0] == '.') ||
+             path.include?('src/rsync') ||
+             (path[-3..] =~ %r{\.gz|pem|pub}) ||
+             path.include?('developers_guide/rdoc')
+            Find.prune
+          elsif FileTest.symlink?(path) || FileTest.directory?(path)
+            next
           end
 
-          cmd = "git submodule foreach git log --shortstat --reverse --pretty=oneline"
+          ext = File.extname(path)[1..]
+          ext ||= 'none'
 
-          if args.since
-            cmd = cmd + " --since=#{args.since}"
-          end
-          if args.until
-            cmd = cmd + " --until=#{args.until}"
+          unless loc[ext]
+            other_ext.push(ext) unless other_ext.include?(ext)
+            ext = 'other'
           end
 
-          %x{#{cmd}}.each_line do |line|
-            if encode_line(line) =~ /(\d+) files changed, (\d+) insertions\(\+\), (\d+) del.*/
-              changed = changed + $1.to_i
-              new = new + $2.to_i
-              removed = removed + $3.to_i
+          File.open(path, 'r').each do |line|
+            unless %r{^\s*$}.match?(encode_line(line))
+              loc[ext] = loc[ext] + 1
             end
           end
-
-          puts "Code Stats for #{cur_branch}:"
-          printf "  Files Changed: %6d\n", changed
-          printf "  New Lines:     %6d\n", new
-          printf "  Removed Lines: %6d\n", removed
-        end # End of :stats task.
-
-        desc "Show line count. Prints a report of the lines of code in the source.
-       * :show_unknown - Flag for displaying any file extensions not expected."
-        task :count,[:show_unknown] do |t,args|
-          require 'find'
-
-          loc = Hash.new
-          loc["rake"] = 0
-          loc["pp"] = 0
-          loc["rb"] = 0
-          loc["erb"] = 0
-          loc["sh"] = 0
-          loc["csh"] = 0
-          loc["html"] = 0
-          loc["spec"] = 0
-          loc["other"] = 0
-
-          File.open("#{@base_dir}/Rakefile","r").each do |line|
-            if encode_line(line) !~ /^\s*$/
-              loc["rake"] = loc["rake"] + 1
-            end
-          end.close
-
-          other_ext = Array.new
-
-          Find.find(@src_dir) do |path|
-            if (
-              ( File.basename(path)[0] == ?. ) or
-              ( path =~ /src\/rsync/ ) or
-              ( path[-3..-1] =~ /\.gz|pem|pub/ ) or
-              ( path =~ /developers_guide\/rdoc/ )
-            )
-              Find.prune
-            else
-              next if FileTest.symlink?(path) or FileTest.directory?(path)
-            end
-
-            ext = File.extname(path)[1..-1]
-            ext ||= 'none'
-
-            unless loc[ext]
-              other_ext.push(ext) unless other_ext.include?(ext)
-              ext = 'other'
-            end
-
-            File.open(path,'r').each do |line|
-              if encode_line(line) !~ /^\s*$/
-                loc[ext] = loc[ext] + 1
-              end
-            end
+        end
+
+        puts 'Code Count Report:'
+        printf "  %-6s %6s\n", 'Ext', 'Count' # rubocop:disable Style/FormatStringToken
+        puts "  #{'-' * 13}"
+
+        total_loc = 0
+        loc.sort.each do |key, val|
+          printf "  %-6s %6d\n", key, val
+          total_loc += val
+        end
+
+        puts "  #{'-' * 13}"
+        printf "  %-6s %6d\n", 'Total', total_loc.to_s
+        puts
+        puts "Unknown Extension Count: #{other_ext.length}"
+
+        if args.show_unknown
+          puts 'Unknown Extensions:'
+          other_ext.sort.each do |ext|
+            puts "  #{ext}"
           end
-
-          puts "Code Count Report:"
-          printf "  %-6s %6s\n", "Ext", "Count"
-          puts "  " + ("-" * 13)
-
-          total_loc = 0
-          loc.sort.each do |key,val|
-            printf "  %-6s %6d\n", key, val
-            total_loc = total_loc + val
-          end
-
-          puts "  " + ("-" * 13)
-          printf "  %-6s %6d\n", "Total", "#{total_loc}"
-          puts
-          puts "Unknown Extension Count: #{other_ext.length}"
-
-          if args.show_unknown
-            puts "Unknown Extensions:"
-            other_ext.sort.each do |ext|
-              puts "  #{ext}"
-            end
-          end
-        end # End of :count task.
-
-      end # End of :code namespace.
+        end
+      end
     end
   end
 end

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

@@ -1,13 +1,16 @@
+# frozen_string_literal: true
+
 require 'rake/tasklib'
 
 module Simp::Rake; end
 module Simp::Rake::Build; end
+
 module Simp::Rake::Build::Constants
   def distro_build_dir(build_dir, build_distro, build_version, build_arch)
     File.join(build_dir, 'distributions', build_distro, build_version, build_arch)
   end
 
-  def init_member_vars( base_dir )
+  def init_member_vars(base_dir)
     return if @member_vars_initialized
 
     require 'facter'
@@ -16,7 +19,7 @@ module Simp::Rake::Build::Constants
     $simp6_clean_dirs = []
 
     if ENV['SIMP_BUILD_distro']
-      distro, version, arch = ENV['SIMP_BUILD_distro'].split(/,|\//)
+      distro, version, arch = ENV['SIMP_BUILD_distro'].split(%r{,|/})
     end
 
     @build_distro = distro || Facter.fact('operatingsystem').value
@@ -24,7 +27,7 @@ module Simp::Rake::Build::Constants
     @build_arch = arch || Facter.fact('architecture').value
 
     # Working around the SIMP::RPM.system_dist workaround
-    if ENV['SIMP_RPM_dist'].nil? && @build_distro =~ /CentOS|RedHat/i
+    if ENV['SIMP_RPM_dist'].nil? && @build_distro =~ %r{CentOS|RedHat}i
       @build_rpm_dist = ".el#{@build_version}"
       ENV['SIMP_RPM_dist'] = @build_rpm_dist
     end
@@ -37,7 +40,7 @@ module Simp::Rake::Build::Constants
     @spec_dir          = File.join(@src_dir, 'build')
     @spec_file         = FileList[File.join(@spec_dir, '*.spec')]
     @simp_version      = Simp::RPM.new(File.join(@src_dir, 'assets', 'simp', 'build', 'simp.spec')).full_version
-    @simp_dvd_dirs     = ["SIMP","ks","Config"]
+    @simp_dvd_dirs     = ['SIMP', 'ks', 'Config']
     @member_vars_initialized = true
 
     @distro_build_dir  = distro_build_dir(@build_dir, @build_distro, @build_version, @build_arch)