prremote 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d080a70a00d10af1e419cae964da017bbc6650f85f54f3a18223b81bb204fe7
-  data.tar.gz: 158c193d72d4d414726f79183f6016017132077f37f0adc2f3238cd843e5672b
+  metadata.gz: 46762e433d6de80bfe8f614bbdd3ee25fdbf976a235d69b3aecfe2039bd180f8
+  data.tar.gz: bcff6b310ed0056d0298a6511cdefe9ffb77aadbcbf0522a379b62d6e3fcc872
 SHA512:
-  metadata.gz: 47d36cf128e0106b732273bad92aeb3af77c97a4e93f167e77d3ea34999578976a75f7babe8e3e910c6cf364422821cca6e5886cc7c7e5fa327a032a7d3bafb9
-  data.tar.gz: a63fae436f971e92d97386933706f99396dfcfc1ecf105c4ded5215aa1410d3ba3fadeb49805a9735a7285c1b6202da51dad325438d9b13d444756d48d88906e
+  metadata.gz: 9ad10419ea1caafefbdbbeaf803dc80d2a39caf148d0ad545f069661acd46010ba45eecba4c1325235b06d0e43d8cc695bc042e03906d48a820fd6c14b658f53
+  data.tar.gz: 40ba90421406056fdde9b2849b46a849bd6d642c00784c14f03b62ce12e09724d343b61d89eb97d6d9a035350f1dbd445b253cefe602a5faacc56698df36ff4c

data/README.md

@@ -6,15 +6,24 @@
 
 Inspired by [mpremote](https://docs.micropython.org/en/latest/reference/mpremote.html) for MicroPython.
 
+
+[![Gem Version](https://img.shields.io/gem/v/prremote)](https://rubygems.org/gems/prremote)
+[![CI](https://github.com/lumbermill/prremote/actions/workflows/ci.yml/badge.svg)](https://github.com/lumbermill/prremote/actions/workflows/ci.yml)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![Ruby](https://img.shields.io/badge/ruby-3.4%20%7C%204.0-red)](https://github.com/lumbermill/prremote)
+
 ---
 
 ## Requirements
 
-- Ruby 3.x or later
+- Ruby 3.4 or later
 - Raspberry Pi Pico W
-- `mrbc` in your PATH (for `run`, `deploy`, and `eval`)
+- `mrbc` (mruby 4.x) for `run`, `deploy`, and `eval`
   - macOS: `brew install mruby`
-  - Ubuntu / Raspberry Pi OS: `sudo apt install mruby`
+  - Linux: build from source — [github.com/mruby/mruby/releases](https://github.com/mruby/mruby/releases)
+    (`sudo apt install mruby` installs mruby 3.x which is **not compatible**)
+  - If `mrbc` is not on your PATH, set the `MRBC` environment variable:
+    `MRBC=/path/to/mrbc prremote run app.rb`
 
 ---
 
@@ -71,6 +80,8 @@ prremote run blink.rb --port /dev/tty.usbmodem101
 
 The device responds with `RUNNING`, streams any output, then `DONE`.
 
+You can find some examples in [test/samples](test/samples/).
+
 ---
 
 ### `deploy FILE`

data/VERSION

@@ -0,0 +1 @@
+0.1.4

data/lib/prremote/cli.rb

@@ -20,11 +20,13 @@ module Prremote
       true
     end
 
+    remove_command :tree
+
     desc 'install', 'Flash prremote runtime firmware to Pico W or Pico'
-    option :version, type: :string, desc: "Firmware version to install (default: #{RUNTIME_VERSION})"
+    option :version, type: :string, desc: "Firmware version to install (default: #{VERSION})"
     option :board, type: :string, desc: 'Board type: pico or picow (default: picow)'
     def install
-      version = options[:version] || RUNTIME_VERSION
+      version = options[:version] || VERSION
       board = options[:board] || 'picow'
       unless RuntimeManager::BOARDS.include?(board)
         raise Thor::Error, "Unknown board '#{board}'. Valid values: #{RuntimeManager::BOARDS.join(', ')}"
@@ -102,14 +104,19 @@ module Prremote
     desc 'version', 'Show prremote, mrbc, and device firmware version'
     def version
       puts "prremote: #{VERSION}"
+      puts "runtime:  #{fetch_runtime_version}"
 
       begin
-        puts "mrbc:     #{Mrbc.version} (#{Mrbc.bin})"
+        major = Mrbc.major_version
+        puts "mrbc: #{Mrbc.version} (#{Mrbc.bin})"
+        unless major && major >= Mrbc::REQUIRED_MAJOR
+          puts "  ** mrbc is too old (need #{Mrbc::REQUIRED_MAJOR}.x) **"
+          puts "  Hint: the path can be set via MRBC environment variable."
+        end
       rescue StandardError => e
         puts "mrbc:     (#{e.message})"
       end
 
-      puts "runtime:  #{fetch_runtime_version}"
     end
 
     private
@@ -153,7 +160,7 @@ module Prremote
           next
         end
 
-        return ::Regexp.last_match(1) if buf =~ %r{READY prremote-runtime/([\d.]+)}
+        return "#{::Regexp.last_match(1)} (#{port})" if buf =~ %r{READY prremote-runtime/([\d.]+)}
         return '(not responding)' if Time.now > deadline
 
         sleep 0.05

data/lib/prremote/commands/deploy.rb

@@ -26,6 +26,7 @@ module Prremote
       private
 
       def compile(rb_path)
+        Mrbc.check_version!
         tmp = Tempfile.new(['prremote', '.mrb'])
         out, status = Open3.capture2e(Mrbc.bin, '-o', tmp.path, rb_path)
         raise "mrbc failed:\n#{out.chomp}" unless status.success?

data/lib/prremote/commands/install.rb

@@ -3,7 +3,7 @@ require 'fileutils'
 module Prremote
   module Commands
     class Install
-      def initialize(version: RUNTIME_VERSION, board: 'picow')
+      def initialize(version: VERSION, board: 'picow')
         @version = version
         @board = board
       end

data/lib/prremote/commands/run.rb

@@ -23,6 +23,7 @@ module Prremote
       private
 
       def compile(rb_path)
+        Mrbc.check_version!
         tmp = Tempfile.new(['prremote', '.mrb'])
         out, status = Open3.capture2e(Mrbc.bin, '-o', tmp.path, rb_path)
         raise "mrbc failed:\n#{out.chomp}" unless status.success?

data/lib/prremote/mrbc.rb

@@ -1,18 +1,21 @@
 require 'open3'
 
 module Prremote
+  # mrbc lookup order:
+  #   1. MRBC env var if set (use this to point at a non-PATH binary)
+  #   2. PATH entries, excluding rbenv shims — shims delegate to the project's
+  #      .ruby-version (typically CRuby) and do not work as a standalone mrbc
+  #   3. rbenv direct installs (~/.rbenv/versions/mruby-*/bin/mrbc)
+  # The first candidate wins; version compatibility is checked in check_version!.
   module Mrbc
     SHIMS_RE = %r{\.rbenv/shims}
+    REQUIRED_MAJOR = 4
 
     def self.bin
       return ENV['MRBC'] if ENV['MRBC'] && File.executable?(ENV['MRBC'])
 
-      found = ENV['PATH'].split(File::PATH_SEPARATOR)
-                         .grep_v(SHIMS_RE)
-                         .map    { |d| File.join(d, 'mrbc') }
-                         .find   { |f| File.executable?(f) }
-
-      found || raise('mrbc not found. Install mruby: brew install mruby')
+      (path_candidates + rbenv_candidates).first ||
+        raise('mrbc not found. Install mruby 4.x: brew install mruby')
     end
 
     def self.version
@@ -21,5 +24,35 @@ module Prremote
     rescue RuntimeError
       '(mrbc not found)'
     end
+
+    def self.major_version
+      version[/\bmruby (\d+)\./, 1]&.to_i
+    end
+
+    def self.check_version!
+      return if @version_ok
+
+      major = major_version
+      unless major && major >= REQUIRED_MAJOR
+        raise "mrbc is mruby #{major || '?'}.x but mruby #{REQUIRED_MAJOR}.x or newer is required.\n" \
+              "Installed: #{version}\n" \
+              "Install mruby 4.x: brew install mruby\n" \
+              "On Linux: build from source (https://github.com/mruby/mruby/releases)"
+      end
+
+      @version_ok = true
+    end
+
+    private_class_method def self.path_candidates
+      ENV['PATH'].split(File::PATH_SEPARATOR)
+                 .grep_v(SHIMS_RE)
+                 .map { |d| File.join(d, 'mrbc') }
+                 .select { |f| File.executable?(f) }
+    end
+
+    private_class_method def self.rbenv_candidates
+      Dir.glob(File.expand_path('~/.rbenv/versions/mruby-*/bin/mrbc'))
+         .select { |f| File.executable?(f) }
+    end
   end
 end

data/lib/prremote/version.rb

@@ -1,4 +1,3 @@
 module Prremote
-  VERSION         = '0.1.1'.freeze
-  RUNTIME_VERSION = '0.1.3'.freeze
+  VERSION = File.read(File.expand_path('../../VERSION', __dir__)).strip
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prremote
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - ITO Yosei
@@ -103,6 +103,7 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- VERSION
 - bin/prremote
 - lib/prremote.rb
 - lib/prremote/cli.rb