govuk_schemas 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac6896c57c2532adcb41b53a7299bc0199aee11e
-  data.tar.gz: 8aae891ff22402cff6c858b33490edaaaf326a7b
+  metadata.gz: 7ae3fcbab8090c1fc21b77822f02f3d13ad1e6b7
+  data.tar.gz: e417e9c8d4ee30225e1e55c9852af054692f1c45
 SHA512:
-  metadata.gz: fb53487240a352345f504c932aee0b4895ae5aa8fb71aa91709563983fa3a6c0a06767009f8798dc126952655d865e4cff39ab1a242cba294e05d0b19ed97ad1
-  data.tar.gz: dd87037cb8ea2887b1397ecf55ccdbe45654067b4d834c3a854c7cab36eb9cc54260d64b0e43a31d6abdc302e47bdcfcbe507952722aaac6fbfa8ec979b77fb9
+  metadata.gz: 5e87fd5bc7f3c42d7e6cf1193361a9056b6da54d14c7579173ffa3c4b94ea04c932194fe597a84930dcced18c893032dee84834afad9b20e14b8a2cf147b5ed1
+  data.tar.gz: e803c13e394c7778836a8c87c416de4a38d81f75ab79d44659b1caf0adc4bff314ee2986f59b4e8e9480ea43543aadd9e567b6f30d538d9e9775a61c20332f16

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.1.1
+
+* Support for a new regex in GOV.UK content schemas
+
 # 2.1.0
 
 * Add `Schema.schema_names` to return all schema names

data/Jenkinsfile

@@ -0,0 +1,50 @@
+#!/usr/bin/env groovy
+
+REPOSITORY = 'govuk_schemas'
+
+node {
+  def govuk = load '/var/lib/jenkins/groovy_scripts/govuk_jenkinslib.groovy'
+
+  try {
+    stage('Checkout') {
+      checkout scm
+    }
+
+    stage('Clean') {
+      govuk.cleanupGit()
+      govuk.mergeMasterBranch()
+    }
+
+    stage("Set up content schema dependency") {
+      govuk.contentSchemaDependency()
+    }
+
+    stage('Bundle') {
+      echo 'Bundling'
+      sh("bundle install --path ${JENKINS_HOME}/bundles/${JOB_NAME}")
+    }
+
+    stage('Linter') {
+      govuk.rubyLinter()
+    }
+
+    stage('Tests') {
+      govuk.setEnvar('RAILS_ENV', 'test')
+      govuk.runTests('spec')
+    }
+
+    if(env.BRANCH_NAME == "master") {
+      stage('Publish Gem') {
+        govuk.publishGem(REPOSITORY, env.BRANCH_NAME)
+      }
+    }
+
+  } catch (e) {
+    currentBuild.result = 'FAILED'
+    step([$class: 'Mailer',
+          notifyEveryUnstableBuild: true,
+          recipients: 'govuk-ci-notifications@digital.cabinet-office.gov.uk',
+          sendToIndividuals: true])
+    throw e
+  }
+}

data/README.md

@@ -37,10 +37,6 @@ To rebuild the documentation, run:
 
     $ bundle exec rake yard
 
-## Releasing the gem
-
-This gem uses [gem_publisher](https://github.com/alphagov/gem_publisher). Updating the [version](lib/govuk_schemas/version.rb) will automatically release a new version to Rubygems.
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](LICENSE.md).

data/Rakefile

@@ -1,19 +1,11 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require "gem_publisher"
 require "yard"
 
 RSpec::Core::RakeTask.new(:spec)
 
 task default: [:spec]
 
-desc "Publish gem to RubyGems"
-task :publish_gem do |_t|
-  published_gem = GemPublisher.publish_if_updated("govuk_schemas.gemspec", :rubygems)
-  puts "Published #{published_gem}" if published_gem
-end
-
-
 YARD::Rake::YardocTask.new do |t|
   t.options = ['--no-private', '--markup', 'markdown', '--output-dir', 'docs']
 end

data/govuk_schemas.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.4"
-  spec.add_development_dependency "gem_publisher", "~> 1.5.0"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "govuk-lint", "~> 1.2.1"
   spec.add_development_dependency "yard", "~> 0.8"

data/lib/govuk_schemas/random.rb

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module GovukSchemas
   # @private
   module Random
@@ -28,9 +30,11 @@ module GovukSchemas
         "/" + rand(1..5).times.map { SecureRandom.uuid }.join('/')
       end
 
-      def govuk_campaign_url
-        subdomain = rand(1..5).times.map { ('a'..'z').to_a.sample(rand(1..5)).join }.join('.')
-        "https://#{subdomain}.campaign.gov.uk#{base_path}"
+      def govuk_subdomain_url
+        subdomain = rand(2..4).times.map {
+          ('a'..'z').to_a.sample(rand(3..8)).join
+        }.join('.')
+        "https://#{subdomain}.gov.uk#{base_path}"
       end
 
       def string(minimum_chars = nil, maximum_chars = nil)
@@ -72,7 +76,9 @@ module GovukSchemas
         when "^/(([a-zA-Z0-9._~!$&'()*+,;=:@-]|%[0-9a-fA-F]{2})+(/([a-zA-Z0-9._~!$&'()*+,;=:@-]|%[0-9a-fA-F]{2})*)*)?(\\?([a-zA-Z0-9._~!$&'()*+,;=:@-]|%[0-9a-fA-F]{2})*)?(#([a-zA-Z0-9._~!$&'()*+,;=:@-]|%[0-9a-fA-F]{2})*)?$"
           base_path
         when "^https://([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[A-Za-z0-9])?\\.)+campaign\\.gov\\.uk(/(([a-zA-Z0-9._~!$&'()*+,;=:@-]|%[0-9a-fA-F]{2})+(/([a-zA-Z0-9._~!$&'()*+,;=:@-]|%[0-9a-fA-F]{2})*)*)?(\\?([a-zA-Z0-9._~!$&'()*+,;=:@-]|%[0-9a-fA-F]{2})*)?(#([a-zA-Z0-9._~!$&'()*+,;=:@-]|%[0-9a-fA-F]{2})*)?)?$"
-          govuk_campaign_url
+          govuk_subdomain_url
+        when "^https://([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[A-Za-z0-9])?\\.)*gov\\.uk(/(([a-zA-Z0-9._~!$&'()*+,;=:@-]|%[0-9a-fA-F]{2})+(/([a-zA-Z0-9._~!$&'()*+,;=:@-]|%[0-9a-fA-F]{2})*)*)?(\\?([a-zA-Z0-9._~!$&'()*+,;=:@-]|%[0-9a-fA-F]{2})*)?(#([a-zA-Z0-9._~!$&'()*+,;=:@-]|%[0-9a-fA-F]{2})*)?)?$"
+          govuk_subdomain_url
         when '[a-z0-9\-_]'
           "#{SecureRandom.hex}-#{SecureRandom.hex}"
         else

data/lib/govuk_schemas/random_example.rb

@@ -9,8 +9,8 @@ module GovukSchemas
     #
     # For example:
     #
-    #     schema = GovukSchemas::Schema.find("detailed_guide", schema_type: "frontend")
-    #     GovukSchemas::RandomExample.new(schema).payload
+    #     schema = GovukSchemas::Schema.find(frontend_schema: "detailed_guide")
+    #     GovukSchemas::RandomExample.new(schema: schema).payload
     #
     # @param [Hash] schema A JSON schema.
     # @return [GovukSchemas::RandomExample]

data/lib/govuk_schemas/version.rb

@@ -1,4 +1,4 @@
 module GovukSchemas
   # @private
-  VERSION = "2.1.0".freeze
+  VERSION = "2.1.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_schemas
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: gem_publisher
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +107,7 @@ files:
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
+- Jenkinsfile
 - LICENSE.md
 - README.md
 - Rakefile
@@ -143,8 +130,6 @@ files:
 - docs/method_list.html
 - docs/top-level-namespace.html
 - govuk_schemas.gemspec
-- jenkins-schema.sh
-- jenkins.sh
 - lib/govuk_schemas.rb
 - lib/govuk_schemas/example.rb
 - lib/govuk_schemas/random.rb

data/jenkins-schema.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-export REPO_NAME="alphagov/govuk-content-schemas"
-export CONTEXT_MESSAGE="Verify govuk_schemas_gem against content schemas"
-
-exec ./jenkins.sh

data/jenkins.sh

@@ -1,74 +0,0 @@
-#!/bin/bash
-
-set -e
-
-REPO_NAME=${REPO_NAME:-"alphagov/govuk_schemas_gem"}
-CONTEXT_MESSAGE=${CONTEXT_MESSAGE:-"default"}
-GH_STATUS_GIT_COMMIT=${SCHEMA_GIT_COMMIT:-${GIT_COMMIT}}
-
-function github_status {
-  REPO_NAME="$1"
-  STATUS="$2"
-  MESSAGE="$3"
-  gh-status "$REPO_NAME" "$GH_STATUS_GIT_COMMIT" "$STATUS" -d "Build #${BUILD_NUMBER} ${MESSAGE}" -u "$BUILD_URL" -c "$CONTEXT_MESSAGE" >/dev/null
-}
-
-function error_handler {
-  trap - ERR # disable error trap to avoid recursion
-  local parent_lineno="$1"
-  local message="$2"
-  local code="${3:-1}"
-  if [[ -n "$message" ]] ; then
-    echo "Error on or near line ${parent_lineno}: ${message}; exiting with status ${code}"
-  else
-    echo "Error on or near line ${parent_lineno}; exiting with status ${code}"
-  fi
-  github_status "$REPO_NAME" error "errored on Jenkins"
-  exit "${code}"
-}
-
-trap 'error_handler ${LINENO}' ERR
-github_status "$REPO_NAME" pending "is running on Jenkins"
-
-# Cleanup anything left from previous test runs
-git clean -fdx
-
-# Try to merge master into the current branch, and abort if it doesn't exit
-# cleanly (ie there are conflicts). This will be a noop if the current branch
-# is master.
-git merge --no-commit origin/master || git merge --abort
-
-echo "Running ruby linter"
-bundle install --path "${HOME}/bundles/${JOB_NAME}"
-bundle exec govuk-lint-ruby \
-  --format html --out rubocop-${GIT_COMMIT}.html \
-  --format clang
-
-# Clone govuk-content-schemas depedency for contract tests
-rm -rf /tmp/govuk-content-schemas
-git clone git@github.com:alphagov/govuk-content-schemas.git /tmp/govuk-content-schemas
-(
- cd /tmp/govuk-content-schemas
- git checkout ${SCHEMA_GIT_COMMIT:-"master"}
-)
-export GOVUK_CONTENT_SCHEMAS_PATH=/tmp/govuk-content-schemas
-
-# Bundle and run tests against multiple ruby versions
-for version in 2.3.1; do
-  rm -f Gemfile.lock
-  export RBENV_VERSION=$version
-  echo "Running tests under ruby $version"
-  bundle install --path "${HOME}/bundles/${JOB_NAME}"
-  if ! bundle exec rake ${TEST_TASK:-"default"}; then
-    github_status "$REPO_NAME" failure "failed on Jenkins"
-    exit 1
-  fi
-done
-unset RBENV_VERSION
-
-if [[ -n "$PUBLISH_GEM" ]]; then
-  bundle install --path "${HOME}/bundles/${JOB_NAME}"
-  bundle exec rake publish_gem --trace
-fi
-
-github_status "$REPO_NAME" success "succeeded on Jenkins"