libyui-rake 0.1.17 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a16d63403d503679095db38f9e1d7e901f1d9a29e9c395a8ece98e7dee3216e5
-  data.tar.gz: 645f9bfab51c1f5c7ba7b14f405c0af52295ad0ce4a79c6795568d59ecab5b8c
+  metadata.gz: cdb114dfba2f8d8816e5f2fcfa000f95de9cf8fda7d6e57b787ea690442fd62f
+  data.tar.gz: 88bc3c1d5ddd10bde1d811aa9514d9a65d137cbb1cada7dcc52ae9bea5285c3c
 SHA512:
-  metadata.gz: dc504b96a770598cc8ff65c8a13553160a9870acbdff6d21e8c34fd9828d55da7cad3309ef457b58b6a12d4deb3326203c2550de2d0532fd31e7e77330e1c354
-  data.tar.gz: e8b4268efcf73975f32e6b1adbbc74b497be7f461b742821a752fdf82e733bbe4690d890c297377b1faf6596b81a4a788d4e80a9e29f5317042e1863ac97f9a8
+  metadata.gz: 50318f61dac4997534ed0c431ac502c2f1d9e22daf943ad14959535de68968fc9884434b3531e9a8f74f9120ad2316a9e788481bac20f855cb14fd5cf9699120
+  data.tar.gz: 0dbbee57f083abcdc2499567177c311435a7146714cefd0037d77e9694df908c5f51b1467430dcdd743346d6494f6aa11f1a2cf4c397ba727ba5d40a84572987

data/VERSION

@@ -1 +1 @@
-0.1.17
+0.1.23

data/data/targets.yml

@@ -54,11 +54,26 @@
   obs_project: "Devel:YaST:SLE-15-SP1"
   obs_sr_project: "SUSE:SLE-15-SP1:Update"
   obs_target: "SUSE_SLE-15-SP1_GA"
+:sle15sp2:
+  obs_api: "https://api.suse.de/"
+  obs_project: "Devel:YaST:SLE-15-SP2"
+  obs_sr_project: "SUSE:SLE-15-SP2:Update"
+  obs_target: "SUSE_SLE-15-SP2_GA"
+:sle15sp3:
+  obs_api: "https://api.suse.de/"
+  obs_project: "Devel:YaST:SLE-15-SP3"
+  obs_sr_project: "SUSE:SLE-15-SP3:Update"
+  obs_target: "SUSE_SLE-15-SP3_GA"
+:sle15sp4:
+  obs_api: "https://api.suse.de/"
+  obs_project: "Devel:YaST:SLE-15-SP4"
+  obs_sr_project: "SUSE:SLE-15-SP4:Update"
+  obs_target: "SUSE_SLE-15-SP4_GA"
 :sle_latest:
   obs_api: "https://api.suse.de/"
   obs_project: "Devel:YaST:Head"
-  obs_sr_project: "SUSE:SLE-15-SP2:GA"
-  obs_target: "SUSE_SLE-15-SP2_GA"
+  obs_sr_project: "SUSE:SLE-15-SP4:GA"
+  obs_target: "SUSE_SLE-15-SP4_GA"
 :factory:
   obs_project: "devel:libraries:libyui"
   obs_sr_project: "openSUSE:Factory"

data/lib/libyui/tasks.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (C) 2015 SUSE LLC
+# Copyright (C) 2015-2021 SUSE 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.
@@ -41,35 +41,110 @@ module Libyui
 
     # Some helpers to be used on tasks definition
     module Helpers
-      # Read the version from spec file
-      # @return [String] like "1.2.3"
-      def spec_version(spec_filename)
-        File.read(spec_filename)[/^Version:\s*(\S+)/, 1]
+      # Returns the CMake version from the version file.
+      # VERSION_TWEAK is optional.
+      #
+      # @param filename [String, nil] %{VERSION_CMAKE} by default
+      # @return [String] like "1.2.3" or "1.2.3.4"
+      def cmake_version(filename = nil)
+        filename = cmake_filename(filename)
+
+        values = cmake_values(filename,
+          "VERSION_MAJOR", "VERSION_MINOR", "VERSION_PATCH", "VERSION_TWEAK")
+
+        values.compact.join(".")
+      end
+
+      # Returns the CMake so version from the version file.
+      #
+      # @param filename [String, nil] %{VERSION_CMAKE} by default
+      # @return [String] like "4.0.0"
+      def cmake_so_version(filename = nil)
+        filename = cmake_filename(filename)
+
+        values = cmake_values(filename, "SONAME_MAJOR", "SONAME_MINOR", "SONAME_PATCH")
+
+        values.compact.join(".")
+      end
+
+      # Bumps the so version in the CMake version file
+      #
+      # @param filename [string, nil] %{VERSION_CMAKE} by default
+      def bump_cmake_so_version(filename = nil)
+        filename = cmake_filename(filename)
+
+        so_version = cmake_so_version(filename).split(".").first.to_i.next
+
+        content = File.read(filename)
+        content.sub!(/(^SET.*SONAME_MAJOR.*)"([^"\n])*"/, "\\1\"#{so_version}\"")
+        content.sub!(/(^SET.*SONAME_MINOR.*)"([^"\n])*"/, "\\1\"0\"")
+        content.sub!(/(^SET.*SONAME_PATCH.*)"([^"\n])*"/, "\\1\"0\"")
+
+        File.write(filename, content)
       end
 
-      # Extracts the value from a CMake string
+      # Extract values from a CMake version file
+      #
+      # @see cmake_value
       #
-      # @param s   [String] '... SET( VERSION_MAJOR "3") ...'
-      # @param key [String] 'VERSION_MAJOR'
-      # @return "3"
+      # @param filename [String]
+      # @param keys [Array<String>]
+      def cmake_values(filename, *keys)
+        content = File.read(filename)
+
+        keys.map { |k| cmake_value(content, k) }
+      end
+
+      # Extracts the value of the given key from the content of a CMake version file
+      #
+      # @param s   [String] e.g., '... SET( VERSION_MAJOR "3") ...'
+      # @param key [String] e.g., 'VERSION_MAJOR'
+      #
+      # @return [String] e.g., "3"
       def cmake_value(s, key)
         e_key = Regexp.escape(key)
         m = /SET\s*\(\s*#{e_key}\s+"([^"]*)"\s*\)/.match(s)
         m ? m[1] : nil
       end
 
-      # Returns the CMake version from the version file.
-      # VERSION_TWEAK is optional.
+      # Filename of the CMake version file
       #
-      # @param  [String] Version file (VERSION_CMAKE by default)
-      # @return [String] like "1.2.3" or "1.2.3.4"
-      # @see VERSION_CMAKE
-      def cmake_version(file = nil)
-        f = File.read(file || VERSION_CMAKE)
-        [cmake_value(f, "VERSION_MAJOR"),
-         cmake_value(f, "VERSION_MINOR"),
-         cmake_value(f, "VERSION_PATCH"),
-         cmake_value(f, "VERSION_TWEAK")].compact.join(".")
+      # @param filename [string, nil] %{VERSION_CMAKE} if no filename is given
+      # @return [String]
+      def cmake_filename(filename)
+        filename || VERSION_CMAKE
+      end
+
+      # Returns the so version from the given spec file
+      #
+      # @param filename [String, nil] if nil, it uses the shortest spec filename
+      # @return [String, nil] e.g., "12"
+      def spec_so_version(filename = nil)
+        filename = spec_filename(filename)
+
+        File.read(filename).scan(/^%define\s+so_version\s+(\d+)/).flatten.first
+      end
+
+      # Bumps the so version in the given spec file
+      #
+      # @param filename [String, nil] if nil, it uses the shortest spec filename
+      def bump_spec_so_version(filename = nil)
+        filename = spec_filename(filename)
+
+        so_version = spec_so_version(filename).to_i.next
+
+        content = File.read(filename)
+        content.gsub!(/^(%define\s+so_version\s+)\d+$/, "\\1#{so_version}")
+
+        File.write(filename, content)
+      end
+
+      # Filename of the spec file
+      #
+      # @param filename [String, nil] if nil, it uses the shortest spec filename
+      # @return [String]
+      def spec_filename(filename)
+        filename || Dir.glob("package/*.spec").sort.first
       end
     end
   end

data/lib/tasks/so_version.rake

@@ -0,0 +1,53 @@
+#--
+# Copyright (C) 2021 SUSE 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
+#++
+
+namespace :so_version do
+  include Libyui::Tasks::Helpers
+
+  desc "Check that the so version numbers are in sync"
+  task :check do
+    so_version = cmake_so_version.split(".").first
+
+    filenames = Dir.glob("package/*.spec").sort
+    filenames.reject! { |f| spec_so_version(f).nil? }
+
+    mismatches = filenames.select { |f| spec_so_version(f) != so_version }
+
+    if mismatches.any?
+      messages = ["so version mismatch:"]
+      messages << "cmake so version: #{so_version}"
+      messages += mismatches.map { |f| "#{f}: #{spec_so_version(f)}" }
+
+      raise messages.join("\n")
+    end
+
+    puts cmake_so_version if verbose
+  end
+
+  desc "Increase the so version in spec and cmake files"
+  task bump: :check do
+    bump_cmake_so_version
+
+    Dir.glob("package/*.spec").each { |f| bump_spec_so_version(f) }
+
+    puts cmake_so_version if verbose
+  end
+
+  desc "Show the so version"
+  task :show do
+    puts cmake_so_version
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libyui-rake
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.23
 platform: ruby
 authors:
 - YaST team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2021-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.8
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.8
+        version: '1.5'
 description: |
   Rake tasks that support the workflow of a libyui developer. It allows packaging
   a repo, sending it to the build service, creating a submit request to the
@@ -60,6 +60,7 @@ files:
 - data/targets.yml
 - lib/libyui/rake.rb
 - lib/libyui/tasks.rb
+- lib/tasks/so_version.rake
 - lib/tasks/test.rake
 - lib/tasks/version.rake
 homepage: https://github.com/openSUSE/libyui-rake
@@ -81,7 +82,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.6.2
 signing_key: 
 specification_version: 4
 summary: Rake tasks providing basic workflow for libyui development