lux 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17f092e16bb5301fa762d0137e24918531506458
-  data.tar.gz: f0ff905d5f5173fdb7ed0bafb14ca14fa876b767
+  metadata.gz: b33a925f4741864c351ea1cd82d4ddaec70df75d
+  data.tar.gz: e6b6a2f15e7109c3a72238a782fcb5dd5b34883c
 SHA512:
-  metadata.gz: 391206b1d269ae2eb0908789297c8e8c79a0b4f6b895f5ba30ac26b8a20b8c1a5b797fb4aaad4e2d58402806f64ad955cb91c80470edd495b18bc5865e6c0d08
-  data.tar.gz: 3b28efd211f89e4b9071a62121a9a274c1f67fc2da04be69fc42b6882686be62802ad23ea13a2a7596ce9207d5a25694026a294b8ad45d9a71b0634ed1b873bd
+  metadata.gz: 1cb51a17a4438e7c25b3151b28c350cb82f2c7aadb7ff3d44141b7f31d71ff26207538eccfdb047f9652f43a2fecef92530f2b5c041178eada76ac55c36fd06e
+  data.tar.gz: 5179c4addbd373575ad0efa637b273326fd46c1502bb02521479d8ca915c36c4dfe8ed056412d61942cf340230c427b7980a36e496c487c758ddd835a59ae053

data/CHANGELOG

@@ -1,3 +1,10 @@
+lux (1.0.9)
+
+ * Use docker-api gem to determine Docker URL, not environment
+ * Return '127.0.0.1' as address if Unix socket (for Docker for Mac)
+
+ -- Nick Townsend <nick.townsend@mac.com> Tue, 27 Dec 2016 11:12:10 -0700
+
 lux (1.0.8)
 
  * Don't prompt to select image if only one matches

data/lib/lux.rb

@@ -1,4 +1,5 @@
 require 'highline/import'
+require 'docker'
 require 'uri'
 require 'socket'
 require 'json'
@@ -10,29 +11,30 @@ 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:
-  # - 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'
+  # - 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.
   #
   def dockerip
-    vars = ['DOCKER_URL', 'DOCKER_HOST']
-    var, url = vars.map{|v| [v, ENV[v]]}.find{|d| d[1]}
-    return nil, nil, nil, nil unless var
-    uri = URI.parse(url)
-    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
+    uri = URI.parse(Docker.url)
+    case uri.scheme
+    when 'unix'
+      addr = '127.0.0.1'
+      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}"
+    end
+    return addr, '', uri, info
   end
 
   # Get the current list of images and make a guess at which one it is...

data/lib/lux/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lux
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Nick Townsend
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2016-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -123,9 +123,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Handy utilities for working with Docker
 test_files: []
-has_rdoc: