ndr_dev_support 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff79dd76561dbabac2a6f54db5b1dadc19439165
-  data.tar.gz: 1033b76bb6f51a15b9a2fe66a0e475d793102c40
+  metadata.gz: b462909165b10c8d687b0748b757ee8a797766bc
+  data.tar.gz: bfaa3539a90a7b010f81e12d31c2852a25f1a6e4
 SHA512:
-  metadata.gz: 2d0228f1592a2ed805c9191d64de4d91abbcda9b9e180ae2e00ff50369171125e06d10daa37bd5be50803574597231c41af2afe5f4b5375b9afb3a831ebfd480
-  data.tar.gz: f3f5e3fe9406928742b403eff426e2283eb5117a4b80b1762a87a878b3ac6f1b29ac31b0085dd5d7cc8f4e615cf62b8175f3e6ac010a000fcd2f752189d18fda
+  metadata.gz: 202df7fbda561139125efae9eeb3ba6e1753c0252c8e3097a6febb0668a81e866bb2daf1ba8f6480dafb6ecd37cabd1123d7f1a798869ef825a21ea7336f428f
+  data.tar.gz: abf58184c149a5053dc394ef41184e54b733a4fe5aaa01be61b3455f11765c5d1aabf91af8a927efdff74d83a3dbcfcbafeac72dc1ceb9ee00fb8cc7216fb26e

data/.hound.yml

@@ -0,0 +1,10 @@
+fail_on_violations: true
+
+coffeescript:
+  enabled: false
+javascript:
+  enabled: false
+ruby:
+  config_file: .rubocop.yml
+scss:
+  enabled: false

data/.rubocop.yml

@@ -35,8 +35,8 @@ Style/FrozenStringLiteralComment:
   # We're not confident enough to make this recommendation everywhere
   Enabled: false
 
-Style/IfUnlessModifier:
-  MaxLineLength: 100
+Metrics/LineLength:
+  Max: 100
 
 Style/ModuleFunction:
   # `extend self` has fewer side effects than `module_function`.
@@ -50,8 +50,11 @@ Style/SingleLineBlockParams:
   # Prefer readability of contextually-named variables.
   Enabled: false
 
-Style/WhileUntilModifier:
-  MaxLineLength: 100
+####################### Performance ############################
+
+# Disagree; readabilty trumps here IMO.
+Performance/Casecmp:
+  Enabled: false
 
 ##################### Metrics ##################################
 # NOTE: we bump some metrics by 50%, in recognition of Rubocop's

data/code_safety.yml

@@ -4,10 +4,14 @@ file safety:
     comments: 
     reviewed_by: timgentry
     safe_revision: c59a45986f8b6d087c8c21b1e889f31f7346da17
+  ".hound.yml":
+    comments: 
+    reviewed_by: timgentry
+    safe_revision: c03d4ff0dd037a2798563d464d0daeca1189debe
   ".rubocop.yml":
     comments: 
     reviewed_by: timgentry
-    safe_revision: 7256d6b694c7f3a62769b7d8ef56f32b93772ff9
+    safe_revision: ac89be1deb3d47e9fb00ac2de424116593012074
   ".travis.yml":
     comments: 
     reviewed_by: josh.pencheon
@@ -87,12 +91,12 @@ file safety:
   lib/ndr_dev_support/version.rb:
     comments: 
     reviewed_by: timgentry
-    safe_revision: 32aea472f527924ab3dad90b5116cc1c5716c3e8
+    safe_revision: fde5bc348b5393ab95b8f0e8d5cae9df29a85f34
   lib/tasks/audit_code.rake:
     comments: Identical to the version reviewed by josh.pencheon when contained within
       ndr_support
     reviewed_by: timgentry
-    safe_revision: 063ba98f4ce8449cf586231dd9630a28aacc0743
+    safe_revision: 4813e92fc951a3c033c08c848a9e07e8d5867133
   lib/tasks/rubocop.rake:
     comments: 
     reviewed_by: josh.pencheon
@@ -100,7 +104,7 @@ file safety:
   ndr_dev_support.gemspec:
     comments: 
     reviewed_by: timgentry
-    safe_revision: 6436fb4ccee84240eec27f56f6f59528a10442e7
+    safe_revision: ac89be1deb3d47e9fb00ac2de424116593012074
   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.1.1'.freeze
+  VERSION = '2.1.2'.freeze
 end

data/lib/tasks/audit_code.rake

@@ -13,6 +13,11 @@ SAFETY_FILE =
 # Temporary overrides to only audit external access files
 SAFETY_REPOS = [['/svn/era', '/svn/extra/era/external-access']]
 
+# Returns the (Bundler aware) rake command
+def rake_cmd
+  ENV['BUNDLE_BIN_PATH'] ? 'bundle exec rake' : 'rake'
+end
+
 # Parameter max_print is number of entries to print before truncating output
 # (negative value => print all)
 def audit_code_safety(max_print = 20, ignore_new = false, show_diffs = false, show_in_priority = false, user_name = 'usr')
@@ -57,7 +62,8 @@ def audit_code_safety(max_print = 20, ignore_new = false, show_diffs = false, sh
       file_safety[f] = {
         'comments' => nil,
         'reviewed_by' => nil,
-        'safe_revision' => nil }
+        'safe_revision' => nil
+      }
     end
     File.open(SAFETY_FILE, 'w') do |file|
       # Consistent file diffs, as ruby preserves Hash insertion order since v1.9
@@ -72,19 +78,19 @@ def audit_code_safety(max_print = 20, ignore_new = false, show_diffs = false, sh
   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 }
+    puts "  Please run #{rake_cmd} 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|
     !x['safe_revision'].nil? && x['safe_revision'] != -1 &&
-    x['last_changed_rev'] != x['safe_revision'] &&
-    !(x['last_changed_rev'] =~ /^[0-9]+$/ && x['safe_revision'] =~ /^[0-9]+$/ &&
+      x['last_changed_rev'] != x['safe_revision'] &&
+      !(x['last_changed_rev'] =~ /^[0-9]+$/ && x['safe_revision'] =~ /^[0-9]+$/ &&
       x['last_changed_rev'].to_i < x['safe_revision'].to_i)
   end
   puts "Number of files with no safe version: #{unknown.size}"
@@ -196,7 +202,7 @@ def repository_type
   @repository_type ||= if Dir.exist?('.svn') || system("svn info . > /dev/null 2>&1")
                          'svn'
                        elsif Dir.exist?('.git') && open('.git/config').grep(/svn/).any?
-                         'git-svn' 
+                         'git-svn'
                        elsif Dir.exist?('.git') && open('.git/config').grep(/git/).any?
                          'git'
                        else
@@ -209,17 +215,17 @@ def get_trunk_repo
   when 'svn'
     repo_info = %x[svn info]
     puts 'svn case'
-    return repo_info.split("\n").select { |x| x =~ /^URL: / }.collect { |x| x[5..-1] }.first
+    repo_info.split("\n").select { |x| x =~ /^URL: / }.collect { |x| x[5..-1] }.first
   when 'git-svn'
     puts 'git-svn case'
     repo_info = %x[git svn info]
-    return repo_info.split("\n").select { |x| x =~ /^URL: / }.collect { |x| x[5..-1] }.first
+    repo_info.split("\n").select { |x| x =~ /^URL: / }.collect { |x| x[5..-1] }.first
   when 'git'
     puts 'git case'
     repo_info = %x[git remote -v]
-    return repo_info.split("\n").first[7..-9]
+    repo_info.split("\n").first[7..-9]
   else
-    return 'Information not available. Unknown repository type'
+    'Information not available. Unknown repository type'
   end
 end
 
@@ -359,7 +365,7 @@ def print_repo_file_diffs(repolatest, repo, fname, user_name, safe_revision)
   end
   if cmd
     puts(cmd.join(' '))
-    stdout_and_err_str, status = Open3.capture2e(*cmd)
+    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
@@ -367,7 +373,8 @@ def print_repo_file_diffs(repolatest, repo, fname, user_name, safe_revision)
   end
 
   puts %(To flag the changes to this file as safe, run:)
-  puts %(  rake audit:safe release=#{repolatest} file=#{fname} reviewed_by=#{user_name} comments="")
+  puts "  #{rake_cmd} audit:safe release=#{repolatest} file=#{fname} reviewed_by=#{user_name}" \
+       ' comments=""'
   puts
 end
 
@@ -397,27 +404,27 @@ def get_release
 end
 
 def clean_working_copy?
- case repository_type
- when 'svn'
-   system('svn status | grep -q [^AMCDG]')
- when 'git', 'git-svn'
-   system('git diff --quiet HEAD')
- end
+  case repository_type
+  when 'svn'
+    system('svn status | grep -q [^AMCDG]')
+  when 'git', 'git-svn'
+    system('git diff --quiet HEAD')
+  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 = file_safety.keys.reject { |ff| File.file?(ff) }
   files_no_longer_in_repo.each do |f|
-    puts 'No longer in repository ' + f 
+    puts 'No longer in repository ' + f
     file_safety.delete f
-  end 
+  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
 end
 
 namespace :audit do
@@ -440,17 +447,16 @@ files which have changed since they were last verified as safe."
     all_safe = audit_code_safety(max_print, ignore_new, show_diffs, show_in_priority, reviewer)
 
     unless show_diffs
-      puts 'To show file diffs, run:  rake audit:code max_print=-1 show_diffs=true'
+      puts "To show file diffs, run:  #{rake_cmd} audit:code max_print=-1 show_diffs=true"
     end
 
     exit(1) unless all_safe
   end
 
   desc "Flag a source file as safe.
-
 Usage:
-  Flag as safe:   rake audit:safe release=revision reviewed_by=usr [comments=...] file=f
-  Needs review:   rake audit:safe release=0 [comments=...] file=f"
+  Flag as safe:   #{rake_cmd} audit:safe release=revision reviewed_by=usr [comments=...] file=f
+  Needs review:   #{rake_cmd} audit:safe release=0 [comments=...] file=f"
   task(:safe) do
     release = get_release
 
@@ -458,14 +464,14 @@ Usage:
     required_fields << 'reviewed_by' if release # 'Needs review' doesn't need a reviewer
     missing = required_fields.collect { |f| (f if ENV[f].to_s.empty? || (f == 'reviewed_by' && ENV[f] == 'usr')) }.compact # Avoid accidental missing username
     unless missing.empty?
-      puts 'Usage: rake audit:safe release=revision reviewed_by=usr [comments=...] file=f'
-      puts 'or, to flag a file for review: rake audit:safe release=0 [comments=...] file=f'
+      puts "Usage: #{rake_cmd} audit:safe release=revision reviewed_by=usr [comments=...] file=f"
+      puts "or, to flag a file for review: #{rake_cmd} audit:safe release=0 [comments=...] file=f"
       abort("Error: Missing required argument(s): #{missing.join(', ')}")
     end
 
     unless release.nil? || release_valid?(release)
-      puts 'Usage: rake audit:safe release=revision reviewed_by=usr [comments=...] file=f'
-      puts 'or, to flag a file for review: rake audit:safe release=0 [comments=...] file=f'
+      puts "Usage: #{rake_cmd} audit:safe release=revision reviewed_by=usr [comments=...] file=f"
+      puts "or, to flag a file for review: #{rake_cmd} audit:safe release=0 [comments=...] file=f"
       abort("Error: Invalid release: #{ENV['release']}")
     end
 
@@ -495,7 +501,7 @@ Usage:
     rescue SystemExit => ex
       puts '=============================================================='
       puts 'Code safety review of some files are not up-to-date; aborting!'
-      puts '  - to review the files in question, run:  rake audit:code'
+      puts "  - to review the files in question, run:  #{rake_cmd} audit:code"
       puts '=============================================================='
 
       raise ex
@@ -505,4 +511,3 @@ end
 
 # Prevent building of un-reviewed gems:
 task build: :'audit:ensure_safe'
-

data/ndr_dev_support.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'pry'
 
   # Rubocop dependencies:
-  spec.add_dependency 'rubocop', '0.44.1'
+  spec.add_dependency 'rubocop', '0.52.1'
   spec.add_dependency 'parser'
   spec.add_dependency 'rainbow'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_dev_support
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-22 00:00:00.000000000 Z
+date: 2018-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.44.1
+        version: 0.52.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.44.1
+        version: 0.52.1
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +157,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
 - ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md