Merge pull request #2 from sqitchers/develop

sync
sqitchers · Apr 21, 2020 · 8726d5a · 8726d5a
2 parents 8b9366e + cbb7d0b
commit 8726d5a
Show file tree

Hide file tree

Showing 26 changed files with 404 additions and 308 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: perl
 stage: 🐪 Perl
 perl:
+  - "5.30"
   - "5.28"
   - "5.26"
   - "5.24"
@@ -35,7 +36,7 @@ jobs:
         - ./dev/prove -lr t
 
     - stage: 📈 Coverage
-      if: branch = develop
+      if: branch = master OR branch =~ /(?i:cover)/
       services: docker
       env: COVERAGE=1
       before_install:
@@ -61,7 +62,7 @@ jobs:
 
     - &postgres
       stage: 🐘 Postgres
-      if: branch = develop
+      if: branch = master OR branch =~ /(?i:pgsql|postgre(?i:sql)?)/
       env: POSTGRES=11
       before_install:
         - source dev/linux-postgres
@@ -90,7 +91,7 @@ jobs:
     # https://sqlite.org/chronology.html
     - &sqlite
       stage: 💡 SQLite
-      if: branch = develop
+      if: branch = master OR branch =~ /(?i:sqlite)/
       env: SQLITE=3.26.0
       before_install:
         - source dev/linux-sqlite
@@ -140,7 +141,7 @@ jobs:
     # https://hub.docker.com/_/mariadb
     - &mysql
       stage: 🐬 MySQL
-      if: branch = develop
+      if: branch = master OR branch =~ /(?i:mysql)/
       services: docker
       env: MYSQL=mysql:8.0
       before_install:
@@ -170,7 +171,7 @@ jobs:
     # https://hub.docker.com/r/cjonesy/docker-vertica/tags
     - &vertica
       stage: 🔺 Vertica
-      if: branch = develop
+      if: branch = master OR branch =~ /(?i:vertica)/
       env: VERTICA=9.1.1-0
       before_install:
         - source dev/linux-vertica
@@ -189,7 +190,7 @@ jobs:
     # https://hub.docker.com/r/exasol/docker-db/tags
     - &exasol
       stage: ☀️ Exasol
-      if: branch = develop
+      if: branch = master OR branch =~ /(?i:exasol)/
       env: EXASOL=6.1.1-d1
       before_install:
         - source dev/linux-exasol
@@ -202,7 +203,7 @@ jobs:
     # https://hub.docker.com/r/jacobalberty/firebird/tags
     - &firebird
       stage: 🔥 Firebird
-      if: branch = develop
+      if: branch = master OR branch =~ /(?i:firebird)/
       env: FIREBIRD=3.0
       before_install:
         - source dev/linux-firebird
@@ -240,6 +241,5 @@ jobs:
 
   fast_finish: true
   allow_failures:
-    - env: FIREBIRD=2.5-ss # https://github.com/jacobalberty/firebird-docker/issues/33
     - stage: ❄️ Snowflake
     - stage: 🔮 Oracle
diff --git a/Changes b/Changes
@@ -1,5 +1,14 @@
 Revision history for Perl extension App::Sqitch
 
+1.0.1
+     - Fixed Perl Pod errors, thanks to a pull request from Mohammad S Anwar
+       (#470).
+     - Fixed test failures when running with the localization set to German
+       or Italian. Thanks to Slaven Rezić for the report (#472).
+     - Fixed an issue when the full name of the current user is not set so
+       that it properly falls back on the username. Thanks to Slaven Rezić and
+       Matthieu Foucault for the report and testing various fixes (#473).
+
 1.0.0  2019-06-04T12:56:22Z
      - Fixed test failure due to a hard-coded system error that may be
        localized on non-en-US hosts. Thanks to Slaven Rezić for the catch

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-App/Sqitch version 0.9999
+App/Sqitch version v1.0.1
 =========================
 
 [![CPAN version](https://badge.fury.io/pl/App-Sqitch.svg)](https://badge.fury.io/pl/App-Sqitch)

diff --git a/dev/linux-firebird b/dev/linux-firebird
@@ -6,4 +6,5 @@ docker run --rm -d -e ISC_PASSWORD=nix -e FIREBIRD_DATABASE=sqitchtest.db -p 305
 sudo add-apt-repository -y ppa:mapopa/firebird3.0
 sudo apt-get update -qq
 sudo apt-get install -qq firebird-dev firebird3.0-utils
+export FIREBIRD_HOME=/usr
 export FIREBIRD_URI=db:firebird://sysdba:nix@localhost//firebird/data/sqitchtest.db
diff --git a/dist.ini b/dist.ini
@@ -1,7 +1,7 @@
 name = App-Sqitch
 license = MIT
 copyright_holder = "iovation Inc."
-version = v1.0.0
+version = v1.0.1
 
 [GatherDir]
 [PruneCruft]

diff --git a/dist/sqitch.spec b/dist/sqitch.spec
@@ -1,5 +1,5 @@
 Name:           sqitch
-Version:        1.0.0
+Version:        1.0.1
 Release:        1%{?dist}
 Summary:        Sensible database change management
 License:        MIT

diff --git a/lib/App/Sqitch.pm b/lib/App/Sqitch.pm
@@ -94,8 +94,9 @@ has user_name => (
             }
             require User::pwent;
             my $name = User::pwent::getpwnam($sysname) || return $sysname;
+            $name = ($name->gecos)[0] || return $sysname;
             require Encode::Locale;
-            return Encode::decode( locale => ($name->gecos)[0] );
+            return Encode::decode( locale => $name );
         };
     }
 );

diff --git a/lib/sqitch-checkout.pod b/lib/sqitch-checkout.pod
@@ -77,7 +77,7 @@ Don't verify each change. This is the default.
 Set a variable name and value for use by the database engine client, if it
 supports variables. The format must be C<name=value>, e.g.,
 C<--set defuser='Homer Simpson'>. Overrides any values loaded from
-L</configuration Variables>.
+L</Configuration Variables>.
 
 =item C<-e>
 
@@ -86,7 +86,7 @@ L</configuration Variables>.
 Set a variable name and value for use by the database engine client when
 deploying, if it supports variables. The format must be C<name=value>, e.g.,
 C<--set defuser='Homer Simpson'>. Overrides any values from C<--set> or values
-loaded from L</configuration Variables>.
+loaded from L</Configuration Variables>.
 
 =item C<-r>
 
@@ -95,7 +95,7 @@ loaded from L</configuration Variables>.
 Sets a variable name to be used by the database engine client during when
 reverting, if it supports variables. The format must be C<name=value>, e.g.,
 C<--set defuser='Homer Simpson'>. Overrides any values from C<--set> or values
-loaded from L</configuration Variables>.
+loaded from L</Configuration Variables>.
 
 =item C<--log-only>
 

diff --git a/lib/sqitch-target.pod b/lib/sqitch-target.pod
@@ -126,9 +126,9 @@ managed by L<engine|sqitch-engine>.
 
 =item C<--verbose>
 
-  sqitch engine --verbose
+  sqitch target --verbose
 
-Be more verbose when listing engines.
+Be more verbose when listing targets.
 
 =back
 

diff --git a/po/App-Sqitch.pot b/po/App-Sqitch.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: App-Sqitch v1.0.0\n"
+"Project-Id-Version: App-Sqitch v1.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-06-04 07:43-0400\n"
+"POT-Creation-Date: 2020-03-07 14:19-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,56 +22,56 @@ msgstr ""
 msgid "Cannot find your name; run sqitch config --user user.name \"YOUR NAME\""
 msgstr ""
 
-#: lib/App/Sqitch.pm:114
+#: lib/App/Sqitch.pm:115
 msgid ""
 "Cannot infer your email address; run sqitch config --user user.email "
 "you@host.com"
 msgstr ""
 
-#: lib/App/Sqitch.pm:280
+#: lib/App/Sqitch.pm:281
 #, perl-brace-format
 msgid "Cannot change to directory {directory}: {error}"
 msgstr ""
 
-#: lib/App/Sqitch.pm:314 lib/App/Sqitch/Command.pm:112
+#: lib/App/Sqitch.pm:315 lib/App/Sqitch/Command.pm:112
 #, perl-brace-format
 msgid "\"{command}\" is not a valid command"
 msgstr ""
 
-#: lib/App/Sqitch.pm:408
+#: lib/App/Sqitch.pm:409
 msgid ""
 "Sqitch seems to be unattended and there is no default value for this question"
 msgstr ""
 
-#: lib/App/Sqitch.pm:427
+#: lib/App/Sqitch.pm:428
 msgctxt "Confirm prompt answer yes"
 msgid "Yes"
 msgstr ""
 
-#: lib/App/Sqitch.pm:428
+#: lib/App/Sqitch.pm:429
 msgctxt "Confirm prompt answer no"
 msgid "No"
 msgstr ""
 
-#: lib/App/Sqitch.pm:437
+#: lib/App/Sqitch.pm:438
 msgid "Please answer \"y\" or \"n\"."
 msgstr ""
 
-#: lib/App/Sqitch.pm:440
+#: lib/App/Sqitch.pm:441
 msgid "No valid answer after 3 attempts; aborting"
 msgstr ""
 
-#: lib/App/Sqitch.pm:461 lib/App/Sqitch.pm:468
+#: lib/App/Sqitch.pm:462 lib/App/Sqitch.pm:469
 #, perl-brace-format
 msgid "Cannot exec {command}: {error}"
 msgstr ""
 
-#: lib/App/Sqitch.pm:484
+#: lib/App/Sqitch.pm:485
 #, perl-brace-format
 msgid "Error closing pipe to {command}: {error}"
 msgstr ""
 
-#: lib/App/Sqitch.pm:488 lib/App/Sqitch/Engine/oracle.pm:758
+#: lib/App/Sqitch.pm:489 lib/App/Sqitch/Engine/oracle.pm:758
 #, perl-brace-format
 msgid "{command} unexpectedly returned exit value {exitval}"
 msgstr ""

diff --git a/po/de_DE.po b/po/de_DE.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sqitch 0.932\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-06-04 07:43-0400\n"
+"POT-Creation-Date: 2020-03-07 14:19-0500\n"
 "PO-Revision-Date: 2012-08-31 17:15-0700\n"
 "Last-Translator: Thomas Iguchi <ti@nobu-games.com>\n"
 "Language-Team: German <david@justatheory.com>\n"
@@ -24,60 +24,60 @@ msgstr ""
 "Kann deinen Namen nicht finden. Führe den folgenden Befehl aus: sqitch "
 "config --user user.name \"DEIN NAME\""
 
-#: lib/App/Sqitch.pm:114
+#: lib/App/Sqitch.pm:115
 msgid ""
 "Cannot infer your email address; run sqitch config --user user.email "
 "you@host.com"
 msgstr ""
 "Kann deine E-Mail-Adresse nicht finden. Führe den folgenden Befehl aus: "
 "sqitch config --user user.email dein.name@domain.com"
 
-#: lib/App/Sqitch.pm:280
+#: lib/App/Sqitch.pm:281
 #, perl-brace-format
 msgid "Cannot change to directory {directory}: {error}"
 msgstr "Konnte nicht in das folgende Verzeichnis wechseln {directory}: {error}"
 
-#: lib/App/Sqitch.pm:314 lib/App/Sqitch/Command.pm:112
+#: lib/App/Sqitch.pm:315 lib/App/Sqitch/Command.pm:112
 #, perl-brace-format
 msgid "\"{command}\" is not a valid command"
 msgstr "\"{command}\" ist ein ungültiger Befehl"
 
-#: lib/App/Sqitch.pm:408
+#: lib/App/Sqitch.pm:409
 msgid ""
 "Sqitch seems to be unattended and there is no default value for this question"
 msgstr ""
 "Sqitch scheint unbeaufsichtigt ausgeführt zu werden, und es steht leider "
 "keine Standardantwort für diese Frage zur Verfügung"
 
-#: lib/App/Sqitch.pm:427
+#: lib/App/Sqitch.pm:428
 msgctxt "Confirm prompt answer yes"
 msgid "Yes"
 msgstr "Ja"
 
-#: lib/App/Sqitch.pm:428
+#: lib/App/Sqitch.pm:429
 msgctxt "Confirm prompt answer no"
 msgid "No"
 msgstr "Nein"
 
-#: lib/App/Sqitch.pm:437
+#: lib/App/Sqitch.pm:438
 msgid "Please answer \"y\" or \"n\"."
 msgstr "Bitte antworte mit \"j\" oder \"n\""
 
-#: lib/App/Sqitch.pm:440
+#: lib/App/Sqitch.pm:441
 msgid "No valid answer after 3 attempts; aborting"
 msgstr "Drei ungültige Antworten in Folge. Breche ab"
 
-#: lib/App/Sqitch.pm:461 lib/App/Sqitch.pm:468
+#: lib/App/Sqitch.pm:462 lib/App/Sqitch.pm:469
 #, perl-brace-format
 msgid "Cannot exec {command}: {error}"
 msgstr "Konnte den Befehl {command} nicht ausführen: {error}"
 
-#: lib/App/Sqitch.pm:484
+#: lib/App/Sqitch.pm:485
 #, perl-brace-format
 msgid "Error closing pipe to {command}: {error}"
 msgstr "Fehler beim Schließen der Pipeline nach {command}: {error}"
 
-#: lib/App/Sqitch.pm:488 lib/App/Sqitch/Engine/oracle.pm:758
+#: lib/App/Sqitch.pm:489 lib/App/Sqitch/Engine/oracle.pm:758
 #, perl-brace-format
 msgid "{command} unexpectedly returned exit value {exitval}"
 msgstr "{command} brach unerwartet ab mit Rückgabewert {exitval}"