ndr_dev_support 5.4.2 → 5.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40ccc810a2c161f76dc266186853a4e99b55bb3e5d787152c6fb991c15d37ad2
-  data.tar.gz: ed3864f3a6407480926e6d12fcc52608f027f21623bc6be50156b96b4e47bd53
+  metadata.gz: 88fa4dc2d23262c7862de5de6c3b84c3621755cb26f8aea709bb0987994387df
+  data.tar.gz: 7071375825241e3f64ca568c51206540262b499d82d022758a9daef325be422c
 SHA512:
-  metadata.gz: 91b5c6307cffd80b185ec2277efccb99b6a836211753ae8858b9f901b9f0e7956d196268a115fb9aaa8a80396e15c7b42b4ee102929aaeea2dc2d860f2f19f1e
-  data.tar.gz: 362d64a1fc3daccad19fdf05be711ce7b007e4ccde90f6757b1aafc477a49b80e75d9214a9f32532aaaeda028d233b05960c545e6415168f75e69532ebb583bc
+  metadata.gz: 28e5ae508027e943ae8ce540d8f9206b194cd55c1544b9eee7a6332670c62f0a2296717f9021d2305cd4f07211b44b326dcb67f9df054147462eaa52e1f1211b
+  data.tar.gz: da800d3520a3c2dd2003f1e4dd4b588bb07fc1a06c01e45668b5c35641e87896315ad5c698d7181013101d286cdc95e9ff1de82b5e65a4d9d58ab0b385712ff5

data/.rubocop.yml

@@ -30,6 +30,14 @@ Layout/DotPosition:
   # Multi-line method chaining should be done with trailing dots.
   EnforcedStyle: trailing
 
+Layout/AlignHash:
+  EnforcedColonStyle:
+  - key
+  - table
+  EnforcedHashRocketStyle:
+  - key
+  - table
+
 ##################### Style ##################################
 
 # We make use of block comments, e.g. for validation documentation.

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 5.4.3 / 2019-06-18
+### Fixed
+* Avoid `RBENV_ROOT` issues when deploying to NDR-model targets
+* Avoid duplicate 'tests passed' notifications (#49)
+
 ## 5.4.2 / 2019-06-18
 ### Fixed
 * Tweak `:chrome_headless` driver for Chrome 75+

data/code_safety.yml

@@ -11,7 +11,7 @@ file safety:
   ".rubocop.yml":
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: a4fc1188be78ee287799c2fafd2395f94fccabbe
+    safe_revision: e67a239f5e3917fb190092a50862d17f540584fb
   ".travis.yml":
     comments: 
     reviewed_by: josh.pencheon
@@ -19,7 +19,7 @@ file safety:
   CHANGELOG.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: a17b7d43e0c40ae2c5c3a5062c7c47380184dc32
+    safe_revision: f0f36386fbb45f6f8f299fb7784a757d34ed3618
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: timgentry
@@ -75,7 +75,7 @@ file safety:
   lib/ndr_dev_support/capistrano/ndr_model.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 809acebc212beaaf23e6d73ae4d9b87382c2d087
+    safe_revision: fa4042dc341b14eb7feafcc78baf052dbb100eb3
   lib/ndr_dev_support/capistrano/restart.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -203,7 +203,7 @@ file safety:
   lib/ndr_dev_support/version.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: a17b7d43e0c40ae2c5c3a5062c7c47380184dc32
+    safe_revision: f0f36386fbb45f6f8f299fb7784a757d34ed3618
   lib/tasks/audit_code.rake:
     comments: Identical to the version reviewed by josh.pencheon when contained within
       ndr_support
@@ -248,7 +248,7 @@ file safety:
   lib/tasks/ci/redmine.rake:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 2d1b9d19acafebe6ca5f995bf15243abe2847eec
+    safe_revision: 3c24b66ea4beb348de34330984302f1fe25faefd
   lib/tasks/ci/rugged.rake:
     comments: 
     reviewed_by: josh.pencheon

data/lib/ndr_dev_support/capistrano/ndr_model.rb

@@ -111,7 +111,10 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       # Use the application user's ruby:
       set(:default_environment) do
-        { 'PATH' => "#{application_home}/.rbenv/shims:#{application_home}/.rbenv/bin:$PATH" }
+        {
+          'PATH'       => "#{application_home}/.rbenv/shims:#{application_home}/.rbenv/bin:$PATH",
+          'RBENV_ROOT' => "#{application_home}/.rbenv"
+        }
       end
 
       # Set a flag so behaviour can toggle in mixed use cases

data/lib/ndr_dev_support/version.rb

@@ -2,5 +2,5 @@
 # This defines the NdrDevSupport version. If you change it, rebuild and commit the gem.
 # Use "rake build" to build the gem, see rake -T for all bundler rake tasks (and our own).
 module NdrDevSupport
-  VERSION = '5.4.2'.freeze
+  VERSION = '5.4.3'.freeze
 end

data/lib/tasks/ci/redmine.rake

@@ -20,6 +20,7 @@ namespace :ci do
       resolved_tickets = []
       @attachments   ||= []
 
+      require 'active_support/core_ext/object/try'
       require 'ndr_dev_support/rake_ci/redmine/ticket_resolver'
 
       begin
@@ -39,11 +40,16 @@ namespace :ci do
       next if resolved_tickets.empty?
       resolved_tickets.map! { |ticket_id| "https://#{hostname}/issues/#{ticket_id}" }
 
+      old_attachment = @attachments.detect { |att| att[:text] =~ /Tests( now)? pass/ }
+      basic_text     = old_attachment.try(:[], :text) || 'Tests passed'
+
+      @attachments.delete(old_attachment) if old_attachment
+
       issue_s = resolved_tickets.count == 1 ? 'issue' : 'issues'
       attachment = {
         color: 'good',
         title: "#{issue_s.capitalize} Resolved",
-        text: "Tests pass, so #{issue_s} #{resolved_tickets.join(', ')}" \
+        text: "#{basic_text}, so #{issue_s} #{resolved_tickets.join(', ')}" \
               " #{resolved_tickets.count == 1 ? 'has' : 'have'} been resolved",
         footer: 'bundle exec rake ci:minitest',
         mrkdwn_in: ['text']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_dev_support
 version: !ruby/object:Gem::Version
-  version: 5.4.2
+  version: 5.4.3
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-18 00:00:00.000000000 Z
+date: 2019-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry