ndr_dev_support 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: dbcfdf282fc498259213e7c7961b199abf2fab0b20ffd2b3e7ef38d8222722d6
-  data.tar.gz: 3403335c3c26478a99ff0b2de557d0d4c7899d8325073073d12a84d78e36211d
+SHA1:
+  metadata.gz: 1f9fa648db8ffa98eb6e5505ed89da5266ae1d19
+  data.tar.gz: b2a540c25a23505528540b6addd26cc6bfab2fb5
 SHA512:
-  metadata.gz: '02974ba29c5f09941a52fb3fcc7af3aeb01a9edb9d80608ac500959dd19fb39290b35e5b33c55e55f833f552f0313a86c0ca370d333531b6e182f5db4ec8a2a3'
-  data.tar.gz: ec95966fbb3dcf4826e54e1eb1c14b981541243d49daf1c83662e2b109f4b36a9973a5320f9b6615e6fe13de53c8d817966d596bc834914a66af10c270032aca
+  metadata.gz: 80c793fbaa8c72db13f34b53db7b200a6745c8854f0afc5f25097223d32df3225cfff20b781c16a197662c5905566183f07e5cae04e06921673f24542318e968
+  data.tar.gz: b3b6535d2e6e235ad9e4c3c80be4944fd1443f6998ffd79526f216ddad819311d4cb1f50f90484ff9285e6a1a86ad54cd03e6becc16308c12a740bd27a8bdea1

data/.rubocop.yml

@@ -114,6 +114,10 @@ Rails/ActionFilter:
   # projects will want to override this configuration to use 'filter' instead.
   EnforcedStyle: action
 
+Rails/DynamicFindBy:
+  Exclude:
+  - 'test/integration/**/*.rb'
+
 Rails/SkipsModelValidations:
   # Methods like 'update_column' exist for a reason, and it is the developer's
   # responsibilty to understand the behaviour of the code they write; blanket

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'bundler/setup'
-require 'tnql'
+require 'ndr_dev_support'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/code_safety.yml

@@ -10,12 +10,12 @@ file safety:
     safe_revision: c03d4ff0dd037a2798563d464d0daeca1189debe
   ".rubocop.yml":
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 3a4fc58f43e28c32e4fea25fa56a1eaf4a887d84
+    reviewed_by: josh.pencheon
+    safe_revision: 949a0ff086946426531a34d48f646b32c761c272
   ".travis.yml":
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 35fa869f068ca3250fee611147e49f40f0147d92
+    safe_revision: 8faa3e5e7ba5ef29daa1a857c8c15702f57c5a3f
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: timgentry
@@ -38,8 +38,8 @@ file safety:
     safe_revision: a601dbd139132f50eb22b1c88d5eda14a465a7c2
   bin/console:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: c59a45986f8b6d087c8c21b1e889f31f7346da17
+    reviewed_by: josh.pencheon
+    safe_revision: 3377bef3131bbe58acaa82083fcb27c9c6d1e2b0
   bin/setup:
     comments: 
     reviewed_by: timgentry
@@ -83,7 +83,7 @@ file safety:
   lib/ndr_dev_support/integration_testing/dsl.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 12d9c51ec2bc946ee02eee63700e905b8c0c01c1
+    safe_revision: dfe1e6bf5e6c014d6a1a5f9c7e3268900910b00e
   lib/ndr_dev_support/rake_ci/brakeman_helper.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -119,16 +119,16 @@ file safety:
   lib/ndr_dev_support/tasks.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 6240a84dc859af0623328f8667b93299c8eae257
+    safe_revision: 4dc952cb99ec6f4e416a5b668ceca7e8d7604eef
   lib/ndr_dev_support/version.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: b725560e101395a6dd1a9ece106462edb6ebcc74
+    safe_revision: d96ee996d3b7fcd7ccf3450355ffe4c32253b3a5
   lib/tasks/audit_code.rake:
     comments: Identical to the version reviewed by josh.pencheon when contained within
       ndr_support
     reviewed_by: josh.pencheon
-    safe_revision: 73030d56a06d05ae2d8716713b01647d76b7d904
+    safe_revision: 810858eb1acb297625708de6ddf8179c528c48f4
   lib/tasks/ci/brakeman.rake:
     comments: 
     reviewed_by: josh.pencheon
@@ -141,6 +141,10 @@ file safety:
     comments: 
     reviewed_by: timgentry
     safe_revision: cf22c7ab8b2eb67b501b5ebd1309c832db4fdf6c
+  lib/tasks/ci/dependencies.rake:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: 4dc952cb99ec6f4e416a5b668ceca7e8d7604eef
   lib/tasks/ci/housekeep.rake:
     comments: 
     reviewed_by: timgentry
@@ -184,12 +188,16 @@ file safety:
   ndr_dev_support.gemspec:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: e0b3871607c649565330d6e62740ffd860930338
+    safe_revision: 8faa3e5e7ba5ef29daa1a857c8c15702f57c5a3f
+  test/daemon/ci_server_test.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: cdd176f2e90284e11899c5c6eea1032f9b785b74
   test/ndr_dev_support_test.rb:
     comments: 
     reviewed_by: timgentry
     safe_revision: 26a8907a7a8a6b0d836aa12ca0335fa40be12240
   test/test_helper.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: c59a45986f8b6d087c8c21b1e889f31f7346da17
+    reviewed_by: josh.pencheon
+    safe_revision: cdd176f2e90284e11899c5c6eea1032f9b785b74

data/lib/ndr_dev_support/integration_testing/dsl.rb

@@ -29,6 +29,21 @@ module NdrDevSupport
         assert(remain ? has_selector?(selector) : has_no_selector?(selector), message)
       end
 
+      def find_new(*args, **options)
+        # There is no point waiting to see there are no existing matches:
+        pre_options = { wait: 0 }.merge(options)
+        prior_matches = find_all(*args, **pre_options)
+
+        yield
+
+        # We expect exactly one new match as a result of the interaction:
+        post_options = { count: prior_matches.length + 1 }
+        current_matches = find_all(*args, **post_options)
+
+        additional_matches = current_matches.to_a - prior_matches.to_a
+        additional_matches.first
+      end
+
       # Adds variant of Capybara's #within_window method, that doesn't return
       # to the preview window on an exception. This allows us to screenshot
       # a popup automatically if a test errors/fails whilst it has focus.

data/lib/ndr_dev_support/tasks.rb

@@ -2,6 +2,7 @@ load 'tasks/audit_code.rake'
 load 'tasks/ci/brakeman.rake'
 load 'tasks/ci/bundle_audit.rake'
 load 'tasks/ci/bundle_install.rake'
+load 'tasks/ci/dependencies.rake'
 load 'tasks/ci/housekeep.rake'
 load 'tasks/ci/linguist.rake'
 load 'tasks/ci/notes.rake'

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 = '3.0.0'.freeze
+  VERSION = '3.1.0'.freeze
 end

data/lib/tasks/audit_code.rake

@@ -365,7 +365,7 @@ def print_repo_file_diffs(repolatest, repo, fname, usr, safe_revision, interacti
       if usr.to_s.strip.empty?
         usr = ask('File reviewed by:') do |q|
           q.whitespace = :strip_and_collapse
-          q.validate = /\A[\w \-]+\Z/
+          q.validate = /\A[\w \-.]+\Z/
         end
       end
       comment = ask('Please write your comments (optional):')

data/lib/tasks/ci/dependencies.rake

@@ -0,0 +1,61 @@
+namespace :ci do
+  namespace :dependencies do
+    desc 'setup'
+    task :setup do
+      ENV['PROJECT_NAME'] = gem_name || ask('Project Name: ')
+    end
+
+    desc 'process'
+    task process: :setup do
+      # Usage: bundle exec rake ci:dependencies:process
+      arr = [
+        ENV['PROJECT_NAME'],
+        RUBY_VERSION,
+        gem_requirement('rails'),
+        gem_requirement('activemodel-caution'),
+        gem_requirement('ndr_dev_support'),
+        gem_requirement('ndr_error'),
+        gem_requirement('ndr_import'),
+        gem_requirement('ndr_support'),
+        gem_requirement('ndr_ui'),
+        gem_requirement('ndr_workflow'),
+        jquery_version,
+        bootstrap_version
+      ]
+      puts "| #{arr.join(' | ')} |"
+    end
+
+    def current_dependencies
+      @current_dependencies ||= Bundler.environment.current_dependencies
+    end
+
+    # There is probably a simpler way of getting this information
+    def gem_name
+      self_dependency = current_dependencies.detect do |dep|
+        dep.source && dep.source.path.to_s == '.'
+      end
+      self_dependency && self_dependency.name
+    end
+
+    def gem_requirement(name)
+      dependency = current_dependencies.detect { |dep| dep.name == name }
+
+      return '-' if dependency.nil? || (dependency.source && dependency.source.path.to_s == '.')
+      return "@#{dependency.source.ref}@" if dependency.source
+      dependency.requirement.to_s
+    end
+
+    def jquery_version
+      Jquery::Rails::JQUERY_VERSION
+    rescue NameError
+      '-'
+    end
+
+    def bootstrap_version
+      require 'bootstrap-sass'
+      Bootstrap::VERSION
+    rescue LoadError
+      '-'
+    end
+  end
+end

data/ndr_dev_support.gemspec

@@ -13,6 +13,8 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  # SECURE BNS 2018-08-06: Minimise sharing of (public-key encrypted) slack secrets in .travis.yml
+  spec.files         -= %w[.travis.yml] # Not needed in the gem
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
@@ -46,5 +48,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'rake', '~> 10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_dev_support
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -262,6 +262,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -285,7 +299,6 @@ files:
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -318,6 +331,7 @@ files:
 - lib/tasks/ci/brakeman.rake
 - lib/tasks/ci/bundle_audit.rake
 - lib/tasks/ci/bundle_install.rake
+- lib/tasks/ci/dependencies.rake
 - lib/tasks/ci/housekeep.rake
 - lib/tasks/ci/linguist.rake
 - lib/tasks/ci/notes.rake
@@ -349,7 +363,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: NDR Developer Support library

data/.travis.yml

@@ -1,11 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.2.5
-  - 2.3.1
-
-sudo: false
-
-cache: bundler
-
-before_script: "bundle update"