lux 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9064cd42c7698352abe3e9f1db29d000ef4c4a7f
-  data.tar.gz: f26172a2ccc61f7fa5bac8954166018ce13e0669
+  metadata.gz: 2d80091c120733bc4bb30d9d551fecfb1b19e19d
+  data.tar.gz: 188b53c0ceed1fd37894980fd9f9d4195b8f0647
 SHA512:
-  metadata.gz: c9b02b28acd7a97fc1700a8673a1439a779c6930ad9f19d375a4257534fb0b7d4e2f64dbc6769b54f048507a01a8a6d5ce69a9cb9dfbfa91e40e668a355a2fb8
-  data.tar.gz: 0e58a3fa9232ac288f3df161ee3d259e55b78ae746c5ade739379b0b96a0745d212892ed5b95727929329f61a3e20c0d7822c51b6b631cb79723ed25c93218f9
+  metadata.gz: 6d1e9a3ce52dcda546b0c1f43c903836239a670eeb8e059f55d32747636c67de3260f659f01d04e6ad7b2570b8aecff06a86d660baabed4a1795649dcca8387b
+  data.tar.gz: 84e506beedb7a83921a6e0e097f56a519d6496757a88779cdea55686fe31ea9a5c45d3cc8cfcfc9f3f4d8b35d62ec2c3b33b593bd169705efd58a2ce0caf60d7

data/README.md

@@ -5,6 +5,8 @@ Shining some light on setting up and running various Docker things.
 Lux is both a command line tool (based on Thor) and a library of useful routines
 that can be included in Rake tasks.
 
+[![Gem Version](https://img.shields.io/gem/v/lux.svg?style=flat)][gem]
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/bin/lux

@@ -3,4 +3,9 @@
 require "bundler/setup"
 require "lux"
 
+trap("INT") do
+  print "\n"
+  exit(1)
+end
+
 Lux::App.start(ARGV)

data/lib/lux.rb

@@ -1,14 +1,20 @@
 require "lux/version"
 require 'pathname'
+require 'highline/import'
 require 'shellwords'
 require 'thor'
 require 'uri'
 
-class Lux::App < Thor
-
 # The Thor subclass containing useful tasks shared between the Lux
 # standalone executable and Rake tasks.
 #
+class Lux::App < Thor
+
+  desc "version", "Show the version"
+  def version
+    puts "Version #{Lux::VERSION}"
+  end
+
   desc "check", "Check the integrity of the Git repositories"
   def check
     repobranch = `git symbolic-ref -q HEAD`.chomp.gsub(%r{^.*/},'')
@@ -21,16 +27,16 @@ class Lux::App < Thor
       die "Bad submodule status #{s}" unless /^(?<flag>[-+U\s])(?<sha>[0-9a-f]{40})\s(?<path>\S+)(\s*\((?<ref>\S+)\))?$/ =~ s
       case flag
       when '-'
-        puts "Submodule at #{path} is not initialized!"
+        Highline.say "Submodule at #{path} is <%= color('not initialized', RED) %>!"
         nModuleWarn += 1
       when '+'
-        puts "Submodule at #{path} is not at correct commit!"
+        Highline.say "Submodule at #{path} is <%= color('not at correct commit', RED) %>!"
         nModuleErr += 1
       when 'U'
-        puts "Submodule at #{path} is conflicted!"
+        Highline.say "Submodule at #{path} is <%= color('conflicted', RED) %>!"
         nModuleErr += 1
       else
-        puts "Submodule at #{path} OK"
+        Highline.say "Submodule at #{path} is <%= color('OK', GREEN) %>"
       end
       [path, [flag, sha, ref]]
     end ]
@@ -43,7 +49,7 @@ class Lux::App < Thor
     if changes.size > 0
       die "Repository is not clean (#{changes.size} issues), use 'git status'"
     else
-      puts "Repository is clean"
+      HighLine.say "<%= color('Repository is clean', GREEN) %>"
     end
   end
 
@@ -105,6 +111,32 @@ class Lux::App < Thor
     end
   end
 
+  desc "rmimages", "Remove named Docker images (with optional pattern)"
+  method_option :match, type: :string, aliases: '-m', default: '*', desc: 'Matching files'
+  method_option :pattern, type: :string, aliases: '-p', default: nil, desc: 'Matching pattern (regex)'
+  method_option :confirm, type: :boolean, aliases: '-c', default: true, desc: 'Confirm removal'
+  def rmimages
+    if options.pattern
+      rx = Regexp.new(options.pattern)
+      matcher = lambda {|s| rx.match(s)}
+    else
+      matcher = lambda {|s| File.fnmatch?(options.match, s)}
+    end
+    imagelines = `docker images`.split("\n")[1..-1]
+    imagelines.each do |imageline|
+      imageinfo = imageline.split(/\s+/)
+      next if imageinfo[0] == '<none>'
+      imagename = imageinfo[0]+':'+imageinfo[1]
+      imagesize = imageinfo[-2]+' '+imageinfo[-1]
+      imageage  = imageinfo[3..-3].join(' ')
+      next unless matcher.call(imagename)
+      if !options.confirm or (agree("Delete #{imagename} (#{imageage}, #{imagesize})? "){|q|q.echo=true})
+        `docker rmi #{imageinfo[2]}`
+        HighLine.say "Image <%= color('#{imagename}', RED)%> deleted"
+      end
+    end
+  end
+
   desc "clobber", "Destroy all containers (even if running!)"
   def clobber
     clean
@@ -167,7 +199,7 @@ class Lux::App < Thor
   end
 
   def die msg, rc = 1
-    STDERR.puts msg
+    HighLine.say HighLine.color(msg, HighLine::RED)
     exit(rc)
   end
 

data/lib/lux/version.rb

@@ -1,3 +1,3 @@
 module Lux
-  VERSION = "0.3"
+  VERSION = "0.4"
 end

data/lux.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">=2.0.0"
 
   spec.add_runtime_dependency "thor"
+  spec.add_runtime_dependency "highline"
   spec.add_runtime_dependency "bundler", "~> 1.9"
 
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lux
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Nick Townsend
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement