conjur-debify 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f144ac5f47a96820c0c42b1941adee5e51720335
-  data.tar.gz: 4316233ba88c597982eae537cfd9fee00c1d5542
+  metadata.gz: 862455ae84807ccc3cf1335557e2df5649a84382
+  data.tar.gz: 39a34fec2c9bef304fa33f28f5ed7a04c0102345
 SHA512:
-  metadata.gz: d13e2010bf0aea5cf5e1285e6444ad7fb8225da92056e18533e3546897f78d91c39f64a8f7123e82a9877f1d744ac675b22dc29f3f58c77ba080bbca1ef21bb3
-  data.tar.gz: 05dcfd9104f647cfc5a0cd6ea9b8e111d975dd01b01c98af0d9f19b80f6cd09b82e85e14e3c198e03fb9218eb0bc6aa890517c35da10006957364a9db00cd3d9
+  metadata.gz: 6323cb3635571b8426cbdac72e4a2a8d2b6da988b8ac7572b3760f1ce372d0df0d02d4c234d8221d3b58b2f98221701aff309fe6562c3365c9de979bca53f696
+  data.tar.gz: 004efe037fb96a93eb2670ecac8085fca8cc84f1e4ff6f5852447992aff1162dee8ab5d1ed1cd921bee070732f412afddde80c605b95e951e758d9f6bc9e38b0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.5.4
+
+* `debify publish` now checks env var `BRANCH_NAME` as well as `GIT_BRANCH`.
+  Jenkins pipelines use `BRANCH_NAME`, Jenkins jobs use `GIT_BRANCH`.
+
 # 1.5.3
 
 * debify now uses `~/.docker/config` auth if pulling an image fails due to auth
@@ -42,7 +47,7 @@
 
 # 1.0.0
 
-* Base image used for packaging on Ubuntu 14.04 
+* Base image used for packaging on Ubuntu 14.04
 * Install ruby2.2 and related packages
 
 # 0.11.1

data/lib/conjur/debify.rb

@@ -625,7 +625,7 @@ be auto-detected from Git.
 
 --component should be 'stable' if run after package tests pass or 'testing' if the package is not yet ready for release.
 If you don't specify the component, it will be set to 'testing' unless the current git branch is 'master' or 'origin/master'.
-The git branch is first detected from the env var GIT_BRANCH, and then by checking `git rev-parse --abbrev-ref HEAD`
+The git branch is first detected from the env var GIT_BRANCH or BRANCH_NAME, and then by checking `git rev-parse --abbrev-ref HEAD`
 (which won't give you the answer you want when detached).
 
 DESC
@@ -646,7 +646,7 @@ command "publish" do |c|
     raise "Received extra command-line arguments" if args.shift
 
     def detect_component
-      branch = ENV['GIT_BRANCH'] || `git rev-parse --abbrev-ref HEAD`.strip
+      branch = ENV['GIT_BRANCH'] || ENV['BRANCH_NAME'] || `git rev-parse --abbrev-ref HEAD`.strip
       if %w(master origin/master).include?(branch)
         'stable'
       else

data/lib/conjur/debify/version.rb

@@ -1,5 +1,5 @@
 module Conjur
   module Debify
-    VERSION = "1.5.3"
+    VERSION = "1.5.4"
   end
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
   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'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.33'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.33'
 - !ruby/object:Gem::Dependency
   name: conjur-cli
   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'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   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: aruba
   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'
 description: 
@@ -116,10 +116,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .dockerignore
-- .gitignore
-- .project
-- .rvmrc
+- ".dockerignore"
+- ".gitignore"
+- ".project"
+- ".rvmrc"
 - CHANGELOG.md
 - Dockerfile
 - Gemfile
@@ -156,17 +156,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'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: Utility commands to build and package Conjur services as Debian packages