From 52be72edaad70276a4e6e69abf345545abc0747a Mon Sep 17 00:00:00 2001 From: Chris Welham <71787007+apexatoll@users.noreply.github.com> Date: Sat, 28 Oct 2023 10:08:01 +0100 Subject: [PATCH 1/5] Do not track gem signatures --- .gems/colorize/1.1/.rbs_meta.yaml | 9 -------- .gems/colorize/1.1/colorize.rbs | 32 ---------------------------- .gems/sequel/5.72/.rbs_meta.yaml | 9 -------- .gems/sequel/5.72/database.rbs | 5 ----- .gems/sequel/5.72/migrator.rbs | 5 ----- .gems/sequel/5.72/sequel.rbs | 5 ----- .gems/zeitwerk/2.6/.rbs_meta.yaml | 9 -------- .gems/zeitwerk/2.6/gem_inflector.rbs | 7 ------ .gems/zeitwerk/2.6/loader.rbs | 13 ----------- .gitignore | 1 + 10 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 .gems/colorize/1.1/.rbs_meta.yaml delete mode 100644 .gems/colorize/1.1/colorize.rbs delete mode 100644 .gems/sequel/5.72/.rbs_meta.yaml delete mode 100644 .gems/sequel/5.72/database.rbs delete mode 100644 .gems/sequel/5.72/migrator.rbs delete mode 100644 .gems/sequel/5.72/sequel.rbs delete mode 100644 .gems/zeitwerk/2.6/.rbs_meta.yaml delete mode 100755 .gems/zeitwerk/2.6/gem_inflector.rbs delete mode 100755 .gems/zeitwerk/2.6/loader.rbs diff --git a/.gems/colorize/1.1/.rbs_meta.yaml b/.gems/colorize/1.1/.rbs_meta.yaml deleted file mode 100644 index 419b030..0000000 --- a/.gems/colorize/1.1/.rbs_meta.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: colorize -version: '1.1' -source: - type: git - name: apexatoll/gem_signatures - revision: 1094d5a2ee9a07f3fbf6880980eaa099fb655ba9 - remote: https://github.com/apexatoll/gem_signatures - repo_dir: sig diff --git a/.gems/colorize/1.1/colorize.rbs b/.gems/colorize/1.1/colorize.rbs deleted file mode 100644 index 201b39d..0000000 --- a/.gems/colorize/1.1/colorize.rbs +++ /dev/null @@ -1,32 +0,0 @@ -class String -def black: -> instance - def red: -> instance - def green: -> instance - def yellow: -> instance - def blue: -> instance - def magenta: -> instance - def cyan: -> instance - def white: -> instance - def default: -> instance - def light_black: -> instance - def light_red: -> instance - def light_green: -> instance - def light_yellow: -> instance - def light_blue: -> instance - def light_magenta: -> instance - def light_cyan: -> instance - def light_white: -> instance - def bold: -> instance - def dim: -> instance - def italic: -> instance - def underline: -> instance - def blink: -> instance - def blink_slow: -> instance - def blink_fast: -> instance - def invert: -> instance - def hide: -> instance - def strike: -> instance - def double_underline: -> instance - def reveal: -> instance - def overlined: -> instance -end diff --git a/.gems/sequel/5.72/.rbs_meta.yaml b/.gems/sequel/5.72/.rbs_meta.yaml deleted file mode 100644 index 21f34cc..0000000 --- a/.gems/sequel/5.72/.rbs_meta.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: sequel -version: '5.72' -source: - type: git - name: apexatoll/gem_signatures - revision: 1094d5a2ee9a07f3fbf6880980eaa099fb655ba9 - remote: https://github.com/apexatoll/gem_signatures - repo_dir: sig diff --git a/.gems/sequel/5.72/database.rbs b/.gems/sequel/5.72/database.rbs deleted file mode 100644 index cb2c582..0000000 --- a/.gems/sequel/5.72/database.rbs +++ /dev/null @@ -1,5 +0,0 @@ -module Sequel - class Database - - end -end diff --git a/.gems/sequel/5.72/migrator.rbs b/.gems/sequel/5.72/migrator.rbs deleted file mode 100644 index 1e4a008..0000000 --- a/.gems/sequel/5.72/migrator.rbs +++ /dev/null @@ -1,5 +0,0 @@ -module Sequel - class Migrator - def self.run: (Sequel::Database, String) -> void - end -end diff --git a/.gems/sequel/5.72/sequel.rbs b/.gems/sequel/5.72/sequel.rbs deleted file mode 100644 index 4de7381..0000000 --- a/.gems/sequel/5.72/sequel.rbs +++ /dev/null @@ -1,5 +0,0 @@ -module Sequel - def self.sqlite: (String path) -> Database - - def self.extension: (Symbol) -> void -end diff --git a/.gems/zeitwerk/2.6/.rbs_meta.yaml b/.gems/zeitwerk/2.6/.rbs_meta.yaml deleted file mode 100644 index 8a1c1c9..0000000 --- a/.gems/zeitwerk/2.6/.rbs_meta.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: zeitwerk -version: '2.6' -source: - type: git - name: apexatoll/gem_signatures - revision: 1094d5a2ee9a07f3fbf6880980eaa099fb655ba9 - remote: https://github.com/apexatoll/gem_signatures - repo_dir: sig diff --git a/.gems/zeitwerk/2.6/gem_inflector.rbs b/.gems/zeitwerk/2.6/gem_inflector.rbs deleted file mode 100755 index 0fbb580..0000000 --- a/.gems/zeitwerk/2.6/gem_inflector.rbs +++ /dev/null @@ -1,7 +0,0 @@ -module Zeitwerk - class GemInflector - def initialize: (String file) -> void - - def inflect: (Hash[String, String]) -> void - end -end diff --git a/.gems/zeitwerk/2.6/loader.rbs b/.gems/zeitwerk/2.6/loader.rbs deleted file mode 100755 index 9079d8e..0000000 --- a/.gems/zeitwerk/2.6/loader.rbs +++ /dev/null @@ -1,13 +0,0 @@ -module Zeitwerk - class Loader - attr_accessor inflector: GemInflector - - def self.for_gem: (?warn_on_extra_files: bool) -> instance - - def collapse: (Array[String]) -> void - - def push_dir: (String dir, ?namespace: Module) -> void - - def setup: -> void - end -end diff --git a/.gitignore b/.gitignore index ba831eb..4633f6f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /doc/ /pkg/ /tmp/ +/.gems/ From 24c492c3335819d9cb03fe07c1f87abae0e80d81 Mon Sep 17 00:00:00 2001 From: Chris Welham <71787007+apexatoll@users.noreply.github.com> Date: Sat, 28 Oct 2023 10:08:47 +0100 Subject: [PATCH 2/5] Update rbs collection --- rbs_collection.lock.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rbs_collection.lock.yaml b/rbs_collection.lock.yaml index 0f3cb4e..9336c3f 100644 --- a/rbs_collection.lock.yaml +++ b/rbs_collection.lock.yaml @@ -2,12 +2,12 @@ sources: - type: git name: apexatoll/gem_signatures - revision: a6ee8a6175d4672e16cd149d88217aacf4f8dea1 + revision: 8eb0b43b978c3d9a00b6af015a4cb8e3cf5b1fd3 remote: https://github.com/apexatoll/gem_signatures repo_dir: sig - type: git name: ruby/gem_rbs_collection - revision: 3e93a59bd5da185b68187991630ac9a54a2468a7 + revision: 2de2d4535caba275f3b8533684aab110d921f553 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems path: ".gems" @@ -25,7 +25,7 @@ gems: source: type: git name: apexatoll/gem_signatures - revision: 1094d5a2ee9a07f3fbf6880980eaa099fb655ba9 + revision: 8eb0b43b978c3d9a00b6af015a4cb8e3cf5b1fd3 remote: https://github.com/apexatoll/gem_signatures repo_dir: sig - name: dbm @@ -57,7 +57,7 @@ gems: source: type: git name: apexatoll/gem_signatures - revision: 1094d5a2ee9a07f3fbf6880980eaa099fb655ba9 + revision: 8eb0b43b978c3d9a00b6af015a4cb8e3cf5b1fd3 remote: https://github.com/apexatoll/gem_signatures repo_dir: sig - name: tempfile @@ -73,7 +73,7 @@ gems: source: type: git name: apexatoll/gem_signatures - revision: 1094d5a2ee9a07f3fbf6880980eaa099fb655ba9 + revision: 8eb0b43b978c3d9a00b6af015a4cb8e3cf5b1fd3 remote: https://github.com/apexatoll/gem_signatures repo_dir: sig - name: zirconia From b8c8dbd575c8048287705ed79d376603178e77f0 Mon Sep 17 00:00:00 2001 From: Chris Welham <71787007+apexatoll@users.noreply.github.com> Date: Sat, 28 Oct 2023 10:10:04 +0100 Subject: [PATCH 3/5] Add native imports to Gemfile --- Gemfile | 4 ++++ Gemfile.lock | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/Gemfile b/Gemfile index 03f4164..8eb9a5e 100644 --- a/Gemfile +++ b/Gemfile @@ -2,9 +2,13 @@ source "https://rubygems.org" gemspec +gem "fileutils" +gem "forwardable" +gem "pathname" gem "rake", "~> 13.0" gem "rspec", "~> 3.0" gem "rubocop", "~> 1.21" gem "rubocop-rspec", "~> 2.23" gem "steep", "~> 1.5" +gem "yaml" gem "zirconia", "~> 0.1" diff --git a/Gemfile.lock b/Gemfile.lock index f182871..4cfb9a7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,6 +28,7 @@ GEM cgi (>= 0.3.3) ffi (1.15.5) fileutils (1.7.1) + forwardable (1.3.3) i18n (1.14.1) concurrent-ruby (~> 1.0) json (2.6.3) @@ -41,6 +42,7 @@ GEM parser (3.2.2.3) ast (~> 2.4.1) racc + pathname (0.2.1) racc (1.7.1) rainbow (3.1.1) rake (13.0.6) @@ -112,6 +114,7 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.4.2) + yaml (0.2.1) zeitwerk (2.6.11) zirconia (0.1.2) @@ -120,12 +123,16 @@ PLATFORMS x86_64-linux DEPENDENCIES + fileutils + forwardable kangaru! + pathname rake (~> 13.0) rspec (~> 3.0) rubocop (~> 1.21) rubocop-rspec (~> 2.23) steep (~> 1.5) + yaml zirconia (~> 0.1) BUNDLED WITH From ed1b541cc3bb502e01f563eda1e57353dbab370b Mon Sep 17 00:00:00 2001 From: Chris Welham <71787007+apexatoll@users.noreply.github.com> Date: Sat, 28 Oct 2023 10:10:56 +0100 Subject: [PATCH 4/5] Remove native imports from rbs collection --- rbs_collection.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/rbs_collection.yaml b/rbs_collection.yaml index 1e4aeba..5227f2a 100644 --- a/rbs_collection.yaml +++ b/rbs_collection.yaml @@ -22,8 +22,3 @@ gems: ignore: true - name: steep ignore: true - - - name: fileutils - - name: forwardable - - name: pathname - - name: yaml From e4b383f1889439dfaba941fe3e813b9d317d993a Mon Sep 17 00:00:00 2001 From: Chris Welham <71787007+apexatoll@users.noreply.github.com> Date: Sat, 28 Oct 2023 10:13:26 +0100 Subject: [PATCH 5/5] Remove duplicated Zeitwerk signature --- sig/zeitwerk/loader.rbs | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 sig/zeitwerk/loader.rbs diff --git a/sig/zeitwerk/loader.rbs b/sig/zeitwerk/loader.rbs deleted file mode 100644 index b2ec374..0000000 --- a/sig/zeitwerk/loader.rbs +++ /dev/null @@ -1,5 +0,0 @@ -module Zeitwerk - class Loader - def eager_load_namespace: (Module) -> void - end -end