mnenv 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bb839d75925723bae3de1d40012914fc768b8f981d4be837247ea0b8de8bf2d
-  data.tar.gz: 1335ac68fba15671370c1c42f4d6999707915fd3ec884d33ee47759f3ba95863
+  metadata.gz: ebbe93f7754277cc8cb84ed21cf9d8c588c8dc9edd2164a51a4e175509e0afc8
+  data.tar.gz: d6c02ff55dbf8dbc816102e603c07a0a5e947b0570cfda4b6d08c0736f5e78da
 SHA512:
-  metadata.gz: b09af8fc57ec321e46c1b4976ff69e73f00b9443168659b7e343cb8a1f527ef64eaa0ea9dc0265fda6e4d8b678d351bca6fe1adca4b35ded707ddc1e4b895b18
-  data.tar.gz: 68a851a68c5a2feafe61cb47b0e68f98dc328d78c7e5459b31440250048c03fd19724cf2fcdf2462e46c6b00c6fdf6e33514d1c24569929d539fdaa8fe7efb69
+  metadata.gz: 1a6b0db4fb7021a8b82af5532632c39273afe217984487f61e21b1110738a3f2cc04221de9056d18f77b5656264bbaf7224bea5a417e2455ce26a0e8f00d0695
+  data.tar.gz: bd4196df600ebd1fcfcafc5db7baa6dc35dcf5ceafb762a6615e3fde71f3ca4d8de315d00e372b3cf836772c40d6e6c9a784bd27faf5b0aabf325044e8aac2bb

data/lib/mnenv/commands/snap_command.rb

@@ -28,17 +28,9 @@ module Mnenv
     desc 'refresh', 'Fetch and add new Snap versions (incremental)'
     def refresh
       fetcher = Snap::Fetcher.new
-      repo = fetcher.repository
-
-      # Build map of existing composite keys
-      existing_keys = repo.all.map { |v| "#{v.version}-#{v.revision}-#{v.arch}-#{v.channel}" }
+      existing = fetcher.repository.all.map(&:version)
       remote_versions = fetcher.fetch_all
-
-      # Find truly new versions (composite key doesn't exist)
-      new_versions = remote_versions.reject do |v|
-        key = "#{v.version}-#{v.revision}-#{v.arch}-#{v.channel}"
-        existing_keys.include?(key)
-      end
+      new_versions = remote_versions.reject { |v| existing.include?(v.version) }
 
       if new_versions.empty?
         puts 'No new Snap versions found'
@@ -55,22 +47,21 @@ module Mnenv
       puts "Revamped #{versions.size} Snap versions"
     end
 
-    desc 'update VERSION', 'Update a specific Snap version (all arch/channel combinations)'
+    desc 'update VERSION', 'Update a specific Snap version'
     def update(version)
       fetcher = Snap::Fetcher.new
       versions = fetcher.fetch_all
-      targets = versions.select { |v| v.version == version }
+      target = versions.find { |v| v.version == version }
 
-      if targets.empty?
-        puts "Snap version #{version} not found in current channel-map"
-        puts 'Note: Historical versions no longer in Snap API cannot be updated'
+      if target.nil?
+        puts "Snap version #{version} not found"
         exit 1
       end
 
-      fetcher.repository.save_all(targets)
-      puts "Updated #{targets.size} Snap entries for version #{version}:"
-      targets.each do |v|
-        puts "  - #{v.arch}/#{v.channel}: revision #{v.revision}"
+      fetcher.repository.save_all([target])
+      puts "Updated 1 Snap entry for version #{version}:"
+      target.channels.each do |v|
+        puts "  - channel: #{v.name} arch: #{v.arch} revision: #{v.revision}"
       end
     end
 

data/lib/mnenv/gemfile/extractor.rb

@@ -80,6 +80,8 @@ module Mnenv
         # Store relative paths (relative to data/gemfile directory)
         version.gemfile_path = "v#{version.version}/Gemfile"
         version.gemfile_lock_path = "v#{version.version}/Gemfile.lock.archived"
+        # Set parsed_at to now if not already set
+        version.parsed_at = DateTime.now if version.parsed_at.nil?
 
         repository.save(version)
       end

data/lib/mnenv/models/snap_channel.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Mnenv
+  class SnapChannel < Lutaml::Model::Serializable
+    attribute :revision, :integer
+    attribute :arch, :string, default: 'amd64'
+    attribute :name, :string, default: 'stable'
+
+    key_value do
+      map 'name', to: :name
+      map 'revision', to: :revision
+      map 'arch', to: :arch
+    end
+
+    def to_hash
+      super.merge(
+        'revision' => revision,
+        'arch' => arch,
+        'name' => name
+      )
+    end
+  end
+end

data/lib/mnenv/models/snap_version.rb

@@ -1,29 +1,20 @@
 # frozen_string_literal: true
 
 require_relative 'version'
+require_relative 'snap_channel'
 
 module Mnenv
   class SnapVersion < ArtifactVersion
-    attribute :revision, :integer
-    attribute :arch, :string, default: 'amd64'
-    attribute :channel, :string, default: 'stable'
+    attribute :channels, ::Mnenv::SnapChannel,
+              collection: true, default: -> { [] }
 
     key_value do
-      map 'version', to: :version
-      map 'published_at', to: :published_at
-      map 'parsed_at', to: :parsed_at
-      map 'revision', to: :revision
-      map 'arch', to: :arch
-      map 'channel', to: :channel
+      map 'channels', to: :channels
     end
 
-    def display_name = revision ? "#{version}-#{revision}" : "v#{version}"
-
     def to_hash
       super.merge(
-        'revision' => revision,
-        'arch' => arch,
-        'channel' => channel
+        'channels' => channels.map(&:to_hash)
       )
     end
   end

data/lib/mnenv/repository.rb

@@ -62,7 +62,7 @@ module Mnenv
       end
     end
 
-    # Override in subclasses for custom caching (e.g., SnapRepository uses composite keys)
+    # Override in subclasses for custom caching
     def cache_version(version)
       @versions_cache[version.version] = version
     end

data/lib/mnenv/snap/fetcher.rb

@@ -8,6 +8,9 @@ require 'uri'
 require 'json'
 require 'fileutils'
 require 'net/http'
+require_relative 'missing_credentials_error'
+require_relative 'snapcraft_not_available_error'
+require_relative 'login_failed_error'
 
 module Mnenv
   module Snap
@@ -24,45 +27,112 @@ module Mnenv
       ARCHITECTURES = %w[amd64 arm64].freeze
 
       def fetch_all
-        # Load existing versions from YAML (single source of truth)
-        existing_map = repository.all.to_h { |v| [snap_key(v), v] }
+        fetch_all_from_snapcraft
+      end
+
+      def fetch_all_from_cache
+        # Load existing versions from YAML
+        version_map = repository.all
 
         # Fetch current heads from snap_metadata API
         current_versions = fetch_current_heads
 
-        # Merge: keep existing, add/update current from API
-        version_map = {}
-
-        # Add all existing versions
-        existing_map.each_value { |v| version_map[snap_key(v)] = v }
-
-        # Add/update current from API (overrides existing if same key)
-        current_versions.each do |cv|
-          key = snap_key_hash(cv)
-          version_map[key] = SnapVersion.new(
-            version: cv.fetch('version'),
-            revision: cv.fetch('revision'),
-            arch: cv.fetch('arch'),
-            channel: cv.fetch('channel')
+        current_versions.each_key do |k|
+          next if repository.exists?(k)
+
+          # Add new version
+          version_map << SnapVersion.new(
+            version: k,
+            parsed_at: DateTime.now,
+            channels: current_versions[k].map do |cv|
+              SnapChannel.new(
+                name: cv.fetch('channel'),
+                revision: cv.fetch('revision'),
+                arch: cv.fetch('arch')
+              )
+            end
           )
         end
 
-        version_map.values.sort
+        version_map
+      end
+
+      def fetch_all_from_snapcraft
+        raise MissingCredentialsError unless ENV['SNAPCRAFT_STORE_CREDENTIALS']
+        raise SnapcraftNotAvailableError unless snapcraft_available?
+
+        login_result = system('echo "$SNAPCRAFT_STORE_CREDENTIALS" | snapcraft login --with -')
+
+        raise LoginFailedError unless login_result
+
+        # delete the environment variable immediately to prevent
+        # duplicate login error
+        ENV.delete('SNAPCRAFT_STORE_CREDENTIALS')
+
+        result = `snapcraft revisions metanorma`
+        snap_revisions = parse_snap_revisions(result)
+        build_snap_version_map(snap_revisions)
       end
 
       private
 
-      def snap_key(version)
-        "#{version.version}-#{version.revision}-#{version.arch}-#{version.channel}"
+      def snapcraft_available?
+        system('command -v snapcraft > /dev/null 2>&1')
       end
 
-      def snap_key_hash(hash)
-        "#{hash.fetch('version')}-#{hash.fetch('revision')}-#{hash.fetch('arch')}-#{hash.fetch('channel')}"
+      def parse_snap_revisions(data)
+        lines = data.lines.map(&:strip).reject { |l| l.empty? || l.start_with?('Rev.') }
+        revisions = []
+        lines.each do |line|
+          fields = line.split(/\s{2,}/)
+          rev, uploaded, arches, version, channels = fields
+          revisions << {
+            version: version,
+            published_at: uploaded,
+            revision: rev,
+            arch: arches,
+            channels: channels
+          }
+        end
+        revisions
+      end
+
+      def build_snap_version_map(snap_revisions)
+        versions = []
+        latest_version = snap_revisions.first[:version]
+
+        snap_revisions.each do |sr|
+          snap_version = versions.find { |v| v&.version == sr[:version] }
+          if snap_version.nil?
+            snap_version = SnapVersion.new
+            snap_version.version = sr[:version]
+            snap_version.published_at = sr[:published_at]
+            snap_version.parsed_at = DateTime.now
+          end
+
+          channels = sr[:channels].split(',').map(&:strip)
+          channels.each do |channel|
+            next unless channel.start_with? 'latest/'
+
+            channel = channel.sub('latest/', '')
+            next if (sr[:version] == latest_version) && !channel.end_with?('*')
+
+            snap_version.channels << SnapChannel.new(
+              name: channel.gsub('*', ''),
+              revision: sr[:revision],
+              arch: sr[:arch]
+            )
+          end
+
+          versions << snap_version
+        end
+
+        versions.reverse
       end
 
       # Fetch current heads from snap_metadata API for all channel/arch combinations
       def fetch_current_heads
-        versions = []
+        versions = {}
 
         CHANNELS.each do |channel|
           ARCHITECTURES.each do |arch|
@@ -88,8 +158,9 @@ module Mnenv
 
             if data['_embedded'] && data['_embedded']['clickindex:package']
               pkg = data['_embedded']['clickindex:package'][0]
-              versions << {
-                'version' => pkg['version'],
+
+              versions[pkg['version']] ||= []
+              versions[pkg['version']] << {
                 'revision' => pkg['revision'],
                 'arch' => arch,
                 'channel' => channel

data/lib/mnenv/snap/login_failed_error.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Mnenv
+  module Snap
+    class LoginFailedError < StandardError
+      def initialize
+        super('Failed to login to snapcraft with provided credentials.')
+      end
+    end
+  end
+end

data/lib/mnenv/snap/missing_credentials_error.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Mnenv
+  module Snap
+    class MissingCredentialsError < StandardError
+      def initialize
+        super('Missing SNAPCRAFT_STORE_CREDENTIALS environment variable. Please set it to fetch Snap versions.')
+      end
+    end
+  end
+end

data/lib/mnenv/snap/snapcraft_not_available_error.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Mnenv
+  module Snap
+    class SnapcraftNotAvailableError < StandardError
+      def initialize
+        super('Snapcraft is not available. Please install Snapcraft to fetch Snap versions.')
+      end
+    end
+  end
+end

data/lib/mnenv/snap_repository.rb

@@ -8,45 +8,30 @@ module Mnenv
     def version_class = SnapVersion
     def source_name = :snap
 
-    # Override cache_version to use composite key for Snap
-    # Since same version can have multiple revisions/arch/channels
-    def cache_version(version)
-      @versions_cache[snap_key(version)] = version
-    end
-
-    # Override find to work with composite keys
-    def find(version_number)
-      @versions_cache.values.find { |v| v.version == version_number }
-    end
-
-    # Find by specific version, revision, arch, channel
-    def find_exact(version_number, revision, arch, channel)
-      @versions_cache[snap_key(version_number, revision, arch, channel)]
-    end
-
-    # Get all entries for a specific version
-    def find_all_by_version(version_number)
-      @versions_cache.values.select { |v| v.version == version_number }.sort
-    end
-
-    def exists?(version_number)
-      @versions_cache.values.any? { |v| v.version == version_number }
-    end
-
-    private
-
-    def snap_key(*args)
-      case args.size
-      when 1
-        # Single SnapVersion object
-        v = args.first
-        "#{v.version}-#{v.revision}-#{v.arch}-#{v.channel}"
-      when 4
-        # version, revision, arch, channel
-        version_number, revision, arch, channel = args
-        "#{version_number}-#{revision}-#{arch}-#{channel}"
-      else
-        raise ArgumentError, 'snap_key requires 1 or 4 arguments'
+    protected
+
+    def load
+      data = fetch_versions_data
+
+      return if data.nil? || data['versions'].nil?
+
+      data['versions'].each do |version_hash|
+        channels = version_hash['channels'].map do |c|
+          SnapChannel.new(
+            name: c['name'],
+            revision: c['revision'],
+            arch: c['arch']
+          )
+        end
+
+        version = SnapVersion.new.tap do |v|
+          v.version = version_hash['version']
+          v.published_at = version_hash['published_at']
+          v.parsed_at = version_hash['parsed_at']
+          v.channels = channels
+        end
+
+        cache_version(version)
       end
     end
   end

data/lib/mnenv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mnenv
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mnenv
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-14 00:00:00.000000000 Z
+date: 2026-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -206,6 +206,7 @@ files:
 - lib/mnenv/models/chocolatey_version.rb
 - lib/mnenv/models/gemfile_version.rb
 - lib/mnenv/models/homebrew_version.rb
+- lib/mnenv/models/snap_channel.rb
 - lib/mnenv/models/snap_version.rb
 - lib/mnenv/models/version.rb
 - lib/mnenv/paths.rb
@@ -220,6 +221,9 @@ files:
 - lib/mnenv/shim_manager.rb
 - lib/mnenv/snap.rb
 - lib/mnenv/snap/fetcher.rb
+- lib/mnenv/snap/login_failed_error.rb
+- lib/mnenv/snap/missing_credentials_error.rb
+- lib/mnenv/snap/snapcraft_not_available_error.rb
 - lib/mnenv/snap_repository.rb
 - lib/mnenv/source_registry.rb
 - lib/mnenv/sources.rb