govuk_content_models 43.0.0 → 43.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f15eb0a9eef38fe905ab33a5d01ce094b4797f11
-  data.tar.gz: cc94807990d1d85e930f640023dad9cb9e8a9541
+  metadata.gz: 54b7d713506a0afb97612ae9222dbbbce18e8f07
+  data.tar.gz: 04fe73a18bf538aa18919191dda6922b96d375fa
 SHA512:
-  metadata.gz: ac60a959b9cc31d0061ea4ad7f85b39edfef0fba9ca9269217cbc6c642c470f1f489498e827b1e475c768625ed6ccc604ea7e33e87423cacb5fba9f87d1fae60
-  data.tar.gz: 1ca84a731d074eb102e01ea80863dc55022d4f200ce253dd6bb2093e17b801a89b8ab7dbef067ff4cd1712ed3cd897b751d28e7fc7dd2f0a41dfde7158bf785b
+  metadata.gz: 87a0c5f42cb3d6536ff9a7df7681cd648e8ede6b6f79965f3d2868b6a4348a71e8a3e648ba61543249e0aef78dade031415613542939adc826cf7c199ab3d421
+  data.tar.gz: 4b18ffb4d9babfcd4415a15af0b0fd3a49fb1ec138ea2d91a39234a695be245ccf1f5a3136572b720c31fa7bd524c6268498ceeff968c0ed529d37f6c84488f7

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 43.0.1
+
+- Expose the display_start_time of a Downtime object
+
 ## 43.0.0
 
 - Bump Ruby version to 2.2.3

data/Jenkinsfile

@@ -0,0 +1,47 @@
+#!/usr/bin/env groovy
+
+REPOSITORY = 'govuk_content_models'
+
+node {
+  def govuk = load '/var/lib/jenkins/groovy_scripts/govuk_jenkinslib.groovy'
+
+  try {
+    stage('Checkout') {
+      checkout scm
+    }
+
+    stage('Clean') {
+      govuk.cleanupGit()
+      govuk.mergeMasterBranch()
+    }
+
+    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.setEnvar('GOVUK_APP_DOMAIN', 'dev.gov.uk')
+      govuk.runTests()
+    }
+
+    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/app/models/downtime.rb

@@ -17,7 +17,11 @@ class Downtime
   end
 
   def publicise?
-    Time.zone.now.between?(start_time.yesterday.at_midnight, end_time)
+    Time.zone.now.between?(display_start_time, end_time)
+  end
+
+  def display_start_time
+    start_time.yesterday.at_midnight
   end
 
   private

data/lib/govuk_content_models/version.rb

@@ -1,4 +1,4 @@
 module GovukContentModels
   # Changing this causes Jenkins to tag and release the gem into the wild
-  VERSION = "43.0.0"
+  VERSION = "43.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 43.0.0
+  version: 43.0.1
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -317,6 +317,7 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
+- Jenkinsfile
 - LICENSE
 - README.md
 - Rakefile
@@ -365,8 +366,6 @@ files:
 - app/validators/slug_validator.rb
 - config/mongoid.yml
 - govuk_content_models.gemspec
-- jenkins.sh
-- jenkins_branches.sh
 - lib/govuk_content_models.rb
 - lib/govuk_content_models/action_processors.rb
 - lib/govuk_content_models/action_processors/approve_fact_check_processor.rb

data/jenkins.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-set -e
-rm -f Gemfile.lock
-bundle install --path "${HOME}/bundles/${JOB_NAME}"
-export GOVUK_APP_DOMAIN=dev.gov.uk
-bundle exec rake
-
-bundle exec govuk-lint-ruby --diff --cached --format clang app config lib test
-
-if [[ -n "$PUBLISH_GEM" ]]; then
-  bundle exec rake publish_gem
-fi

data/jenkins_branches.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-set -e
-
-VENV_PATH="${HOME}/venv/${JOB_NAME}"
-
-[ -x ${VENV_PATH}/bin/pip ] || virtualenv ${VENV_PATH}
-. ${VENV_PATH}/bin/activate
-
-pip install -q ghtools
-
-REPO="alphagov/govuk_content_models"
-gh-status "$REPO" "$GIT_COMMIT" pending -d "\"Build #${BUILD_NUMBER} is running on Jenkins\"" -u "$BUILD_URL" >/dev/null
-
-if ./jenkins.sh; then
-  gh-status "$REPO" "$GIT_COMMIT" success -d "\"Build #${BUILD_NUMBER} succeeded on Jenkins\"" -u "$BUILD_URL" >/dev/null
-  exit 0
-else
-  gh-status "$REPO" "$GIT_COMMIT" failure -d "\"Build #${BUILD_NUMBER} failed on Jenkins\"" -u "$BUILD_URL" >/dev/null
-  exit 1
-fi