pkg: refactor packaging (2) (#1346)

Author: mrexox

packaging/scripts/clean.raku

@@ -3,15 +3,15 @@
 use v6;
 
 use lib $?FILE.IO.parent.child("lib");
-use Packaging;
-use Registry :kinds;
+use Packager;
+use Registry :Target;
 
 sub MAIN(
-  Registry::Kind :$target = all-registries,
+  Registry::Target :$target = all-registries,
   Bool :$dry-run = False,
 ) {
-  Packaging.new(
-    target => $target,
+  Packager.new(
+    target  => $target,
     dry-run => $dry-run,
   ).clean;
 }

packaging/scripts/lib/Packaging.rakumod packaging/scripts/lib/Packager.rakumodpackaging/scripts/lib/Packaging.rakumod renamed to packaging/scripts/lib/Packager.rakumod

@@ -5,7 +5,7 @@
 # I hope that reading through these scripts will show you
 # a lot of interesting concepts... and definitely fun!
 
-unit class Packaging;
+unit class Packager;
 
 use System;
 use Registry;
@@ -24,8 +24,8 @@ my constant @PACKAGE-TYPES = (
   Registries::AUR-Bin,
 );
 
-has Bool           $.dry-run is required;
-has Registry::Kind $.target  is required;
+has Bool             $.dry-run is required;
+has Registry::Target $.target  is required;
 
 method clean(--> Nil)       { .clean       for self!packages }
 method set-version(--> Nil) { .set-version for self!packages }
@@ -36,7 +36,7 @@ method !packages(--> Seq) {
   my $sys = System.new(dry-run => $!dry-run);
   my @packages = @PACKAGE-TYPES.map({ .new(sys => $sys) });
 
-  return @packages.Seq if $!target == Registry::Kind::all-registries;
+  return @packages.Seq if $!target == Registry::Target::all-registries;
 
-  @packages.grep(*.kind == $!target);
+  @packages.grep(*.target == $!target);
 }

packaging/scripts/lib/Registries/AUR-Bin.rakumod

@@ -10,7 +10,7 @@ my constant PKGBUILD = PKG-ROOT.child("aur").child("lefthook-bin").child("PKGBUI
 
 has SystemAPI $.sys is required;
 
-method kind(--> Registry::Kind:D) { Registry::Kind::aur-bin }
+method target(--> Registry::Target:D) { Registry::Target::aur-bin }
 
 method clean {}
 

packaging/scripts/lib/Registries/AUR.rakumod

@@ -10,7 +10,7 @@ my constant PKGBUILD = PKG-ROOT.child("aur").child("lefthook").child("PKGBUILD")
 
 has SystemAPI $.sys is required;
 
-method kind(--> Registry::Kind:D) { Registry::Kind::aur }
+method target(--> Registry::Target:D) { Registry::Target::aur }
 
 method clean {}
 

packaging/scripts/lib/Registries/NPM.rakumod

@@ -75,7 +75,7 @@ my constant %NPM-BUNDLED-DISTS = (
   arm64-openbsd => "{NPM-BUNDLED}/bin/lefthook-openbsd-arm64/lefthook",
 );
 
-method kind(--> Registry::Kind:D) { Registry::Kind::npm }
+method target(--> Registry::Target:D) { Registry::Target::npm }
 
 method clean {
   $!sys.rm(

packaging/scripts/lib/Registries/PyPI.rakumod

@@ -30,7 +30,7 @@ my constant @PLATFORMS = (
 
 has SystemAPI $.sys is required;
 
-method kind(--> Registry::Kind:D) { Registry::Kind::pypi }
+method target(--> Registry::Target:D) { Registry::Target::pypi }
 
 method clean {
   $!sys.rm(

packaging/scripts/lib/Registries/RubyGems.rakumod

@@ -22,8 +22,7 @@ my constant %RUBYGEM-DISTS = (
 
 has SystemAPI $.sys is required;
 
-
-method kind(--> Registry::Kind:D) { Registry::Kind::rubygem }
+method target(--> Registry::Target:D) { Registry::Target::rubygem }
 
 method clean {
   $!sys.rm("{RUBYGEMS}/libexec/".IO.dir.grep(*.d));

packaging/scripts/lib/Registry.rakumod

@@ -1,7 +1,7 @@
 unit module Registry;
 
 # Supported regitstries.
-enum Kind is export(:kinds) <
+enum Target is export(:Target) <
   all-registries
 
   npm
@@ -13,7 +13,7 @@ enum Kind is export(:kinds) <
 
 # Abstract interface for a registry class to implement.
 role Package {
-  method kind(--> Kind:D)     { ... }
+  method target(--> Target:D)     { ... }
   method clean(--> Nil)       { ... }
   method set-version(--> Nil) { ... }
   method prepare(--> Nil)     { ... }

packaging/scripts/prepare.raku

@@ -3,15 +3,15 @@
 use v6;
 
 use lib $?FILE.IO.parent.child("lib");
-use Packaging;
-use Registry :kinds;
+use Packager;
+use Registry :Target;
 
 sub MAIN(
-  Registry::Kind :$target = all-registries,
+  Registry::Target :$target = all-registries,
   Bool :$dry-run = False,
 ) {
-  Packaging.new(
-    target => $target,
+  Packager.new(
+    target  => $target,
     dry-run => $dry-run,
   ).prepare;
 }

packaging/scripts/publish.raku

@@ -3,15 +3,15 @@
 use v6;
 
 use lib $?FILE.IO.parent.child("lib");
-use Packaging;
-use Registry :kinds;
+use Packager;
+use Registry :Target;
 
 sub MAIN(
-  Registry::Kind :$target = all-registries,
+  Registry::Target :$target = all-registries,
   Bool :$dry-run = False,
 ) {
   Packaging.new(
-    target => $target,
+    target  => $target,
     dry-run => $dry-run,
   ).publish;
 }