conjur-debify 1.10.2 → 1.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f87ebc10c78db4a39ad8d8b211c9b6b07d6068c37d2625eb44f9f7c75e2cf78
-  data.tar.gz: fcd3cc94728f39e000eed291ef7b5d70b63a7912db4c5951b1c9347507c60893
+  metadata.gz: a5d37eadc9ebb56259a7a9fbb811761eb4d9a4210b664b450e5ddcb51e3f5eeb
+  data.tar.gz: 88611983be2c6a1726b54ffac032f95ab3966e3d7cef57e50504fd3c781fce54
 SHA512:
-  metadata.gz: '081d1c2d58f09b54e736264627d8ac11940b07604d83de23a283d75c21184a209eab8e81ef7aafb4f3888f780866f5bbf43cc0c1457dab7e958116b120ea6ba7'
-  data.tar.gz: 8f999bdc7706bef9b353fc098794ea3c2a8b246fd870fee86a97771665792f177e1cf8110f11837a4012f4fb11f0cc9a5862edee533eda5e0f74957a89e20780
+  metadata.gz: 4be770ae77cf5e80478fb77137b90394086d3bbede9a0d15a61b64b636a6c43ca8e1711e69d7033deb12f0ed13f9609c5c13d1eab4ececfc7a89163a530aa2d7
+  data.tar.gz: 925471e67b930d1fab9cba2484706bea504357fc3dead42cb6c3b2136036cf4ece73092b640b8fef70abf46b84bb7908f0f2189ebef0994171abc06f21d57e32

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.10.3
+
+* Fix a bug causing duplicate files between normal and dev packages when a file name contained a space.
+
 # 1.10.2
 
 * Pin `ruby-xz` gem in fpm Dockerfile, so it works on Ruby 2.2. Upstream issue: https://github.com/jordansissel/fpm/issues/1493

data/VERSION

@@ -1 +1 @@
-1.10.2
+1.10.3

data/lib/conjur/fpm/debify_utils.sh

@@ -9,3 +9,24 @@ function bundle_clean() {
     rm -rf vendor/bundle/ruby/${ruby_version}/gems/*/{test,spec,examples,example,contrib,doc,ext,sample}
   fi
 }
+
+# Remove files from the current directory that also exist in another given
+# directory. For example, say in the current directory there is:
+#    foo
+#    bar/baz
+#    bar/xyzzy
+#    bacon
+#    people/phlebas
+# and in dir2 there is
+#    bacon
+#    alice
+#    people/phlebas
+#    bar/xyzzy
+# then after running `remove_matching dir2` current directory will be left with only:
+#    foo
+#    bar/baz
+# Note it probably isn't 100% fool-proof, so don't launch it out to space or something.
+function remove_matching() {
+  find "$1" -type f -print0 | sed -ze "s@^$1@.@" | xargs -0 rm -f
+  find . -type d -empty -delete
+}

data/lib/conjur/fpm/package.sh

@@ -28,8 +28,7 @@ bundle --without development test
 bundle clean
 cp /usr/local/bundle/config .bundle/config # bundler for some reason stores config there...
 cd /dev-pkg
-find $prefix -type f | sed -e "s@^$prefix@.@" | xargs rm -f
-find . -type d -empty -delete
+remove_matching $prefix
 bundle_clean
 
 if [ `ls | wc -l` -eq 0 ]; then

data/spec/debify_utils_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+require 'aruba/rspec'
+
+Aruba.configure do |c|
+  c.activate_announcer_on_command_failure = %i(stderr stdout)
+end
+
+describe "remove_matching()", type: :aruba do
+  it "removes matching files" do
+    here %w(foo bar/baz bar/xyzzy zork)
+    there %w(foo bar/baz not)
+    remove_matching
+    expect(contents_of herepath).to match_array %w(zork bar bar/xyzzy)
+  end
+  
+  it "also handles files with spaces in names" do
+    here ['foo', 'bar/baz', 'with space', 'with', 'bar/another space']
+    there ['with space', 'bar/another space here']
+    remove_matching
+    expect(contents_of herepath).to match_array ['foo', 'bar', 'bar/baz', 'with', 'bar/another space']
+  end
+  
+  # auxiliary methods and setup
+  let(:herepath) { Pathname.new Dir.mktmpdir }
+  let(:therepath) { Pathname.new Dir.mktmpdir }
+  after { [herepath, therepath].each &FileUtils.method(:remove_entry) }
+
+  def contents_of dir
+    Dir.chdir(dir) { Dir['**/*'] }
+  end
+
+  def remove_matching
+    run_simple "bash -c 'source #{DEBIFY_UTILS_PATH}; cd #{herepath}; remove_matching #{therepath}'"
+  end
+  
+  def here files
+    mkfiles herepath, files
+  end
+  
+  def there files
+    mkfiles therepath, files
+  end
+
+  def mkfiles dir, files  
+    return dir if files.empty?
+    files.each do |path|
+      fullpath = dir + path
+      FileUtils.makedirs fullpath.dirname
+      FileUtils.touch fullpath
+    end
+  end
+  
+  DEBIFY_UTILS_PATH = File.expand_path '../../lib/conjur/fpm/debify_utils.sh', __FILE__
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.10.3
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-21 00:00:00.000000000 Z
+date: 2018-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -224,6 +224,7 @@ files:
 - spec/action/publish_spec.rb
 - spec/data/Makefile
 - spec/data/test.tar
+- spec/debify_utils_spec.rb
 - spec/spec_helper.rb
 - spec/utils_spec.rb
 - tag-image.sh
@@ -264,5 +265,6 @@ test_files:
 - spec/action/publish_spec.rb
 - spec/data/Makefile
 - spec/data/test.tar
+- spec/debify_utils_spec.rb
 - spec/spec_helper.rb
 - spec/utils_spec.rb