ndr_support 3.2.0 → 3.2.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTE0YTVkMGEwNDI5ZmZlMDA0NTNmMTBiM2VjNGM3M2UyYjk3YTMwOQ==
-  data.tar.gz: !binary |-
-    MDFhOTI2YWNmZmE0YTVkZWMyNDIyYjFmOTZiMTVhMDMwMDgzOWMwZQ==
+SHA1:
+  metadata.gz: 7df1f7e7eb2e4dd71eecb4f6bc8703d2d7ff5850
+  data.tar.gz: ce69a7eafd85020580f9a042de4b56379c104890
 SHA512:
-  metadata.gz: !binary |-
-    ODM0NDFhZjMzOTE5NTlmMDgwYmMzMTYzYmY5OTEyYmUxNDhiZTMxMDg4ZDBl
-    NDU4MWIxMzhmMGQwOTg0ZDk1NWVmZmY0MDUwMTA5NzZjYmEyZDgxNWRlMjY5
-    YjQwODRjMGE1ZTY4YmQyMTE4Nzk0YmYxMTIyNmQyNTI3YzE0YTY=
-  data.tar.gz: !binary |-
-    OGYxOTg3NDc2NjY4MmE3OTIwNzU5Nzc5OWE5YzgyOTYwZjE4YmIzNjNmYWJi
-    Y2I0OGRiZjE0MGMzNTFiOTExZmFjMGE5OWYzNGM5ZTA2NmEzZDFmZWEwY2U4
-    MjUxMDMxZTBjNGRhYTU3ZmQyYWZmYTA4YzA5NDYxNGRhNWM4M2Q=
+  metadata.gz: 0f334539ad6bc8679bc3555ab37e5ced3442fb8d07369c10794a3e4ce0ba0fb615c6dc01befc5a7de52ab5094bb67e42f94dd0c5fc26f7c2d1dd8a415ce9bfd6
+  data.tar.gz: b2d9068afe08a631a4d11a8237730b319a8d0c027f1a1ddca3f3336f34be55f0a6c2adfe95e50a37b9850682332e1df13b172c8f944c89d68a7c271c09d0cba6

data/.rubocop.yml

@@ -21,7 +21,9 @@ LineLength:
   Max: 99
 
 # Relax some of the cops for tests
-Metrics/ClassLength: &exclude_tests
+Metrics/ClassLength:
+  Exclude:
+    - test/**/*.rb
+Metrics/MethodLength:
   Exclude:
     - test/**/*.rb
-Metrics/MethodLength: *exclude_tests

data/code_safety.yml

@@ -1,18 +1,14 @@
 ---
 file safety:
-  .gitignore:
+  ".gitignore":
     comments: 
     reviewed_by: timgentry
     safe_revision: 2590c1c28a8ca9cfb20ad3fe3ee65a12190a5810
-  .rubocop.yml:
+  ".rubocop.yml":
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 506a317e59d0ccb5b32d813b74d822f35a55cea9
-  .ruby-version:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 6a7c3764e5315981070eba27b9f0be9d9182476c
-  .travis.yml:
+    reviewed_by: josh.pencheon
+    safe_revision: 02f0647891dc0f9efa30860c5d2c8ec2fc696347
+  ".travis.yml":
     comments: 
     reviewed_by: timgentry
     safe_revision: d82f4f2fc0d720607ca5c25f068370757d3466e5
@@ -159,7 +155,7 @@ file safety:
   lib/ndr_support/version.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 312e59a33a7d50aa5be72f536951d96f5907456c
+    safe_revision: cbf10e1b385db80851875e95d9d0afb648ce52d7
   lib/ndr_support/yaml/serialization_migration.rb:
     comments: 
     reviewed_by: timgentry
@@ -167,7 +163,7 @@ file safety:
   lib/tasks/audit_code.rake:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 7f0e16404f65ad531109e7bf8da3663351aabeb5
+    safe_revision: 20cde082ee86a547de7b21a97a695bb307ac9f64
   ndr_support.gemspec:
     comments: 
     reviewed_by: timgentry

data/lib/ndr_support/version.rb

@@ -1,5 +1,5 @@
 # This defines the NdrSupport 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 NdrSupport
-  VERSION = '3.2.0'
+  VERSION = '3.2.1'
 end

data/lib/tasks/audit_code.rake

@@ -1,5 +1,7 @@
 SAFETY_FILE =
-  if defined?(Rails)
+  if File.exist?('code_safety.yml')
+    'code_safety.yml'
+  elsif defined?(Rails)
     Rails.root.join('config', 'code_safety.yml')
   else
     'code_safety.yml'
@@ -359,12 +361,12 @@ def print_repo_file_diffs(repolatest, repo, fname, user_name, safe_revision)
   puts
 end
 
-def release_valid?
+def release_valid?(release)
   case repository_type
   when 'svn', 'git-svn'
-    ENV['release'] =~ /\A[0-9][0-9]*\Z/
+    release =~ /\A[0-9][0-9]*\Z/
   when 'git'
-    ENV['release'] =~ /\A[0-9a-f]{40}\Z/
+    release =~ /\A[0-9a-f]{40}\Z/
   else
     false
   end
@@ -384,6 +386,15 @@ def get_release
   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
+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]
@@ -416,8 +427,10 @@ 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"
   task(:safe) do
+    release = get_release
+
     required_fields = %w(release file)
-    required_fields << 'reviewed_by' unless ENV['release'] == '0'
+    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'
@@ -425,21 +438,22 @@ Usage:
       abort("Error: Missing required argument(s): #{missing.join(', ')}")
     end
 
-    unless release_valid?
+    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'
       abort("Error: Invalid release: #{ENV['release']}")
     end
 
-    release = get_release
     flag_file_as_safe(release, ENV['reviewed_by'], ENV['comments'], ENV['file'])
   end
 
   desc 'Wraps audit:code, and stops if any review is pending/stale.'
   task(:ensure_safe) do
-    begin
-      puts 'Checking code safety...'
+    abort('You have local changes, cannot verify code safety!') unless clean_working_copy?
 
+    puts 'Checking code safety...'
+
+    begin
       begin
         $stdout = $stderr = StringIO.new
         Rake::Task['audit:code'].invoke
@@ -458,4 +472,4 @@ Usage:
 end
 
 # Prevent building of un-reviewed gems:
-task :build => :'audit:ensure_safe'
+task build: :'audit:ensure_safe'

metadata

@@ -1,179 +1,179 @@
 --- !ruby/object:Gem::Specification
 name: ndr_support
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.18
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.18
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.18
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.18
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: guard
   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: guard-rubocop
   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: guard-minitest
   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: terminal-notifier-guard
   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: simplecov
   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'
 description: Provides NDR classes and class extensions
@@ -182,10 +182,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Guardfile
@@ -257,17 +256,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: NDR Support library

data/.ruby-version

@@ -1 +0,0 @@
-1.9.3-p547