conjur-debify 1.11.4 → 2.1.0

data/lib/conjur/fpm/package.sh

@@ -8,47 +8,69 @@ version=$1
 shift
 
 if [ -z "$project_name" ]; then
-	echo Project name argument is required
-	exit 1
+  echo Project name argument is required
+  exit 1
 fi
 if [ -z "$version" ]; then
-	echo Version argument is required
-	exit 1
+  echo Version argument is required
+  exit 1
 fi
 
-package_name=conjur-"$project_name"_"$version"_amd64.deb
-dev_package_name=conjur-"$project_name"-dev_"$version"_amd64.deb
+for i in "$@"; do
+  case $i in
+  -ft=* | --file-type=*)
+    file_type="${i#*=}"
+    shift
+    ;;
+  esac
+done
+
+if [ -z "$file_type" ]; then
+  echo "No file type given. Using deb"
+  file_type=deb
+fi
+
+echo Project Name is $project_name
+echo Version is $version
+echo file_type is $file_type
+echo params at the end are $@
 
 # Build dev package first
-echo Building $dev_package_name
 prefix=/src/opt/conjur/project
-cp -al $prefix /dev-pkg
 cd $prefix
-bundle --without development test
+bundle config set --local deployment 'true' && \
+bundle config set --local path 'vendor/bundle' && \
+bundle
+cp -al $prefix /dev-pkg
+bundle config set --local without 'development test'
 bundle clean
-cp /usr/local/bundle/config .bundle/config # bundler for some reason stores config there...
 cd /dev-pkg
 remove_matching $prefix
 bundle_clean
 
-if [ `ls | wc -l` -eq 0 ]; then
+if [ $(ls | wc -l) -eq 0 ]; then
   echo No dev dependencies, skipping dev package
 else
-  fpm -s dir -t deb -n conjur-$project_name-dev -v $version -C . \
-    --maintainer "Conjur Inc." \
-    --vendor "Conjur Inc." \
+  echo "Building conjur-$project_name-dev $file_type package"
+
+  fpm \
+    -s dir \
+    -t $file_type \
+    -n conjur-$project_name-dev \
+    -v $version \
+    -C . \
+    --maintainer "CyberArk Software, Inc." \
+    --vendor "CyberArk Software, Inc." \
     --license "Proprietary" \
-    --url "https://www.conjur.net" \
+    --url "https://www.cyberark.com" \
     --deb-no-default-config-files \
-    --deb-user conjur \
-    --deb-group conjur \
+    --$file_type-user conjur \
+    --$file_type-group conjur \
     --depends "conjur-$project_name = $version" \
     --prefix /opt/conjur/$project_name \
     --description "Conjur $project_name service - development files"
 fi
 
-echo Building $package_name
-
 mv /src/opt/conjur/project /src/opt/conjur/$project_name
 
 cd /src/opt/conjur/$project_name
@@ -63,16 +85,23 @@ mkdir -p opt/conjur/etc
 
 [ -d opt/conjur/"$project_name"/distrib ] && mv opt/conjur/"$project_name"/distrib /
 
-fpm -s dir -t deb -n conjur-$project_name -v $version -C . \
-	--maintainer "Conjur Inc." \
-	--vendor "Conjur Inc." \
-	--license "Proprietary" \
-	--url "https://www.conjur.net" \
-	--deb-no-default-config-files \
-	--config-files opt/conjur/etc \
-	--deb-user conjur \
-	--deb-group conjur \
-	--description "Conjur $project_name service" \
-	"$@"
-
-ls -al *.deb
+echo "Building conjur-$project_name $file_type package"
+
+fpm \
+  -s dir \
+  -t $file_type \
+  -n conjur-$project_name \
+  -v $version \
+  -C . \
+  --maintainer "CyberArk Software, Inc." \
+  --vendor "CyberArk Software, Inc." \
+  --license "Proprietary" \
+  --url "https://www.cyberark.com" \
+  --config-files opt/conjur/etc \
+  --deb-no-default-config-files \
+  --$file_type-user conjur \
+  --$file_type-group conjur \
+  --description "Conjur $project_name service" \
+  "$@"
+
+ls -l

data/lib/conjur/publish/Dockerfile

@@ -1,11 +1,5 @@
-FROM buildpack-deps:curl
+FROM releases-docker.jfrog.io/jfrog/jfrog-cli:1.52.0
 
 ENV JFROG_CLI_OFFER_CONFIG=false
-ENV JFROG_VERSION=1.13.1
-
-RUN curl -kL \
-    -o /usr/bin/jfrog \
-    https://bintray.com/jfrog/jfrog-cli-go/download_file?file_path=${JFROG_VERSION}%2Fjfrog-cli-linux-amd64%2Fjfrog && \
-    chmod +x /usr/bin/jfrog
 
 WORKDIR /src

data/spec/action/publish_spec.rb

@@ -31,8 +31,8 @@ describe Conjur::Debify::Action::Publish do
     end
     
     it 'runs' do
-      expect(action).to receive(:publish)
-      
+      expect(action).to receive(:publish).twice
+
       action.run
     end
     
@@ -42,8 +42,8 @@ describe Conjur::Debify::Action::Publish do
 
     it 'runs' do
       expect(action).to receive(:fetch_art_creds)
-      expect(action).to receive(:publish)
-      
+      expect(action).to receive(:publish).twice
+
       action.run
     end
   end

data/spec/debify_utils_spec.rb

@@ -30,7 +30,7 @@ describe "remove_matching()", type: :aruba do
   end
 
   def remove_matching
-    run_simple "bash -c 'source #{DEBIFY_UTILS_PATH}; cd #{herepath}; remove_matching #{therepath}'"
+    run_command_and_stop "bash -c 'source #{DEBIFY_UTILS_PATH}; cd #{herepath}; remove_matching #{therepath}'"
   end
   
   def here files

data/spec/utils_spec.rb

@@ -6,7 +6,7 @@ describe 'Conjur::Debify::Utils.copy_from_container' do
   it "copies a file from the container to the current directory" do
     tar = File.read "#{__dir__}/data/test.tar"
     container = instance_double Docker::Container
-    allow(container).to receive(:copy).with "/tmp/test.tar" do |&b|
+    allow(container).to receive(:archive_out).with "/tmp/test.tar" do |&b|
       StringIO.new(tar).each(nil, 512) do |c|
         # docker api sends three arguments, so emulate that
         b[c, nil, nil]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 1.11.4
+  version: 2.1.0
 platform: ruby
 authors:
-- Kevin Gilpin
+- CyberArk Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2021-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.33'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.33'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: conjur-cli
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.2.30
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.2.30
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +126,16 @@ dependencies:
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +166,7 @@ dependencies:
         version: '1.0'
 description: 
 email:
-- kgilpin@conjur.net
+- conj_maintainers@cyberark.com
 executables:
 - debify
 extensions: []
@@ -177,6 +177,7 @@ files:
 - ".project"
 - ".rvmrc"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Dockerfile
 - Gemfile
 - Jenkinsfile
@@ -249,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Utility commands to build and package Conjur services as Debian packages