libyui-rake 0.1.20 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 289128538d5b119be1af09ead2c0560a71a94078588053835383e21fa5bb76c6
-  data.tar.gz: 3557d5112aad595ded8eadf1fa699e9b6fa38ae6f51e1ed8c6de9a8dafaf593e
+  metadata.gz: 628c79e773ab9286bd477d87379fc9603a0d13e94988c9e2df6bf059c084e5a0
+  data.tar.gz: 2db3b8e03f22243882944f53f9e2b1d6f628f91e633119444940cd0a9ae7becf
 SHA512:
-  metadata.gz: da624337f6a4bdb9e30b75a29e43970f9435c0854c9b4381e8945edd83f7c041e48c5bd8bb9a8f5c512ccb31f2b4e3ff55cecd7d8dd578c46bf3707f02fa90f5
-  data.tar.gz: 65636fad104c4853573ef0a2dac53f6c907396a5ff0eef46ba4c03afe2263b6d67f177aa8487ab2dbd3aff9b9ba80d21d63da2d891916b9e1da9058dfbc059b8
+  metadata.gz: 05a07328e9b67b309e800a360617e1e0d06bf3ae78939f11051bab4d4674631deeba0dfa2bf14e35ca493a71f43f617c4a064618eb5156aefb678569dcfa3a85
+  data.tar.gz: 20376aa46a7ae7b7d74ef4ef6c0ab050dc455cff06f1cbf42b9a13bd16e416e30bea014c2d1b5be6f9dacf4c4ae454527ae348ed772273137b948241794f3e5f

data/README.md

@@ -1,7 +1,7 @@
 # Libyui::Rake
 
-[![Build Status](https://travis-ci.org/libyui/libyui-rake.svg?branch=master
-)](https://travis-ci.org/libyui/libyui-rake)
+[![Workflow Status](https://github.com/libyui/libyui-rake/workflows/CI/badge.svg?branch=master)](
+https://github.com/libyui/libyui-rake/actions?query=branch%3Amaster)
 
 Rake tasks to help with uniform handling of libyui related projects. It provides setup for
 [packaging tasks](http://github.com/openSUSE/packaging_tasks) and add some additional tasks.
@@ -10,7 +10,7 @@ Rake tasks to help with uniform handling of libyui related projects. It provides
 
 Create a `Rakefile` with this content:
 
-```
+```ruby
   require "libyui/rake"
 ```
 
@@ -32,7 +32,7 @@ configuration choosing from a set of [targets
 definitions](https://github.com/libyui/libyui-rake/blob/master/data/targets.yml).
 For example, if you want to submit to SLE12, you can do:
 
-```
+```ruby
   Libyui::Tasks.submit_to(:sle12)
 ```
 This method can receive, as a second parameter, the path to your own

data/VERSION

@@ -1 +1 @@
-0.1.20
+0.1.24

data/data/targets.yml

@@ -59,11 +59,26 @@
   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"
+:sle15sp5:
+  obs_api: "https://api.suse.de/"
+  obs_project: "Devel:YaST:SLE-15-SP5"
+  obs_sr_project: "SUSE:SLE-15-SP5:Update"
+  obs_target: "SUSE_SLE-15-SP5_GA"
 :sle_latest:
   obs_api: "https://api.suse.de/"
   obs_project: "Devel:YaST:Head"
-  obs_sr_project: "SUSE:SLE-15-SP3:GA"
-  obs_target: "SUSE_SLE-15-SP3_GA"
+  obs_sr_project: "SUSE:SLE-15-SP5:GA"
+  obs_target: "SUSE_SLE-15-SP5_GA"
 :factory:
   obs_project: "devel:libraries:libyui"
   obs_sr_project: "openSUSE:Factory"

data/lib/libyui/rake.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Copyright (C) 2015 SUSE LLC
 #   This library is free software; you can redistribute it and/or modify
@@ -23,7 +25,7 @@ Libyui::Tasks.configuration do |conf|
   include Libyui::Tasks::Helpers
 
   # read package name from spec file name because CWD can have a -branch suffix
-  main_spec = Dir.glob("package/*.spec").sort.last
+  main_spec = Dir.glob("package/*.spec").max
   conf.package_name = main_spec[/package\/(.*)\.spec$/, 1]
 
   conf.version = cmake_version
@@ -36,7 +38,7 @@ Libyui::Tasks.configuration do |conf|
 end
 
 # load libyui-rake tasks
-task_path = File.expand_path("../../tasks", __FILE__)
+task_path = File.expand_path("../tasks", __dir__)
 Dir["#{task_path}/*.rake"].each do |f|
   load f
 end

data/lib/libyui/tasks.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 #--
-# 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.
@@ -19,9 +21,9 @@ module Libyui
   # Facilities to write Libyui related rake tasks.
   module Tasks
     # Name of the CMake version file
-    VERSION_CMAKE = "VERSION.cmake".freeze
+    VERSION_CMAKE = "VERSION.cmake"
     # Targets definition
-    TARGETS_FILE = File.expand_path("../../../data/targets.yml", __FILE__)
+    TARGETS_FILE = File.expand_path("../../data/targets.yml", __dir__)
 
     # Wrapper to set up packaging tasks
     def self.configuration(&block)
@@ -32,6 +34,7 @@ module Libyui
       targets = YAML.load_file(file)
       config = targets[target]
       raise "Not configuration found for #{target}" if config.nil?
+
       Libyui::Tasks.configuration do |conf|
         config.each do |meth, val|
           conf.public_send("#{meth}=", val)
@@ -41,29 +44,110 @@ module Libyui
 
     # Some helpers to be used on tasks definition
     module Helpers
-      # Extracts the value from a CMake string
+      # 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
+
+      # Extract values from a CMake version file
+      #
+      # @see cmake_value
       #
-      # @param s   [String] '... SET( VERSION_MAJOR "3") ...'
-      # @param key [String] 'VERSION_MAJOR'
-      # @return "3"
-      def cmake_value(s, key)
+      # @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(text, key)
         e_key = Regexp.escape(key)
-        m = /SET\s*\(\s*#{e_key}\s+"([^"]*)"\s*\)/.match(s)
+        m = /SET\s*\(\s*#{e_key}\s+"([^"]*)"\s*\)/.match(text)
         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").min
       end
     end
   end

data/lib/tasks/so_version.rake

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+#--
+# 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.reject { |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

data/lib/tasks/test.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Copyright (C) 2015 SUSE LLC
 #   This library is free software; you can redistribute it and/or modify

data/lib/tasks/version.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Copyright (C) 2015 SUSE LLC
 #   This library is free software; you can redistribute it and/or modify
@@ -27,7 +29,7 @@ namespace :version do
       spec_v = spec_version(spec_filename)
       if cmake_v != spec_v
         raise "Version mismatch, #{Libyui::Tasks::VERSION_CMAKE}:#{cmake_v} "\
-          "#{spec_filename}:#{spec_v}"
+              "#{spec_filename}:#{spec_v}"
       end
     end
     puts cmake_v if verbose

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: libyui-rake
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.24
 platform: ruby
 authors:
 - YaST team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-23 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: packaging_rake_tasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -30,26 +44,12 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '99'
-- !ruby/object:Gem::Dependency
-  name: packaging_rake_tasks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.8
 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
   target repo or running the client from the git repo.
   Heavily inspired by yast-rake.
-email: yast-devel@suse.com
+email: yast-devel@lists.opensuse.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -60,13 +60,15 @@ 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
+homepage: https://github.com/libyui/libyui-rake
 licenses:
 - LGPL-2.1
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -74,15 +76,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
-summary: Rake tasks providing basic workflow for libyui development
+summary: Rake tasks that provide basic workflow for libyui development
 test_files: []