Merge branch 'release/0.94'

gugod · Dec 4, 2021 · 7c14acb · 7c14acb
2 parents 35ccdf8 + bc2767e
commit 7c14acb
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 9 deletions.
diff --git a/Changes b/Changes
@@ -1,3 +1,7 @@
+0.94
+	- Released at 2021-12-05T08:39:16+0900
+	- Let `self-upgrade` print version numbers when doing upgrades. Github issue #678.
+
 0.93
 	- Released at 2021-11-22T23:09:25+0900
 	- Let `clone-modules` takes just one arguments and mean 'cloning modules from that perl'.

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
@@ -2,6 +2,7 @@
 \bCVS\b
 ^MANIFEST\.
 ^Makefile$
+^Build$
 ~$
 ^#
 \.old$

diff --git a/META.json b/META.json
@@ -75,7 +75,7 @@
       },
       "App::perlbrew" : {
          "file" : "lib/App/perlbrew.pm",
-         "version" : "0.93"
+         "version" : "0.94"
       }
    },
    "release_status" : "stable",
@@ -89,8 +89,8 @@
          "web" : "https://github.com/gugod/App-perlbrew"
       }
    },
-   "version" : "0.93",
-   "x_serialization_backend" : "JSON::PP version 4.06",
+   "version" : "0.94",
+   "x_serialization_backend" : "JSON::PP version 4.04",
    "x_spdx_expression" : "MIT",
    "x_static_install" : "1"
 }
diff --git a/META.yml b/META.yml
@@ -37,7 +37,7 @@ provides:
     file: lib/App/Perlbrew/Util.pm
   App::perlbrew:
     file: lib/App/perlbrew.pm
-    version: '0.93'
+    version: '0.94'
 requires:
   CPAN::Perl::Releases: '5.20210620'
   Capture::Tiny: '0.48'
@@ -52,7 +52,7 @@ requires:
 resources:
   bugtracker: https://github.com/gugod/App-perlbrew/issues
   repository: https://github.com/gugod/App-perlbrew.git
-version: '0.93'
+version: '0.94'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
 x_spdx_expression: MIT
 x_static_install: '1'
diff --git a/dev-bin/release.sh b/dev-bin/release.sh
@@ -3,6 +3,8 @@
 # Make sure we are at the right directory.
 cd $(dirname $0)/..
 
+git clean -xdf
+
 CURRENT_VERSION=$(egrep 'our \$VERSION = "[\.0-9]+";' lib/App/perlbrew.pm  | egrep -o '[0-9]+' | tail -1)
 RELEASE_VERSION=0.$((CURRENT_VERSION+1))
 RELEASE_TIMESTAMP=$(date +'%FT%T%z')

diff --git a/lib/App/perlbrew.pm b/lib/App/perlbrew.pm
@@ -2,7 +2,7 @@ package App::perlbrew;
 use strict;
 use warnings;
 use 5.008;
-our $VERSION = "0.93";
+our $VERSION = "0.94";
 use Config;
 
 BEGIN {
@@ -2232,10 +2232,14 @@ sub run_command_self_upgrade {
     } else {
         die "Unable to detect version of new perlbrew!\n";
     }
+
     if ($new_version <= $VERSION) {
-        print "Your perlbrew is up-to-date.\n";
+        print "Your perlbrew is up-to-date (version $VERSION).\n" unless $self->{quiet};
         return;
     }
+
+    print "Upgrading from $VERSION to $new_version\n" unless $self->{quiet};
+
     system $TMP_PERLBREW, "self-install";
     $TMP_PERLBREW->unlink;
 }

diff --git a/perlbrew b/perlbrew
@@ -450,7 +450,7 @@ $fatpacked{"App/perlbrew.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'AP
   use strict;
   use warnings;
   use 5.008;
-  our $VERSION = "0.93";
+  our $VERSION = "0.94";
   use Config;
 
   BEGIN {
@@ -2680,10 +2680,14 @@ $fatpacked{"App/perlbrew.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'AP
       } else {
           die "Unable to detect version of new perlbrew!\n";
       }
+
       if ($new_version <= $VERSION) {
-          print "Your perlbrew is up-to-date.\n";
+          print "Your perlbrew is up-to-date (version $VERSION).\n" unless $self->{quiet};
           return;
       }
+
+      print "Upgrading from $VERSION to $new_version\n" unless $self->{quiet};
+
       system $TMP_PERLBREW, "self-install";
       $TMP_PERLBREW->unlink;
   }