pwn 0.5.634 → 0.5.635

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8632bee6e87072a40fbd993834156ad06e1c448918b2922125d592debd7c033d
-  data.tar.gz: 399687f4f6ea85666f9e7d8e4c0450998be2949218b45d68b061e8c20c452010
+  metadata.gz: 347b9c864507e706e465e27933acee3d03b8fca35529e3c63bfb374a50763061
+  data.tar.gz: 98764623bb85939b3dc681c1703ad4f5e50bc9450caef5773c39855b3b4b469e
 SHA512:
-  metadata.gz: 964a576117407e3e5907a302106c2a0f657bedc9a4ebd59167ca360f7f89dbcb3975aec4b6c036e3cc2f138461044f162371f8b2e62d05e5f0ca1c498fa852b4
-  data.tar.gz: 8cae2ebdeb246fc190c49aed8b5a787372a482e2eecc3027116eab1bca985b33d9451cd22df4f158f1d4e0e8dc4314f6b1754f4e3b42f68dd8f7c1808b7ea3e6
+  metadata.gz: 3fe90d0d5abb8876bcb55d3be503725f7819426b2b42ea1e10c756c3c7c3f4d4060bace652e8617ba5d74af1078dab2d6250c5c5c57e0a3ca52eaf3a9410492b
+  data.tar.gz: d778fc2e42b1276b2731546fc84f893bf7174f903d8c3880a75c1930509d3a4e55e387e0c38ed61cfb43ad19e9e9e824c0f336b6e559d409d8fd6604da00ddfe

data/.github/workflows/install-matrix.yml

@@ -105,7 +105,13 @@ jobs:
         # "detected dubious ownership" and the gem builds with ZERO files.
         run: git config --global --add safe.directory "$PWD"
       - name: build & install gem from checkout (git-checkout path in doc)
+        # `gem update --system` first: distro rubies ship RubyGems 3.x whose
+        # Molinillo resolver crashes with `undefined method 'request' for nil`
+        # (rubygems/rubygems#6215) instead of naming the unsatisfiable dep
+        # when a runtime dependency's required_ruby_version excludes this ruby.
+        # A modern RubyGems prints the real conflict.
         run: |
+          gem update --system --no-document || true
           gem build pwn.gemspec
           gem install --no-document ./pwn-*.gem
           gem install --no-document rspec
@@ -139,6 +145,7 @@ jobs:
 
       - name: build & install gem from checkout
         run: |
+          gem update --system --no-document || true
           gem build pwn.gemspec
           gem install --no-document ./pwn-*.gem
           gem install --no-document rspec

data/lib/pwn/plugins/repl.rb

@@ -2,7 +2,6 @@
 
 require 'curses'
 require 'fileutils'
-require 'meshtastic'
 require 'pry'
 require 'reline'
 require 'tty-prompt'
@@ -613,6 +612,18 @@ module PWN
 
           def process
             pi = pry_instance
+            # meshtastic is a *setup-managed* gem (see pwn.gemspec / PWN::Setup):
+            # its rubygems.org releases carry `required_ruby_version >= 4.0`, so
+            # it cannot be a hard runtime dependency while pwn supports ruby 3.3+.
+            begin
+              require 'meshtastic'
+            rescue LoadError => e
+              output.puts "pwn-mesh unavailable: #{e.message}"
+              output.puts "  meshtastic requires ruby >= 4.0 (running #{RUBY_VERSION})." if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('4.0.0')
+              output.puts '  Run: `pwn setup --profile full` (or `gem install meshtastic`) on ruby >= 4.0.'
+              return
+            end
+
             pi.config.pwn_mesh = true
             meshtastic_env = PWN::Env[:plugins][:meshtastic]
 

data/lib/pwn/setup.rb

@@ -102,6 +102,16 @@ module PWN
         apt: %w[imagemagick libmagickwand-dev], dnf: %w[ImageMagick-devel],
         pacman: %w[imagemagick], brew: %w[imagemagick], port: %w[imagemagick],
         plugins: %w[PWN::Reports]
+      },
+      # Not a native extension, but gated by required_ruby_version >= 4.0 on
+      # rubygems.org — so it cannot be a hard runtime dependency of pwn while
+      # pwn.gemspec advertises `>= 3.3`. Managed here instead so
+      # `gem install pwn` succeeds on distro rubies (3.3/3.4) and `pwn setup`
+      # installs it post-hoc where possible. See install-matrix.yml.
+      'meshtastic' => {
+        apt: %w[], dnf: %w[], pacman: %w[], brew: %w[], port: %w[],
+        min_ruby: '4.0.0',
+        plugins: %w[PWN::Plugins::REPL#pwn-mesh]
       }
     }.freeze
 
@@ -398,6 +408,15 @@ module PWN
 
       prof     = PROFILES[profile]
       gems     = Array(prof[:gems])
+      # Drop setup-managed gems whose upstream required_ruby_version excludes
+      # THIS ruby (e.g. meshtastic >= 4.0 on a distro ruby 3.3) — otherwise
+      # `gem install` in the loop below fails and takes the whole profile with it.
+      gems = gems.reject do |g|
+        floor = NATIVE_GEMS.dig(g, :min_ruby)
+        skip  = floor && Gem::Version.new(RUBY_VERSION) < Gem::Version.new(floor)
+        io.puts "  \e[33mskip\e[0m #{g} — requires ruby >= #{floor} (running #{RUBY_VERSION})" if skip
+        skip
+      end
       bins     = Array(prof[:bins])
       os_pkgs  = []
       gems.each { |g| os_pkgs.concat(Array(NATIVE_GEMS.dig(g, pm[:key]))) }

data/lib/pwn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PWN
-  VERSION = '0.5.634'
+  VERSION = '0.5.635'
 end

data/pwn.gemspec

@@ -73,6 +73,7 @@ Gem::Specification.new do |spec|
     faye-websocket
     gruff
     libusb
+    meshtastic
     pg
     rmagick
     rtesseract

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.5.634
+  version: 0.5.635
 platform: ruby
 authors:
 - 0day Inc.
@@ -548,7 +548,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.172
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: