package_name in config

olegantonyan · olegantonyan · commit d44f92380be6 · 2025-04-02T16:29:50.000+02:00
diff --git a/.omnipackage/config.yml b/.omnipackage/config.yml
@@ -4,15 +4,21 @@ extract_version:
     file: 'lib/omnipackage_agent/version.rb'
     regex: "VERSION = '(.+)'"
 
+common: &common
+  package_name: 'omnipackage-agent'
+  maintainer: 'Oleg Antonyan <oleg@omnipackage.org>'
+  homepage: https://omnipackage.org/
+  description: OmniPackage agent for both standalone and client-server modes
+
 rpm: &rpm
-  installable_package_name: 'omnipackage-agent'
+  <<: *common
   build_dependencies: []
   runtime_dependencies: ['ruby', 'tar', 'xz', '(docker or podman)']
   rpm:
     spec_template: '.omnipackage/specfile.spec.liquid'
 
 deb: &deb
-  installable_package_name: 'omnipackage-agent'
+  <<: *common
   build_dependencies: []
   runtime_dependencies: ['ruby', 'tar', 'xz-utils', 'docker | podman']
   deb:
diff --git a/.omnipackage/deb/changelog.liquid b/.omnipackage/deb/changelog.liquid
@@ -1,5 +1,5 @@
-omnipackage-agent ({{ version }}-0) stable; urgency=low
+{{ package_name }} ({{ version }}-0) stable; urgency=low
 
   * Release {{ version }}
 
- -- Oleg Antonyan <oleg@omnipackage.org>  {{ current_time_rfc2822 }}
+ -- {{ maintainer }}  {{ current_time_rfc2822 }}
diff --git a/.omnipackage/deb/control.liquid b/.omnipackage/deb/control.liquid
@@ -1,12 +1,12 @@
-Source: omnipackage-agent
+Source: {{ package_name }}
 Section: devel
 Priority: optional
-Maintainer: Oleg Antonyan <oleg@omnipackage.org>
+Maintainer: {{ maintainer }}
 Build-Depends: debhelper (>= 8.0.0), {{ build_dependencies | join: ', ' }}
 Standards-Version: 3.9.4
-Homepage: https://omnipackage.org
+Homepage: {{ homepage }}
 
-Package: omnipackage-agent
+Package: {{ package_name }}
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, {{ runtime_dependencies | join: ', ' }}
-Description: OmniPackage agent for both standalone and client-server modes
+Description: {{ description }}
diff --git a/.omnipackage/deb/dsc.dsc.liquid b/.omnipackage/deb/dsc.dsc.liquid
diff --git a/.omnipackage/deb/rules.liquid b/.omnipackage/deb/rules.liquid
@@ -3,7 +3,7 @@
 # Be carefull, this is a Makefile, so the indents are tabs and not spaces!
 # -*- makefile -*-
 
-export DESTROOT=$(CURDIR)/debian/omnipackage-agent
+export DESTROOT=$(CURDIR)/debian/{{ package_name }}
 # export DH_VERBOSE=1
 
 %:
diff --git a/.omnipackage/specfile.spec.liquid b/.omnipackage/specfile.spec.liquid
@@ -1,7 +1,7 @@
-Name:       omnipackage-agent
+Name:       {{ package_name }}
 Version:    {{ version }}
 Release:    1%{?dist}
-Summary:    OmniPackage agent for both standalone and client-server modes
+Summary:    {{ description }}
 License:    MIT
 URL:        https://omnipackage.org/
 Source0:    {{ source_folder_name }}.tar.gz
@@ -12,7 +12,7 @@ Requires: {{ runtime_dependencies | join: ', ' }}
 %define _build_id_links none
 
 %description
-OmniPackage agent for both standalone and client-server modes
+{{ descroption }}
 
 
 %prep
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,4 +1,4 @@
-require:
+plugins:
 - rubocop-rake
 - rubocop-minitest
 
diff --git a/lib/omnipackage_agent/build/base_package.rb b/lib/omnipackage_agent/build/base_package.rb
@@ -28,6 +28,10 @@ def build_deps
       def artefacts
       end
 
+      def name
+        build_conf.fetch(:package_name)
+      end
+
       def before_build_script(relative_to = source_path)
         bbs = build_conf[:before_build_script]
         return unless bbs
diff --git a/lib/omnipackage_agent/build/deb/debian_folder.rb b/lib/omnipackage_agent/build/deb/debian_folder.rb
@@ -17,18 +17,6 @@ def initialize(debian_folder_path)
           @debian_folder_path = debian_folder_path
         end
 
-        def name
-          file = if ::File.exist?(mkpath_rel("control#{template_ext}"))
-                   ::File.read(mkpath_rel("control#{template_ext}"))
-                 elsif ::File.exist?(mkpath_rel('control'))
-                   ::File.read(mkpath_rel('control'))
-                 else
-                   raise "no control file in #{debian_folder_path}"
-                 end
-
-          /[Ss]ource:(.+)/.match(file)[1].strip
-        end
-
         def render(params_hash) # rubocop: disable Metrics/AbcSize
           ::Dir.foreach(debian_folder_path).each_with_object({}) do |fname, result_hash|
             next if ['.', '..'].include?(fname)
diff --git a/lib/omnipackage_agent/build/deb/package.rb b/lib/omnipackage_agent/build/deb/package.rb
@@ -20,7 +20,7 @@ def artefacts
         def setup # rubocop: disable Metrics/MethodLength, Metrics/AbcSize
           debian_folder_template_path = build_conf.fetch(:deb).fetch(:debian_templates)
           debian_folder = ::OmnipackageAgent::Build::Deb::DebianFolder.new(::OmnipackageAgent::Utils::Path.mkpath(source_path, debian_folder_template_path))
-          build_folder_name = "#{debian_folder.name}-#{distro.name}"
+          build_folder_name = "#{name}-#{distro.name}"
 
           build_path = ::OmnipackageAgent::Utils::Path.mkpath(build_dir, build_folder_name, 'build')
           @output_path = ::OmnipackageAgent::Utils::Path.mkpath(build_dir, build_folder_name, 'output')
diff --git a/lib/omnipackage_agent/build/logfile.rb b/lib/omnipackage_agent/build/logfile.rb
@@ -8,7 +8,7 @@ class Logfile
       attr_reader :file, :path
 
       def initialize(path)
-        ::FileUtils.rm(path) if ::File.exist?(path)
+        ::FileUtils.rm_f(path)
         @path = path
         @file = ::File.open(path, 'a+')
         at_exit { close }
diff --git a/lib/omnipackage_agent/build/rpm/package.rb b/lib/omnipackage_agent/build/rpm/package.rb
@@ -21,12 +21,12 @@ def setup # rubocop: disable Metrics/MethodLength, Metrics/AbcSize
           specfile_path_template_path = build_conf.fetch(:rpm).fetch(:spec_template)
 
           specfile = ::OmnipackageAgent::Build::Rpm::Specfile.new(::OmnipackageAgent::Utils::Path.mkpath(source_path, specfile_path_template_path))
-          rpmbuild_folder_name = "#{specfile.name}-#{distro.name}"
+          rpmbuild_folder_name = "#{name}-#{distro.name}"
           rpmbuild_path = ::OmnipackageAgent::Utils::Path.mkpath(build_dir, rpmbuild_folder_name)
           ::FileUtils.mkdir_p(rpmbuild_path)
           @output_path = rpmbuild_path
 
-          source_folder_name = "#{specfile.name}-#{version}"
+          source_folder_name = "#{name}-#{version}"
           specfile_name = "#{source_folder_name}-#{distro.name}.spec"
 
           template_params = build_conf.merge(job_variables).merge(source_folder_name: source_folder_name)
diff --git a/lib/omnipackage_agent/build/rpm/specfile.rb b/lib/omnipackage_agent/build/rpm/specfile.rb
@@ -6,9 +6,6 @@ module OmnipackageAgent
   class Build
     module Rpm
       class Specfile < ::OmnipackageAgent::Utils::Template
-        def name
-          /[Nn]ame:(.+)/.match(template)[1].strip
-        end
       end
     end
   end
diff --git a/test/sample_project/.omnipackage/config.yml b/test/sample_project/.omnipackage/config.yml
@@ -5,13 +5,13 @@ extract_version:
     regex: 'VERSION "(.+)"'
 
 rpm: &rpm
-  installable_package_name: 'sample_project'
+  package_name: 'sample_project'
   build_dependencies: ['gcc', 'make']
   rpm:
     spec_template: '.omnipackage/sample_project.spec.liquid'
 
 deb: &deb
-  installable_package_name: 'sample-project'
+  package_name: 'sample-project'
   build_dependencies: ['build-essential']
   deb:
     debian_templates: '.omnipackage/deb'
@@ -41,6 +41,9 @@ builds:
 - distro: 'fedora_40'
   <<: *rpm
 
+- distro: 'fedora_41'
+  <<: *rpm
+
 - distro: 'fedora_rawhide'
   <<: *rpm
 
@@ -65,12 +68,6 @@ builds:
 - distro: 'ubuntu_22.04'
   <<: *deb
 
-- distro: 'ubuntu_23.10'
-  <<: *deb
-
-- distro: 'ubuntu_23.04'
-  <<: *deb
-
 - distro: 'ubuntu_24.04'
   <<: *deb
 
diff --git a/test/sample_project/.omnipackage/deb/changelog.liquid b/test/sample_project/.omnipackage/deb/changelog.liquid
@@ -1,4 +1,4 @@
-sample-project ({{ version }}-0) stable; urgency=low
+{{ package_name }} ({{ version }}-0) stable; urgency=low
 
   * Release {{ version }}
 
diff --git a/test/sample_project/.omnipackage/deb/control.liquid b/test/sample_project/.omnipackage/deb/control.liquid
@@ -1,12 +1,12 @@
-Source: sample-project
+Source: {{ package_name }}
 Section: sound
 Priority: optional
 Maintainer: Chuck Norris <chuck@norr.is>
 Build-Depends: debhelper (>= 8.0.0), {{ build_dependencies | join: ', ' }}
 Standards-Version: 3.9.4
 Homepage: http://example.com
 
-Package: sample-project
+Package: {{ package_name }}
 Architecture: amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}, {{ runtime_dependencies | join: ', ' }}
 Description: Sample project
diff --git a/test/sample_project/.omnipackage/deb/rules.liquid b/test/sample_project/.omnipackage/deb/rules.liquid
@@ -3,7 +3,7 @@
 # Be carefull, this is a Makefile, so the indents are tabs and not spaces!
 # -*- makefile -*-
 
-export DESTROOT=$(CURDIR)/debian/sample-project
+export DESTROOT=$(CURDIR)/debian/{{ package_name }}
 export DH_VERBOSE=1
 
 %:
diff --git a/test/sample_project/.omnipackage/deb/sample_project.dsc.liquid b/test/sample_project/.omnipackage/deb/sample_project.dsc.liquid
@@ -1,7 +1,7 @@
 Format: 1.0
-Source: sample-project
+Source: {{ package_name }}
 Version: {{ version }}-0
-Binary: sample_project
+Binary: {{ package_name }}
 Maintainer: Chuck Norris <chuck@norr.is>
 Architecture: amd64
 Homepage: http://example.com
diff --git a/test/sample_project/.omnipackage/sample_project.spec.liquid b/test/sample_project/.omnipackage/sample_project.spec.liquid
@@ -1,4 +1,4 @@
-Name:       sample_project
+Name:       {{ package_name }}
 Version:    {{ version }}
 Release:    1%{?dist}
 Summary:    Sample project

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-require:`
	`1`	`+plugins:`
`2`	`2`	`- rubocop-rake`
`3`	`3`	`- rubocop-minitest`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-sample-project ({{ version }}-0) stable; urgency=low`
	`1`	`+{{ package_name }} ({{ version }}-0) stable; urgency=low`
`2`	`2`
`3`	`3`	`* Release {{ version }}`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Name: sample_project`
	`1`	`+Name: {{ package_name }}`
`2`	`2`	`Version: {{ version }}`
`3`	`3`	`Release: 1%{?dist}`
`4`	`4`	`Summary: Sample project`