dory 0.3.7 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a47351367a7364f212a527181aa547ca5759f72
-  data.tar.gz: 5656fdb4e5c0f7db64f437ce16e42880059d5e0a
+  metadata.gz: f93c9a9d5c8d8c7ac6e84a18a946209d5da811cc
+  data.tar.gz: db80f007af9afc1de49f48dd9b0cc09aac4de9ab
 SHA512:
-  metadata.gz: 9394a03254d6c8d50491fd3613d28afa023e99810149b74978e5418c1736af72fff3a893f36046c7c45fed5f218b3fe13545b7ac7f8feb1e012120fe9e0d952f
-  data.tar.gz: adb6de18b3f69da8ffe172c4d4f2b188ff113d6609bb5eb2dc639b9630af6934332bc7bf9ac386c5ceeaaea992c36ccc4741b3bbc304713e7dcd49b9d7e2b6fe
+  metadata.gz: 38f44ffae7792e826d959c28d201637f65e95ecafdd9545c258a6dbea31528d8ed856e2ff0b53fd67a753998276df509864f936ec792d1248e5b53a302d292fa
+  data.tar.gz: d09cbf8d66a6db8c1dd7d9ca97d72a6731c5e8f0e5e140a3f90e3549839470addf55303b95917abafd59c2ea38cfea5a5095f465cd4f155ea0dc0c926180f987

data/bin/dory

@@ -112,8 +112,47 @@ class DoryBin < Thor
     exec_attach(service, options)
   end
 
+  desc 'pull', 'Pull down the docker images that dory uses'
+  long_desc <<-LONGDESC
+    This will pull down the docker images that dory uses.
+    You don't need to run this command as dory will automatically
+    pull down the images when needed if they aren't there already.
+    However, you may wish to pull down in advance, and for that
+    purpose this command is here for you.
+
+    > $ dory pull [proxy] [dns]
+  LONGDESC
+  def pull(*services)
+    exec_pull(services, options)
+  end
+
   private
 
+  def exec_pull(services, _options)
+    servs = services.empty? ? %w[proxy dns] : services
+    servs = sanitize_services(servs)
+    return unless servs
+    servs.each do |service|
+      imgname = if service == 'proxy'
+                  Dory::Proxy.dory_http_proxy_image_name
+                elsif service == 'dns'
+                  Dory::Dnsmasq.dnsmasq_image_name
+                else
+                  nil
+                end
+      if imgname
+        puts "Pulling image '#{imgname}'...".green
+        if Dory::Sh.run_command("docker pull #{imgname}").success?
+          puts "Successfully pulled image '#{imgname}'".green
+        else
+          puts "Error pulling docker image '#{imgname}'".red
+        end
+      else
+        puts "Can only pull 'proxy' or 'dns', you tried to pull '#{service}'".red
+      end
+    end
+  end
+
   def exec_attach(service, _options)
     s = sanitize_service(service)
     mod = if s == 'proxy'
@@ -398,7 +437,7 @@ class DoryBin < Thor
       if valid_service?(service)
         true
       else
-        puts "'#{service}' is not valid.  Must be one or more of these: #{valid_services.join(', ')}"
+        puts "'#{service}' is not valid.  Must be one or more of these: #{valid_services.join(', ')}".red
         false
       end
     end

data/lib/dory/dnsmasq.rb

@@ -113,7 +113,8 @@ module Dory
       pids = listener_list.uniq(&:pid).map(&:pid)
       pidstr = pids.join(' and ')
       print "This interferes with Dory's dnsmasq container.  Would you like me to kill PID #{pidstr}? (Y/N): "
-      conf = answer ? answer : STDIN.gets.chomp
+      conf = answer ? answer : ENV['DORY_KILL_DNSMASQ']
+      conf = STDIN.gets.chomp unless conf
       if conf =~ /y/i
         puts "Requesting sudo to kill PID #{pidstr}"
         return Sh.run_command("sudo kill #{pids.join(' ')}").success?

data/lib/dory/version.rb

@@ -1,4 +1,4 @@
 module Dory
-  VERSION = '0.3.7'
-  DATE    = '2016-07-29'
+  VERSION = '0.3.9'
+  DATE    = '2016-10-17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dory
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.9
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Your development proxy for Docker