dory 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c9a8eb4e309988a08bc4418c313cc5fcd942fef
-  data.tar.gz: ea5da1d8d1541824b3566669565c614414e27ad3
+  metadata.gz: ed649cb5289752a049537d2bd38fae7e7834a84f
+  data.tar.gz: 941c32d3efd7be78416cbacc0b1033aa34331acb
 SHA512:
-  metadata.gz: af839401db81b131b4bdd0a7f45d401f3cb796240dc8b256647f8073386dfc84093ab403d1d1adc31a5cb451e0ae67e6417c13b2beb19bb989ca959d4c683c3b
-  data.tar.gz: eb51a6604b6539d11c164113557718ac2f028b636f283ee8293477416a3f4d88bbe038db5884bcf8bc070664614a0a1bfa26c053564313bdbc74608d57c066bc
+  metadata.gz: 4ea2d8ad43bae5f5235fe962b5ce64afa64267603915c65942f3938937e584448b0e4f4449bda8fe48a21a5b11690c722aea8b3bce4f90ccc8c6092305b75333
+  data.tar.gz: 7a2e0d0475f4b98762e4434bf2c661ae025472c8c4b83cb75107f0e39b860c810f00e1c7c1a93bef7fea975c5745d929a3c02091c9c22ae6b07d87bd95b03165

data/bin/dory

@@ -2,6 +2,7 @@
 
 require 'thor'
 require 'yaml'
+require 'json'
 
 require 'dory'
 
@@ -126,6 +127,18 @@ class DoryBin < Thor
     exec_pull(services, options)
   end
 
+  desc 'ip', 'Grab the IPv4 address of a running dory service'
+  long_desc <<-LONGDESC
+    For the nginx proxy and dnsmasq containers, this command
+    grabs the IP address of the container.  You could get this
+    info from `docker inspect` but this is more convenient.
+
+    > $ dory ip [proxy] [dns]
+  LONGDESC
+  def ip(service = nil)
+    exec_ip(service, options)
+  end
+
   private
 
   def exec_pull(services, _options)
@@ -162,6 +175,44 @@ class DoryBin < Thor
     end
   end
 
+  def exec_ip(service, _options)
+    s = sanitize_service(service)
+    mod = if s == 'proxy'
+            Dory::Proxy
+          elsif s == 'dns'
+            Dory::Dnsmasq
+          else
+            nil
+          end
+    if mod
+      unless mod.running?
+        puts "Service '#{service}' is not running.  Starting...".green
+        if mod.start
+          puts "Service '#{service}' successfully started.".green
+        else
+          puts "Error starting service '#{service}'".red
+        end
+      end
+      if mod.running?
+        inspect = Dory::Sh.run_command("docker inspect #{mod.container_name}")
+        if inspect.success?
+          begin
+            puts JSON.parse(inspect.stdout).first['NetworkSettings']['IPAddress']
+          rescue StandardError => e
+            puts "Error parsing JSON from container #{mod.container_name}:".red
+            puts e.message.red
+          end
+        else
+          puts "Error inspecting docker container #{mod.container_name}!".red
+        end
+      else
+        puts "Service '#{service}' is not running.  Cannot get IP address".red
+      end
+    else
+      puts "Can only get IP address for 'proxy' or 'dns'".red
+    end
+  end
+
   def exec_attach(service, _options)
     s = sanitize_service(service)
     mod = if s == 'proxy'

data/lib/dory/version.rb

@@ -1,4 +1,4 @@
 module Dory
-  VERSION = '0.5.1'
-  DATE    = '2016-02-15'
+  VERSION = '0.5.2'
+  DATE    = '2016-03-22'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dory
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Your development proxy for Docker