lux 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d5b17560966b0d42c68cc11280dd78d122555c1
-  data.tar.gz: adbebd07c74ce022217dee2464969dc3bfef7de7
+  metadata.gz: 8be0be4990f3bbdb5b2d7117a756996543f38262
+  data.tar.gz: 90e03ff7bcdd4cb679d728258d5cf27b8ec8d907
 SHA512:
-  metadata.gz: 2b176d8c351517d852d173ee752bd83648a7e4d82dcea665585c90d35cfd27e628729b1878f42af2c1d33cb477e6b882abbe9aadb45ea3f5db096d8e7924a6dd
-  data.tar.gz: da28e7e66292c1e92faf4ae8a99915f9ff98a1093d540650017a1d17545d925f2e64603688e59b66ef4252e016e9a5858985b70c488c2f913f1ec37cc82d5885
+  metadata.gz: 2b855936cae4a5b38ef7e94e9bbba9e9d99e2175c825132efca363a1c18627b063e7f6a9665a3f5a0515ea9158e0c4bdafd9bf8cf44fba2b4d01d5e7025646e2
+  data.tar.gz: ae712eb0ab6690e7edb49ced1c7592f119aedba172c4863aaa0f86f6a42a639e4a5bbfc58fd579bbd5db8a69ace4198f57ac5237646666983b8f58b4dbeae328

data/CHANGELOG

@@ -1,3 +1,11 @@
+lux (1.0.6)
+
+ * Improve address check for Docker server
+ * Disable Docker tasks if tcp based server cannot be found
+ * Return Docker version number on 'dockerip' command
+
+ -- Nick Townsend <nick.townsend@mac.com> Fri, 21 Aug 2015 17:12:20 -0700
+
 lux (1.0.5)
 
  * Send only 'export' command to STDOUT in lux dockerip.

data/lib/lux.rb

@@ -1,32 +1,43 @@
 require 'highline/import'
 require 'uri'
 require 'socket'
+require 'json'
 
 module Lux
 
+  module_function
+
   # Determine the IPv4 address of the current Docker host
   # Used to avoid long reverse DNS lookups on .local names
-  # Returns either nil if the lookup failed, or a triplet:
-  # - the IPv4 address as a string
-  # - a URI object
+  # Returns an array of four items:
+  # - the IPv4 address as a string or nil if it couldn't be found
+  #   or wasn't an IP URL
   # - a string saying which variable was used, 'URL' or 'HOST'
+  # - a URI object
+  # - a hash containing the Docker version information
   # Note that DOCKER_URL is used by the docker-api client, but
   # as Docker uses the misleading DOCKER_HOST we fallback to that.
   #
-  def self.dockerip
+  def dockerip
     vars = ['DOCKER_URL', 'DOCKER_HOST']
     var, url = vars.map{|v| [v, ENV[v]]}.find{|d| d[1]}
-    return nil unless var
+    return nil, nil, nil, nil unless var
     uri = URI.parse(url)
-    name = uri.host
-    addrs = Socket.getaddrinfo(name, nil, :INET, :STREAM, 0, 0, false) rescue []
-    name = addrs.first[3] if addrs.size > 0
-    return name, var, uri
+    return nil, var, url, nil unless uri.scheme == 'tcp'
+    addr = nil
+    info = nil
+    Addrinfo.tcp(uri.host, uri.port).connect(timeout: 5) {|s|
+      addr = s.remote_address.ip_address
+      s.print "GET /version HTTP/1.0\r\nHost: localhost\r\n\r\n"
+      response, emptyline, body = s.read.partition(/(\r\n){2}/)
+      info = JSON.parse(body, symbolize_names: true)
+    } rescue nil
+    return addr, var, uri, info
   end
 
   # Get the current list of images and make a guess at which one it is...
   #
-  def self.findimage image
+  def findimage 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
@@ -51,7 +62,7 @@ module Lux
   # - user name (defaults to current user), and
   # - a bash script setup command
   #
-  def self.user_setup_cmd user = `id -nu`.strip
+  def user_setup_cmd user = `id -nu`.strip
     [user, <<-COMMAND.gsub(/^\s*/,'').gsub(/\n/,' ; ')]
       uid=$(echo $(stat -c %u:%g #{ENV['HOME']}) | cut -d: -f2)
       useradd -M -d #{ENV['HOME']} -u $uid -s #{ENV['SHELL']} #{user}
@@ -59,9 +70,17 @@ module Lux
     COMMAND
   end
 
-  def self.die msg, rc = 1
+  def die msg, rc = 1
+    error msg
+    exit rc
+  end
+
+  def error msg
     HighLine.new(STDIN, STDERR).say HighLine.color(msg, HighLine::RED)
-    exit(rc)
+  end
+
+  def info msg
+    HighLine.new(STDIN, STDERR).say HighLine.color(msg, HighLine::YELLOW)
   end
 
 end

data/lib/lux/app.rb

@@ -175,13 +175,18 @@ class Lux::App < Thor
 
   desc "dockerip", "Show DOCKER_HOST IP address in exportable format. Use $(lux dockerip) to set it"
   def dockerip
-    name, var, uri = Lux.dockerip
-    Lux.die "Docker URL or HOST not found" unless name
-    STDERR.puts "Found #{var}=#{uri.to_s}"
+    name, var, uri, info = Lux.dockerip
+    Lux.die "Not found: #{var}=#{uri.to_s}" unless name
     if uri.host != name
       uri.host = name
+      msg = "Set"
       puts "export #{var}=#{uri.to_s}"
+    else
+      msg = "Found"
     end
+    msg << ": #{var}=#{uri.to_s}"
+    msg << " (version #{info[:Version]})" if info
+    Lux.info msg
   end
 
 end

data/lib/lux/docker_tasks.rb

@@ -5,11 +5,6 @@ require 'lux'
 require 'rake'
 require 'socket'
 
-# Set this to avoid 5 sec timeouts with .local addresses
-# which don't resolve in IPv6
-#
-Docker.options = { family: Socket::Constants::AF_INET }
-
 module Rake
   module DSL
     def dockerimage(*args, &block)
@@ -22,6 +17,26 @@ module Rake
 end
 
 module Lux
+
+  addr, var, uri = Lux.dockerip
+
+  DISABLED = case
+             when !addr && var && uri.scheme == 'tcp'
+                error "Invalid Docker server, disabling Docker tasks!"
+                true
+             else
+                begin
+                  # Set this to avoid 5 sec timeouts with .local addresses
+                  # which don't resolve in IPv6
+                  Docker.options = { family: Socket::Constants::AF_INET, connect_timeout: 5 }
+                  Docker.validate_version!
+                  false
+                rescue Exception => e
+                  error "Docker problem (#{e.message}), tasks will be disabled"
+                  true
+                end
+             end
+
   class DockerImageTask < Rake::FileTask
     # This task checks to see if the image is present in the local Docker Server
     # If present it returns the creation date as the timestamp, if not then it
@@ -32,14 +47,17 @@ module Lux
       super(task_name, app)
       @imagename = @name
       @imagename += ':latest' unless @imagename.index(':')
-      @image = Docker::Image.all.select{|i| i.info['RepoTags'].include? @imagename}.first
+      @image = DISABLED ? nil :
+          Docker::Image.all.select{|i| i.info['RepoTags'].include? @imagename}.first
     end
 
     def needed?
+      return false if DISABLED
       ! @image || out_of_date?(timestamp) || @application.options.build_all
     end
 
     def timestamp
+      return Time.now if DISABLED
       if @image = Docker::Image.all.select{|i| i.info['RepoTags'].include? @imagename}.first
         Time.at(@image.info['Created'])
       else
@@ -61,12 +79,15 @@ module Lux
       super(task_name, app)
       @containername, sep, @imagename = task_name.partition('@')
       raise "Task #{task_name} must be name@image" if @containername.empty? or @imagename.empty?
-      @container = Docker::Container.get(@containername) rescue nil
-      @imagename += ':latest' unless @imagename.index(':')
-      @image = Docker::Image.all.select{|i| i.info['RepoTags'].include? @imagename}.first
+      unless DISABLED
+        @container = Docker::Container.get(@containername) rescue nil
+        @imagename += ':latest' unless @imagename.index(':')
+        @image = Docker::Image.all.select{|i| i.info['RepoTags'].include? @imagename}.first
+      end
     end
 
     def needed?
+      return false if DISABLED
       not @container or
       @container.info["Image"] != @image.id or
       not @container.info["State"]["Running"] or
@@ -102,6 +123,7 @@ module Lux
     end
 
     def timestamp
+      return Time.now if DISABLED
       if @container = Docker::Container.get(@containername) rescue nil
         Time.iso8601(@container.info['Created'])
       else

data/lib/lux/version.rb

@@ -1,3 +1,3 @@
 module Lux
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lux
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Nick Townsend
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor