packaging_rake_tasks 1.4.7 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61dce2a4d63cf7d18fc08f8ad82bbff0e5216fca3c867deb41f80fddbd6c0fea
-  data.tar.gz: 10ba682006cf40fea5a7aaf0806d557fc35e906fa57e04bdc61136ec20154749
+  metadata.gz: 47be5a27f65d9a027aa8fa4beea8f8abde96ab8a6edd71e3d51b685233535c21
+  data.tar.gz: aab7e6292b15f7b192ea4662a2719cc9f405f133df9332ad31848c2a184a0da9
 SHA512:
-  metadata.gz: '007299d639cfc4f78b213df4a0ef67cb6aaf54a81878db61234a4f77943a51fbb3fc880117a451c723e1867de77c27a678641b546d9df9b90db58bad2faa795b'
-  data.tar.gz: 4df18d98c34639c0bfcb0077e3af75ece264352258220a109e8a5f53f6b1fe9d544fbf3b8eff4155694f2a5df84550175cb2d58c7b4c614cbb1ead047bf1797a
+  metadata.gz: 2a11c5d4860ee72e8b97171c6a791557601b69e0a9fa80609c1906d4e169a5088164d2a9da636fb5a2448a4d6f161c0b15dc69c453a2161549aae19c62d145d8
+  data.tar.gz: 6d6370b0738d43364a6bf41456fc1971171b646537b05032984bbfdfbb5469b1733135e059de9772b0b1f9884cdd51f37c6fa1043cc3210d4b594b3fb6a8ec50

data/VERSION

@@ -1 +1 @@
-1.4.7
+1.4.8

data/lib/packaging/git_helpers.rb

@@ -0,0 +1,109 @@
+#--
+# 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 the first .spec file in the packages/
+    # subdirectory.
+    #
+    # @return String
+    #
+    def spec_version
+      # 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
+    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

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.8
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2019-06-12 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