lux 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b33a925f4741864c351ea1cd82d4ddaec70df75d
-  data.tar.gz: e6b6a2f15e7109c3a72238a782fcb5dd5b34883c
+  metadata.gz: 52906a201abcf043e68aacfd17f2bd136d1ce65f
+  data.tar.gz: e223ae1465b5c7eb1d2ac3f2e91e09bade30ee11
 SHA512:
-  metadata.gz: 1cb51a17a4438e7c25b3151b28c350cb82f2c7aadb7ff3d44141b7f31d71ff26207538eccfdb047f9652f43a2fecef92530f2b5c041178eada76ac55c36fd06e
-  data.tar.gz: 5179c4addbd373575ad0efa637b273326fd46c1502bb02521479d8ca915c36c4dfe8ed056412d61942cf340230c427b7980a36e496c487c758ddd835a59ae053
+  metadata.gz: 5d6ad48f9e2d191d701c4ed659b86e38451c7ae5ef88ac07531e021f6dd3fa2422cac42814e97b712ea8ccb0196c4ab473e7d1da6ed159bfe9540cf797de84f3
+  data.tar.gz: adc4dcbae8378bf1c4f86b4ae01b245e2f101f43b14311f83f8751d3e40efe4e8e6dabc8dbbb42ea333d23c8688aa954123548b27551fdffd0be0a74f26a29c5

data/CHANGELOG

@@ -1,3 +1,14 @@
+lux (1.1.0)
+
+ Breaking changes:
+ * Remove variable name from dockerip() return
+ * Use plain strings not symbols for the version info returned by dockerip
+
+ Improvements
+ * Disable Docker tasks when no Docker server present
+
+ -- Nick Townsend <nick.townsend@mac.com>  Wed, 28 Dec 2016 09:41:43 -0800
+
 lux (1.0.9)
 
  * Use docker-api gem to determine Docker URL, not environment

data/lib/lux.rb

@@ -10,31 +10,36 @@ module Lux
 
   # Determine the IPv4 address of the current Docker host
   # Used to avoid long reverse DNS lookups on .local names
-  # Returns an array of four items:
+  # Also useful when running Docker for macOS which runs on
+  # a Unix socket but makes container ports available on localhost
+  #
+  # Returns an array of three items:
   # - the IPv4 address as a string or '127.0.0.1' if it was a Unix socket
-  # - Used to indicate ENV var, now empty
   # - 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.
+  # These are all nil if no Docker server is found
   #
   def dockerip
-    uri = URI.parse(Docker.url)
-    case uri.scheme
-    when 'unix'
-      addr = '127.0.0.1'
+    begin
       info = Docker.version
-    when 'tcp'
-      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
-    else
-      raise "Can't handle #{uri.scheme}"
+      uri = URI.parse Docker.url
+      case uri.scheme
+      when 'unix'
+        addr = '127.0.0.1'
+      when 'tcp'
+        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}/)
+          versioninfo = JSON.parse(body, symbolize_names: false)
+        }
+      else
+        raise "Can't handle #{uri.scheme}"
+      end
+      return addr, uri, info
+    rescue
+      return nil, nil, nil
     end
-    return addr, '', uri, info
   end
 
   # Get the current list of images and make a guess at which one it is...

data/lib/lux/app.rb

@@ -15,14 +15,14 @@ class Lux::App < Thor
     puts "Version #{Lux::VERSION}"
   end
 
-  desc "check", "Check the integrity of the Git repositories"
+  desc "check", "Check current Git repository"
   def check
     repobranch = `git symbolic-ref -q HEAD`.chomp.gsub(%r{^.*/},'')
     puts "Repository is on branch #{repobranch}"
     `git fetch --recurse-submodules=on-demand`
     nModuleErr = 0
     nModuleWarn = 0
-    # Inspect the submodules currently checked out in turtle
+    # Inspect any submodules currently checked out
     submodules = Hash[`git submodule status --recursive`.split(/\n/).map do |s|
       Lux.die "Bad submodule status #{s}" unless /^(?<flag>[-+U\s])(?<sha>[0-9a-f]{40})\s(?<path>\S+)(\s*\((?<ref>\S+)\))?$/ =~ s
       case flag
@@ -173,11 +173,17 @@ class Lux::App < Thor
     end
   end
 
+  # This was originally designed to allow the easy export of an IPv4 address URL for Docker
+  # as early Docker implementations did not honor .local addresses on macOS
+  #
   desc "dockerip", "Show DOCKER_HOST IP address in exportable format. Use $(lux dockerip) to set it"
   def dockerip
-    name, var, uri, info = Lux.dockerip
-    Lux.die "Not found: #{var}=#{uri.to_s}" unless name
-    if uri.host != name
+    name, uri, info = Lux.dockerip
+    return Lux.info "Docker is not available" unless name
+
+    var = 'DOCKER_HOST'
+    case uri.scheme
+    when 'tcp'
       uri.host = name
       if STDOUT.isatty
         Lux.info "Please export: #{var}=#{uri.to_s}"
@@ -186,10 +192,10 @@ class Lux::App < Thor
         Lux.info "Exported: #{var}=#{uri.to_s}"
         puts "export #{var}=#{uri.to_s}"
       end
-    else
-      Lux.info "Found: #{var}=#{uri.to_s}"
+    when 'unix'
+        Lux.info "Docker is running on a Unix socket"
     end
-    Lux.info "Docker version #{info[:Version]}, OS: #{info[:Os]}, Arch: #{info[:Arch]}, Kernel: #{info[:KernelVersion]}" if info
+    Lux.info "Version #{info['Version']}, OS: #{info['Os']}, Arch: #{info['Arch']}, Kernel: #{info['KernelVersion']}" if info
   end
 
 end

data/lib/lux/docker_tasks.rb

@@ -18,11 +18,11 @@ end
 
 module Lux
 
-  addr, var, uri = Lux.dockerip
+  version = Docker.version rescue nil
 
   DISABLED = case
-             when !addr && var && uri.scheme == 'tcp'
-                error "Invalid Docker server, disabling Docker tasks!"
+             when version.nil?
+                error "Docker server not found, disabling Docker tasks!"
                 true
              else
                 begin

data/lib/lux/version.rb

@@ -1,3 +1,3 @@
 module Lux
-  VERSION = "1.0.9"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lux
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Nick Townsend
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor