dory 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 065982a17c11138746bc3cf24270e3d047b0c16a
-  data.tar.gz: 7985ebfd3972c8661ca99385ef47eebc2b6d0885
+  metadata.gz: 78281e4844cc2720db9d465be198522dd0a89b83
+  data.tar.gz: 0aff6a8d3ca04ab8cbd999834031f131015f6595
 SHA512:
-  metadata.gz: b08b713daa9363fbb32ff43efbbfecfc786cc26adc57a0bdd442a4117735cc67c6fafab4d1be41257e4b9594b74e784fe816d42a9b2131de2f9519cfa8573050
-  data.tar.gz: 9f0aff75f6c853d976632bd0c25baf0513739e0443d7279d57b0c7e0f8a06d54d35f9f68b9990b2d29500a776dc53bcdcb7870d58204d182f48c10f240ed1501
+  metadata.gz: d5e3972cfea9164e794ce7e85606c542fe44f3a8b36d92639054e8ebd017e4ebc097cd0e9391f622242fdcbce39b178975de6ea246944271f57e67827632e278
+  data.tar.gz: 78cf5d4c8161b9290b1c8b751cdfcb187ea2aa272f7d2b5ea6a81c3a4f6e9bbc0adb1c2b954d87e9408a40fd95c0deb2c64f6848d8d1e37802a071b08edc3673

data/bin/dory

@@ -132,6 +132,15 @@ class DoryBin < Thor
     servs = services.empty? ? %w[proxy dns] : services
     servs = sanitize_services(servs)
     return unless servs
+
+    unless Dory::DockerService.docker_installed?
+      puts "Docker does not appear to be installed /o\\".red
+      puts "Docker is required for DNS and Nginx proxy.  These can be " \
+        "disabled in the config file if you don't need them.\n".yellow
+      puts "Please install docker and try again".red
+      return
+    end
+
     servs.each do |service|
       imgname = if service == 'proxy'
                   Dory::Proxy.dory_http_proxy_image_name

data/lib/dory/docker_service.rb

@@ -3,10 +3,14 @@ require 'ostruct'
 
 module Dory
   module DockerService
-    def docker_installed?
+    def self.docker_installed?
       Sh.run_command('which docker').success?
     end
 
+    def docker_installed?
+      Dory::DockerService.docker_installed?
+    end
+
     def run_preconditions
       # Override if preconditions are needed
       return true
@@ -73,10 +77,6 @@ module Dory
       end
     end
 
-    def has_docker_client?
-      Sh.run_command('which docker').success?
-    end
-
     def stop(container_name = self.container_name)
       Sh.run_command("docker kill #{Shellwords.escape(container_name)}") if self.running?
       !self.running?

data/lib/dory/version.rb

@@ -1,4 +1,4 @@
 module Dory
-  VERSION = '0.4.0'
-  DATE    = '2016-12-14'
+  VERSION = '0.4.1'
+  DATE    = '2016-02-08'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dory
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -167,9 +167,8 @@ 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
 test_files: []
-has_rdoc: