yast-rake 0.2.43 → 0.2.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 183bdc451acadf652d5ef8d5749b166770f3664b2f73139cadab86f59b35f9e7
-  data.tar.gz: 86a255dfe87bb4b38128568e04752e4a111c2840bbd880499a12f6f0447e3e71
+  metadata.gz: b131d89f00dea687fc5d44232d1cf6ce503659ca2ca810d63b17169d69eb5e00
+  data.tar.gz: 1e2d455ac8ca10a363b7bf89585f8bf0927dd06c94204d222a1384f421b4270d
 SHA512:
-  metadata.gz: 778c1d1c7e5258ce439e0e6d16ec01b0eb20cbb1ac4a7260f497a1256b189865d5d594ba4f1dbf18b9dc6accbaf2430ccb4f3510b19c7a65ae0b56ff5a06c8c0
-  data.tar.gz: 848c641d6d94d8b40a610d575b4fc0f63df0942b5fe0987663511d11761278ddb560e8e86d1a20a19b3b5529be2b012c9cc4f7d593934613e6832366e1eaaa42
+  metadata.gz: 5a83c6e94d862c23c0f04e84cdf68d48c0aa4b4f51caba4000a6f5106831097c38343b10a553fc83fd3355e37a9b719befab007656b3a1626b2364b76f8db35a
+  data.tar.gz: 13828bd3771752722aa0fe5eb0c7f8f305b6f447bf8f0310e71c5df33e4810d5f071fa2cdef39cbcdfc17a2eff2e9e4e12b2f37675aff1c6fbda0d5d4b1b9a24

data/VERSION

@@ -1 +1 @@
-0.2.43
+0.2.44

data/lib/tasks/rubocop.rake

@@ -15,12 +15,24 @@
 #
 #++
 
+# the default old version used
+OLD_RUBOCOP_VERSION = "0.41.2"
+
+def rubocop_version
+  return @rubocop_version if @rubocop_version
+
+  @rubocop_version = if File.read(".rubocop.yml").match(/rubocop-(\d+\.\d+\.\d+)/)
+    Regexp.last_match[1]
+  else
+    OLD_RUBOCOP_VERSION
+  end
+end
+
 def rubocop_bin
   return @rubocop_bin if @rubocop_bin
   return @rubocop_bin = ENV["RUBOCOP_BIN"] if ENV["RUBOCOP_BIN"]
 
-  version = File.read(".rubocop.yml").include?("rubocop-0.71.0") ? "0.71.0" : "0.41.2"
-  binary = `/usr/sbin/update-alternatives --list rubocop | grep '#{version}'`.strip
+  binary = `/usr/sbin/update-alternatives --list rubocop | grep '#{rubocop_version}'`.strip
   if !system("which #{binary}")
     raise "cannot find proper version of rubocop binary in " \
       "'/usr/sbin/update-alternatives --list rubocop'." \
@@ -32,18 +44,26 @@ end
 # run Rubocop in parallel
 # @param params [String] optional Rubocop parameters
 def run_rubocop(params = "")
-  # how it works:
-  # 1) get the list of inspected files by Rubocop
-  # 2) shuffle it randomly (better would be evenly distribute them according to
-  #    the analysis complexity but that is hard to evaluate and even simply
-  #    distributing by file size turned out to be ineffective and slower than
-  #    a simple random shuffling)
-  # 3) pass that as input for xargs
-  #    a) use -P with number of processors to run the commands in parallel
-  #    b) use -n to set the maximum number of files per process, this number
-  #       is computed to equally distribute the files across the workers
-  sh "#{rubocop_bin} -L | sort -R | xargs -P`nproc` -n$(expr `#{rubocop_bin} -L | wc -l` / " \
-    "`nproc` + 1) #{rubocop_bin} #{params}"
+  # newer Rubocop versions support the "-P" ("--parallel") option,
+  # but that is not compatible with the "-a" ("--auto-correct") option
+  if rubocop_version != OLD_RUBOCOP_VERSION && !params.to_s.match(/-a|--auto-correct/)
+    sh "#{rubocop_bin} -P #{params}"
+  else
+    # for older Rubocop or auto-correct mode manually start multiple instances in parallel
+    #
+    # how it works:
+    # 1) get the list of inspected files by Rubocop
+    # 2) shuffle it randomly (better would be evenly distribute them according to
+    #    the analysis complexity but that is hard to evaluate and even simply
+    #    distributing by file size turned out to be ineffective and slower than
+    #    a simple random shuffling)
+    # 3) pass that as input for xargs
+    #    a) use -P with number of processors to run the commands in parallel
+    #    b) use -n to set the maximum number of files per process, this number
+    #       is computed to equally distribute the files across the workers
+    sh "#{rubocop_bin} -L | sort -R | xargs -P`nproc` -n$(expr `#{rubocop_bin} -L | wc -l` / " \
+      "`nproc` + 1) #{rubocop_bin} #{params}"
+  end
 end
 
 namespace :check do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yast-rake
 version: !ruby/object:Gem::Version
-  version: 0.2.43
+  version: 0.2.44
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: packaging_rake_tasks