conjur-debify 1.7.0 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8855639443d69bd88b95e4c6ba08bf24f2b165ca
-  data.tar.gz: f3c6e6d781021d263caa26bdc1f15dbb5abc75d4
+  metadata.gz: 117d315b0dc516a27f84486de525a05e62bd786b
+  data.tar.gz: f45792c06ba54081913e1cb3d066b6fba0fab566
 SHA512:
-  metadata.gz: 8efa8c22f09f29eaa660f96cb6313b35995774d01f4d735ddb65223fbb3e7e135348e5a9f91670a75e358f458fc63cc7d798c370e898ef1c9bc097c97b19461e
-  data.tar.gz: 9e67e5c2496368e1cfb09924263f7ed8adae19b19defc6444bdd3424aacddc1cccfac799c307ffae43c0ed1f14d77523b05c5242f45242ee6d6f876f35318082
+  metadata.gz: 0ad524150e3af3a337ff05b7cec2bd587d2841714d202fefca2c1845ec98e4c2642d426fc7f60f6da270defb1d46c605725ece553ecf2cdd5e1716c114ab4b6b
+  data.tar.gz: e05efbdcd0f98acc62fad72e0dd23f86180077151b17be44e8228772eafeafeb3dba43cc9704d0e87c1881733cd9b0b8d274a9a7fbbf224706313395efbd001e

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.7.1
+
+* Take out a `require 'pry'` that had snuck in.
+* Fix `publish` subcommand, broken after factoring publish out into a separate action.
+
 # 1.7.0
 
 * Read artifactory credentials from the environment

data/Jenkinsfile

@@ -49,7 +49,23 @@ pipeline {
     stage('Publish to RubyGems') {
       agent { label 'releaser-v2' }
       when {
-        branch 'master'
+        allOf {
+          branch 'master'
+          expression {
+            boolean publish = false
+
+            try {
+              timeout(time: 5, unit: 'MINUTES') {
+                input(message: 'Publish to RubyGems?')
+                publish = true
+              }
+            } catch (final ignore) {
+              publish = false
+            }
+
+            return publish
+          }
+        }
       }
 
       steps {

data/VERSION

@@ -1 +1 @@
-1.7.0
+1.7.2

data/lib/conjur/debify.rb

@@ -643,7 +643,6 @@ command "publish" do |c|
     raise "project-name is required" unless project_name = args.shift
     raise "Received extra command-line arguments" if args.shift
 
-    require 'pry'; binding.pry
     Conjur::Debify::Action::Publish.new(distribution, project_name, cmd_options).run
   end
 end

data/lib/conjur/debify/action/publish.rb

@@ -58,7 +58,7 @@ module Conjur::Debify
       end
 
       def create_image
-        Docker::Image.build_from_dir File.expand_path('publish', File.dirname(__FILE__)), tag: "debify-publish", &DebugMixin::DOCKER
+        Docker::Image.build_from_dir File.expand_path('../../publish', File.dirname(__FILE__)), tag: "debify-publish", &DebugMixin::DOCKER
       end
 
       def fetch_art_creds

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.2
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -189,7 +189,6 @@ files:
 - features/package.feature
 - features/step_definitions/debify_steps.rb
 - features/support/env.rb
-- jenkins.sh
 - lib/conjur/debify.rb
 - lib/conjur/debify/Dockerfile.fpm
 - lib/conjur/debify/action/publish.rb

data/jenkins.sh

@@ -1,16 +0,0 @@
-#!/bin/bash -ex
-
-gem install -N bundler
-bundle
-rm -rf features/reports
-cucumber --format pretty --format junit --out features/reports || true
-
-if [ "$GIT_BRANCH" == "origin/master" ]; then
-  TAG=$(cat lib/conjur/debify/version.rb | grep -o '".*"' | tr -d '"')
-
-  docker build -t debify .
-  docker tag -f debify registry.tld/debify:$TAG
-  docker tag -f debify registry.tld/debify:latest
-  docker push registry.tld/debify:$TAG
-  docker push registry.tld/debify:latest
-fi