packaging_rake_tasks 1.4.7 → 1.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61dce2a4d63cf7d18fc08f8ad82bbff0e5216fca3c867deb41f80fddbd6c0fea
-  data.tar.gz: 10ba682006cf40fea5a7aaf0806d557fc35e906fa57e04bdc61136ec20154749
+  metadata.gz: 21fc4c918f4cd24e55fe122412f6b066cb8fb66b1c84772e83d925af1e90f5b9
+  data.tar.gz: 122ea8f7be3eefe6fb7435f05fae84d2f7e1072293ed4fca0af08a08f44f46a3
 SHA512:
-  metadata.gz: '007299d639cfc4f78b213df4a0ef67cb6aaf54a81878db61234a4f77943a51fbb3fc880117a451c723e1867de77c27a678641b546d9df9b90db58bad2faa795b'
-  data.tar.gz: 4df18d98c34639c0bfcb0077e3af75ece264352258220a109e8a5f53f6b1fe9d544fbf3b8eff4155694f2a5df84550175cb2d58c7b4c614cbb1ead047bf1797a
+  metadata.gz: 407ca2694fdcf64bfd7be9e01f627d003ed5f7f56265f093407022cd3b7063d6fc75e6467fe304af08e5bda098958a4ab736962f4f3a69a38e154e5970a88482
+  data.tar.gz: 534d101ab268287dba9b3df19847e7130dd80d13250251baa8747238cc44539a3453c1bb469244be8c1583679c05698225986881b8cb97afe60be9ad33cf6116

data/VERSION

@@ -1 +1 @@
-1.4.7
+1.4.12

data/lib/packaging/git_helpers.rb

@@ -0,0 +1,110 @@
+#--
+# Rake helpers
+#
+# Copyright (C) 2019 SUSE Linux LLC
+#   This library is free software; you can redistribute it and/or modify
+# it only under the terms of version 2.1 of the GNU Lesser General Public
+# License as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+# details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#++
+
+module Packaging
+  #
+  # Helpers around various git commands
+  module GitHelpers
+    # Create a git tag based on the version and the current branch.
+    #
+    # The optional block can specify the version number to use.  If no block
+    # is given, this uses spec_version, i.e. the version number of the first
+    # .spec file in the package/ subdirectory.
+    #
+    # @return [Boolean] true if the tag was created, false if it already existed
+    #
+    def create_version_tag(&block)
+      name = tag_name(&block)
+      if tag_exists?(name)
+        puts "Tag #{name} already exists"
+        false
+      else
+        puts "Creating tag #{name}"
+        git("tag #{name}")
+        true
+      end
+    end
+
+    # Check if a tag exists.
+    #
+    # @return Boolean
+    #
+    def tag_exists?(name = nil)
+      name ||= tag_name
+      git("tag").include?(name)
+    end
+
+    # 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(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(specfile_name)
+          .grep(/^\s*Version:\s*/).first.sub("Version:", "").strip
+    end
+
+    # Return the name of the current git branch or "detached" if in "head
+    # detached" state.
+    #
+    # @return String
+    #
+    def branch_name
+      branch = git("branch").grep(/^\* /).first.sub(/^\* /, "")
+      return "detached" if branch =~ /HEAD detached/
+      branch
+    end
+
+    # Check if the current branch is "master".
+    #
+    # @return [Boolean]
+    #
+    def master?
+      branch_name == "master"
+    end
+
+    # Return a suitable tag name based on version and branch.
+    # For "master", this is only the version number.
+    # For branches, this is "branchname-version".
+    # If in "detached head" state, this is "detached-version".
+    #
+    # Like in create_version_tag, the optional block can specify the version
+    # number to use. If no block is given, this uses spec_version, i.e. the
+    # version number of the first .spec file in the package/ subdirectory.
+    #
+    # @return String
+    #
+    def tag_name(&block)
+      branch = branch_name
+      version = block_given? ? block.call : spec_version
+      return version if branch == "master"
+      branch + "-" + version
+    end
+
+    # Call a git subcommand and return its output as an array of strings.
+    #
+    # @return Array<String>
+    #
+    def git(subcmd)
+      `/usr/bin/git #{subcmd}`.split("\n")
+    end
+  end
+end

data/lib/tasks/build_dependencies.rake

@@ -54,7 +54,8 @@ 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"
+      cmd = "#{sudo} zypper 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.7
+  version: 1.4.12
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2020-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -35,6 +35,7 @@ files:
 - VERSION
 - lib/packaging.rb
 - lib/packaging/configuration.rb
+- lib/packaging/git_helpers.rb
 - lib/packaging/tasks.rb
 - lib/tasks/build_dependencies.rake
 - lib/tasks/check_changelog.rake
@@ -66,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