yast-rake 0.2.33 → 0.2.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aaa008190c1fafe2ba6626b4122791f3f8a1836d3cea7a0a062b3fcd28fea0a9
-  data.tar.gz: 59bfc610ce26b37f11d40d0e525342d1a78c27680b11a4cf0450d44aa5e1a3a7
+  metadata.gz: cf7eceae62dd270be7aa3d585c849f167de79e3fc0d2c19227115a9a31369c2c
+  data.tar.gz: 8d1a2b6238bb073661dcc3094fff41b29fb48d1f44725b897e7dc432bb8eb425
 SHA512:
-  metadata.gz: 9acd95cd06cc8e22f902b03d7f1fef22a563a87d3272aa2b330ab825887bb6e89b69245bbda0f72e387b3fbc062231cf9923defeb884ab4574b10179f7c4f920
-  data.tar.gz: 9bae5c07747905387532cb44bb08c214af492f59358d65b4cbcdc3d9271450dabb9ac3dbbbcec5b7f45c166f63a1199bda141d5fac9efdfa86dc2703d65cc675
+  metadata.gz: dcde1b6fcd4e201951b0394478e01f0025ec6b0cca159da600bfe2076ef04c5b4df4da4574b0a49724966269d5473f32428e8267a87b88fa83d374a44755df00
+  data.tar.gz: e7711375a60035a0e7505f52c1481943d8208102a9b7c1164610beeef91c4c64db5137c55ed12904666f8fe747a3df94cc996566ef3f0aa305351bb016366799

data/VERSION

@@ -1 +1 @@
-0.2.33
+0.2.34

data/lib/tasks/install.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Yast rake
 #
@@ -76,13 +78,13 @@ task :install do
   config.install_locations.each_pair do |glob, install_to|
     FileUtils.mkdir_p(install_to, verbose: true) unless File.directory?(install_to)
     Dir[glob].each do |source|
-      begin
-        # do not use FileUtils.cp_r as it have different behavior if target
-        # exists and we copy a symlink
-        sh "cp -r '#{source}' '#{install_to}'"
-      rescue => e
-        raise "Cannot install file #{source} to #{install_to}: #{e.message}"
-      end
+
+      # do not use FileUtils.cp_r as it have different behavior if target
+      # exists and we copy a symlink
+      sh "cp -r '#{source}' '#{install_to}'"
+    rescue StandardError => e
+      raise "Cannot install file #{source} to #{install_to}: #{e.message}"
+
     end
   end
 end

data/lib/tasks/pot.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Yast rake
 #
@@ -27,16 +29,16 @@ end
 namespace :check do
   # print failed lines and a hint to STDERR
   def report_pot_errors(lines)
-    $stderr.puts "Failed lines:"
-    $stderr.puts "-" * 30
-    $stderr.puts lines
-    $stderr.puts "-" * 30
+    warn "Failed lines:"
+    warn "-" * 30
+    warn lines
+    warn "-" * 30
     $stderr.puts
-    $stderr.puts "Note: \#{foo} substitution in translatable strings does" \
+    warn "Note: \#{foo} substitution in translatable strings does" \
       " not work properly, use"
-    $stderr.puts "  _(\"foo %{bar} baz\") % { :bar => bar }"
-    $stderr.puts "or"
-    $stderr.puts "  _(\"foo %s baz\") % bar"
+    warn "  _(\"foo %{bar} baz\") % { :bar => bar }"
+    warn "or"
+    warn "  _(\"foo %s baz\") % bar"
     $stderr.puts
   end
 

data/lib/tasks/rubocop.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Yast rake
 #
@@ -13,6 +15,20 @@
 #
 #++
 
+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
+  if !system("which #{binary}")
+    raise "cannot find proper version of rubocop binary in " \
+      "'/usr/sbin/update-alternatives --list rubocop'." \
+      "If rubocop is installed via gem, define its binary name via env variable RUBOCOP_BIN."
+  end
+  @rubocop_bin = binary
+end
+
 # run Rubocop in parallel
 # @param params [String] optional Rubocop parameters
 def run_rubocop(params = "")
@@ -26,8 +42,8 @@ def run_rubocop(params = "")
   #    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 -L | sort -R | xargs -P`nproc` -n$(expr `rubocop -L | wc -l` / " \
-    "`nproc` + 1) rubocop #{params}"
+  sh "#{rubocop_bin} -L | sort -R | xargs -P`nproc` -n$(expr `#{rubocop_bin} -L | wc -l` / " \
+    "`nproc` + 1) #{rubocop_bin} #{params}"
 end
 
 namespace :check do

data/lib/tasks/run.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Yast rake
 #
@@ -32,8 +34,9 @@ task :run, :client do |_t, args|
     clients = Dir["**/src/clients/*.rb"]
     client = clients.reduce do |min, n|
       next n if min.nil?
+
       # use client with shortest name by default
-      min.size > n.size ? n : min
+      (min.size > n.size) ? n : min
     end
   end
 

data/lib/tasks/spellcheck.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Yast rake
 #

data/lib/tasks/spellcheck_task.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Yast rake
 #
@@ -33,8 +35,8 @@ require "rake/tasklib"
 module Yast
   # Defines a spellcheck rake task
   class SpellcheckTask < Rake::TaskLib
-    GLOBAL_SPELL_CONFIG_FILE = File.expand_path("../spell.yml", __FILE__)
-    CUSTOM_SPELL_CONFIG_FILE = ".spell.yml".freeze
+    GLOBAL_SPELL_CONFIG_FILE = File.expand_path("spell.yml", __dir__)
+    CUSTOM_SPELL_CONFIG_FILE = ".spell.yml"
 
     # define the Rake task in the constructor
     def initialize
@@ -65,11 +67,12 @@ module Yast
     # @return [Aspell] the speller object
     def speller
       return @speller if @speller
+
       # raspell is an optional dependency, handle the missing case nicely
       begin
         require "raspell"
       rescue LoadError
-        $stderr.puts "ERROR: Ruby gem \"raspell\" is not installed."
+        warn "ERROR: Ruby gem \"raspell\" is not installed."
         exit 1
       end
 
@@ -105,9 +108,9 @@ module Yast
       duplicates = dict1 & dict2
       return if duplicates.empty?
 
-      $stderr.puts "Warning: Found dictionary duplicates in the local dictionary " \
+      warn "Warning: Found dictionary duplicates in the local dictionary " \
         "(#{CUSTOM_SPELL_CONFIG_FILE}):\n"
-      duplicates.each { |duplicate| $stderr.puts "  #{duplicate}" }
+      duplicates.each { |duplicate| warn "  #{duplicate}" }
       $stderr.puts
     end
 
@@ -161,6 +164,7 @@ module Yast
     def misspelled_on_line(text)
       switch_block_tag if block_line?(text)
       return [] if inside_block
+
       speller.list_misspelled([text]) - config["dictionary"]
     end
 
@@ -179,7 +183,7 @@ module Yast
       if files_to_check.all? { |file| check_file(file) }
         puts "Spelling OK."
       else
-        $stderr.puts "Spellcheck failed! (Fix it or add the words to " \
+        warn "Spellcheck failed! (Fix it or add the words to " \
           "'#{CUSTOM_SPELL_CONFIG_FILE}' file if it is OK.)"
         exit 1
       end

data/lib/tasks/test_unit.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Yast rake
 #
@@ -36,6 +38,8 @@ def run_parallel_tests(files)
     Coveralls::RakeTask.new
     Rake::Task["coveralls:push"].invoke
   end
+
+  nil
 end
 
 def run_sequential_tests(files)
@@ -56,7 +60,7 @@ namespace :test do
       run_parallel_tests(files)
     else
       if parallel_tests_wanted?
-        $stderr.puts "WARNING: parallel tests enabled, but 'parallel_rspec' is" \
+        warn "WARNING: parallel tests enabled, but 'parallel_rspec' is" \
         " not installed, falling back to the standard 'rspec' runner."
       end
       run_sequential_tests(files)

data/lib/tasks/version.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Yast rake
 #

data/lib/yast/rake.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Yast rake
 #
@@ -36,7 +38,7 @@ Yast::Tasks.configuration do |conf|
 end
 
 # load own tasks
-task_path = File.expand_path("../../tasks", __FILE__)
+task_path = File.expand_path("../tasks", __dir__)
 Dir["#{task_path}/*.rake"].each do |f|
   load f
 end

data/lib/yast/tasks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Yast rake
 #
@@ -23,7 +25,7 @@ module Yast
   # Yast::Task module contains helper methods
   module Tasks
     # Targets definition
-    TARGETS_FILE = File.expand_path("../../../data/targets.yml", __FILE__)
+    TARGETS_FILE = File.expand_path("../../data/targets.yml", __dir__)
 
     def self.configuration(&block)
       ::Packaging.configuration(&block)
@@ -34,7 +36,7 @@ module Yast
       # use the first *.spec file found, assume all spec files
       # contain the same version
       File.readlines(Dir.glob("package/*.spec").first)
-          .grep(/^\s*Version:\s*/).first.sub("Version:", "").strip
+        .grep(/^\s*Version:\s*/).first.sub("Version:", "").strip
     end
 
     def self.submit_to(target, file = TARGETS_FILE)
@@ -43,6 +45,7 @@ module Yast
       if config.nil?
         raise "No configuration found for #{target}. Known values: #{targets.keys.join(", ")}"
       end
+
       Yast::Tasks.configuration do |conf|
         config.each do |meth, val|
           conf.public_send("#{meth}=", val)

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: yast-rake
 version: !ruby/object:Gem::Version
-  version: 0.2.33
+  version: 0.2.34
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2019-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: packaging_rake_tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
-  name: packaging_rake_tasks
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '0'
 description: |
   Rake tasks that support work-flow of Yast developer. It allows packaging repo,
   send it to build service, create submit request to target repo or run client
@@ -80,7 +80,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Rake tasks providing basic work-flow for Yast development