conjur-rack-heartbeat 2.1.0 → 2.2.1.pre.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0aed2e1c5727587ff7c0a87eee7ff36d7e51534755aa1e3c3cd6dd512042c306
-  data.tar.gz: 697bd0e9cea60f1d30297d91d5a57dc541575f792bd7cde4817c68ebfaed84f4
+  metadata.gz: 851871ef64267dfcd207a8608206b8c32de087e5e1ffcc4e49b84db82e5de49a
+  data.tar.gz: b3b4dfbd55f53fde16ec684296986ba472b749ed77e19bff7ea22e780bbf3cac
 SHA512:
-  metadata.gz: e39f47e48f3e5a5a0725213771c61bc2148c625822b9df434b01c0ca2b8f63357d65dd249f6ffe44a335d25a5039b9fb6f1e0a21c8c7ca9e37cf602b7bad1b39
-  data.tar.gz: 5370a49f3524a99684aee7f4e312e9cf45d6012bb60986308e1e9af903c600b4211c8ccfb4a4b04a9324dfbf475572545f74bdfa2fc552a908c8a2274813c806
+  metadata.gz: 48c466e319fc7119f6de81dd06654a9ff959035a61dce4f0d3625bcb420d132e53713116d2e268dbd394bf83ba94c0972607a9972cb61b4ec8ea99846adec93b
+  data.tar.gz: ec3704be15746a6dc28c8108dc7513b5fcd9086a6fa32b4910e0cb3be5e79d2a1a8d234da3c33f240d446ccd76484dfc96d2407b2ebe17b1946e3d1c8a86b5e2

data/.gitignore

@@ -1,4 +1,4 @@
-report.xml
+test/junit.xml
 *.gem
 *.rbc
 .bundle
@@ -7,7 +7,7 @@ report.xml
 Gemfile.lock
 InstalledFiles
 _yardoc
-coverage
+coverage/
 doc/
 lib/bundler/man
 pkg

data/CHANGELOG.md

@@ -0,0 +1,30 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+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).
+
+## [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.
+
+## [2.2.1] - 2022-01-19
+
+## [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
+
+## [2.1.0] - 2016-04-07
+### Added
+- Add Sinatra support [#1](https://github.com/conjurinc/rack-heartbeat/pull/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

@@ -0,0 +1,17 @@
+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"]

data/Gemfile

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

data/Jenkinsfile

@@ -0,0 +1,85 @@
+#!/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' }
+
+  options {
+    timestamps()
+    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'        
+      }
+      post { always {
+        junit 'test/junit.xml'
+      }}
+    }
+
+    stage('Release') {
+      when {
+        expression {
+          MODE == "RELEASE"
+        }
+      }
+
+      steps {
+        release { billOfMaterialsDirectory, assetDirectory ->
+          sh './publish-rubygem.sh'
+          sh 'cp conjur-rack-heartbeat-*.gem release-assets/.'
+        }
+      }
+    }
+
+  }
+
+  post {
+    always {
+      cleanupAndNotify(currentBuild.currentResult)
+    }
+  }
+}

data/Rakefile

@@ -11,6 +11,6 @@ end
 Rake::TestTask.new(:jenkins) do |t|
   t.libs << 'test'
   t.test_files = FileList['test/**/test*.rb']
-  t.options = '--junit'
+  t.options = '--junit --junit-filename=test/junit.xml --junit-jenkins'
   t.verbose = true
 end

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/{rack-heartbeat.gemspec → conjur-rack-heartbeat.gemspec}

@@ -4,14 +4,14 @@ Gem::Specification.new do |gem|
   gem.authors       = ["James Cox", "Kevin Gilpin"]
   gem.email         = ["james@imaj.es", "kgilpin@gmail.com"]
   gem.summary       = %q{Provides OPTIONS / as a heartbeat URL}
-  gem.homepage      = "https://github.com/conjurinc/rack-heartbeat"
+  gem.homepage      = "https://rubygems.org/gems/conjur-rack-heartbeat"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "conjur-rack-heartbeat"
   gem.require_paths = ["lib"]
-  gem.version       = '2.1.0'
+  gem.version       = File.open('VERSION', &:readline)
 
   gem.add_development_dependency('minitest')
   gem.add_development_dependency('rack-test')

data/lib/rack/heartbeat/railtie.rb

@@ -2,7 +2,7 @@ module Rack
 
   class Heartbeat::Railtie < Rails::Railtie
     initializer "rack.heartbeat.initializer" do |app|
-      app.middleware.insert 0, 'Rack::Heartbeat'
+      app.middleware.insert 0, Rack::Heartbeat
     end
   end
 

data/lib/rack/heartbeat/sinatra.rb

@@ -8,7 +8,7 @@ module Conjur
         def self.extended cls
           cls.module_eval do
             
-            configure :appliance do
+            configure do
               use ::Rack::Heartbeat
             end
 

data/publish-rubygem.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -e
+
+summon --yaml "RUBYGEMS_API_KEY: !var rubygems/api-key" \
+  publish-rubygem conjur-rack-heartbeat

data/test.sh

@@ -0,0 +1,12 @@
+#!/bin/bash -e
+
+docker build -t rack-heartbeat .
+
+docker run --rm \
+  -v $PWD/coverage:/usr/src/app/coverage \
+  -v $PWD/test:/usr/src/app/test \
+  rack-heartbeat \
+    bundle exec rake jenkins
+# gem install -N bundler
+# bundle
+# bundle exec rake jenkins

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-rack-heartbeat
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.1.pre.8
 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,26 +71,32 @@ description:
 email:
 - james@imaj.es
 - kgilpin@gmail.com
-executables: []
+executables:
+- parse-a-changelog
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".project"
+- CHANGELOG.md
+- Dockerfile
 - Gemfile
+- Jenkinsfile
 - LICENSE
 - README.md
 - Rakefile
+- bin/parse-a-changelog
 - config.ru
-- jenkins.sh
+- conjur-rack-heartbeat.gemspec
 - lib/conjur-rack-heartbeat.rb
 - lib/rack/heartbeat.rb
 - lib/rack/heartbeat/railtie.rb
 - lib/rack/heartbeat/sinatra.rb
-- rack-heartbeat.gemspec
+- publish-rubygem.sh
+- test.sh
 - test/helper.rb
 - test/rack/test_heartbeat.rb
-homepage: https://github.com/conjurinc/rack-heartbeat
+homepage: https://rubygems.org/gems/conjur-rack-heartbeat
 licenses: []
 metadata: {}
 post_install_message: 
@@ -104,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

data/jenkins.sh

@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-gem install -N bundler
-bundle
-bundle exec rake jenkins