dctl_rb 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab76aae888a88ca60e89189df1cf1e94724dc96c01905d08d83b966485ece0fa
-  data.tar.gz: 9941b6abe70021a19524070cb15ced5d58d85a8f9ed0e14b67f240f1d798d53d
+  metadata.gz: 119ea41f3d1d29e0442e04bb4dc05bec0a100ca85cd990ea8b57a2bb389437d4
+  data.tar.gz: 1be5b2cc464cdced2b932e8b06821bb7202453749e0bc5fa7049b1623e064d06
 SHA512:
-  metadata.gz: 52144fb9f09699821ad578189c3858b3c782505d5e9cec09f001f6268a4467c035c1add79d7e7abcec5807f176e874a1fd4e9d87133a3d2ac5d186af9f0dd21a
-  data.tar.gz: 88612640a611006756279318c80970e446a33349b872b6a0b738a09e6d8bf71069a675c507dd9239b7b904da767d46e514f95155d77fcb871ec3e46311e17e3c
+  metadata.gz: 352e33ad3787e18c7ac195ab4403766c5423eeba52c0613c24c651e2eff6ff4266123a97f0708bf2c5552dece773cd6d2ba9c45eb5c0ac2452ff407ccaab233e
+  data.tar.gz: 31cbffda220c6eee2d8e38ac7137a15ce48e761d979bb5c1dfef984bc930d4c5a924642fe60fd9664a137229cd97a45bcbdb27a5b2882c4bbb55fc11371a269f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dctl_rb (0.6.2)
+    dctl_rb (0.7.0)
       config (>= 1, < 2)
       rainbow (>= 2.2, < 3)
       thor (~> 0.17, >= 0.17.0)
@@ -27,7 +27,7 @@ GEM
     dry-container (0.6.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.1)
+    dry-core (0.4.2)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.2.0)
     dry-logic (0.4.2)

data/exe/dctl

@@ -5,9 +5,15 @@ require "thor"
 require "pty"
 require "rainbow"
 require "config"
+require "open3"
 
 module Dctl
   class Cli < Thor
+
+    ERROR_COLOR = :red
+    SUCCESS_COLOR = :green
+    CMD_COLOR = :dimgray
+
     class_option :env, default: "dev", type: :string
 
     desc "build", "Build images. Pass image name to build a specific one; otherwise builds all"
@@ -150,15 +156,44 @@ module Dctl
     end
 
     desc "cleanup", "cleans up dangling docker images"
+    option :keep, type: :numeric, default: -1, desc: "How many old images to keep around, e.g. \"3\" will keep the current version plus the three next most recent. Use -1 to keep all."
     def cleanup
-      dangling = `#{sudo}docker images --filter dangling=true -q`.split("\n")
+      to_remove = []
+      to_remove += `#{sudo}docker images --filter dangling=true -q`.split("\n")
+
+      if options[:keep] != -1
+        keep_last = options[:keep]
+        dctl = Dctl::Main.new env: options[:env]
+        dctl.expand_images.each do |image|
+          current_version = dctl.current_version_for_image(image).to_i
+          keep_after_tag = current_version - keep_last
+
+          next if keep_after_tag < 0
+
+          cmd = "#{sudo}docker images #{dctl.image_tag(image, version: nil)} --filter before=#{dctl.image_tag(image, version: keep_after_tag)} -q"
+          puts Rainbow(cmd).fg CMD_COLOR
+          stdout, stderr, status = Open3.capture3(cmd)
+          if status.success?
+            to_remove += stdout.split("\n")
+          elsif stderr.include? "No such image"
+            # Specified before filter did not exist on current machine. Loop
+            # through all old images to manually reconstruct.
+            Array(0..keep_after_tag).each do |version|
+              cmd = "#{sudo}docker images #{dctl.image_tag(image, version: version)} -q"
+              puts Rainbow(cmd).fg CMD_COLOR
+              image_id = `#{cmd}`.strip
+              to_remove << image_id unless image_id.empty?
+            end
+          end
+        end
+      end
 
-      if dangling.none?
-        puts "No images to cleanup. Yay!"
+      if to_remove.none?
+        puts Rainbow("No images to cleanup. Yay!").fg SUCCESS_COLOR
         exit 0
       end
 
-      stream_output "#{sudo}docker rmi -f #{dangling.join(" ")}", exec: true
+      stream_output "#{sudo}docker rmi -f #{to_remove.join(" ")}", exec: true
     end
 
     desc "bash CONTAINER", "Create a new instance of the given image with a bash prompt"
@@ -186,7 +221,7 @@ module Dctl
       container = `#{cmd}`.chomp
 
       if container.empty?
-        puts Rainbow("No running containers for image #{image}").red
+        puts Rainbow("No running containers for image #{image}").fg ERROR_COLOR
         exit 1
       end
 
@@ -200,7 +235,7 @@ module Dctl
 
     no_commands do
       def stream_output(string, print_command: true, exec: false)
-        puts string if print_command
+        puts Rainbow(string).fg(CMD_COLOR) if print_command
         if exec
           exec string
         else

data/lib/dctl/main.rb

@@ -11,13 +11,22 @@ module Dctl
     # Generate the full tag for the given image, concatenating the org,
     # project, env, image name, and version.
     #
+    # Pass `version: nil` to exclude the version portion.
+    #
     # @example
     #   image_tag("app") # => jutonz/dctl-dev-app:1
-    def image_tag(image, version: versions[image])
+    def image_tag(image, version: current_version_for_image(image))
       org       = settings.org
       project   = settings.project
 
-      "#{org}/#{project}-#{env}-#{image}:#{version}"
+      tag = "#{org}/#{project}-#{env}-#{image}"
+      tag += ":#{version}" if !version.nil?
+
+      tag
+    end
+
+    def current_version_for_image(image)
+      versions[image]
     end
 
     ##

data/lib/dctl/version.rb

@@ -1,3 +1,3 @@
 module Dctl
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dctl_rb
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Justin Toniazzo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2017-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler