prremote 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38c2f68eda963d1330c36a056cd57d7f40aa20916aab7b254b190aea3f9cde11
-  data.tar.gz: 6ef03b383f689c40a43a5449300e648cc693a1c7ebc974661398e2f290272396
+  metadata.gz: 8d080a70a00d10af1e419cae964da017bbc6650f85f54f3a18223b81bb204fe7
+  data.tar.gz: 158c193d72d4d414726f79183f6016017132077f37f0adc2f3238cd843e5672b
 SHA512:
-  metadata.gz: 67e8c6d8ce84d1721f23671269460fa366ab3ceaf4316f535e185a8d4395b919d6cb746197934074a8942752ed389476a0e979d41705f22cb5053a0fbade6531
-  data.tar.gz: 88100fc592979327716cf747bebbd06c90087c8193c2bb7fc692fab36fb7a3f9d38d68b97c5b5533c3a682ca0ac4e55b39c311ff28c2ac0643aaea3fe1fd3a2f
+  metadata.gz: 47d36cf128e0106b732273bad92aeb3af77c97a4e93f167e77d3ea34999578976a75f7babe8e3e910c6cf364422821cca6e5886cc7c7e5fa327a032a7d3bafb9
+  data.tar.gz: a63fae436f971e92d97386933706f99396dfcfc1ecf105c4ded5215aa1410d3ba3fadeb49805a9735a7285c1b6202da51dad325438d9b13d444756d48d88906e

data/README.md

@@ -12,7 +12,9 @@ Inspired by [mpremote](https://docs.micropython.org/en/latest/reference/mpremote
 
 - Ruby 3.x or later
 - Raspberry Pi Pico W
-- `mrbc` in your PATH (for `run`, `deploy`, and `eval`) — install via `brew install mruby` on macOS
+- `mrbc` in your PATH (for `run`, `deploy`, and `eval`)
+  - macOS: `brew install mruby`
+  - Ubuntu / Raspberry Pi OS: `sudo apt install mruby`
 
 ---
 
@@ -43,16 +45,18 @@ prremote run app.rb
 
 ### `install`
 
-Flash the prremote runtime firmware to a Pico W.
+Flash the prremote runtime firmware to a Pico W or Pico.
 
 ```bash
-prremote install
-prremote install --version 0.1.1   # specify a runtime version
+prremote install                          # Pico W (default)
+prremote install --board pico             # Pico (no wireless)
+prremote install --version 0.1.1          # specify a runtime version
+prremote install --board pico --version 0.1.1
 ```
 
 The firmware is downloaded from GitHub Releases on first use and cached in `~/.prremote/runtime/`. Subsequent installs use the cache.
 
-Put the Pico W into BOOTSEL mode (hold BOOTSEL, connect USB, release) when prompted.
+Put the device into BOOTSEL mode (hold BOOTSEL, connect USB, release) when prompted.
 
 ---
 
@@ -140,9 +144,9 @@ Show the gem version, mrbc version, and the connected device's runtime version.
 
 ```bash
 prremote version
-# prremote: 0.1.0
+# prremote: 0.1.1
 # mrbc:     3.3.0 (/usr/local/bin/mrbc)
-# runtime:  0.1.2
+# runtime:  0.1.3
 ```
 
 ---
@@ -199,4 +203,5 @@ Scripts saved via `deploy` are stored in flash and run automatically on every bo
 ## Related Projects
 
 - [mruby/c](https://github.com/mrubyc/mrubyc) — Lightweight mruby implementation used in the runtime
+- [picotool](https://github.com/raspberrypi/picotool) — Official Raspberry Pi tool for inspecting and managing Pico devices; useful for checking what's on flash or force-rebooting outside of prremote
 - [mpremote](https://docs.micropython.org/en/latest/reference/mpremote.html) — MicroPython equivalent (inspiration)

data/lib/prremote/cli.rb

@@ -20,12 +20,18 @@ module Prremote
       true
     end
 
-    desc 'install', 'Flash prremote runtime firmware to Pico W'
+    desc 'install', 'Flash prremote runtime firmware to Pico W or Pico'
     option :version, type: :string, desc: "Firmware version to install (default: #{RUNTIME_VERSION})"
+    option :board, type: :string, desc: 'Board type: pico or picow (default: picow)'
     def install
       version = options[:version] || RUNTIME_VERSION
-      Commands::Install.new(version: version).call
-    rescue RuntimeError => e
+      board = options[:board] || 'picow'
+      unless RuntimeManager::BOARDS.include?(board)
+        raise Thor::Error, "Unknown board '#{board}'. Valid values: #{RuntimeManager::BOARDS.join(', ')}"
+      end
+
+      Commands::Install.new(version: version, board: board).call
+    rescue StandardError => e
       raise Thor::Error, e.message
     end
 
@@ -33,7 +39,7 @@ module Prremote
     def run_script(file)
       port = resolve_port
       Commands::Run.new(port: port, baud: options[:baud]).call(file)
-    rescue RuntimeError => e
+    rescue StandardError => e
       raise Thor::Error, e.message
     end
     map 'run' => :run_script
@@ -42,7 +48,7 @@ module Prremote
     def deploy(file)
       port = resolve_port
       Commands::Deploy.new(port: port, baud: options[:baud]).call(file)
-    rescue RuntimeError => e
+    rescue StandardError => e
       raise Thor::Error, e.message
     end
 
@@ -50,7 +56,7 @@ module Prremote
     def undeploy
       port = resolve_port
       Commands::Undeploy.new(port: port, baud: options[:baud]).call
-    rescue RuntimeError => e
+    rescue StandardError => e
       raise Thor::Error, e.message
     end
 
@@ -58,7 +64,7 @@ module Prremote
     def eval(expr)
       port = resolve_port
       Commands::EvalCmd.new(port: port, baud: options[:baud]).call(expr)
-    rescue RuntimeError => e
+    rescue StandardError => e
       raise Thor::Error, e.message
     end
 
@@ -66,7 +72,7 @@ module Prremote
     def watch(file)
       port = resolve_port
       Commands::Watch.new(port: port, baud: options[:baud]).call(file)
-    rescue RuntimeError => e
+    rescue StandardError => e
       raise Thor::Error, e.message
     end
 
@@ -87,7 +93,7 @@ module Prremote
       serial.write("\x03")
       sleep 0.1
       puts 'Reset signal sent.'
-    rescue RuntimeError => e
+    rescue StandardError => e
       raise Thor::Error, e.message
     ensure
       serial&.close
@@ -99,7 +105,7 @@ module Prremote
 
       begin
         puts "mrbc:     #{Mrbc.version} (#{Mrbc.bin})"
-      rescue RuntimeError => e
+      rescue StandardError => e
         puts "mrbc:     (#{e.message})"
       end
 
@@ -108,7 +114,7 @@ module Prremote
 
     private
 
-    def fetch_runtime_version
+    def fetch_runtime_version # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
       port = options[:port] || Detector.find_device
       return '(no device connected)' unless port
 
@@ -116,14 +122,44 @@ module Prremote
       serial.write("\x03")
       buf      = +''
       deadline = Time.now + 5
+
       loop do
-        buf << (serial.read(256) || '').gsub("\r\n", "\n").gsub("\r", '')
+        begin
+          buf << (serial.read(256) || '').gsub("\r\n", "\n").gsub("\r", '')
+        rescue StandardError
+          # Watchdog reboot dropped USB; wait for re-enumeration then reopen.
+          begin
+            serial.close
+          rescue StandardError
+            nil
+          end
+          serial = nil
+          reopen_deadline = [deadline, Time.now + 8].min
+          loop do
+            return '(not responding)' if Time.now > reopen_deadline
+
+            p = options[:port] || Detector.find_device
+            if p && File.exist?(p)
+              serial = begin
+                Serial.new(p, options[:baud])
+              rescue StandardError
+                nil
+              end
+              break if serial
+            end
+            sleep 0.3
+          end
+          buf = +''
+          next
+        end
+
         return ::Regexp.last_match(1) if buf =~ %r{READY prremote-runtime/([\d.]+)}
-        break if Time.now > deadline
+        return '(not responding)' if Time.now > deadline
 
         sleep 0.05
       end
-      '(not responding)'
+    rescue StandardError => e
+      "(#{e.message})"
     ensure
       serial&.close
     end

data/lib/prremote/commands/install.rb

@@ -3,14 +3,16 @@ require 'fileutils'
 module Prremote
   module Commands
     class Install
-      def initialize(version: RUNTIME_VERSION)
+      def initialize(version: RUNTIME_VERSION, board: 'picow')
         @version = version
+        @board = board
       end
 
       def call
-        uf2_path = RuntimeManager.fetch(@version)
+        uf2_path = RuntimeManager.fetch(@version, @board)
 
-        puts 'Put the Pico W into BOOTSEL mode:'
+        device_label = @board == 'picow' ? 'Pico W' : 'Pico'
+        puts "Put the #{device_label} into BOOTSEL mode:"
         puts '  1. Hold the BOOTSEL button'
         puts '  2. Connect USB (or press RUN while holding BOOTSEL)'
         puts '  3. Release BOOTSEL — RPI-RP2 should appear as a USB drive'

data/lib/prremote/commands/undeploy.rb

@@ -10,18 +10,67 @@ module Prremote
 
       def call
         serial = Serial.new(@port, @baud)
-        sleep 0.5
-        serial.read(4096)
+        serial.write("\x03")
+
+        # \x03 may trigger a watchdog reboot (if a script was running).
+        # wait_for_ready returns the active serial (original or reopened).
+        serial = wait_for_ready(serial)
 
         serial.write(ERASE_MAGIC)
         wait_for_erased(serial)
         warn 'Flash erased. Device will no longer auto-run a script on boot.'
       ensure
-        serial&.close
+        begin
+          serial&.close
+        rescue StandardError
+          nil
+        end
       end
 
       private
 
+      # Returns the serial object in READY state (may be a new object after reboot).
+      def wait_for_ready(serial) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+        buf      = +''
+        deadline = Time.now + 10
+        loop do
+          begin
+            buf << (serial.read(256) || '').gsub("\r\n", "\n").gsub("\r", '')
+          rescue StandardError
+            # Watchdog reboot dropped USB; wait for device to re-enumerate.
+            begin
+              serial.close
+            rescue StandardError
+              nil
+            end
+            serial = nil
+            reopen_deadline = [deadline, Time.now + 8].min
+            loop do
+              raise 'Timeout waiting for device to reconnect' if Time.now > reopen_deadline
+
+              candidate = Detector.find_device || @port
+              if candidate && File.exist?(candidate)
+                begin
+                  serial = Serial.new(candidate, @baud)
+                  @port  = candidate
+                  break
+                rescue StandardError
+                  nil
+                end
+              end
+              sleep 0.3
+            end
+            buf = +''
+            next
+          end
+
+          return serial if buf.include?('READY prremote-runtime/')
+          raise 'Timeout waiting for READY' if Time.now > deadline
+
+          sleep 0.05
+        end
+      end
+
       def wait_for_erased(serial)
         buf = +''
         deadline = Time.now + 30

data/lib/prremote/commands/watch.rb

@@ -34,7 +34,7 @@ module Prremote
 
       def run(rb_path)
         Run.new(port: @port, baud: @baud).call(rb_path)
-      rescue RuntimeError => e
+      rescue StandardError => e
         warn "Error: #{e.message}"
       end
     end

data/lib/prremote/runtime_manager.rb

@@ -4,33 +4,32 @@ require 'fileutils'
 
 module Prremote
   module RuntimeManager
-    REPO  = 'lumbermill/prremote'.freeze
-    BOARD = 'picow'.freeze
+    BOARDS = %w[pico picow].freeze
 
-    def self.uf2_filename(version)
-      "prremote-#{BOARD}-runtime-#{version}.uf2"
+    def self.uf2_filename(version, board)
+      "prremote-#{board}-runtime-#{version}.uf2"
     end
 
-    def self.release_url(version)
-      "https://github.com/#{REPO}/releases/download/runtime-#{version}/#{uf2_filename(version)}"
+    def self.release_url(version, board)
+      "https://github.com/lumbermill/prremote/releases/download/runtime-#{version}/#{uf2_filename(version, board)}"
     end
 
     def self.cache_dir
       File.join(Dir.home, '.prremote', 'runtime')
     end
 
-    def self.cached_path(version)
-      File.join(cache_dir, uf2_filename(version))
+    def self.cached_path(version, board)
+      File.join(cache_dir, uf2_filename(version, board))
     end
 
-    def self.fetch(version)
-      path = cached_path(version)
+    def self.fetch(version, board)
+      path = cached_path(version, board)
       return path if File.exist?(path)
 
       FileUtils.mkdir_p(cache_dir)
-      $stderr.print "Downloading #{uf2_filename(version)}..."
+      $stderr.print "Downloading #{uf2_filename(version, board)}..."
       $stderr.flush
-      download(release_url(version), path)
+      download(release_url(version, board), path)
       warn ' done.'
       path
     end

data/lib/prremote/version.rb

@@ -1,4 +1,4 @@
 module Prremote
-  VERSION         = '0.1.0'.freeze
-  RUNTIME_VERSION = '0.1.2'.freeze
+  VERSION         = '0.1.1'.freeze
+  RUNTIME_VERSION = '0.1.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prremote
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - ITO Yosei