packaging_rake_tasks 1.4.8 → 1.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47be5a27f65d9a027aa8fa4beea8f8abde96ab8a6edd71e3d51b685233535c21
-  data.tar.gz: aab7e6292b15f7b192ea4662a2719cc9f405f133df9332ad31848c2a184a0da9
+  metadata.gz: '059259f817d554fce29ebcb0edd1b37514644bd605322ec6b74183618330c8ae'
+  data.tar.gz: d088cc1ab6e04f6cd50023139ddedcda07c148eb0a3002009b1a166cfa7f430c
 SHA512:
-  metadata.gz: 2a11c5d4860ee72e8b97171c6a791557601b69e0a9fa80609c1906d4e169a5088164d2a9da636fb5a2448a4d6f161c0b15dc69c453a2161549aae19c62d145d8
-  data.tar.gz: 6d6370b0738d43364a6bf41456fc1971171b646537b05032984bbfdfbb5469b1733135e059de9772b0b1f9884cdd51f37c6fa1043cc3210d4b594b3fb6a8ec50
+  metadata.gz: 966f38193b4f25996858052867e0e24b5b75542f32d25e648fec74b7b82053683f0f004c18bfb53e3a47e835b80ccc62f53a5f3322d6a8ab9d9a9018532d967a
+  data.tar.gz: 3a890f6ee3d46236e7354ed0f483e9a6315cd0de3e03b66e1f27c9ce53861d5ff4a6fe36570eb73580ecb035bbd586fa5cc50cc76cbb2539c112b39db12f30ed

data/VERSION

@@ -1 +1 @@
-1.4.8
+1.4.13

data/lib/packaging/git_helpers.rb

@@ -49,15 +49,16 @@ module Packaging
       git("tag").include?(name)
     end
 
-    # Read the package version from the first .spec file in the packages/
-    # subdirectory.
+    # Read the package version from specfile_name. If specfile_name is 'nil',
+    # use the first .spec file in the packages/ subdirectory.
     #
     # @return String
     #
-    def spec_version
+    def spec_version(specfile_name = nil)
+      specfile_name ||= Dir.glob("#{Packaging::Configuration.instance.package_dir}/*.spec").first 
       # use the first *.spec file found, assume all spec files
       # contain the same version
-      File.readlines(Dir.glob("package/*.spec").first)
+      File.readlines(specfile_name)
           .grep(/^\s*Version:\s*/).first.sub("Version:", "").strip
     end
 

data/lib/tasks/build_dependencies.rake

@@ -54,7 +54,9 @@ namespace :build_dependencies do
     if escaped_list.empty?
       puts "Nothing to install, *.spec file not found or no build dependencies defined"
     else
-      cmd = "sudo zypper install #{escaped_list}"
+      sudo = Process.euid.zero? ? "" : "sudo"
+      interactive = $stdin.tty? ? "" : "--non-interactive"
+      cmd = "#{sudo} zypper #{interactive} install #{escaped_list}"
       sh(cmd)
     end
   end

data/lib/tasks/check_changelog.rake

@@ -46,6 +46,8 @@ ID_MATCHERS = [
   /build#(\d+)/,
   /osc#(\d+)/,
   /jsc#([[:alpha:]]+\-\d+)/,
+  /lf#(\d+)/,
+  /(?:gh|github)#([a-z\d](?:[a-z\d]|-(?=[a-z\d])){0,38}\/[\w.-]+#\d+)/i
 ]
 
 namespace "check" do

data/lib/tasks/check_license.rake

@@ -113,9 +113,9 @@ def license_report
   if ! report[:missing].empty?
     raise "\nMissing license:\n#{report[:missing].join("\n")}"
   end
-  puts "\nSkipped files:\n#{report[:skipped].join("\n")}" if verbose
-  puts "\nCopyright found in these files:\n#{report[:seen].join("\n")}" if verbose
-  puts "\nCopyright detected as not needed in these files:\n#{report[:unneeded].join("\n")}" if verbose
+  puts "\nSkipped files:\n#{report[:skipped].join("\n")}" if verbose == true
+  puts "\nCopyright found in these files:\n#{report[:seen].join("\n")}" if verbose == true
+  puts "\nCopyright detected as not needed in these files:\n#{report[:unneeded].join("\n")}" if verbose == true
   puts "\nAll files have proper license reference." if verbose
 end
 

data/lib/tasks/osc.rake

@@ -52,7 +52,8 @@ namespace :osc do
   end
 
   def checkout
-    sh "osc -A '#{obs_api}' --traceback --verbose checkout '#{obs_project}' #{package_name}"
+    osc_verbose = (verbose == true) ? "--verbose" : ""
+    sh "osc -A '#{obs_api}' --traceback #{osc_verbose} checkout '#{obs_project}' #{package_name}"
   end
 
   def osc_checkout_dir

data/lib/tasks/tarball.rake

@@ -36,8 +36,10 @@ def remove_old_packages
   # remove the old tarball - all versions
   config = Packaging::Configuration.instance
   package_glob = File.join(Dir.pwd,config.package_dir,"#{config.package_name}-*.tar.bz2")
-  Dir[package_glob].each do |d|
-    rm d
+  verbose(verbose == true) do
+    Dir[package_glob].each do |d|
+      rm d
+    end
   end
 end
 
@@ -88,10 +90,17 @@ task :tarball do
   config = Packaging::Configuration.instance
   target = File.join(config.package_dir, package_file_name)
   begin
-    Rake::Task[target].invoke
-    build_tarball
+    puts "* Making tarball #{package_file_path} ..." if verbose
+    # collapse the middle state to false to silence FileUtils
+    verbose(verbose == true) do
+      Rake::Task[target].invoke
+      build_tarball
+    end
+    puts "* ...Done" if verbose
   ensure
-    rm_rf target
+    verbose(verbose == true) do
+      rm_rf target
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging_rake_tasks
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.4.13
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2020-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Rake tasks providing tasks to package project in git and integration with