lux 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d80091c120733bc4bb30d9d551fecfb1b19e19d
-  data.tar.gz: 188b53c0ceed1fd37894980fd9f9d4195b8f0647
+  metadata.gz: a1eb1c7d352c7326e296feace6572c226beb98ea
+  data.tar.gz: 3c42a89dbc463141bbaf9da031d63fe79ef4eed7
 SHA512:
-  metadata.gz: 6d1e9a3ce52dcda546b0c1f43c903836239a670eeb8e059f55d32747636c67de3260f659f01d04e6ad7b2570b8aecff06a86d660baabed4a1795649dcca8387b
-  data.tar.gz: 84e506beedb7a83921a6e0e097f56a519d6496757a88779cdea55686fe31ea9a5c45d3cc8cfcfc9f3f4d8b35d62ec2c3b33b593bd169705efd58a2ce0caf60d7
+  metadata.gz: a90943a58a1faca71b089b1f63ef8f593ea9fd419989d1dcba5acb61371f54e3ca15f90030653ac4c31e0a2401ca28a579ac8137bad043ec4ee5cdff1374fb5c
+  data.tar.gz: 2bf8bb996fce1c3fbd89569f197560789787be1f109ab2f53a8998eb78cdde766dd98a75a9c7df9d762f674c3046efea95f793607260d6f4b34090486f46e85d

data/README.md

@@ -1,12 +1,14 @@
 # Lux
 
+[![Gem Version](http://img.shields.io/gem/v/lux.svg)][gem]
+
+[gem]: https://rubygems.org/gems/lux
+
 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/lib/lux.rb

@@ -61,7 +61,7 @@ class Lux::App < Thor
     image = findimage options.image
     puts "Starting #{image} container..."
     me, setup_cmd = user_setup_cmd()
-    args = ["-v /home/#{me}:/home/#{me}"]
+    args = ["-v #{ENV['HOME']}:#{ENV['HOME']}"]
     args << "--env-file=#{options.env}" if options.env
     args << "--name=#{options.name}" unless options.name == '<autogenerated>'
     cid = `docker run -dit #{args.join(' ')} #{image} /bin/bash`.strip
@@ -87,7 +87,7 @@ class Lux::App < Thor
     env = ENV.reject{|k,v| EXCLUDE_VARS.include? k or v =~/\s+/}.map{|k,v| "#{k}=#{v.shellescape}"}
     env += IO.readlines(options.env).grep(/^(?!#)/).map(&:rstrip) if options.env
     cmd = setup_cmd + "su - #{me} -c 'cd #{relwd}; env -i #{env.join(' ')} #{command.join(' ')}'"
-    args = ["-v /home/#{me}:/home/#{me}"]
+    args = ["-v #{ENV['HOME']}:#{ENV['HOME']}"]
     system "docker run --rm #{args.join(' ')} #{image} /bin/bash -c #{cmd.shellescape}"
   end
 
@@ -111,16 +111,40 @@ 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)
+  desc "lsimages [PATTERN]", "List Docker images (with optional pattern)"
+  method_option :regex, type: :boolean, aliases: '-r', default: false, desc: 'Pattern is a regular expression'
+  def lsimages(pattern=nil)
+    if options.regex
+      pattern = '.*' unless pattern
+      rx = Regexp.new(pattern)
       matcher = lambda {|s| rx.match(s)}
     else
-      matcher = lambda {|s| File.fnmatch?(options.match, s)}
+      pattern = '*' unless pattern
+      matcher = lambda {|s| File.fnmatch?(pattern, s)}
+    end
+    imagelines = `docker images`.split("\n")[1..-1].sort
+    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)
+      printf "%-54s%-16s%10s\n", imagename, imageage, imagesize
+    end
+  end
+
+  desc "rmimages [PATTERN]", "Remove Docker images (with optional pattern)"
+  method_option :regex, type: :boolean, aliases: '-r', default: false, desc: 'Pattern is a regular expression'
+  method_option :force, type: :boolean, aliases: '-f', default: false, desc: 'Do not prompt for confirmation'
+  def rmimages(pattern=nil)
+    if options.regex
+      pattern = '.*' unless pattern
+      rx = Regexp.new(pattern)
+      matcher = lambda {|s| rx.match(s)}
+    else
+      pattern = '*' unless pattern
+      matcher = lambda {|s| File.fnmatch?(pattern, s)}
     end
     imagelines = `docker images`.split("\n")[1..-1]
     imagelines.each do |imageline|
@@ -130,7 +154,7 @@ class Lux::App < Thor
       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})
+      if options.force or (agree("Delete #{imagename} (#{imageage}, #{imagesize})? "){|q|q.echo=true})
         `docker rmi #{imageinfo[2]}`
         HighLine.say "Image <%= color('#{imagename}', RED)%> deleted"
       end
@@ -169,21 +193,20 @@ class Lux::App < Thor
   #
   def findimage image
     if image.count('/') == 0
-      local_images = `docker images`.strip.split(/\n/)[1..-1].map{|l| l.gsub!(/^(\S+)\s+(\S+).*/,'\1:\2')}.sort
-      matching_images = local_images.select{|l| l =~ %r[/#{image}] }
+      local_images = `docker images`.strip.split("\n")[1..-1].map{|l| l.gsub!(/^(\S+)\s+(\S+).*/,'\1:\2')}.sort
+      matching_images = local_images.select{|l| l.include? image }
       if matching_images.size > 0
         if image.count(':') == 0
-          matching_image = matching_images.select{|l| l =~ /:latest$/ }.first
+          matching_image = matching_images.select{|l| l.end_with? ':latest' }.first
         end
         unless matching_image
           matching_image = matching_images.first
         end
       else
-        matching_image = nil
+        die "No image found matching: #{image}"
       end
-      image = matching_image ? matching_image : "lightside/"+image
     end
-    return image
+    return matching_image
   end
 
   # Return two elements:
@@ -192,8 +215,8 @@ class Lux::App < Thor
   #
   def user_setup_cmd user = `id -nu`.strip
     [user, <<-COMMAND.gsub(/^\s*/,'').gsub(/\n/,' ; ')]
-      uid=$(echo $(stat -c %u:%g /home/#{user}) | cut -d: -f2)
-      useradd -M -u $uid -s #{ENV['SHELL']} #{user}
+      uid=$(echo $(stat -c %u:%g #{ENV['HOME']}) | cut -d: -f2)
+      useradd -M -d #{ENV['HOME']} -u $uid -s #{ENV['SHELL']} #{user}
       echo "#{user} ALL=(ALL:ALL) NOPASSWD: ALL" > /etc/sudoers.d/#{user}
     COMMAND
   end

data/lib/lux/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lux
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Nick Townsend
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor