ea-area_lookup 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c99ab0de6a724c2523342a8a449fbb9339775d9d
-  data.tar.gz: 7116fcacb2bfdb3aefe0014a9529194c1378a749
+  metadata.gz: 2ebb3ce081b3b0c65c18e347c7c675f2dfaf0639
+  data.tar.gz: 8fc6e31040527ae90d4b4f87a0fbcbf3ab5b947f
 SHA512:
-  metadata.gz: d2756f41e09bd6759e81287d85b915a82a4d79f81aced6c06d7c0d9ff4db316614ddd0e710b6c6c98df515e583ad6a222390a15b64b5c23235485046cb370f96
-  data.tar.gz: d085bc9adadd4f24ebd109c9a42fcc48d9bc553e7f63c7622c3f6e0fd92dbed21a24f9b3f953cb61279c9d440b5c0dc0687571d13dbfd4b6fd4a69cdfe03db9c
+  metadata.gz: aee7fa970d492f90f616a145fb1339cd6bbf431bddd7fed2d94a109bb0dc86ab9d9c5d478b21220e1b1205247e5d823834cc471aaa4842c73e704a629bfb66db
+  data.tar.gz: 9de87e23e276a60f6589197cb5f3c075323e190bcc174eb1f0348ca889621d607f7c135c419f6c3c8df9cc6cec3aae34066b7d5b1f68e0a5380598f2c58c43bb

data/.travis.yml

@@ -1,32 +1,29 @@
+env:
+  global:
+    - CC_TEST_REPORTER_ID=5fb5a14e6e46bf106b2c94f3fcdc17624a6b7151c565095f254098e38de335db
+
 language: ruby
-cache: bundler
 rvm: 2.3.1
-before_install: gem install bundler -v 1.12.3
-bundler_args: "--binstubs=./bundler_stubs"
+cache: bundler
+
+before_install:
+  - export TZ=UTC
+  - gem install -v 1.17.3 bundler --no-document
+
 before_script:
-script:
-  - bundle exec rake --trace before_commit:run_without_checks
-  - git config --global user.email test@example.com
-  - git config --global user.name "Test Example"
-  - BUNDLE_GEMFILE=.overcommit_gems.rb bundle exec overcommit --run
-  - bundle exec rspec
-# Have this option to stop travis-ci building twice. Currently we have travis set to build both
-# PR's and pushes. However this means when we push to a PR we have to wait for Travis to finish
-# 2 builds. If we unticked 'pushes' when the PR was finally merged that would not be built. The
-# brute force approach would be to untick build PR's and just build all pushes. We instead have
-# gone with the approach outlined here http://stackoverflow.com/a/31882307
-branches:
-  only:
-    - master
+  # Setup to support the CodeClimate test coverage submission
+  # As per CodeClimate's documentation, they suggest only running
+  # ./cc-test-reporter commands on travis-ci push builds only. Hence we wrap all
+  # the codeclimate test coverage related commands in a check that tests if we
+  # are in a pull request or not.
+  - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter; fi
+  - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then chmod +x ./cc-test-reporter; fi
+  - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./cc-test-reporter before-build; fi
+
+after_script:
+  - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi
 
-# This section was added as per https://docs.travis-ci.com/user/code-climate/
-# To protect our codeclimate stats rather than adding the Codeclimate API key for ea-area_lookup
-# in the open we used this guide https://docs.travis-ci.com/user/encryption-keys/ to encryt the
-# value. Essentially install travis gem, then run `travis encrypt <my_code_climate_api_key>`
 addons:
-  code_climate:
-    repo_token:
-      secure: "DsWI1kzx5RIfB/QQysErQTW94FF6v512q3vqFChSXaAViJA6LgU9coBRiLtZ3RyE0YcvPzu0B1q/fqR4sDq4xG1L6VMY2PlF4ZI57AaPa1WFmzT9mCAhYCbpYKXuMySCoS4YvoHrHgwd30M0RYmiRtZY75Olmbd1PsbbZGfnIGwcEchujHb6oQ6WKgEAqq6zvHHf5QM18oSm4ZCFSYijGU7BvxMsLTToFuPnndGomWHCfMDSyBkC2wt5pmfdsjbirrsPPnFbYxCOCxGk77WWw9G+swUZclgUiUn1q2tSFgri27zufbFuGknDWf9HMiMqzgfCO8kut/78CqRjt5BtUm2otJLEhlpmL4t9rqDUKl/hmc+asxfoj04qP1cNRmjZf0QYbT4rFlsFlcNgYNcZcLf66ry9c8WXcpV6qvKukaT9Xyj1/KAVXDqO1EUd1oEBIoKnILW7H4Zhbjhu6lq2ga47Wux0IrMdtHE2RwjdtCxwfhkuUcblfnPpjW8tXeDND0nE/Se45rXZ/YwojZSeqyZCvZbcXMOvggzRQeAgi02sruw33oZU6W/f8VOjC5VrB1KEHm4j0n21dI6ENu0D+tbjBIW0TvI47hAuV/R1v7kHJVbSIcAedtxWt87mSdyQkOukCVSYHMOKJHY6T1EtZlK5V9RHDrHD8KIMeJV/Dx0="
 deploy:
   provider: rubygems
   api_key:
@@ -34,5 +31,5 @@ deploy:
   gem: ea-area_lookup
   on:
     tags: true
-    repo: EnvironmentAgency/ea-area_lookup
+    repo: DEFRA/ea-area_lookup
     all_branches: true

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-# Change log
+# Changelog
+
+### 0.2.2
+
+- Update Nokogiri
+- Remove before_commit
+- Modernise Travis CI config
+- Fix Code Climate test reporting
 
 ### 0.1.1
 
@@ -6,6 +13,6 @@
 - Loosened gem dependency version restrictions
 - Alter Travis config to build using Ruby 2.3.1 and autodeploy to ruby gems on a tag push
 
- ### 0.1.0
+### 0.1.0
 
- Initial release
+Initial release

data/Gemfile

@@ -3,6 +3,3 @@ ruby "2.3.1"
 
 # Specify your gem's dependencies in gemspec
 gemspec
-
-# Required to enable codeclimate's test coverage functionality
-gem "codeclimate-test-reporter", group: :test, require: nil

data/README.md

@@ -1,9 +1,9 @@
 # EA::AreaLookup
 
-[![Build Status](https://travis-ci.org/EnvironmentAgency/ea-area_lookup.svg?branch=master)](https://travis-ci.org/EnvironmentAgency/ea-area_lookup)
-[![security](https://hakiri.io/github/EnvironmentAgency/ea-area_lookup/master.svg)](https://hakiri.io/github/EnvironmentAgency/ea-area_lookup/master)
-[![Code Climate](https://codeclimate.com/github/EnvironmentAgency/ea-area_lookup/badges/gpa.svg)](https://codeclimate.com/github/EnvironmentAgency/ea-area_lookup)
-[![Test Coverage](https://codeclimate.com/github/EnvironmentAgency/ea-area_lookup/badges/coverage.svg)](https://codeclimate.com/github/EnvironmentAgency/ea-area_lookup/coverage)
+[![Build Status](https://travis-ci.org/DEFRA/ea-area_lookup.svg?branch=master)](https://travis-ci.org/DEFRA/ea-area_lookup)
+[![security](https://hakiri.io/github/DEFRA/ea-area_lookup/master.svg)](https://hakiri.io/github/DEFRA/ea-area_lookup/master)
+[![Code Climate](https://codeclimate.com/github/DEFRA/ea-area_lookup/badges/gpa.svg)](https://codeclimate.com/github/DEFRA/ea-area_lookup)
+[![Test Coverage](https://codeclimate.com/github/DEFRA/ea-area_lookup/badges/coverage.svg)](https://codeclimate.com/github/DEFRA/ea-area_lookup/coverage)
 [![Gem Version](https://badge.fury.io/rb/ea-area_lookup.svg)](https://badge.fury.io/rb/ea-area_lookup)
 
 This ruby gem provides a means of looking up the Environment Agency Administrative Area (e.g. 'Wessex')

data/Rakefile

@@ -3,8 +3,4 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-require 'before_commit'
-spec = Gem::Specification.find_by_name 'before_commit'
-load "#{spec.gem_dir}/lib/tasks/before_commit.rake"
-
 task default: :spec

data/ea-area_lookup.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "nokogiri", "~> 1.6.8"
+  spec.add_dependency "nokogiri", "~> 1.7"
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake"
@@ -31,5 +31,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock", "~> 1.24"
   spec.add_development_dependency "shoulda-matchers", "~> 3.1"
   spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "before_commit"
 end

data/lib/ea/area_lookup/version.rb

@@ -1,5 +1,5 @@
 module EA
   module AreaLookup
-    VERSION = "0.2.1".freeze
+    VERSION = "0.2.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ea-area_lookup
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Digital Services Team, EnvironmentAgency
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2019-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: before_commit
-  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 a means of looking-up an Environment Agency administrative area
   using the co-ordinates of any point in England.
 email: