crosspack 0.2.1 → 0.5.0

data/lib/crosspack/builders/rpm.rb

@@ -8,7 +8,8 @@ module Crosspack
   module Builders
     # Stages a buildroot and packs it with rpmbuild. The spec is generated
     # with AutoReqProv disabled so dependency names come exclusively from
-    # deps.yaml (resolved per target), never from ELF soname scanning.
+    # the deps: section of crosspack.yml (resolved per target), never from
+    # ELF soname scanning.
     class Rpm
       def self.build(name:, version:, release:, summary:, license:, requires:,
                      files:, symlinks: {}, executables: [], description: nil,

data/lib/crosspack/builds.rb

@@ -8,6 +8,10 @@ module Crosspack
   module Builds
     ARCH_DIR_RE = /\A(amd64|x86_64|x64|arm64|aarch64)\z/i.freeze
 
+    # Written by `crosspack build <target>` into every builds/<target>/
+    # directory; `crosspack pack <target>` reads it as the default version.
+    STAMP_NAME = '.crosspack-build'
+
     # Returns [Target] for every target directory found under root.
     def self.available(root)
       return [] unless File.directory?(root)
@@ -30,6 +34,14 @@ module Crosspack
       lines.join("\n")
     end
 
+    # The version stamped by `crosspack build <target>` into the target's
+    # builds/ directory, or nil when the directory has no stamp (packed by
+    # an older build or never built through the stage pipeline).
+    def self.version_for(target, root)
+      stamp = File.join(target.output_dir(root.to_s, target.format), STAMP_NAME)
+      File.exist?(stamp) ? File.read(stamp).strip : nil
+    end
+
     private
 
     def self.scan_family(dir, family)

data/lib/crosspack/config.rb

@@ -0,0 +1,164 @@
+# frozen_string_literal: true
+
+require 'yaml'
+
+module Crosspack
+  # crosspack.yml — the single configuration file. The top level carries the
+  # shared facts (name, version scheme) plus three sections:
+  #   build:   what and where to build (the former build.yaml)
+  #   package: what and how to pack   (the former package.yaml)
+  #   deps:    runtime dependencies   (the former deps.yaml)
+  # The shared name/version are injected into the build section and the name
+  # into the package section; each section is then validated by its manifest
+  # class (Crossbuild::BuildManifest, PackageManifest, Manifest). A missing
+  # section yields a manifest whose root error names the section — gating
+  # happens per section, not per file.
+  class Config
+    DEFAULT_PATH = 'crosspack.yml'
+    TOP_LEVEL_KEYS = %w[name version build package deps].freeze
+    NAME_RE = /\A[a-z0-9][a-z0-9+._-]*\z/i.freeze
+
+    attr_reader :path, :errors, :warnings
+
+    def self.load(path = DEFAULT_PATH)
+      unless File.file?(path)
+        raise InvalidManifestError,
+              "crosspack.yml not found: #{path}\n" \
+              'Create crosspack.yml in the project root (see crosspack/README.md).'
+      end
+      begin
+        raw = YAML.safe_load(File.read(path), permitted_classes: [], aliases: false)
+      rescue Psych::SyntaxError => e
+        raise InvalidManifestError,
+              "#{path}: YAML syntax error on line #{e.line}: #{e.problem}"
+      end
+      new(path, raw)
+    end
+
+    # A Config, or a path to crosspack.yml, -> Config. Relative paths are
+    # resolved against root.
+    def self.coerce(config, root: Dir.pwd)
+      return config if config.is_a?(self)
+
+      load(File.expand_path(config.to_s, root))
+    end
+
+    def initialize(path, raw)
+      @path = path
+      @raw = raw
+      @errors = []
+      @warnings = []
+      validate
+    end
+
+    def valid?
+      @errors.empty?
+    end
+
+    def error_report
+      lines = []
+      if valid?
+        lines << "#{@path}: config is valid."
+      else
+        lines << "#{@path}: crosspack.yml is invalid (#{@errors.size} errors):"
+        @errors.each { |e| lines << "  ✗ #{e}" }
+      end
+      @warnings.each { |w| lines << "  ⚠ #{w}" }
+      lines.join("\n")
+    end
+
+    def build_manifest
+      require_relative '../crossbuild' unless defined?(::Crossbuild::BuildManifest)
+
+      @build_manifest ||= Crossbuild::BuildManifest.new(@path, build_section)
+    end
+
+    def package_manifest
+      @package_manifest ||= PackageManifest.new(@path, package_section)
+    end
+
+    def deps_manifest
+      @deps_manifest ||= Manifest.new(@path, deps_section)
+    end
+
+    private
+
+    def validate
+      unless @raw.is_a?(Hash) && !@raw.empty?
+        @errors << Issue.new('(root)',
+                             'crosspack.yml must be a non-empty mapping: name, version?, build:, package:, deps:')
+        return
+      end
+
+      check_unknown_keys
+      validate_name
+      validate_version
+      check_section_types
+    end
+
+    def check_unknown_keys
+      @raw.keys.each do |key|
+        next if TOP_LEVEL_KEYS.include?(key.to_s)
+
+        @errors << Issue.new("(root).#{key}", "unknown key; allowed: #{TOP_LEVEL_KEYS.join(', ')}")
+      end
+    end
+
+    def validate_name
+      name = @raw['name']
+      if name.nil?
+        @errors << Issue.new('name', 'is required once at the top level, e.g. name: myapp')
+      elsif !name.is_a?(String) || name.strip.empty? || name !~ NAME_RE
+        @errors << Issue.new('name', "invalid name #{name.inspect} (letters, digits, \"+\", \"_\", \"-\", \".\")")
+      end
+    end
+
+    def validate_version
+      v = @raw['version']
+      return if v.nil?
+
+      unless v.is_a?(String) && !v.strip.empty?
+        @errors << Issue.new('version',
+                             "must be a string scheme: calver / git-tag / env:VAR or a literal, got #{v.inspect}")
+      end
+    end
+
+    def check_section_types
+      %w[build package deps].each do |key|
+        next unless @raw.key?(key) && !@raw[key].is_a?(Hash)
+
+        @errors << Issue.new(key, 'must be a mapping')
+      end
+    end
+
+    def build_section
+      base = section('build') or return nil
+
+      { 'name' => top_name, 'version' => top_version }.merge(base)
+    end
+
+    def package_section
+      base = section('package') or return nil
+
+      { 'name' => top_name }.merge(base)
+    end
+
+    def deps_section
+      section('deps')
+    end
+
+    def section(key)
+      s = @raw.is_a?(Hash) ? @raw[key] : nil
+      s.is_a?(Hash) && !s.empty? ? s : nil
+    end
+
+    def top_name
+      @raw.is_a?(Hash) ? @raw['name'] : nil
+    end
+
+    def top_version
+      v = @raw.is_a?(Hash) ? @raw['version'] : nil
+      v.is_a?(String) && !v.strip.empty? ? v.strip : nil
+    end
+  end
+end

data/lib/crosspack/manifest.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require 'yaml'
-
 module Crosspack
-  # Canonical dependency names crosspack knows about. Anything else in
-  # deps.yaml still resolves, but produces a warning (possible typo).
+  # Canonical dependency names crosspack knows about. Anything else in the
+  # deps: section still resolves, but produces a warning (possible typo).
   KNOWN_CANONICAL = %w[
     webkit2gtk gtk3 openmp ayatana-appindicator
     glib2 cairo pango gdk-pixbuf alsa-lib pulseaudio dbus
@@ -15,7 +13,8 @@ module Crosspack
 
   CANONICAL_NAME_RE = /\A[a-z0-9][a-z0-9+._-]*\z/.freeze
 
-  # A single schema problem: full path into deps.yaml + human explanation.
+  # A single schema problem: full path into the deps: section + human
+  # explanation.
   class Issue
     attr_reader :path, :message
 
@@ -31,33 +30,27 @@ module Crosspack
 
   class InvalidManifestError < StandardError; end
 
-  # Parses and validates deps.yaml. Root keys are canonical dependency
-  # names; each maps to { targets: { family: { "version": [pkgs] } } } or a
-  # scalar verdict for a whole family.
+  # Parses and validates the deps: section of crosspack.yml. Keys are
+  # canonical dependency names; each maps to
+  # { targets: { family: { "version": [pkgs] } } } or a scalar verdict for a
+  # whole family. A reserved `version:` key inside the section declares the
+  # schema version (see SCHEMA_VERSION).
   class Manifest
-    attr_reader :path, :deps, :errors, :warnings
+    # The deps: section schema version this crosspack understands. Sections
+    # declaring a newer version are rejected at load time with an upgrade
+    # hint; older (or absent) versions are accepted.
+    SCHEMA_VERSION = 1
 
-    def self.load(path)
-      unless File.file?(path)
-        raise InvalidManifestError,
-              "Dependencies file not found: #{path}\n" \
-              'Create deps.yaml next to the Rakefile (see crosspack/README.md).'
-      end
-      begin
-        raw = YAML.safe_load(File.read(path), permitted_classes: [], aliases: false)
-      rescue Psych::SyntaxError => e
-        raise InvalidManifestError,
-              "#{path}: YAML syntax error on line #{e.line}: #{e.problem}"
-      end
-      new(path, raw)
-    end
+    attr_reader :path, :deps, :schema_version, :errors, :warnings
 
     def initialize(path, raw)
       @path = path
-      @deps = raw.is_a?(Hash) ? raw : {}
-      @raw = raw
+      @schema_version = raw.is_a?(Hash) ? raw['version'] : nil
       @errors = []
       @warnings = []
+      check_schema_version!
+      @deps = raw.is_a?(Hash) ? raw.reject { |key, _| key == 'version' } : {}
+      @raw = raw
       validate
     end
 
@@ -69,7 +62,7 @@ module Crosspack
     def validate!
       return self if valid?
 
-      lines = ["#{path}: deps.yaml schema is invalid (#{@errors.size} errors):"]
+      lines = ["#{path}: the deps: section is invalid (#{@errors.size} errors):"]
       @errors.each { |e| lines << "  ✗ #{e}" }
       lines << 'Build aborted: fix the listed nodes and retry.'
       raise InvalidManifestError, lines.join("\n")
@@ -79,9 +72,9 @@ module Crosspack
     def error_report
       lines = []
       if valid?
-        lines << "#{path}: schema is valid."
+        lines << "#{path}: the deps: section is valid."
       else
-        lines << "#{path}: deps.yaml schema is invalid (#{@errors.size} errors):"
+        lines << "#{path}: the deps: section is invalid (#{@errors.size} errors):"
         @errors.each { |e| lines << "  ✗ #{e}" }
       end
       @warnings.each { |w| lines << "  ⚠ #{w}" }
@@ -90,15 +83,36 @@ module Crosspack
 
     private
 
+    # A schema version newer than this crosspack supports is a hard, loud
+    # error at load time — every command (resolve, matrix, pack) reports it,
+    # not just validate. Malformed versions (not an integer >= 1) are
+    # ordinary schema errors.
+    def check_schema_version!
+      v = @schema_version
+      return if v.nil?
+
+      unless v.is_a?(Integer) && v >= 1
+        @errors << Issue.new('version', "schema version must be an integer >= 1, got #{v.inspect}")
+        return
+      end
+      return if v <= SCHEMA_VERSION
+
+      raise InvalidManifestError,
+            "#{@path}: the deps: section declares schema version #{v}, " \
+            "but this crosspack (#{Crosspack::VERSION}) supports up to #{SCHEMA_VERSION}. " \
+            'Update the gem (gem update crosspack) or lower the declared version.'
+    end
+
     def validate
       unless @raw.is_a?(Hash) && !@raw.empty?
         @errors << Issue.new(
           '(root)',
-          'file must be a non-empty mapping: canonical name -> { targets: ... }'
+          'the deps: section of crosspack.yml is missing or empty — ' \
+          'it must map canonical names to per-distro packages'
         )
         return
       end
-      @raw.each { |name, body| validate_dep(name.to_s, body) }
+      @raw.each { |name, body| validate_dep(name.to_s, body) unless name == 'version' }
     end
 
     def validate_dep(name, body)

data/lib/crosspack/matrix.rb

@@ -4,7 +4,7 @@ require 'set'
 
 module Crosspack
   # Renders the dependency x target matrix straight from the manifest.
-  # Columns come from the targets declared in deps.yaml itself.
+  # Columns come from the targets declared in the deps: section itself.
   class Matrix
     def initialize(manifest)
       @manifest = manifest
@@ -12,7 +12,7 @@ module Crosspack
 
     def render
       columns = target_columns
-      return 'deps.yaml is empty — nothing to show.' if columns.empty?
+      return 'the deps: section is empty — nothing to show.' if columns.empty?
 
       header = ['dependency'] + columns.map(&:to_s)
       rows = @manifest.deps.map do |name, body|

data/lib/crosspack/package_manifest.rb

@@ -1,32 +1,16 @@
 # frozen_string_literal: true
 
-require 'yaml'
-
 module Crosspack
-  # Packaging manifest (package.yaml): declares WHAT and HOW to pack —
-  # payload, executables, symlinks, desktop entry, icon. Compilation is not
-  # crosspack's business; artifacts are picked from `sources` as-is.
+  # Packaging manifest (the package: section of crosspack.yml): declares
+  # WHAT and HOW to pack — payload, executables, symlinks, desktop entry,
+  # icon. Compilation is not crosspack's business; artifacts are picked from
+  # `sources` as-is.
   class PackageManifest
-    REQUIRED = %w[name maintainer description sources prefix payload].freeze
-    OPTIONAL = %w[summary license section lib_dir executables links desktop icon].freeze
+    REQUIRED = %w[maintainer description sources prefix payload].freeze
+    OPTIONAL = %w[name summary license section lib_dir executables links desktop icon].freeze
 
     attr_reader :path, :data, :errors, :warnings
 
-    def self.load(path)
-      unless File.file?(path)
-        raise InvalidManifestError,
-              "Packaging manifest not found: #{path}\n" \
-              'Create package.yaml next to the Rakefile (see crosspack/README.md).'
-      end
-      begin
-        raw = YAML.safe_load(File.read(path), permitted_classes: [], aliases: false)
-      rescue Psych::SyntaxError => e
-        raise InvalidManifestError,
-              "#{path}: YAML syntax error on line #{e.line}: #{e.problem}"
-      end
-      new(path, raw)
-    end
-
     def initialize(path, raw)
       @path = path
       @data = raw.is_a?(Hash) ? raw : {}
@@ -43,7 +27,7 @@ module Crosspack
     def validate!
       return self if valid?
 
-      lines = ["#{path}: package.yaml schema is invalid (#{@errors.size} errors):"]
+      lines = ["#{path}: the package: section is invalid (#{@errors.size} errors):"]
       @errors.each { |e| lines << "  ✗ #{e}" }
       lines << 'Packing aborted: fix the listed nodes and retry.'
       raise InvalidManifestError, lines.join("\n")
@@ -51,9 +35,9 @@ module Crosspack
 
     def error_report
       if valid?
-        "#{path}: schema is valid."
+        "#{path}: the package: section is valid."
       else
-        ["#{path}: package.yaml schema is invalid (#{@errors.size} errors):",
+        ["#{path}: the package: section is invalid (#{@errors.size} errors):",
          *@errors.map { |e| "  ✗ #{e}" }].join("\n")
       end
     end
@@ -120,10 +104,16 @@ module Crosspack
 
     def validate
       unless @raw.is_a?(Hash) && !@raw.empty?
-        @errors << Issue.new('(root)', 'file must be a non-empty mapping: name, maintainer, payload, ...')
+        @errors << Issue.new('(root)',
+                             'the package: section of crosspack.yml is missing or empty — ' \
+                             'the pack stage needs it (maintainer, description, payload, ...)')
         return
       end
 
+      if @data['name'].nil?
+        @errors << Issue.new('name', 'is required at the top level of crosspack.yml, e.g. name: myapp')
+      end
+
       REQUIRED.each do |key|
         next unless @data[key].nil?
 

data/lib/crosspack/packer.rb

@@ -4,30 +4,33 @@ require 'fileutils'
 require 'tmpdir'
 
 module Crosspack
-  # Single entry point: takes a compiled artifacts directory (per
-  # package.yaml), resolves dependencies for the target (per deps.yaml) and
-  # produces a native package under output_base/<family>/<version>/<arch>/.
-  # The builder is chosen by the target format — deb, rpm or PKGBUILD.
+  # Single entry point: takes a Config (the package: and deps: sections of
+  # crosspack.yml), resolves dependencies for the target and produces a
+  # native package under output_base/<family>/<version>/<arch>/. The builder
+  # is chosen by the target format — deb, rpm or PKGBUILD.
+  # version: when omitted, the version stamped by `crosspack build <target>`
+  # (.crosspack-build in the target's builds/ directory) is used.
   class Packer
-    def self.pack(manifest:, deps:, target:, version:, root: Dir.pwd,
+    def self.pack(config:, target:, version: nil, root: Dir.pwd,
                   output_base: 'crosspacks')
-      new(manifest: manifest, deps: deps, target: target, version: version,
+      new(config: config, target: target, version: version,
           root: root, output_base: output_base).pack
     end
 
-    def initialize(manifest:, deps:, target:, version:, root:, output_base:)
-      @pkg_path = manifest
-      @deps_path = deps
+    def initialize(config:, target:, version:, root:, output_base:)
+      @config = config
       @target = target
-      @version = version.to_s
+      @version = version && version.to_s
       @root = root
-      @output_base = output_base
+      @output_base = output_base || 'crosspacks'
     end
 
     def pack
-      @pkg = PackageManifest.load(@pkg_path)
-      @deps = Manifest.load(@deps_path)
+      @config = Config.coerce(@config, root: @root)
+      @pkg = @config.package_manifest
+      @deps = @config.deps_manifest
       validate_both!
+      resolve_version!
       @pkg_data = build_layout
 
       case @target.format
@@ -49,8 +52,24 @@ module Crosspack
 
     private
 
+    # --version wins; otherwise the version recorded by the build stage.
+    def resolve_version!
+      return unless @version.nil? || @version.strip.empty?
+
+      stamped = Builds.version_for(@target, File.expand_path(@pkg.sources, @root))
+      if stamped.nil? || stamped.strip.empty?
+        raise BuildError,
+              "No version for target #{@target}: no --version given and no build stamp " \
+              "(#{Builds::STAMP_NAME}) in #{@pkg.sources}. " \
+              "Run: crosspack build #{@target} — or pass --version explicitly."
+      end
+
+      @version = stamped
+    end
+
     def validate_both!
       errors = []
+      errors << @config.error_report unless @config.valid?
       errors << @pkg.error_report unless @pkg.valid?
       errors << @deps.error_report unless @deps.valid?
       return if errors.empty?
@@ -70,10 +89,10 @@ module Crosspack
         hint = available.empty? ? 'no built targets at all.' :
                "available builds: #{available.map { |t| "#{t} (#{t.output_dir(@pkg.sources, t.format)})" }.join(', ')}."
         raise BuildError,
-              "No compiled artifacts for target #{@target}: expected them in #{src_dir}.\n" \
+              "Build stage not done for target #{@target}: expected compiled artifacts in #{src_dir}.\n" \
               "The builds tree (#{@pkg.sources}) mirrors the output tree: builds/<family>/<version>/<arch>/. " \
               "Currently #{hint}\n" \
-              'Build the application for this target first, then pack.'
+              "Run: crosspack build #{@target}"
       end
 
       lib_dst = File.join(@pkg.prefix, @pkg.lib_dir)

data/lib/crosspack/resolver.rb

@@ -25,7 +25,7 @@ module Crosspack
   class ResolveError < StandardError; end
 
   # Turns (manifest, target) into concrete package dependencies. No network,
-  # no search: everything comes from deps.yaml.
+  # no search: everything comes from the deps: section of crosspack.yml.
   class Resolver
     def initialize(manifest)
       @manifest = manifest
@@ -41,7 +41,7 @@ module Crosspack
         if rule.nil?
           available = rules.keys.map(&:to_s).join(', ')
           raise ResolveError,
-                "#{name}: deps.yaml has no rules for family #{family} (target #{target}). " \
+                "#{name}: the deps: section has no rules for family #{family} (target #{target}). " \
                 "Add the section #{name}: targets: #{family}: ... — currently described: #{available}"
         end
 

data/lib/crosspack/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Crosspack
-  VERSION = '0.2.1'
+  VERSION = '0.5.0'
 end

data/lib/crosspack.rb

@@ -4,6 +4,7 @@ require_relative 'crosspack/version'
 require_relative 'crosspack/target'
 require_relative 'crosspack/manifest'
 require_relative 'crosspack/package_manifest'
+require_relative 'crosspack/config'
 require_relative 'crosspack/resolver'
 require_relative 'crosspack/matrix'
 require_relative 'crosspack/builds'
@@ -30,8 +31,8 @@ module Crosspack
   #   executables: [destination paths to chmod 0755]
   class BuildError < StandardError; end
 
-  # Convenience wrapper: Crosspack.pack(manifest: 'package.yaml',
-  # deps: 'deps.yaml', target: Target.parse('debian-12'), version: '1.0-1')
+  # Convenience wrapper: Crosspack.pack(config: 'crosspack.yml',
+  # target: Target.parse('debian-12'), version: '1.0-1')
   def self.pack(**kwargs)
     Packer.pack(**kwargs)
   end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: crosspack
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Oleg Orlov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-09-11 00:00:00.000000000 Z
+date: 2026-09-13 00:00:00.000000000 Z
 dependencies: []
-description: 'Two cooperating commands: crossbuild runs the build steps of a project
-  from a build.yaml matrix and fans the produced artifacts out into the per-target
-  builds/ tree; crosspack turns that tree into native packages, driven by a cross-distro
-  deps.yaml. Both share the same target vocabulary so the trees never drift apart.'
+description: 'One command, one target vocabulary: crosspack deps <target> verifies
+  and installs the build host dependencies, crosspack build <target> runs the build.yaml
+  matrix entry and fans artifacts into builds/, crosspack pack <target> turns that
+  tree into a native package. Stages are gated — no packing before building — and
+  keyed by the same target strings throughout.'
 email:
 - orelcokolov@gmail.com
 executables:
 - crosspack
-- crossbuild
 extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - LICENSE
 - README.md
-- exe/crossbuild
 - exe/crosspack
 - lib/crossbuild.rb
 - lib/crossbuild/build_manifest.rb
 - lib/crossbuild/builder.rb
+- lib/crossbuild/dep_installer.rb
 - lib/crossbuild/distributor.rb
 - lib/crossbuild/matrix.rb
 - lib/crossbuild/platform.rb
@@ -43,6 +43,7 @@ files:
 - lib/crosspack/builders/rpm.rb
 - lib/crosspack/builders/wix.rb
 - lib/crosspack/builds.rb
+- lib/crosspack/config.rb
 - lib/crosspack/manifest.rb
 - lib/crosspack/matrix.rb
 - lib/crosspack/package_manifest.rb
@@ -74,5 +75,5 @@ requirements: []
 rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
-summary: Cross-platform build orchestrator and native package builder (deb/rpm/PKGBUILD/winget/cask)
+summary: 'Staged cross-platform pipeline: deps → build → pack native packages (deb/rpm/PKGBUILD/winget/cask)'
 test_files: []