chore(release): 0.37.4 [skip ci]

## [0.37.4](https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.3...v0.37.4) (2019-05-31) ### Continuous Integration * **travis:** reduce matrix down to 6 instances ([2ff919f](https://github.com/saltstack-formulas/postgres-formula/commit/2ff919f)) ### Tests * **`services_spec`:** remove temporary `suse` conditional ([81165fc](https://github.com/saltstack-formulas/postgres-formula/commit/81165fc)) * **command_spec:** use cleaner `match` string using `%r` ([a054cea](https://github.com/saltstack-formulas/postgres-formula/commit/a054cea)) * **locale:** improve test using locale `en_US.UTF-8` ([7796064](https://github.com/saltstack-formulas/postgres-formula/commit/7796064))
Merge pull request #269 from myii/chore/test-locales
2019-05-31 17:53:44 +00:00 · 2019-05-31 18:37:23 +01:00 · 2019-05-31 02:19:35 +01:00 · 2019-05-31 02:15:57 +01:00 · 2019-05-31 02:08:10 +01:00 · 2019-05-31 02:08:08 +01:00
10 changed files with 74 additions and 46 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,21 +22,21 @@ env:
    # TODO: Re-enable this once the `systemd` service can be restarted reliably
    # - INSTANCE: default-ubuntu-1804-2019-2-py3
    - INSTANCE: default-centos-7-2019-2-py3
-    - INSTANCE: default-fedora-29-2019-2-py3
+    # - INSTANCE: default-fedora-29-2019-2-py3
    - INSTANCE: default-opensuse-leap-15-2019-2-py3
-    - INSTANCE: default-debian-9-2018-3-py2
+    # - INSTANCE: default-debian-9-2018-3-py2
    - INSTANCE: default-ubuntu-1604-2018-3-py2
-    - INSTANCE: default-centos-7-2018-3-py2
+    # - INSTANCE: default-centos-7-2018-3-py2
    - INSTANCE: default-fedora-29-2018-3-py2
    # TODO: Use this when fixed instead of `opensuse-423`
    # NOTE: Having to temporarily disable `opensuse-423` due to slow mirror
    # - INSTANCE: default-opensuse-leap-15-2018-3-py2
    # - INSTANCE: default-opensuse-423-2018-3-py2
-    - INSTANCE: default-debian-8-2017-7-py2
-    - INSTANCE: default-ubuntu-1604-2017-7-py2
+    # - INSTANCE: default-debian-8-2017-7-py2
+    # - INSTANCE: default-ubuntu-1604-2017-7-py2
    - INSTANCE: default-centos-6-2017-7-py2
-    - INSTANCE: default-fedora-28-2017-7-py2
-    - INSTANCE: default-opensuse-leap-42-2017-7-py2
+    # - INSTANCE: default-fedora-28-2017-7-py2
+    # - INSTANCE: default-opensuse-leap-42-2017-7-py2

 script:
  - bundle exec kitchen verify ${INSTANCE}
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -6,11 +6,11 @@ Avatar|Contributor|Contributions
 :-:|---|:-:
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|57
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|47
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|45
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|41
-<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|41
-<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/16338056?v=4' width='36' height='36' alt='@vutny'>|[@vutny](https://github.com/vutny)|30
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/16338056?v=4' width='36' height='36' alt='@vutny'>|[@vutny](https://github.com/vutny)|31
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|19
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|19
-<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|18
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|11
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/745513?v=4' width='36' height='36' alt='@EvaSDK'>|[@EvaSDK](https://github.com/EvaSDK)|9
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1713422?v=4' width='36' height='36' alt='@dferrantelli'>|[@dferrantelli](https://github.com/dferrantelli)|8
@@ -65,8 +65,9 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/2097647?v=4' width='36' height='36' alt='@XRasher'>|[@XRasher](https://github.com/XRasher)|1
 <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/8005290?v=4' width='36' height='36' alt='@YetAnotherMinion'>|[@YetAnotherMinion](https://github.com/YetAnotherMinion)|1
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/17393048?v=4' width='36' height='36' alt='@ek9'>|[@ek9](https://github.com/ek9)|1
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/11394644?v=4' width='36' height='36' alt='@Strade288'>|[@Strade288](https://github.com/Strade288)|1
 <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/52996?v=4' width='36' height='36' alt='@daks'>|[@daks](https://github.com/daks)|1

 ---

-Auto generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-05-16.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-05-31.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog

+## [0.37.4](https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.3...v0.37.4) (2019-05-31)
+
+
+### Continuous Integration
+
+* **travis:** reduce matrix down to 6 instances ([2ff919f](https://github.com/saltstack-formulas/postgres-formula/commit/2ff919f))
+
+
+### Tests
+
+* **`services_spec`:** remove temporary `suse` conditional ([81165fc](https://github.com/saltstack-formulas/postgres-formula/commit/81165fc))
+* **command_spec:** use cleaner `match` string using `%r` ([a054cea](https://github.com/saltstack-formulas/postgres-formula/commit/a054cea))
+* **locale:** improve test using locale `en_US.UTF-8` ([7796064](https://github.com/saltstack-formulas/postgres-formula/commit/7796064))
+
 ## [0.37.3](https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.2...v0.37.3) (2019-05-16)


--- a/2
+++ b/2
@@ -1,7 +1,7 @@
 name: postgres
 os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
 os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
-version: 0.37.3
+version: 0.37.4
 release: 1
 minimum_version: 2016.11
 summary: Postgres formula
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@@ -19,21 +19,21 @@ This list is sorted by the number of commits per contributor in *descending* ord
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>`
     - `@aboe76 <https://github.com/aboe76>`_
     - 47
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
+     - `@myii <https://github.com/myii>`_
+     - 45
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>`
     - `@gravyboat <https://github.com/gravyboat>`_
     - 41
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
-     - `@myii <https://github.com/myii>`_
-     - 41
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/16338056?v=4' width='36' height='36' alt='@vutny'>`
     - `@vutny <https://github.com/vutny>`_
-     - 30
+     - 31
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>`
+     - `@javierbertoli <https://github.com/javierbertoli>`_
+     - 19
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>`
     - `@nmadhok <https://github.com/nmadhok>`_
     - 19
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>`
-     - `@javierbertoli <https://github.com/javierbertoli>`_
-     - 18
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>`
     - `@puneetk <https://github.com/puneetk>`_
     - 11
@@ -196,6 +196,9 @@ This list is sorted by the number of commits per contributor in *descending* ord
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/17393048?v=4' width='36' height='36' alt='@ek9'>`
     - `@ek9 <https://github.com/ek9>`_
     - 1
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/11394644?v=4' width='36' height='36' alt='@Strade288'>`
+     - `@Strade288 <https://github.com/Strade288>`_
+     - 1
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/52996?v=4' width='36' height='36' alt='@daks'>`
     - `@daks <https://github.com/daks>`_
     - 1
@@ -203,4 +206,4 @@ This list is sorted by the number of commits per contributor in *descending* ord

 ----

-Auto generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-05-16.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-05-31.
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -2,6 +2,23 @@
 Changelog
 =========

+`0.37.4 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.3...v0.37.4>`_ (2019-05-31)
+-------------------------------------------------------------------------------------------------------------
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **travis:** reduce matrix down to 6 instances (\ `2ff919f <https://github.com/saltstack-formulas/postgres-formula/commit/2ff919f>`_\ )
+
+Tests
+^^^^^
+
+
+* **\ ``services_spec``\ :** remove temporary ``suse`` conditional (\ `81165fc <https://github.com/saltstack-formulas/postgres-formula/commit/81165fc>`_\ )
+* **command_spec:** use cleaner ``match`` string using ``%r`` (\ `a054cea <https://github.com/saltstack-formulas/postgres-formula/commit/a054cea>`_\ )
+* **locale:** improve test using locale ``en_US.UTF-8`` (\ `7796064 <https://github.com/saltstack-formulas/postgres-formula/commit/7796064>`_\ )
+
 `0.37.3 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.2...v0.37.3>`_ (2019-05-16)
 -------------------------------------------------------------------------------------------------------------

--- a/pillar.example
+++ b/pillar.example
@@ -36,7 +36,7 @@ postgres:
  # The default `encoding` is derived from the `locale` so not recommended
  # to provide a value for it unless necessary
  cluster:
-    locale: en_GB.UTF-8
+    locale: en_US.UTF-8
    # encoding: UTF8

  #'Alternatives system' priority incremental. 0 disables feature.
--- a/test/integration/default/controls/command_spec.rb
+++ b/test/integration/default/controls/command_spec.rb
@@ -9,7 +9,6 @@ control 'Postgres command' do

  # Can't use `%Q` here due to the `\`
  describe command(%q{su - postgres -c 'psql -p} + pg_port + %q{ -qtc "\l+ db2"'}) do
-    its(:stdout) { should match(/.*db2.*my_space/) }
-    # its(:stdout) { should match(/db2.*remoteUser.*UTF8.*en_US\.UTF-8.*en_US\.UTF-8.*my_space/) }
+    its(:stdout) { should match(%r{db2.*remoteUser.*UTF8.*en_US.UTF-8.*en_US.UTF-8.*my_space}) }
  end
 end
--- a/test/integration/default/controls/services_spec.rb
+++ b/test/integration/default/controls/services_spec.rb
@@ -7,11 +7,6 @@ elsif os[:family] == 'debian' or os[:name] == 'suse'
  pg_port = 5433
 end

-# Temporary `if` due to `opensuse-leap-15` bug re: `service`
-if os[:name] == 'suse'
-  puts "[Skip `service`-based tests due to `opensuse-leap-15` detection bug (see https://github.com/inspec/train/issues/377)]"
-  puts "[Skip `service`-based tests due to `opensuse-leap-15` bug]"
-else
 control 'Postgres service' do
  impact 0.5
  title 'should be running and enabled'
@@ -25,4 +20,3 @@ control 'Postgres service' do
    it { should be_listening }
  end
 end
-end
--- a/test/salt/pillar/postgres.sls
+++ b/test/salt/pillar/postgres.sls
@@ -42,13 +42,13 @@ postgres:
  #   - postgresql-contrib
  #   - postgresql-plpython

-  # # CLUSTER
-  # # The default `encoding` is derived from the `locale` so not recommended
-  # # to provide a value for it unless necessary
-  # cluster:
-  #   locale: en_GB.UTF-8
-  #   # encoding: UTF8
-  #
+  # CLUSTER
+  # The default `encoding` is derived from the `locale` so not recommended
+  # to provide a value for it unless necessary
+  cluster:
+    locale: en_US.UTF-8
+    # encoding: UTF8
+
  # #'Alternatives system' priority incremental. 0 disables feature.
  # linux:
  #   altpriority: 30
@@ -166,20 +166,20 @@ postgres:
  # databases to be created
  databases:
    db1:
-      owner: 'localUser'
-      # template: 'template0'
-      # lc_ctype: 'en_US.UTF-8'
-      # lc_collate: 'en_US.UTF-8'
+      owner: localUser
+      template: template0
+      lc_ctype: en_US.UTF-8
+      lc_collate: en_US.UTF-8
    db2:
-      owner: 'remoteUser'
-      # template: 'template0'
-      # lc_ctype: 'en_US.UTF-8'
-      # lc_collate: 'en_US.UTF-8'
-      tablespace: 'my_space'
+      owner: remoteUser
+      template: template0
+      lc_ctype: en_US.UTF-8
+      lc_collate: en_US.UTF-8
+      tablespace: my_space
      # set custom schema
      schemas:
        public:
-          owner: 'localUser'
+          owner: localUser
      # enable per-db extension
      {%- if grains.os_family == 'Debian' and grains.osfinger != 'Debian-8' %}
      extensions:
Author	SHA1	Message	Date
semantic-release-bot	44b8fb1bc2	chore(release): 0.37.4 [skip ci] ## [0.37.4](https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.3...v0.37.4) (2019-05-31) ### Continuous Integration * travis: reduce matrix down to 6 instances ([`2ff919f`](https://github.com/saltstack-formulas/postgres-formula/commit/2ff919f)) ### Tests * `services_spec`: remove temporary `suse` conditional ([`81165fc`](https://github.com/saltstack-formulas/postgres-formula/commit/81165fc)) * command_spec: use cleaner `match` string using `%r` ([`a054cea`](https://github.com/saltstack-formulas/postgres-formula/commit/a054cea)) * locale: improve test using locale `en_US.UTF-8` ([`7796064`](https://github.com/saltstack-formulas/postgres-formula/commit/7796064))	2019-05-31 17:53:44 +00:00
Imran Iqbal	cb4e405098	Merge pull request #269 from myii/chore/test-locales test(locale): improve test using locale `en_US.UTF-8`	2019-05-31 18:37:23 +01:00
Imran Iqbal	2ff919f1bf	ci(travis): reduce matrix down to 6 instances * Ref: https://github.com/saltstack-formulas/template-formula/pull/121	2019-05-31 02:19:35 +01:00
Imran Iqbal	81165fc405	test(`services_spec`): remove temporary `suse` conditional * `train` gem has been fixed upstream - https://github.com/inspec/train/pull/451 - https://rubygems.org/gems/train/versions/2.1.7	2019-05-31 02:15:57 +01:00
Javier Bértoli	a054cea962	test(command_spec): use cleaner `match` string using `%r`	2019-05-31 02:08:10 +01:00
Imran Iqbal	77960641dd	test(locale): improve test using locale `en_US.UTF-8`	2019-05-31 02:08:08 +01:00