rpremote 0.1.0 → 0.3.0

data/patches/picoruby-4.0.3-bootsel.patch

@@ -0,0 +1,71 @@
+diff --git a/mrbgems/picoruby-machine/include/machine.h b/mrbgems/picoruby-machine/include/machine.h
+--- a/mrbgems/picoruby-machine/include/machine.h
++++ b/mrbgems/picoruby-machine/include/machine.h
+@@ -68,1 +68,2 @@
+ void Machine_reboot(void);
++void Machine_bootsel(void);
+diff --git a/mrbgems/picoruby-machine/mrblib/machine.rb b/mrbgems/picoruby-machine/mrblib/machine.rb
+--- a/mrbgems/picoruby-machine/mrblib/machine.rb
++++ b/mrbgems/picoruby-machine/mrblib/machine.rb
+@@ -22,0 +23,4 @@
++  def self.bootsel
++    self._bootsel
++  end
++
+diff --git a/mrbgems/picoruby-machine/ports/rp2040/machine.c b/mrbgems/picoruby-machine/ports/rp2040/machine.c
+--- a/mrbgems/picoruby-machine/ports/rp2040/machine.c
++++ b/mrbgems/picoruby-machine/ports/rp2040/machine.c
+@@ -10,0 +11,1 @@
++#include "pico/bootrom.h"
+@@ -42,0 +44,6 @@
++void
++Machine_bootsel(void)
++{
++  rom_reset_usb_boot(0, 0);
++}
++
+diff --git a/mrbgems/picoruby-machine/src/mruby/machine.c b/mrbgems/picoruby-machine/src/mruby/machine.c
+--- a/mrbgems/picoruby-machine/src/mruby/machine.c
++++ b/mrbgems/picoruby-machine/src/mruby/machine.c
+@@ -496,0 +497,11 @@
++static mrb_value
++mrb_s__bootsel(mrb_state *mrb, mrb_value self)
++{
++#if !defined(PICORB_PLATFORM_POSIX)
++  Machine_bootsel();
++#else
++  mrb_raise(mrb, E_NOTIMP_ERROR, "Machine._bootsel is not available on this platform");
++#endif
++  return mrb_nil_value();
++}
++
+@@ -529,0 +541,1 @@
++  mrb_define_class_method_id(mrb, module_Machine, MRB_SYM(_bootsel), mrb_s__bootsel, MRB_ARGS_NONE());
+diff --git a/mrbgems/picoruby-machine/src/mrubyc/machine.c b/mrbgems/picoruby-machine/src/mrubyc/machine.c
+--- a/mrbgems/picoruby-machine/src/mrubyc/machine.c
++++ b/mrbgems/picoruby-machine/src/mrubyc/machine.c
+@@ -316,0 +317,11 @@
++static void
++c_Machine__bootsel(mrbc_vm *vm, mrbc_value *v, int argc)
++{
++#if !defined(PICORB_PLATFORM_POSIX)
++  Machine_bootsel();
++#else
++  mrbc_raise(vm, MRBC_CLASS(RuntimeError), "Machine.bootsel is not available on this platform.");
++#endif
++  SET_NIL_RETURN();
++}
++
+@@ -546,0 +558,1 @@
++  mrbc_define_method(vm, module_Machine, "_bootsel", c_Machine__bootsel);
+diff --git a/mrbgems/picoruby-shell/shell_executables/_path.txt b/mrbgems/picoruby-shell/shell_executables/_path.txt
+--- a/mrbgems/picoruby-shell/shell_executables/_path.txt
++++ b/mrbgems/picoruby-shell/shell_executables/_path.txt
+@@ -17,0 +18,1 @@
++/bin/bootsel
+diff --git a/mrbgems/picoruby-shell/shell_executables/bootsel.rb b/mrbgems/picoruby-shell/shell_executables/bootsel.rb
+new file mode 100644
+--- /dev/null
++++ b/mrbgems/picoruby-shell/shell_executables/bootsel.rb
+@@ -0,0 +1 @@
++Machine.bootsel

data/patches/picoruby-4.0.3-ruby-exception-status.patch

@@ -0,0 +1,59 @@
+diff --git a/mrbgems/picoruby-shell/mrblib/job.rb b/mrbgems/picoruby-shell/mrblib/job.rb
+index f650cce..225c944 100644
+--- a/mrbgems/picoruby-shell/mrblib/job.rb
++++ b/mrbgems/picoruby-shell/mrblib/job.rb
+@@ -1,5 +1,7 @@
+ class Shell
+   class Job
++    RUBY_EXCEPTION_STATUS = "\x1eR2P2:RUBY_EXCEPTION\x1f"
++
+     def initialize(*params)
+       if params.empty?
+         raise ArgumentError, "Job requires at least one parameter"
+@@ -24,12 +26,11 @@ class Shell
+       @sandbox.resume
+       @sandbox.wait(timeout: nil)
+       if error = @sandbox.error
+-        puts "#{error.message} (#{error.class})"
++        return report_ruby_exception(error)
+       end
+       return true
+     rescue Exception => e
+-      puts "#{e.message} (#{e.class})"
+-      return false
++      return report_ruby_exception(e)
+     end
+ 
+     def state
+@@ -60,22 +61,28 @@ class Shell
+       end
+       if error = @sandbox.error
+         reap(before)
+-        puts "\n#{error.message} (#{error.class})"
++        return report_ruby_exception(error, true)
+       end
+       return true
+     rescue Exception => e
+-      puts "#{e.message} (#{e.class})"
+       # backtrace uses a lot of memory
+       #if e.respond_to?(:backtrace)
+       #  e.backtrace.each do |line|
+       #    puts "  #{line}"
+       #  end
+       #end
+-      return false
++      return report_ruby_exception(e)
+     end
+ 
+     private
+ 
++    def report_ruby_exception(error, leading_newline = false)
++      print "\n" if leading_newline
++      puts "#{error.message} (#{error.class})"
++      print RUBY_EXCEPTION_STATUS
++      false
++    end
++
+     # Terminate tasks the job started but left behind, and ONLY when the
+     # job died: a script killed by e.g. NoMemoryError never reaches the
+     # code that would stop its own tasks, and such an orphan keeps running

data/sig/rpremote.rbs

@@ -166,11 +166,33 @@ module Rpremote
     def source_dir: () -> String
   end
 
+  class NukeFirmware
+    URL: String
+    FILENAME: String
+    MAX_REDIRECTS: Integer
+
+    def initialize: (?directory: String, ?fetcher: untyped) -> void
+    def setup: (?force: bool) -> String
+  end
+
+  class PicoRubySourcePatch
+    JOB_PATH: String
+    PATCH_ALIASES: Hash[String, String]
+
+    class Error < Rpremote::Error
+    end
+
+    attr_reader version: String
+
+    def initialize: (version: String) -> void
+    def apply: (String source) -> void
+  end
+
   class Builder
     class Error < Rpremote::Error
     end
 
-    def initialize: (?root: String, ?runner: untyped, ?mrbgems_class: untyped) -> void
+    def initialize: (?root: String, ?runner: untyped, ?mrbgems_class: untyped, ?source_patcher: untyped) -> void
     def build: (
       ?language: String,
       ?language_version: String,
@@ -240,6 +262,7 @@ module Rpremote
     PROMPT_END: String
     CURSOR_POSITION_QUERY: String
     CURSOR_POSITION_RESPONSE: String
+    RUBY_EXCEPTION_STATUS: String
 
     class Error < Rpremote::Error
     end
@@ -260,7 +283,7 @@ module Rpremote
     def initialize: (untyped io, ?timeout: Float) -> void
     def synchronize!: () -> nil
     def send_command: (String command) -> nil
-    def execute: (String command) -> String
+    def execute: (String command, ?output: IO?) -> String
   end
 
   class Terminal
@@ -293,7 +316,12 @@ module Rpremote
       ?shell_class: untyped,
       ?path_factory: untyped
     ) -> void
-    def run: (String data) -> String
+    def run: (String data, ?output: IO?) -> String
+  end
+
+  class RecursiveCopy
+    def initialize: (output: IO, ?serial: untyped, ?device: untyped) -> void
+    def call: (String source, String destination, Hash[Symbol, untyped] options) -> void
   end
 
   class Resetter
@@ -323,7 +351,7 @@ module Rpremote
     class Result < Data
       attr_reader mount: String
       attr_reader destination: String
-      attr_reader port: String
+      attr_reader port: String?
     end
 
     class Error < Rpremote::Error
@@ -348,8 +376,10 @@ module Rpremote
       ?port_probe: untyped,
       ?sleeper: untyped
     ) -> void
-    def flash: (String uf2_path, ?mount: String?, ?port: String?) -> Result
+    def flash: (String uf2_path, ?mount: String?, ?port: String?, ?wait_for_port: bool) -> Result
     def find_mount: (?String? explicit_mount) -> String
+    def find_mounted: (?String? explicit_mount) -> String?
+    def wait_for_mount: (?mount: String?) -> String
   end
 
   class DfuCommand
@@ -401,4 +431,36 @@ module Rpremote
       ?flasher: untyped
     ) -> void
   end
+
+  class DeployCommand
+    def self.run: (
+      Array[String] args,
+      defaults: Hash[Symbol, untyped],
+      ?output: IO,
+      ?error: IO,
+      ?services: Hash[Symbol, untyped]
+    ) -> void
+  end
+
+  class BootselCommand
+    RESET_FLASH_FIRMWARE: String
+
+    class Error < Rpremote::Error
+    end
+
+    def self.run: (
+      Array[String] args,
+      defaults: Hash[Symbol, untyped],
+      ?output: IO,
+      ?services: Hash[Symbol, untyped]
+    ) -> void
+    def self.enter: (
+      mount: String?,
+      port: String?,
+      baud: Integer,
+      timeout: Numeric,
+      output: IO,
+      ?services: Hash[Symbol, untyped]
+    ) -> String
+  end
 end

data/tasks/firmware_build.rb

@@ -32,9 +32,7 @@ output_dir = File.join(REPOSITORY_ROOT, "build", build_name)
 mruby_build_dir = File.join(picoruby_root, "build", config_name)
 cmake_source_dir = File.join(r2p2_gem_dir, "cmake")
 
-unless File.file?(File.join(picoruby_root, "Rakefile"))
-  abort "PicoRuby source not found: #{picoruby_root}\nSet PICORUBY_DIR to a PicoRuby checkout."
-end
+abort "PicoRuby source not found: #{picoruby_root}\nSet PICORUBY_DIR to a PicoRuby checkout." unless File.file?(File.join(picoruby_root, "Rakefile"))
 abort "Build config not found: #{base_config_path}" unless File.file?(base_config_path)
 abort "Generated build config not found: #{config_path}" unless File.file?(config_path)
 build_config = File.read(base_config_path)
@@ -60,11 +58,7 @@ build_env = {
   "PICO_EXTRAS_PATH" => pico_extras_path
 }
 
-# PicoRuby's build directory is keyed by the target name, not by MRUBY_CONFIG.
-# A generated overlay therefore shares the base target's objects. In particular,
-# mrblib.c includes picogem_init.c, but Make does not track that generated include
-# as a dependency. Reusing the directory can leave a removed or added local
-# mrbgem out of libmruby.a. Custom mrbgems must start from a fresh target build.
+# PicoRuby keys build output by target, so an overlay can reuse stale objects; fresh builds keep changed local mrbgems in libmruby.a.
 if fingerprint && File.directory?(mruby_build_dir)
   puts "Removing stale PicoRuby build output: #{mruby_build_dir}"
   FileUtils.rm_rf(mruby_build_dir)

data/tasks/release_check.rb

@@ -34,14 +34,10 @@ module Rpremote
       package = Gem::Package.new(gem_file)
       specification = package.spec
       missing_files = EXPECTED_FILES - package.contents
-      changelog_entry = "## [#{Rpremote::VERSION}]"
+      changelog_entry = /^## #{Regexp.escape(Rpremote::VERSION)} - \d{4}-\d{2}-\d{2}$/
 
-      unless specification.version.to_s == Rpremote::VERSION
-        abort "built gem version does not match #{Rpremote::VERSION}"
-      end
-      unless File.read("CHANGELOG.md").include?(changelog_entry)
-        abort "CHANGELOG.md has no entry for #{Rpremote::VERSION}"
-      end
+      abort "built gem version does not match #{Rpremote::VERSION}" unless specification.version.to_s == Rpremote::VERSION
+      abort "CHANGELOG.md has no entry for #{Rpremote::VERSION}" unless File.read("CHANGELOG.md").match?(changelog_entry)
       abort "built gem is missing: #{missing_files.join(", ")}" unless missing_files.empty?
       abort "built gem does not require MFA" unless specification.metadata["rubygems_mfa_required"] == "true"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rpremote
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - ogom
@@ -26,11 +26,14 @@ files:
 - THIRD_PARTY_NOTICES.md
 - exe/rpremote
 - lib/rpremote.rb
+- lib/rpremote/bootsel_command.rb
 - lib/rpremote/build_command.rb
 - lib/rpremote/builder.rb
 - lib/rpremote/checksum.rb
 - lib/rpremote/cli.rb
 - lib/rpremote/config.rb
+- lib/rpremote/config_show.rb
+- lib/rpremote/deploy_command.rb
 - lib/rpremote/device.rb
 - lib/rpremote/dfu_command.rb
 - lib/rpremote/dfu_compiler.rb
@@ -41,7 +44,10 @@ files:
 - lib/rpremote/language_source.rb
 - lib/rpremote/mrbgems.rb
 - lib/rpremote/mrbgems_command.rb
+- lib/rpremote/nuke_firmware.rb
 - lib/rpremote/picomodem.rb
+- lib/rpremote/picoruby_source_patch.rb
+- lib/rpremote/recursive_copy.rb
 - lib/rpremote/remote_path.rb
 - lib/rpremote/resetter.rb
 - lib/rpremote/runner.rb
@@ -51,6 +57,10 @@ files:
 - lib/rpremote/target.rb
 - lib/rpremote/terminal.rb
 - lib/rpremote/version.rb
+- patches/picoruby-3.4.5-bootsel.patch
+- patches/picoruby-3.4.5-ruby-exception-status.patch
+- patches/picoruby-4.0.3-bootsel.patch
+- patches/picoruby-4.0.3-ruby-exception-status.patch
 - sig/rpremote.rbs
 - tasks/firmware_build.rb
 - tasks/release.rake