ndr_dev_support 2.0.2 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c549695ca2f5c892b209d22a626df24f521590c3
-  data.tar.gz: 626218f3403114a27c4307269e0fb5f09b95ea95
+  metadata.gz: ff79dd76561dbabac2a6f54db5b1dadc19439165
+  data.tar.gz: 1033b76bb6f51a15b9a2fe66a0e475d793102c40
 SHA512:
-  metadata.gz: b7e023326ab81eb33042904a829837329ba0e1bdac2acfbc119a93bc37d8e7e3b016f8538cf2312eb16e06e0afd20f16891c56d74454c6162afb20a20605fe6e
-  data.tar.gz: c3a4a394b4e82d5a22d00aa8dfd4a92602dd3ebc17b991759ea5924189020e7136a1ceaff38c8c276619e6d36d728a80d55ee1403fc2f6420cbcd0a78aa8e8fe
+  metadata.gz: 2d0228f1592a2ed805c9191d64de4d91abbcda9b9e180ae2e00ff50369171125e06d10daa37bd5be50803574597231c41af2afe5f4b5375b9afb3a831ebfd480
+  data.tar.gz: f3f5e3fe9406928742b403eff426e2283eb5117a4b80b1762a87a878b3ac6f1b29ac31b0085dd5d7cc8f4e615cf62b8175f3e6ac010a000fcd2f752189d18fda

data/.rubocop.yml

@@ -10,6 +10,7 @@ AllCops:
   - 'bin/*'
   - 'db/**/*'
   - 'lib/generators/**/templates/*'
+  - 'tmp/**/*'
   - 'vendor/**/*'
 
 # Run the Rails cops by default (-R/--rails not required):

data/README.md

@@ -23,6 +23,12 @@ Or install it yourself as:
 
     $ gem install ndr_dev_support
 
+To add development support tasks (see below) to your project, add this line to your application's `Rakefile`:
+
+```ruby
+require 'ndr_dev_support/tasks'
+```
+
 ## Usage
 
 ### Code Auditing Rake Tasks
@@ -77,12 +83,6 @@ $ rake rubocop:diff:unstaged
 $ find . -iregex .*\.rake$ | xargs rake rubocop:diff:file
 ```
 
-To add development support tasks to your project, add this line to your application's Rakefile:
-
-```ruby
-require 'ndr_dev_support/tasks'
-```
-
 ### Integration test environment
 
 ndr_dev_support bundles a configured Rails integration testing environment. It uses `capybara` and `poltergeist` to drive a PhantomJS headless browser, and includes some sensible configuration.

data/code_safety.yml

@@ -6,8 +6,8 @@ file safety:
     safe_revision: c59a45986f8b6d087c8c21b1e889f31f7346da17
   ".rubocop.yml":
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: b37c9dc7871fad7c592945188b2e7307f1abedcd
+    reviewed_by: timgentry
+    safe_revision: 7256d6b694c7f3a62769b7d8ef56f32b93772ff9
   ".travis.yml":
     comments: 
     reviewed_by: josh.pencheon
@@ -27,7 +27,7 @@ file safety:
   README.md:
     comments: 
     reviewed_by: timgentry
-    safe_revision: a5dda3d6e14d08ca21b1adbfb15c1c3f63804061
+    safe_revision: 04a0d70cc467dad5a380744a6c678693429e0213
   Rakefile:
     comments: 
     reviewed_by: josh.pencheon
@@ -87,12 +87,12 @@ file safety:
   lib/ndr_dev_support/version.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: e7f67cbe41eb7c64866b46ff78b49dd0991a1161
+    safe_revision: 32aea472f527924ab3dad90b5116cc1c5716c3e8
   lib/tasks/audit_code.rake:
     comments: Identical to the version reviewed by josh.pencheon when contained within
       ndr_support
     reviewed_by: timgentry
-    safe_revision: 2cee09c32e63a5c339fc8acddd04c2f30dbbfa06
+    safe_revision: 063ba98f4ce8449cf586231dd9630a28aacc0743
   lib/tasks/rubocop.rake:
     comments: 
     reviewed_by: josh.pencheon
@@ -100,7 +100,7 @@ file safety:
   ndr_dev_support.gemspec:
     comments: 
     reviewed_by: timgentry
-    safe_revision: 73f74aa9091f21a153a0e9ba140aedbc7b94da90
+    safe_revision: 6436fb4ccee84240eec27f56f6f59528a10442e7
   test/ndr_dev_support_test.rb:
     comments: 
     reviewed_by: timgentry

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 = '2.0.2'.freeze
+  VERSION = '2.1.1'.freeze
 end

data/lib/tasks/audit_code.rake

@@ -71,6 +71,14 @@ def audit_code_safety(max_print = 20, ignore_new = false, show_diffs = false, sh
   puts "Number of files originally in #{SAFETY_FILE}: #{orig_count}"
   puts "Number of new files added: #{file_safety.size - orig_count}"
 
+  missing_files = file_safety.keys.reject { |path| File.file?(path) }
+  
+  if missing_files.length > 0
+    puts "Number of files no longer in repository but in code_safety.yml: #{missing_files.length}"
+    puts "  Please run rake audit:tidy_code_safety_file to remove redundant files"
+    missing_files.each { |path| puts "  " + path }
+  end
+
   # Now generate statistics:
   unknown = file_safety.values.select { |x| x['safe_revision'].nil? }
   unsafe = file_safety.values.select do |x|
@@ -352,6 +360,7 @@ def print_repo_file_diffs(repolatest, repo, fname, user_name, safe_revision)
   if cmd
     puts(cmd.join(' '))
     stdout_and_err_str, status = Open3.capture2e(*cmd)
+    puts 'Invalid commit ID in code_safety.yml ' + safe_revision  if stdout_and_err_str.start_with?('fatal: Invalid revision range ')
     puts(stdout_and_err_str)
   else
     puts 'Unknown repo'
@@ -396,6 +405,21 @@ def clean_working_copy?
  end
 end
 
+def remove_non_existent_files_from_code_safety
+  safety_cfg = YAML.load_file(SAFETY_FILE)
+  file_safety = safety_cfg['file safety']
+  files_no_longer_in_repo = file_safety.keys.reject {|ff| File.file?(ff)}
+  files_no_longer_in_repo.each do |f|
+    puts 'No longer in repository ' + f 
+    file_safety.delete f
+  end 
+  File.open(SAFETY_FILE, 'w') do |file|
+    # Consistent file diffs, as ruby preserves Hash insertion order since v1.9
+    safety_cfg['file safety'] = Hash[file_safety.sort]
+    YAML.dump(safety_cfg, file) # Save changes before checking latest revisions
+  end 
+end
+
 namespace :audit do
   desc "Audit safety of source code.
 Usage: audit:code [max_print=n] [ignore_new=false|true] [show_diffs=false|true] [reviewed_by=usr]
@@ -448,6 +472,13 @@ Usage:
     flag_file_as_safe(release, ENV['reviewed_by'], ENV['comments'], ENV['file'])
   end
 
+  desc 'Deletes any files from code_safety.yml that are no longer in repository.'
+  task(:tidy_code_safety_file) do
+    puts 'Checking code safety for missing files...'
+
+    remove_non_existent_files_from_code_safety
+  end
+
   desc 'Wraps audit:code, and stops if any review is pending/stale.'
   task(:ensure_safe) do
     abort('You have local changes, cannot verify code safety!') unless clean_working_copy?

data/ndr_dev_support.gemspec

@@ -20,8 +20,10 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.2'
 
+  spec.add_dependency 'pry'
+
   # Rubocop dependencies:
-  spec.add_dependency 'rubocop', '0.44.0'
+  spec.add_dependency 'rubocop', '0.44.1'
   spec.add_dependency 'parser'
   spec.add_dependency 'rainbow'
 
@@ -32,6 +34,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'pry'
   spec.add_development_dependency "minitest", "~> 5.0"
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ndr_dev_support
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.1
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.44.0
+        version: 0.44.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.44.0
+        version: 0.44.1
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  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: minitest
   requirement: !ruby/object:Gem::Requirement