packaging_rake_tasks 1.4.6 → 1.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8180c1847defd9c47b81a576fb6acb895854a07879a6526cb8cb5d10e230d2a7
-  data.tar.gz: a09a7a77f6cb47b2c2c58d52ed6e820fc4c8b0cf25c32086efced624c3a6edeb
+  metadata.gz: d02ef0977f43dd5efd93ebe2b4ec40a61415ac8012413478a326917fcab8182e
+  data.tar.gz: d05332e52a13152900bf4300a920ce989212ff47c283b62b67b67dd9bc663337
 SHA512:
-  metadata.gz: dc475a47e7c01fb8b51d8ce630aa954f44b8ad2b330f3442101cac71cd388c897d37f0ec18ab76938f681ca5dbe0e986863b48ae01bebca331b50306f14e51f6
-  data.tar.gz: c547a1184272ac40847269b21d2f768b492c167c8e65818e51c19e5c93ac1dc039258479724ca18cec1366bc9e1dc9c9570ddb4d09319ea5618424a91d3fd44e
+  metadata.gz: e66cf2ab83c82d3f1e70af85a5ead91bb9eafcc81e8f08efa314e71a8c3f37346f6806bcd69f2de969f54b9e0b4d5d9d142c8d88450d1c221c0c0a0ebb89c01f
+  data.tar.gz: 160211ee2b33de61e5817c5162b5bbbfedb48999fd41be8d3d0117106e217dccd368eeacc993f6487ddbeae85955118fa71f705130cb85f9f2e80f4e85ac6cc7

data/VERSION

@@ -1 +1 @@
-1.4.6
+1.4.11

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/check_changelog.rake

@@ -44,7 +44,10 @@ ID_MATCHERS = [
   /bxo#(\d+)/,
   /obs#(\d+)/,
   /build#(\d+)/,
-  /osc#(\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.6
+  version: 1.4.11
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-16 00:00:00.000000000 Z
+date: 2020-06-23 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
@@ -65,8 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Rake tasks providing tasks to package project in git and integration with