Rename curlbash to container.

I feel like this better suits the purpose, as we could curlbash things
but this feature can also just do regular Dockerfile/Containerfile
things.

Author: jordansissel

lib/fpm/package/curlbash.rb lib/fpm/package/container.rblib/fpm/package/curlbash.rb renamed to lib/fpm/package/container.rb

@@ -1,9 +1,9 @@
 require "fpm/package"
 require "json"
 
-class FPM::Package::CurlBash < FPM::Package
+class FPM::Package::Container < FPM::Package
 
-  option "--container-image", "IMAGE", "The container image to use when running the command", :default => "ubuntu:latest"
+  option "--image", "IMAGE", "The container image to use when running the command", :default => "ubuntu:latest"
 
   option "--setup", "SHELL COMMANDS", "Commands to run but not to include in the resulting package. For example, 'apt-get update' or other setup.", :multivalued => true
 
@@ -27,8 +27,8 @@ def input(entry)
     name = "whatever-#{$$}"
 
     if File.exists?(entry)
-      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.")
+      if attributes[:container_setup_list]
+        logger.warn("When the argument given is a file or directory, the --container-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)
@@ -44,7 +44,7 @@ def input(entry)
       # The given argument is not a path, so let's assume it's a shell command to run.
       # We'll need to generate a 
 
-      content = template("curlbash.erb").result(binding)
+      content = template("container.erb").result(binding)
       containerfile = build_path("Containerfile")
       File.write(containerfile, content)
 

spec/fixtures/curlbash/Dockerfile spec/fixtures/container/Dockerfilespec/fixtures/curlbash/Dockerfile renamed to spec/fixtures/container/Dockerfile

@@ -1,10 +1,10 @@
 require "spec_setup"
-require "fpm/package/curlbash"
+require "fpm/package/container"
 require "stud/temporary"
 
 require "fpm/package/dir"
 
-describe FPM::Package::CurlBash do
+describe FPM::Package::Container do
   context "with commands" do
     after { subject.cleanup }
 
@@ -18,7 +18,7 @@
 
     context "with setup steps" do
       before do
-        subject.attributes[:curlbash_setup_list] = [
+        subject.attributes[:container_setup_list] = [
           "touch /usr/bin/example",
           "mkdir -p /hello/world",
         ]
@@ -54,7 +54,7 @@
     end
 
     context "and specifying the file directly" do
-      let(:dockerfile) { File.expand_path("../../fixtures/curlbash/Dockerfile", File.dirname(__FILE__)) }
+      let(:dockerfile) { File.expand_path("../../fixtures/container/Dockerfile", File.dirname(__FILE__)) }
 
       before do
         subject.input(dockerfile)
@@ -66,10 +66,9 @@
     end
 
     context "and giving a directory containing a Dockerfile or Containerfile" do
-      let(:path) { File.expand_path("../../fixtures/curlbash", File.dirname(__FILE__)) }
+      let(:path) { File.expand_path("../../fixtures/container", File.dirname(__FILE__)) }
 
       before do
-        p path
         subject.input(path)
       end
 

spec/fpm/package/curlbash_spec.rb spec/fpm/package/container_spec.rbspec/fpm/package/curlbash_spec.rb renamed to spec/fpm/package/container_spec.rb

@@ -0,0 +1,7 @@
+FROM <%= attributes[:container_image] %>
+
+<% attributes.fetch(:container_setup_list, []).each do |step| %>
+RUN <%= step %>
+<% end %>
+
+RUN <%= entry %>