rumrunner 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e256c9acb653c3a0fc37e04748d8207129d9a1d94e42297e38c37e6a13be0991
-  data.tar.gz: 7ad0a4c11ca003d859292ed1329b6cc3e19bd690bb4f17d072f5294c9b5699eb
+  metadata.gz: da4a1989a2252315eba1d4bcd4d921b25ee90c53fd77b2ce6e720dad5a07b807
+  data.tar.gz: ed649270e0622f1aabc134ce1529403dc534b040b6857c5a7fd0db4c4daedbd6
 SHA512:
-  metadata.gz: 4ecab12951fdacceb1aef118e2d4cf9579e03568945177868ec36c5a15e5c0962f6d75fe327e483058833240ed8895d90e4421eb1b77440bbcd01ca43489a1ef
-  data.tar.gz: 767ecf30c9bb0e421a3d7919b98eee3815aafac48ec5f89adbe666d92b43513920d8aea43e33b83bf496869babddadb304f2b42564c40b3ef9fd3de18071ad10
+  metadata.gz: 61514ca3d73be5d90755d2a82af2abee79c38ce673ec310e77e96f7f18ea924a03f0bba8a8821745eb9ff3ce27a5f3dd03470a956e2554610670a5677fe2bb1f
+  data.tar.gz: 59c77172cef86582a1973b761a1e2b9d7475db4d1d477f7f721379777e5f0bb6a448eea8aba4ae673de281f961dad73de549a14bb0300d76c55977ce5ea27941

data/README.md

@@ -1,9 +1,10 @@
-[![Rum Runner](https://github.com/amancevice/rumrunner/blob/master/rumrunner.png?raw=true)](https://github.com/amancevice/rumrunner)
+[![Rum Runner](https://github.com/amancevice/rumrunner/blob/master/rum-runner.png?raw=true)](https://github.com/amancevice/rumrunner)
 [![Build Status](https://travis-ci.com/amancevice/rumrunner.svg?branch=master)](https://travis-ci.com/amancevice/rumrunner)
 [![Gem Version](https://badge.fury.io/rb/rumrunner.svg)](https://badge.fury.io/rb/rumrunner)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/4b56853acc5cbb254125/test_coverage)](https://codeclimate.com/github/amancevice/rumrunner/test_coverage)
 [![Maintainability](https://api.codeclimate.com/v1/badges/4b56853acc5cbb254125/maintainability)](https://codeclimate.com/github/amancevice/rumrunner/maintainability)
 
+<sub>logo by [seenamavaddat.com](http://seenamavaddat.com/)</sub>
 
 Rum Runner is a Rake-based utility for building multi-stage Dockerfiles.
 
@@ -34,7 +35,7 @@ gem install rumrunner
 
 ## Quickstart
 
-Use the `Rum.init` helper to create a template Rumfile for your project:
+If you have a multi-stage Dockerfile in your project and are unsure where to begin, use the `rum init` helper to create a template Rumfile for your project:
 
 ```bash
 gem install rumrunner
@@ -42,6 +43,8 @@ rum init > Rumfile
 rum --tasks
 ```
 
+The `init` command will parse a Dockerfile in the current directory and output a simple Rumfile with each stage and its dependencies declared.
+
 ## Example
 
 Imagine a simple multi-stage Dockerfile:
@@ -158,7 +161,13 @@ end
 
 The methods inside blocks for `build`, `run`, `stage`, `artifact`, and `shell` tasks are dynamically handled. Any option you might pass to the `docker run` or `docker build` command can be used.
 
-Simply drop any leading `-`s from the option and convert to snake-case. Eg, `--build-arg` becomes `build_arg`; `--env-file` becomes `env_file`.
+Simply drop any leading `-`s from the option and convert to snake-case.
+
+Eg,
+
+`--build-arg` becomes `build_arg`
+
+`--env-file` becomes `env_file`.
 
 ## Shared ENV variables
 
@@ -173,7 +182,7 @@ rum :image_name do
   artifact "pkg.zip" => :build
 
   # rum build   => docker build --build-arg FIZZ=BUZZ ...
-  # rum pkg.zip => docker run --env FIZZ=BUZZ ...
+  # rum pkg.zip => docker run         --env FIZZ=BUZZ ...
 end
 ```
 

data/lib/rumrunner/manifest.rb

@@ -89,8 +89,8 @@ module Rum
       name, _, deps = Rake.application.resolve_args(args)
 
       # Assemble image/iidfile from manifest/stage name
-      image   = "#{@image}-#{name}"
-      iidfile = File.join(root, image)
+      image   = Docker::Image.parse("#{@image}-#{name}")
+      iidfile = File.join(root, *image)
       iidpath = File.split(iidfile).first
 
       # Ensure path to iidfile exists
@@ -98,7 +98,8 @@ module Rum
         directory iidpath
         iidpath
       else
-        deps.map{|x| File.join(root, "#{@image}-#{x}") }
+        images = deps.map{|x| Docker::Image.parse("#{@image}-#{x}") }
+        images.map{|x| File.join(root, *x) }
       end
 
       # Build stage and save digest in iidfile
@@ -126,8 +127,8 @@ module Rum
       name, _, deps = Rake.application.resolve_args(args)
 
       target  = deps.first
-      image   = "#{@image}-#{target}"
-      iidfile = File.join(root, image)
+      image   = Docker::Image.parse("#{@image}-#{target}")
+      iidfile = File.join(root, *image)
       path    = File.split(name).first
       deps    = [iidfile]
 
@@ -151,8 +152,8 @@ module Rum
     def shell(*args, &block)
       target  = Rake.application.resolve_args(args).first
       name    = task_name shell: target
-      image   = "#{@image}-#{target}"
-      iidfile = File.join(root, image)
+      image   = Docker::Image.parse("#{@image}-#{target}")
+      iidfile = File.join(root, *image)
 
       Rake::Task[name].clear if Rake::Task.task_defined?(name)
 
@@ -196,9 +197,9 @@ module Rum
       task :clean do
         Dir[File.join root, "**/*"].reverse.each do |name|
           sh "docker", "image", "rm", "--force", File.read(name) if File.file?(name)
-          rm_r name
+          rm_rf name
         end
-        rm_r root if Dir.exist?(root)
+        rm_rf root
       end
     end
 
@@ -206,9 +207,11 @@ module Rum
     # Install file task for stage and save digest in iidfile
     def stage_file(iidfile, iiddeps, tag:, target:, &block)
       file iidfile => iiddeps do
+        tsfile = "#{iidfile}@#{Time.now.utc.to_i}"
         build = Docker::Build.new(options: build_options, &block)
-        build.with_defaults(iidfile: iidfile, tag: tag, target: target)
+        build.with_defaults(iidfile: tsfile, tag: tag, target: target)
         sh build.to_s
+        cp tsfile, iidfile
       end
     end
 
@@ -244,7 +247,7 @@ module Rum
       task task_name(clean: name) do
         if File.exist? iidfile
           sh "docker", "image", "rm", "--force", File.read(iidfile)
-          rm iidfile
+          rm_rf iidfile
         end
       end
 
@@ -272,8 +275,8 @@ module Rum
     def artifact_clobber(name, path)
       desc "Remove any generated files"
       task :clobber => :clean do
-        rm name if File.exist?(name)
-        rm_r path if Dir.exist?(path) && path != "."
+        rm_rf name
+        rm_rf path unless path == "."
       end
     end
 

data/lib/rumrunner/version.rb

@@ -1,5 +1,5 @@
 module Rum
   ##
   # Rum Runner gem version.
-  VERSION = "0.3.2"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rumrunner
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Alexander Mancevice
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-03 00:00:00.000000000 Z
+date: 2019-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake