Wrote some tests...

and also fixed bugs found by the tests. :)

Author: jordansissel

lib/fpm/package/curlbash.rb

@@ -1,3 +1,6 @@
+require "fpm/package"
+require "json"
+
 class FPM::Package::CurlBash < FPM::Package
 
   option "--container-image", "IMAGE", "The container image to use when running the command", :default => "ubuntu:latest"
@@ -10,15 +13,15 @@ def input(entry)
     build_flags = []
 
     if File.exists?(entry)
-      if attributes[:curlbash_setup_list].any?
+      if attributes[:curlbash_setup_list]
         logger.warn("When the argument given is a file or directory, the --curlbash-setup flags are ignored. This is because fpm assumes any setup you want to do is done inside of your Dockerfile or Containerfile, and also because fpm does not know how to edit a Dockerfile to append these setup steps.")
       end
 
       entryinfo = File.stat(entry)
       if entryinfo.file?
         build_flags += ["-f", entry, build_path]
       elsif entryinfo.directory?
-        build_flags += [entryinfo]
+        build_flags += [entry]
       else
         logger.fatal("The path must be a file or a directory. It is not.", :path => entry)
         raise FPM::InvalidPackageConfiguration, "The path must be a file or directory, but it is neither. Path: #{entry.inspect}"
@@ -68,10 +71,14 @@ def input(entry)
 
     (attributes[:excludes] ||= []).append(
       "tmp",
-      "run",
       "var/tmp",
       "root/.bashrc",
-      "root/.profile"
+      "root/.profile",
+
+      # Ignore podman's secrets files
+      "run/secret/**",
+      "run/secret",
+      "run",
     )
   end
 end

spec/fixtures/curlbash/Dockerfile

@@ -0,0 +1,3 @@
+FROM alpine:latest
+
+RUN touch /hello-world

spec/fpm/package/curlbash_spec.rb

@@ -0,0 +1,83 @@
+require "spec_setup"
+require "fpm/package/curlbash"
+require "stud/temporary"
+
+require "fpm/package/dir"
+
+describe FPM::Package::CurlBash do
+  context "with commands" do
+    after { subject.cleanup }
+
+    it "should work maybe" do
+      subject.input("touch /usr/bin/example")
+
+      insist { File.stat(subject.staging_path("usr")) }.directory?
+      insist { File.stat(subject.staging_path("usr/bin")) }.directory?
+      insist { File.stat(subject.staging_path("usr/bin/example")) }.file?
+    end
+
+    context "with setup steps" do
+      before do
+        subject.attributes[:curlbash_setup_list] = [
+          "touch /usr/bin/example",
+          "mkdir -p /hello/world",
+        ]
+
+        # Run a command which makes no file changes.
+        subject.input("true")
+      end
+
+      let(:output) { subject.convert(FPM::Package::Dir) }
+
+      after do
+        output.cleanup
+      end
+
+      it "should not capture setup step file activity" do
+        # Expect an empty staging path in the output package.
+        output.staging_path
+        insist { Dir.entries(output.staging_path) } == [".", ".."]
+      end
+    end
+  end
+
+  context "with Dockerfile or Containerfile" do
+    before do
+      subject.attributes[:excludes] = [ "etc/**", "etc" ]
+    end
+
+    let(:output) { subject.convert(FPM::Package::Dir) }
+
+    after do
+      subject.cleanup
+      output.cleanup
+    end
+
+    context "and specifying the file directly" do
+      let(:dockerfile) { File.expand_path("../../fixtures/curlbash/Dockerfile", File.dirname(__FILE__)) }
+
+      before do
+        subject.input(dockerfile)
+      end
+
+      it "should use the dockerfile" do
+        insist { Dir.entries(output.staging_path) } == [".", "..", "hello-world"]
+      end
+    end
+
+    context "and giving a directory containing a Dockerfile or Containerfile" do
+      let(:path) { File.expand_path("../../fixtures/curlbash", File.dirname(__FILE__)) }
+
+      before do
+        p path
+        subject.input(path)
+      end
+
+      it "should work" do
+        insist { Dir.entries(output.staging_path) } == [".", "..", "hello-world"]
+      end
+    end
+
+  end
+
+end

templates/curlbash.erb

@@ -1,6 +1,6 @@
 FROM <%= attributes[:curlbash_container_image] %>
 
-<% attributes[:curlbash_setup_list].each do |step| %>
+<% attributes.fetch(:curlbash_setup_list, []).each do |step| %>
 RUN <%= step %>
 <% end %>