macmillan-utils 1.0.27 → 1.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b703afeccf56e22b3f681671bb722878c25d376f
-  data.tar.gz: d39c938dc927bfc8d5a00b80245b9943e68d7806
+  metadata.gz: a52b592a6dc2fa6a8e43dab0d7bdcb0a124faec2
+  data.tar.gz: d69410c60657a9a6926737cf947a3f9dee7ffcfe
 SHA512:
-  metadata.gz: 80725cfc5166a1324e513fa5b075fb91571f9531703a2c528c594fcd3f46e6993e410017eaece527c98d9fc88a40bc562df6fbed252ebbb6e18116b1f1dc648e
-  data.tar.gz: 388e50726a9d51363978d391a4162bfd58d631589f6dbef3a6c8116fb57644e96ea2b7190cacdc17693739e37966d40fa3b02d986d7fe41ee6b17e2b11c4c508
+  metadata.gz: 8af1e77116a173bc52941b007216f674848039649e48e3d738f2a86c78b33638065aa7890c35bb10d2102e3347a2720fb557625149acb05457805bc340a9451a
+  data.tar.gz: bbc21e028c0be122c1edbd0aa6269bea942e425818ad2c340bd01c84935d13531e39cf590877aa06f6096b5af4326aa30f7a1354a4f895389469c073a44ac57b

data/.hound.yml

@@ -1,39 +1,3 @@
-Metrics/LineLength:
-  Description: 'Limit lines to 120 characters.'
-  Max: 120
+ruby:
+  config_file: .rubocop.yml
 
-Style/Documentation:
-  Enabled: false
-
-Style/SpaceBeforeFirstArg:
-  Enabled: false
-
-Style/BracesAroundHashParameters:
-  Enabled: false
-
-Style/IndentHash:
-  EnforcedStyle: consistent
-
-Style/AlignHash:
-  EnforcedHashRocketStyle: table
-  EnforcedColonStyle: table
-
-Style/AlignParameters:
-  EnforcedStyle: with_fixed_indentation
-
-Style/StringLiterals:
-  EnforcedStyle: single_quotes
-
-Style/CollectionMethods:
-  PreferredMethods:
-    collect: 'map'
-    collect!: 'map!'
-    inject: 'reduce'
-    detect: 'find'
-    find_all: 'select'
-
-Style/DotPosition:
-  EnforcedStyle: leading
-
-Style/DoubleNegation:
-  Enabled: false

data/.rubocop.yml

@@ -15,6 +15,8 @@ Style/IndentHash:
   EnforcedStyle: consistent
 
 Style/AlignHash:
+  Severity: fatal
+  Enabled: true
   EnforcedHashRocketStyle: table
   EnforcedColonStyle: table
 
@@ -37,3 +39,9 @@ Style/DotPosition:
 
 Style/DoubleNegation:
   Enabled: false
+
+Style/SpaceAroundOperators:
+  # When true, allows most uses of extra spacing if the intent is to align
+  # with an operator on the previous or next line, not counting empty lines
+  # or comment lines.
+  AllowForAlignment: true

data/.travis.yml

@@ -3,12 +3,12 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 1.9.3
   - 2.0
   - 2.1
   - 2.2
   - 2.3.0
-  - jruby-19mode
+  - 2.3.1
+  - jruby
   - rbx-2
 
 # Ensure we don't build for *every* commit (doesn't apply to PR builds)

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

@@ -1,35 +1,17 @@
-def check_rubocop_and_hound
+def check_config_file(filename)
   # ASSUMPTION: We are running the RSpec suite from the root of a project tree
-  update_rubocop     = true
-  rubocop_file       = '.rubocop.yml'
-  local_rubocop_file = File.join(Dir.getwd, rubocop_file)
-  local_hound_file   = File.join(Dir.getwd, '.hound.yml')
+  update_config     = true
+  local_config_file = File.join(Dir.getwd, filename)
 
-  if File.exist?(local_rubocop_file)
-    latest_rubocop_conf  = File.read(File.expand_path("../../../../../#{rubocop_file}", __FILE__))
-    current_rubocop_conf = File.read(local_rubocop_file)
-    update_rubocop       = false if current_rubocop_conf == latest_rubocop_conf
+  if File.exist?(local_config_file)
+    latest_conf   = File.read(File.expand_path("../../../../../#{filename}", __FILE__))
+    current_conf  = File.read(local_config_file)
+    update_config = false if current_conf == latest_conf
   end
 
-  if !File.exist?(local_hound_file) || !File.symlink?(local_hound_file)
-    system "rm -f #{local_hound_file}"
-    system "ln -s #{rubocop_file} #{local_hound_file}"
-  end
-
-  if update_rubocop
-    puts 'WARNING: You do not have the latest set of rubocop style preferences.'
-    puts '         These have now been updated for you. :)'
-    puts ''
-    puts '         You can run RSpec again now.'
-    puts ''
-    puts "         Don't forget to commit the '.rubocop.yml' and '.hound.yml' files to git!"
-
-    File.open(local_rubocop_file, 'w') do |file|
-      file.print latest_rubocop_conf
-    end
+  File.open(local_config_file, 'w') { |file| file.print(latest_conf) } if update_config
 
-    raise '...'
-  end
+  update_config
 end
 
 RSpec.configure do |config|
@@ -39,6 +21,18 @@ RSpec.configure do |config|
   config.fail_fast = true if ENV['FAIL_FAST']
 
   config.before(:suite) do
-    check_rubocop_and_hound
+    config_files = %w(.rubocop.yml)
+    config_files << '.hound.yml' if ENV['MANAGE_HOUND']
+    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!"
+      raise '...'
+    end
   end
 end

data/macmillan-utils.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'yard'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rack-test'
+  spec.add_development_dependency 'rack', '< 2.0.0'
 
   spec.add_dependency 'rspec'
   spec.add_dependency 'simplecov'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: macmillan-utils
 version: !ruby/object:Gem::Version
-  version: 1.0.27
+  version: 1.0.29
 platform: ruby
 authors:
 - Springer Nature
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement