yast-rake 0.2.41 → 0.2.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ea95f9f06d6f3ab9b3a4e5078bf6ac60a87379540571f3c5b99bdea42dfb83c
-  data.tar.gz: 2e15ce0eb612f90be1ae9f65906283ddfaf0d3f6159fe816954a4ceb5a22c4cc
+  metadata.gz: 44bab584e30b75b55a4b7cbfe7744e98c3b29c0fb0fbc259bb3663aac70a1b5d
+  data.tar.gz: fb8b758faff86d93e53658f9b9dcb9a247071fd821882e1992a7d31bf2d3c12b
 SHA512:
-  metadata.gz: 9cb29be7fb662e4c53e693efe4c907183210b9b1fb6f7abbb941a791001b64e0c4c7a1aab312d83846ae4aac73755d64957136a36de9e4861ec4cd5fb43184b5
-  data.tar.gz: ac4dbcc62bcb8a0497205a24f5aac12d6d30137f1832769576e3ac8df5654db9fb3aaa179ab3348b6f6be6ebd427e9264d65a1fb30c99606a1e12eff54efa87b
+  metadata.gz: a855254c47f0071b0b29754dff4ec0415f426f72f48532aab8a7bce4e2fa30aabf5aa006ccb5795ce5682a5c343c81c3dc7cc0281b26412e1243996bc229a40e
+  data.tar.gz: d4ff9bb5d5307137f1dccb83fb110216a7f2c75bcd36ea0d6e62949f5aa6f1190e3491ab8972a871580e015016b0629e3eea08c26cc596dc50040b2fe6f46629

data/VERSION

@@ -1 +1 @@
-0.2.41
+0.2.45

data/lib/tasks/container_runner.rb

@@ -28,8 +28,7 @@ class ContainerRunner
   # @param client [String,nil] the client name, nil or empty string = find
   #   the client automatically
   def run(client)
-    image = find_image
-    container = GithubActions::Container.new(image)
+    container = find_container
     container.pull
     container.start
     container.copy_current_dir
@@ -44,16 +43,16 @@ private
 
   # find the Docker image to use in the container
   # @return [String] the image name
-  def find_image
+  def find_container
     # explicitly requested image
     image = ENV["DOCKER_IMAGE"]
-    return image if image && !image.empty?
+    return GithubActions::Container.new(image) if image && !image.empty?
 
     # scan the Docker images used in the GitHub Actions
-    images = workflow_images
-    return images.first if images.size == 1
+    containers = workflow_containers
+    return containers.first if containers.size == 1
 
-    if images.empty?
+    if containers.empty?
       error("No Docker image was found in the GitHub Actions")
       puts "Use DOCKER_IMAGE=<name> option for specifying the image name"
       abort
@@ -61,20 +60,36 @@ private
 
     # multiple images found
     error("Found multiple Docker images in the GitHub Actions:")
-    error(images.inspect)
+    error(containers.map { |c| [c.image, c.options] })
     puts "Use DOCKER_IMAGE=<name> option for specifying the image name"
+    puts "and DOCKER_OPTIONS=<options> option for specifying the extra Docker"
+    puts "command line parameters."
     abort
   end
 
   # extract the Docker images from the GitHub Actions,
   # the duplicates are removed
-  # @return [Array<String>] image names
-  def workflow_images
-    GithubActions::Workflow.read.each_with_object([]) do |workflow, images|
+  # @return [Array<GithubActions::Container>] image names
+  def workflow_containers
+    ret = GithubActions::Workflow.read.each_with_object([]) do |workflow, containers|
       workflow.jobs.each do |job|
-        container = job.container
-        images << container if container && !images.include?(container)
+        container_data = job.container
+
+        if container_data.is_a?(String)
+          containers << GithubActions::Container.new(container_data)
+        elsif container_data.is_a?(Hash)
+          # to_s converts missing options (nil) to empty options ("")
+          # to treat these as equal in comparison
+          containers << GithubActions::Container.new(
+            container_data["image"],
+            container_data["options"].to_s
+          )
+        else
+          abort "Unsupported container definition: #{container_data.inspect}"
+        end
       end
     end
+
+    ret.uniq { |c| [c.image, c.options] }
   end
 end

data/lib/tasks/github_actions/github_actions/container.rb

@@ -26,7 +26,7 @@ module GithubActions
   class Container
     include Colorizer
 
-    attr_reader :image, :container
+    attr_reader :image, :options, :container
 
     # the default timeout in seconds, maximum time for the running container,
     # after the time runs out the container is automatically stopped and removed
@@ -43,8 +43,10 @@ module GithubActions
 
     # constructor
     # @param image [String] name of the Docker image to use
-    def initialize(image)
+    # @param options [String, nil] extra docker options
+    def initialize(image, options = nil)
       @image = image
+      @options = options
     end
 
     # pull the Docker image, ensure that the latest version is used
@@ -73,7 +75,7 @@ module GithubActions
       end
 
       cmd = "docker create #{env_options(ENV_VARIABLES)} --rm --entrypoint " \
-        "#{run} #{image.shellescape} #{args}"
+        "#{run} #{options} #{ENV["DOCKER_OPTIONS"]} #{image.shellescape} #{args}"
 
       # contains the container ID
       @container = `#{cmd}`.chomp

data/lib/tasks/github_actions/github_actions/job.rb

@@ -22,7 +22,7 @@ module GithubActions
   # Github Actions job
   # @see https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
   class Job
-    attr_reader :name, :steps, :runs_on, :container, :workflow
+    attr_reader :name, :steps, :runs_on, :container, :workflow, :matrix
 
     # @param name [String] name of the job
     # @param data [Hash] data from the workflow YAML file
@@ -32,6 +32,7 @@ module GithubActions
       @runs_on = data["runs-on"]
       @container = data["container"]
       @workflow = workflow
+      @matrix = data.fetch("strategy", {})["matrix"]
 
       @steps = data["steps"].map do |step|
         Step.new(self, step)

data/lib/tasks/github_actions/github_actions/job_runner.rb

@@ -58,12 +58,45 @@ module GithubActions
 
     # pull the Docker image and start the container
     def start_container
-      # prefer the custom image if requested
-      @container = Container.new(image || job.container)
+      @container = find_container
       container.pull
       container.start
     end
 
+    # Get the container configuration
+    # @return [Container] container which should run the job
+    def find_container
+      # prefer the custom image if requested
+      image_name = if image
+        image
+      elsif job.container.is_a?(String)
+        job.container
+      elsif job.container.is_a?(Hash)
+        options = job.container["options"]
+        job.container["image"]
+      else
+        abort "Unsupported container definition: #{job.container.inspect}"
+      end
+
+      Container.new(expand_name(image_name), options.to_s)
+    end
+
+    # replace the ${{ matrix.<value> }} placeholders in the image name
+    #
+    # @param image_name [String] name of the Docker image
+    # @return [String] name with replaced values
+    def expand_name(image_name)
+      image_name.gsub(/\$\{\{\s*matrix\.[^}]*\}\}/) do |subst|
+        name = /\$\{\{\s*matrix\.([^}]*)\}\}/.match(subst)[1].strip
+        value = job.matrix ? job.matrix[name] : subst
+
+        # if the value is an Array use the first value by default
+        replacement = value.is_a?(Array) ? value.first : value.to_s
+        puts "Using ${{matrix.#{name}}} value: #{replacement.inspect}"
+        replacement
+      end
+    end
+
     # run a job step
     # @param step [GithubActions::Step] the step to run
     # @return [Boolean] `true` if the step succeeded, `false` otherwise

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

data/lib/tasks/server.rake

@@ -18,12 +18,16 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #++
 
-require_relative "../yast/tarball_server"
-
 # Rake task for running a source code web server,
 # designed for the `yupdate` script.
 desc "Start an HTTP server providing dynamically generated source code tarball"
 task :server, [:port] do |_task, args|
+  begin
+    require_relative "../yast/tarball_server"
+  rescue LoadError
+    abort "Webrick server is not installed, please install the webrick Ruby gem"
+  end
+
   server = Yast::TarballServer.new(args[:port])
 
   puts "Starting tarball webserver:"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yast-rake
 version: !ruby/object:Gem::Version
-  version: 0.2.41
+  version: 0.2.45
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2022-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: packaging_rake_tasks