conjur-debify 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 183750f5e11ef2f53a84358af536bf0f45071ef2
-  data.tar.gz: 80ad788188c53f46aa75e6a0a53be079aa73753c
+  metadata.gz: ddccb9d6f39996c53c34bea3dc5e877271cb0400
+  data.tar.gz: 6378ea97813d23a8f4d5b8f1412749db6fdb52be
 SHA512:
-  metadata.gz: 1044d35a96eb810c5f54ec03106c48ab5456d9e01395d0aff1447246e71d6e235d959b0fe54f4a2750205c3cf074e96873c24dd679a02b0b8460286f7e81a961
-  data.tar.gz: bcf0d6083a7f0c32e72138b87d6fb8b66d71e4c8bb9c4ef87acba1807a2c437d64cf9619cdba7c451a5ede060b0ef22ae2d3eea25ea5b37dab9e147f698c657a
+  metadata.gz: 33d1e81e5fdf92e94ecfba6faac21967adc69339e204e0982221394c9b6d75a2925ea0ae5df66a472f6db7729be241f64ed97744a93caebb46149e9b61c7b1c6
+  data.tar.gz: 93ca403108dc2b195a9f26006a55de6c7a85470381810236ce32f6bfe64d43098067314b5ab8736e60171e413d74bdb238b7fb154ca4f38ba3d2a155182f3a8f

data/.dockerignore

@@ -0,0 +1,2 @@
+Dockerfile
+Gemfile.lock

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.5.2
+
+* Use new conjurops variables in `publish` command, fall back to old conjurops
+
 # 1.5.1
 
 * Fix the description of the `--version` argument to indicate that the version now comes from the `VERSION` file.

data/Dockerfile

@@ -0,0 +1,9 @@
+FROM ruby:2.2.6
+
+RUN mkdir -p /src
+WORKDIR /src
+
+COPY . /src/
+RUN bundle
+
+ENTRYPOINT ["bundle", "exec", "debify"]

data/jenkins.sh

@@ -4,3 +4,13 @@ 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

data/lib/conjur/debify/version.rb

@@ -1,5 +1,5 @@
 module Conjur
   module Debify
-    VERSION = "1.5.1"
+    VERSION = "1.5.2"
   end
 end

data/lib/conjur/debify.rb

@@ -621,7 +621,6 @@ command "publish" do |c|
 
     dir = cmd_options[:dir] || '.'
     dir = File.expand_path(dir)
-    
     raise "Directory #{dir} does not exist or is not a directory" unless File.directory?(dir)
         
     Dir.chdir dir do
@@ -637,9 +636,17 @@ command "publish" do |c|
       Conjur::Config.load
       Conjur::Config.apply
       conjur = Conjur::Authn.connect nil, noask: true
-      
-      art_username = conjur.variable('artifactory/users/jenkins/username').value
-      art_password = conjur.variable('artifactory/users/jenkins/password').value
+
+      username_var = 'artifactory/users/jenkins/username'
+      password_var = 'artifactory/users/jenkins/password'
+
+      if conjur.variable('ci/artifactory/users/jenkins/username').exists?  # we're on new conjurops
+        username_var.insert(0, 'ci/')
+        password_var.insert(0, 'ci/')
+      end
+
+      art_username = conjur.variable(username_var).value
+      art_password = conjur.variable(password_var).value
 
       options = {
           'Image' => publish_image.id,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -116,10 +116,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .dockerignore
 - .gitignore
 - .project
 - .rvmrc
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md