macmillan-utils 1.0.33 → 1.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 082720f53c08e7a389f791d4859adf4ff408ee1d
-  data.tar.gz: 686bbcdebb11405d314be7fc2eaceca800070539
+  metadata.gz: 0de1c896375db7381540df9d9fe2b4edad6fd926
+  data.tar.gz: b93172e537a04416b9e74bef0fa76d0e6646cbb6
 SHA512:
-  metadata.gz: 72fe89d06f184fb910a157b96330231438767a830b91c702741d7751f65a82ed7baa3e3b80b1eade25c42e671d50b80211ccbd4280d498a8e308596bb42e1d5b
-  data.tar.gz: 893e33789d9f0b892ce93d0dc9c7333f595374d1b2143c1affb4708dfc920064224f51c3aea2f3ab07f7d2076b87aa416b8fd8ee3fb197798a1720dfd95f0bb0
+  metadata.gz: 4114d1edfca40206a2192a227ea8f48f56fd6f9bb77b7520f76e1daa174791a750f8667a0ceca2b1483bc796f14ae5d154d053ab15f13de1b8c41a5ccfdb3c44
+  data.tar.gz: 9f979a93bc577163de9f8fe64d1fffc6fdb206e198c4b9a571782e376b1329b6e5f5568ad09f7d30258d7d8dd79fe38c0ff77a8c0299c01f28e86b3d340d5680

data/lib/macmillan/utils/rspec/rspec_defaults.rb

@@ -1,11 +1,20 @@
+require 'colorize'
+
 def check_config_file(filename)
   # ASSUMPTION: We are running the RSpec suite from the root of a project tree
   update_config     = true
   local_config_file = File.join(Dir.getwd, filename)
 
   if File.exist?(local_config_file)
-    latest_conf   = File.read(File.expand_path("../../../../../#{filename}", __FILE__))
-    current_conf  = File.read(local_config_file)
+    @message ||= []
+
+    latest_conf_path = File.expand_path("../../../../../#{filename}", __FILE__)
+    latest_conf      = File.read(latest_conf_path)
+    @message << "macmillan-utils config file = #{latest_conf_path}"
+
+    current_conf = File.read(local_config_file)
+    @message << "current repo config file = #{local_config_file}"
+
     update_config = false if current_conf == latest_conf
   end
 
@@ -26,12 +35,18 @@ RSpec.configure do |config|
     config_updated = config_files.map { |file| check_config_file(file) }.any?
 
     if config_updated
-      puts 'WARNING: You do not have the latest set of Macmillan::Utils config files.'
-      puts '         These have now been updated for you. :)'
-      puts ''
-      puts '         You can run RSpec again now.'
-      puts ''
-      puts "         Don't forget to commit the config files (#{config_files.join(', ')}) to git!"
+      puts "\nWARNING: Your local config file(s) have been replaced with the versions \n"\
+           "from macmillan-utils gem, on the assumption macmillan-utils is up-to-date.\n"\
+           "\nIf you see this failure on *CI*, you may want to run *locally*: \n"\
+           "$ bundle update macmillan-utils \n"\
+           "before re-running the specs, then committing and pushing the updated configs.\n".red
+
+      @message.each do |msg|
+        puts "Please note: \n #{msg}".red
+      end
+
+      puts "\nYou can now re-run RSpec without this failure interfering.".red
+
       raise '...'
     end
   end

data/macmillan-utils.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'multi_test'
   spec.add_dependency 'syslog-logger'
   spec.add_dependency 'rubocop'
+  spec.add_dependency 'colorize'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: macmillan-utils
 version: !ruby/object:Gem::Version
-  version: 1.0.33
+  version: 1.0.34
 platform: ruby
 authors:
 - Springer Nature
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -206,6 +206,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  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'
 description: 
 email:
 - npp-developers@macmillan.com