lux 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6288ab37dee1e32be74b9ae50a4e90857ee1f175
-  data.tar.gz: 004c036416714fa00796143a43338b00e307f1dc
+  metadata.gz: 3eaee859f2e47a11dd2f1561c33a655478b89b76
+  data.tar.gz: 8bfdb4795d60647e9711c3823d6259f14f5ac438
 SHA512:
-  metadata.gz: 5f7504d919e5dac6496d00ab30c625858f7d79d0d7c063396fb5b6a9dcc2fc56a5e1905b6f38b0a3fa4e57bfa1a2810458488bcb949fa9c59d5853fb881e378b
-  data.tar.gz: 8d1ebc2248e1dc3acdb87344a5a8b0308b7d8f55e14f6ca5b802b27c2a59862f2c03021e04a118a787a8e724a94f7d3f6a10b180d1b951e7b826767cafe330dc
+  metadata.gz: cdfabbacc607ea2d2a80572d2824f1d95e7ef037b9b3cc8dccecb2a21e6ecbbbd6861e115eb9b1c7f2c2baab9afe39fa4ed0cc9fe3abcf95cbefb120854052be
+  data.tar.gz: bb8cb85f41a41a65ab4eb03a827c4b3f61e0d3247dce0da7c87911c4e25afd64ae02a161df4fbd1ee13587ebc437e15b7ffe5ce200d613b5c4a1b2e47733ef18

data/README.md

@@ -92,7 +92,7 @@ end
 # Note how the task name does not include the tag
 desc "Run Tools"
 task :runt => 'quay.io/rasputin/tools' do
-  sh "docker run -it quay.io/turnitin/seu-tools:1.0 /bin/bash"
+  sh "docker run -it quay.io/rasputin/tools:1.0 /bin/bash"
 end
 ```
 

data/bin/lux

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
+#
+require 'lux'
 
-require "bundler/setup"
-require "lux"
-
-trap("INT") do
+trap('INT') do
   print "\n"
   exit(1)
 end

data/lib/lux.rb

@@ -53,12 +53,12 @@ class Lux::App < Thor
     end
   end
 
-  desc "start", "Run a Docker container with user/home mapping (default is 'base')"
-  method_option :image, type: :string, aliases: '-i', default: 'base', desc: 'Docker image'
+  desc "start IMAGE", "Run a Docker image with user/home mapping"
   method_option :env, type: :string, aliases: '-e', desc: 'Path to environment file'
   method_option :name, type: :string, aliases: '-n', default: '<autogenerated>', desc: 'Docker container name'
-  def start
-    image = findimage options.image
+  def start(image)
+    image = findimage image
+    raise "no image" if image.empty?
     puts "Starting #{image} container..."
     me, setup_cmd = user_setup_cmd()
     args = ["-v #{ENV['HOME']}:#{ENV['HOME']}"]
@@ -76,11 +76,10 @@ class Lux::App < Thor
     XPC_SERVICE_NAME XPC_FLAGS __CF_USER_TEXT_ENCODING TERM_PROGRAM TERM_PROGRAM_VERSION TERM_SESSION_ID
   }
 
-  desc "exec COMMAND", "Run a command inside a Docker container"
-  method_option :image, type: :string, aliases: '-i', default: 'base', desc: 'Docker image'
+  desc "exec IMAGE COMMAND", "Run a command inside a Docker container"
   method_option :env, type: :string, aliases: '-e', desc: 'Path to environment file'
-  def exec(*command)
-    image = findimage options.image
+  def exec(image, *command)
+    image = findimage image
     me, setup_cmd = user_setup_cmd
     die "You must be within your home directory!" unless relwd = Pathname.pwd.to_s.gsub!(/^#{ENV['HOME']}/,'~')
     command.map!{|m| m.start_with?('/') ? Pathname.new(m).relative_path_from(Pathname.pwd) : m }
@@ -192,19 +191,22 @@ class Lux::App < Thor
   # Get the current list of images and make a guess at which one it is...
   #
   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.include? image }
-      if matching_images.size > 0
-        if image.count(':') == 0
-          matching_image = matching_images.select{|l| l.end_with? ':latest' }.first
-        end
-        unless matching_image
-          matching_image = matching_images.first
+    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 and image.count('/') > 0
+        matching_image = matching_images.select{|l| l.end_with? ':latest' }.first
+      end
+      unless matching_image
+        matching_image = HighLine.choose do |menu|
+          menu.header = 'List of matching (local) images'
+          menu.choices(*matching_images)
+          menu.choice('None of the above') { nil }
         end
-      else
-        die "No image found matching: #{image}"
+        exit 2 unless matching_image
       end
+    else
+      matching_image = image
     end
     return matching_image
   end

data/lib/lux/version.rb

@@ -1,3 +1,3 @@
 module Lux
-  VERSION = "0.6"
+  VERSION = "0.7"
 end

data/lux.gemspec

@@ -20,9 +20,9 @@ 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_runtime_dependency "thor", "~> 0.19"
+  spec.add_runtime_dependency "highline", "~> 1.7"
+  spec.add_runtime_dependency "rake", "~> 10.0"
 
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 1.9"
 end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: lux
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Nick Townsend
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '10.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.9'
 description: 
 email:
 - nick.townsend@mac.com