conjur-rack-heartbeat 2.2.0 → 2.2.1.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e42c2429f6b44c2fff789c4f7c7cf567356a885a656e5482289c9ec53f215e1e
-  data.tar.gz: f5ced446de3bce99bd2b4cd5c9ccb09fb1b2a44516a101d38ab8549c7e994f62
+  metadata.gz: a7681359db0fedbe95c7604a3e6ff978bee648ac459656762394f570c663ee2d
+  data.tar.gz: 613acd75472e77822299c9d69eb3033121da25b19f39a659eba4c0e035406c2e
 SHA512:
-  metadata.gz: 49df988e19500f360f227cd8c58b92f7e526c71ce4a645fb78ecca06aae5ab2ab9578aaf367f329fa21de9efc342eb60e81de59c8ab23b9726202a18048110be
-  data.tar.gz: 80d6ea8878e47f15c2ddd0a1d09749073501b11e69c6cb42f7456b48e566420f859dc5886004c2f7589a08eab1223456b4a080ebd0afec3fd72d1fe7daf2c2c6
+  metadata.gz: ba1e6dbb94ca5b37182dc2927c26e436ccddd264e545d8bc833623885eb8ef8aa3506112e25940ad153b3ea830dcd8fd818c38c5a62dc7184f2b9b19e1eb2cac
+  data.tar.gz: 72657e01fc0b093ff388b9f9c323b04d6643564f09e15d5c9261b32469f2d0ec7b5cce799fcc9c69b820b506127f47344347207ac108c5e3548e801a920f79f0

data/CHANGELOG.md

@@ -1,15 +1,30 @@
-# 2.2.0
+# Changelog
+All notable changes to this project will be documented in this file.
 
-- Use a symbol when loading `Rack::Heartbeat` into the app's middleware. This change means we can support Rails 5.2+. From upstream https://github.com/imajes/rack-heartbeat/commit/cac635cd29a61afd23899128b674443176295ad5
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-# 2.1.0
+## [Unreleased]
+### Changed
+- Nothing should go in this section, please add to the latest unreleased version
+  (and update the corresponding date), or add a new version.
 
-- Add Sinatra support [#1](https://github.com/conjurinc/rack-heartbeat/pull/1)
+## [2.2.1] - 2022-01-19
 
-# 2.0.0
+## [2.2.0] - 2018-04-24
+### Added
+- Use a symbol when loading `Rack::Heartbeat` into the app's middleware. This
+  change means we can support Rails 5.2+. From upstream
+  https://github.com/imajes/rack-heartbeat/commit/cac635cd29a61afd23899128b674443176295ad5
 
-- Adapted to provide `OPTIONS /` as a heartbeat URL, for Conjur
+## [2.1.0] - 2016-04-07
+### Added
+- Add Sinatra support [#1](https://github.com/conjurinc/rack-heartbeat/pull/1)
 
-# 1.0.1
+## [2.0.0] - 2016-01-17
+### Added
+- Adapted to provide `OPTIONS /` as a heartbeat URL, for Conjur
 
+## [1.0.1] - 2015-03-23
+### Changed
 - Forked from https://github.com/imajes/rack-heartbeat

data/Dockerfile

@@ -1,11 +1,17 @@
-FROM ruby:2.2
+FROM registry.tld/cyberark/ubuntu-ruby-fips:latest
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+  apt-get update -y && \
+  apt-get dist-upgrade -y && \
+  apt-get install -y build-essential curl git tzdata
 
 WORKDIR /usr/src/app
 
 COPY Gemfile* ./
 COPY *.gemspec ./
+COPY VERSION ./
 RUN bundle install
 
 COPY . .
 
-# CMD ["./your-daemon-or-script.rb"]
+# CMD ["./your-daemon-or-script.rb"]

data/Gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'coveralls', :group => :test, :require => false
+gem 'rake', :group => :test

data/Jenkinsfile

@@ -1,5 +1,17 @@
 #!/usr/bin/env groovy
 
+// Automated release, promotion and dependencies
+properties([
+  release.addParams()
+])
+
+if (params.MODE == "PROMOTE") {
+  release.promote(params.VERSION_TO_PROMOTE) { sourceVersion, targetVersion, assetDirectory ->
+    sh './publish-rubygem.sh'
+  }
+  return
+}
+
 pipeline {
   agent { label 'executor-v2' }
 
@@ -8,7 +20,37 @@ pipeline {
     buildDiscarder(logRotator(numToKeepStr: '30'))
   }
 
+  triggers {
+    cron(getDailyCronString())
+  }
+
+  environment {
+    MODE = release.canonicalizeMode()
+  }
+
   stages {
+
+    stage ("Skip build if triggering job didn't create a release") {
+      when {
+        expression {
+          MODE == "SKIP"
+        }
+      }
+      steps {
+        script {
+          currentBuild.result = 'ABORTED'
+          error("Aborting build because this build was triggered from upstream, but no release was built")
+        }
+      }
+    }
+
+    stage('Validate Changelog and set version') {
+      steps {
+        sh './bin/parse-a-changelog'
+        updateVersion("CHANGELOG.md", "${BUILD_NUMBER}")
+      }
+    }
+
     stage('Test') {
       steps {
         sh './test.sh'        
@@ -17,6 +59,22 @@ pipeline {
         junit 'test/junit.xml'
       }}
     }
+
+    stage('Release') {
+      when {
+        expression {
+          MODE == "RELEASE"
+        }
+      }
+
+      steps {
+        release { billOfMaterialsDirectory, assetDirectory ->
+          sh './publish-rubygem.sh'
+          sh 'cp rack-heartbeat-*.gem release-assets/.'
+        }
+      }
+    }
+
   }
 
   post {

data/bin/parse-a-changelog

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+set -ex
+
+cd "$(dirname "$0")"
+docker run --rm \
+  -v $PWD/..:/src/conjur-server \
+  -w /src/conjur-server \
+  ruby:2.5 bash -ec "
+    gem install -N parse_a_changelog
+    parse ./CHANGELOG.md
+  "

data/publish-rubygem.sh

@@ -1,7 +1,5 @@
-#!/bin/bash -e
-
-docker pull registry.tld/conjurinc/publish-rubygem
+#!/usr/bin/env bash
+set -e
 
 summon --yaml "RUBYGEMS_API_KEY: !var rubygems/api-key" \
-  docker run --rm --env-file @SUMMONENVFILE -v "$(pwd)":/opt/src \
-  registry.tld/conjurinc/publish-rubygem rack-heartbeat
+  publish-rubygem rack-heartbeat

data/rack-heartbeat.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "conjur-rack-heartbeat"
   gem.require_paths = ["lib"]
-  gem.version       = '2.2.0'
+  gem.version       = File.open('VERSION', &:readline)
 
   gem.add_development_dependency('minitest')
   gem.add_development_dependency('rack-test')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-rack-heartbeat
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1.pre.3
 platform: ruby
 authors:
 - James Cox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -71,7 +71,8 @@ description:
 email:
 - james@imaj.es
 - kgilpin@gmail.com
-executables: []
+executables:
+- parse-a-changelog
 extensions: []
 extra_rdoc_files: []
 files:
@@ -84,6 +85,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/parse-a-changelog
 - config.ru
 - lib/conjur-rack-heartbeat.rb
 - lib/rack/heartbeat.rb
@@ -108,12 +110,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Provides OPTIONS / as a heartbeat URL