conjur-cli 5.6.3 → 5.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ed6b6ede4ce280bd68268f820911a620b7ab216
-  data.tar.gz: 8b5dfecbcbcabc3adb7d2e3325660e6a5a8e7c49
+  metadata.gz: 1f8b622320f010ccc24a307ded9146bd7856f7c0
+  data.tar.gz: 4d4bc63522bff544432931780925a31e9e0b8e19
 SHA512:
-  metadata.gz: 9d5e00ad48beb3ab211759acdaf249def511f3efe832dc04399c540102d9182488286de3900c792cb63015f3537cd7f677805f4b7f19c1984d6b2991507624b9
-  data.tar.gz: 464040c1700ea7ab95ecce32ce63681d81535af916ecf642fc8408d5c7756ddc8c5f828251e5830263e029f1051191bbc0fe0b1b1b40cfd9dc9cb18f9e443f3d
+  metadata.gz: 4684b54823fa3b59154ad8bb76d96b89a721e60e8dcb32572475c77e6114887e1fdc8d8180cf664a637e54d59bb7f7bee6d4a01aaa2cbe08a7b8b9524abcfaee
+  data.tar.gz: b70c5ba938ef59b5f08e174735fd4de3e7f3cc3eae52eee0e0026d15579a7d7aa9ce2e7d975451a50bb36392565ff6b71c07f5aba0b3467868a33b9140d40ae2

data/APPLIANCE_VERSION

@@ -1 +1 @@
-5.0
+4.9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 5.6.4
+
+* Allow activesupport 5 as a dependency.
+
 # 5.6.3
 
 * Fix the gemspec to reflect dependency changes.

data/Jenkinsfile

@@ -47,38 +47,50 @@ pipeline {
 
     stage('Publish deb') {
       when {
-        branch 'master'
+        branch 'v4'
       }
 
       steps {
-        sh './publish.sh conjurtools stable'
+        sh './publish-deb.sh $(cat APPLIANCE_VERSION) stable'
       }
     }
 
-    // Only publish to RubyGems if branch is 'master'
-    // AND someone confirms this stage within 5 minutes
-    stage('Publish to RubyGems?') {
+    // Only publish to RubyGems if the HEAD is
+    // tagged with the same version as in version.rb
+    stage('Publish to RubyGems') {
       agent { label 'releaser-v2' }
 
       when {
-        allOf {
-          branch 'v4'
-          expression {
-            boolean publish = false
-            try {
-              timeout(time: 5, unit: 'MINUTES') {
-                input(message: 'Publish to RubyGems?')
-                publish = true
-              }
-            } catch (final ignore) {
-              publish = false
-            }
-            return publish
-          }
+        expression {
+          def exitCode = sh returnStatus: true, script: ''' set +x
+            echo "Determining if publishing is requested..."
+
+            VERSION=`cat lib/conjur/version.rb | grep \'VERSION\\s*=\' | sed -e "s/.*\'\\(.*\\)\'.*/\\1/"`
+            echo Declared version: $VERSION
+
+            # Jenkins git plugin is broken and always fetches with `--no-tags`
+            # (or `--tags`, neither of which is what you want), so tags end up
+            # not being fetched. Try to fix that.
+            # (Unfortunately this fetches all remote heads, so we may have to find
+            # another solution for bigger repos.)
+            git fetch -q
+
+            # note when tag not found git rev-parse will just print its name
+            TAG=`git rev-parse tags/v$VERSION 2>/dev/null || :`
+            echo Tag v$VERSION: $TAG
+
+            HEAD=`git rev-parse HEAD`
+            echo HEAD: $HEAD
+
+            test "$HEAD" = "$TAG"
+          '''
+          return exitCode == 0
         }
       }
       steps {
+        checkout scm
         sh './publish-rubygem.sh'
+        deleteDir()
       }
     }
   }

data/conjur-cli.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Conjur::VERSION
 
-  gem.add_dependency 'activesupport', '~> 4.2'
+  gem.add_dependency 'activesupport', '>= 4.2', '< 6'
   gem.add_dependency 'conjur-api', '~> 4.30'
   gem.add_dependency 'gli', '>=2.8.0'
   gem.add_dependency 'highline', '~> 1.7'

data/lib/conjur/version.rb

@@ -19,6 +19,6 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 module Conjur
-  VERSION = '5.6.3'.freeze
+  VERSION = '5.6.4'.freeze
   ::Version=VERSION
 end

data/{publish.sh → publish-deb.sh}

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
 distribution=$1
-component=${2:-`echo $GIT_BRANCH | sed 's/^origin\///' | tr '/' '.'`}
+component=${2:-`echo $BRANCH_NAME | sed 's/^origin\///' | tr '/' '.'`}
 
 exec summon -f ci/secrets/publish.yml ./ci/publish.sh $distribution $component

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 5.6.3
+  version: 5.6.4
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,22 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: conjur-api
   requirement: !ruby/object:Gem::Requirement
@@ -477,8 +483,8 @@ files:
 - lib/patches/conjur/error.rb
 - lib/patches/gli.rb
 - profile.rb
+- publish-deb.sh
 - publish-rubygem.sh
-- publish.sh
 - spec/authn_spec.rb
 - spec/command/assets_spec.rb
 - spec/command/audit_spec.rb