conjur-rack-heartbeat 2.0.0 → 2.2.1.pre.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 787168e29f4219e9b151d18ca6b9316b1c872ade
-  data.tar.gz: a8cde571d1fb2b9873dd1b49bf872a41d8b3df79
+SHA256:
+  metadata.gz: 78efefef913da2c11c5074a9444bd4d6aa4ea16484d6f3c0e896eef13025bfda
+  data.tar.gz: 16b0ea6dbf199bf11ddb05e88b6de92d56abdce5af1265fe08fdc745a57af4b5
 SHA512:
-  metadata.gz: 4112db2d4e98f16d60dd52c8b3465a1ed0116d635cffaa8986c87a5eaf7798ae1a5b6bf7b9ae6b9a2a15eac6b546bd7724a08ffcba313e4fd6260317cd8837e1
-  data.tar.gz: b780e23f6ed4d3a155b7e301de7e165e1dd1c54907bac1bf4c8c73fb58de61fbf4bd31d5d6a634d45c64a53ba2a115b2adb17dfeac1c7028b4612bf874c7e5da
+  metadata.gz: 72a08c1bffbc85b5f1b5336352cd0efc0479e7435481a98475b0f2cb4206b8c3921b852bf7de07d41d46f975089f9bfa39070c2ca23936f46de1c02581691521
+  data.tar.gz: 46bb0432eff5c4095674a666a3747a281513c8b4c379cba5239bbe1ff26de98baa2ad04ed8d340b3e6a69ba84691d7844643b58ed216633939cda488920df7bc

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.0.0'
+  gem.version       = File.open('VERSION', &:readline)
 
   gem.add_development_dependency('minitest')
   gem.add_development_dependency('rack-test')

data/lib/conjur-rack-heartbeat.rb

@@ -1,2 +1,8 @@
 require 'rack/heartbeat'
-require 'rack/heartbeat/railtie' if defined?(Rails)
+
+if defined?(Rails)
+  require 'rack/heartbeat/railtie'
+elsif defined?(Sinatra)
+  require 'rack/heartbeat/sinatra'
+end
+

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

@@ -0,0 +1,20 @@
+require 'rack/heartbeat'
+
+module Conjur
+  module Rack
+    module Heartbeat
+      module Sinatra
+        
+        def self.extended cls
+          cls.module_eval do
+            
+            configure do
+              use ::Rack::Heartbeat
+            end
+
+          end
+        end
+      end
+    end
+  end
+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.0.0
+  version: 2.2.1.pre.7
 platform: ruby
 authors:
 - James Cox
@@ -9,87 +9,94 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   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'
 - !ruby/object:Gem::Dependency
   name: rack-test
   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'
 - !ruby/object:Gem::Dependency
   name: minitest-junit
   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'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
 email:
 - james@imaj.es
 - kgilpin@gmail.com
-executables: []
+executables:
+- parse-a-changelog
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .project
+- ".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
-- rack-heartbeat.gemspec
+- lib/rack/heartbeat/sinatra.rb
+- 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: 
@@ -98,17 +105,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       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.4.3
+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