rpremote 0.5.0 → 0.7.0

data/sig/rpremote.rbs

@@ -188,6 +188,15 @@ module Rpremote
     def apply: (String source) -> void
   end
 
+  class PicoRubyCompiler
+    CANDIDATES: Array[String]
+
+    class Error < StandardError
+    end
+
+    def self.ensure_legacy_path!: (String root) -> String
+  end
+
   class Builder
     class Error < Rpremote::Error
     end
@@ -199,7 +208,7 @@ module Rpremote
       ?board: String,
       ?cache_dir: String,
       ?firmware: String?,
-      ?mrbgems: String | false | nil,
+      ?mrbgems_lock: String | false | nil,
       ?output: IO,
       ?error: IO
     ) -> void
@@ -228,6 +237,7 @@ module Rpremote
       attr_reader path: String?
       attr_reader require_name: String?
       attr_reader auto_require: bool
+      attr_reader groups: Array[Symbol]
     end
 
     class Overlay < Data
@@ -238,6 +248,9 @@ module Rpremote
     attr_reader path: String
     attr_reader lock_path: String
 
+    def self.parse_groups: (String value) -> Array[Symbol]
+    def self.normalize_groups: (untyped values) -> Array[Symbol]
+
     def initialize: (
       ?path: String,
       ?lock_path: String?,
@@ -246,15 +259,18 @@ module Rpremote
     ) -> void
     def exist?: () -> bool
     def dependencies: () -> Array[Dependency]
+    def selected_dependencies: (?with: Array[String | Symbol], ?without: Array[String | Symbol]) -> Array[Dependency]
     def vm: () -> Symbol?
     def check: () -> Array[Dependency]
-    def lock: (?update: bool) -> Hash[String, untyped]
+    def lock: (?update: bool, ?with: Array[String | Symbol], ?without: Array[String | Symbol]) -> Hash[String, untyped]
     def read_lock: (?required: bool) -> Hash[String, untyped]?
+    def require_names: () -> Array[String]
+    def prepend_requires: (String source) -> String
+    def locked_vm: () -> Symbol?
     def generate_overlay: (
       base_config: String,
       target: String,
-      directory: String,
-      ?update: bool
+      directory: String
     ) -> Overlay
   end
 

data/tasks/firmware_build.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require "fileutils"
+require_relative "../lib/rpremote/picoruby_compiler"
 
 REPOSITORY_ROOT = File.expand_path(ENV.fetch("RPREMOTE_ROOT", File.expand_path("../..", __dir__)))
 DEFAULT_BOARD = "pico2"
@@ -14,7 +15,7 @@ def command!(*command, chdir:, env: {})
 end
 
 language = ENV.fetch("RPREMOTE_LANGUAGE", "picoruby")
-target_version = ENV.fetch("RPREMOTE_LANGUAGE_VERSION", "4.0.3")
+target_version = ENV.fetch("RPREMOTE_LANGUAGE_VERSION", "latest")
 board = ENV.fetch("RPREMOTE_BOARD", DEFAULT_BOARD)
 abort "Unsupported language: #{language}" unless language == "picoruby"
 abort "Unsupported board: #{board}" unless SUPPORTED_BOARDS.include?(board)
@@ -43,7 +44,8 @@ command!("rake", "r2p2:setup", chdir: picoruby_root) unless File.directory?(pico
 version_header = File.join(picoruby_root, "include/version.h")
 version = File.read(version_header)[/#define PICORUBY_VERSION "(.+?)"/, 1]
 abort "Could not determine PicoRuby version from #{version_header}" unless version
-abort "PicoRuby source is #{version}, but #{target_version} was requested." unless version == target_version
+abort "PicoRuby source is #{version}, but #{target_version} was requested." \
+  unless target_version == "latest" || version == target_version
 
 cache_file = File.join(output_dir, "CMakeCache.txt")
 if File.file?(cache_file) && !File.read(cache_file).include?("CMAKE_HOME_DIRECTORY:INTERNAL=#{cmake_source_dir}")
@@ -64,6 +66,12 @@ if fingerprint && File.directory?(mruby_build_dir)
   FileUtils.rm_rf(mruby_build_dir)
 end
 command!("rake", chdir: picoruby_root, env: build_env)
+begin
+  compiler = Rpremote::PicoRubyCompiler.ensure_legacy_path!(picoruby_root)
+  puts "Using PicoRuby compiler: #{compiler}"
+rescue Rpremote::PicoRubyCompiler::Error => e
+  abort e.message
+end
 
 cmake_definitions = [
   "-D", "PICORUBY_ROOT=#{picoruby_root}",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rpremote
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - ogom
@@ -31,6 +31,7 @@ files:
 - lib/rpremote/builder.rb
 - lib/rpremote/checksum.rb
 - lib/rpremote/cli.rb
+- lib/rpremote/cli/filesystem_commands.rb
 - lib/rpremote/config.rb
 - lib/rpremote/config_show.rb
 - lib/rpremote/deploy_command.rb
@@ -40,12 +41,21 @@ files:
 - lib/rpremote/flash_command.rb
 - lib/rpremote/flasher.rb
 - lib/rpremote/help.rb
+- lib/rpremote/help/dfu_commands.rb
+- lib/rpremote/help/filesystem_commands.rb
+- lib/rpremote/help/project_commands.rb
+- lib/rpremote/help/remote_commands.rb
+- lib/rpremote/help/root_text.rb
 - lib/rpremote/language.rb
 - lib/rpremote/language_source.rb
 - lib/rpremote/mrbgems.rb
+- lib/rpremote/mrbgems/definition.rb
+- lib/rpremote/mrbgems/file_writer.rb
+- lib/rpremote/mrbgems/lockfile.rb
 - lib/rpremote/mrbgems_command.rb
 - lib/rpremote/nuke_firmware.rb
 - lib/rpremote/picomodem.rb
+- lib/rpremote/picoruby_compiler.rb
 - lib/rpremote/picoruby_source_patch.rb
 - lib/rpremote/recursive_copy.rb
 - lib/rpremote/remote_path.rb
@@ -57,11 +67,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-pwm-sleep-clock.patch
 - patches/picoruby-4.0.3-ruby-exception-status.patch
+- patches/picoruby-4.0.4-pwm-sleep-clock.patch
 - sig/rpremote.rbs
 - tasks/firmware_build.rb
 - tasks/release.rake

data/patches/picoruby-3.4.5-bootsel.patch

@@ -1,71 +0,0 @@
-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
-@@ -48,1 +48,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
-@@ -12,0 +13,1 @@
-+#include "pico/bootrom.h"
-@@ -32,0 +34,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
-@@ -417,0 +418,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();
-+}
-+
-@@ -443,0 +455,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
-@@ -252,0 +253,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();
-+}
-+
-@@ -439,0 +451,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
-@@ -16,0 +17,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-bootsel.patch

@@ -1,71 +0,0 @@
-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