dory 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2932482ce53a36eeed36a29f88c864d849bd415
-  data.tar.gz: 64b1db166bceb3747abd0ee36945c3fffd955206
+  metadata.gz: 53c6457eeee8b8c77ee2373629fec053be1a38af
+  data.tar.gz: c58d1b2cc83521c5c708b7e3acaa6039fb201687
 SHA512:
-  metadata.gz: 0f50c59d0b6511df98592f419110399515282190c5fd6aec9755cefd4eadf84ecefde9d03a8c2f9dd70855c765e98417d7589bed39ff7ccb51f6c84f7ae2a92e
-  data.tar.gz: 65b7ed1f699bd2a7156606f530a35468c2fd841eb3516b438339c478e69de2408d8aef3e381113729f5d1fad0062b9e60eea52c38f22d2ae7d23676575a92d6d
+  metadata.gz: 0f9ce5a80dcc586ff1e274537ad6b92aa8ca8b70280d64ee16e03111dcd7bfed107b87c6ca25e1db75a2f623ac91ccb5af7687c48923cbcf55a9670adbea6265
+  data.tar.gz: 49bb7575f2d686660a5b0d9affa7d05e1c1b312097bf6a1ab3013674ce5ba1761bda705148e040a2913c2854a9b4b6ae724ddbf9e3f80722200814f950925632

data/lib/dory/docker_service.rb

@@ -2,6 +2,10 @@ require 'shellwords'
 
 module Dory
   module DockerService
+    def docker_installed?
+      Sh.run_command('which docker').success?
+    end
+
     def run_preconditions
       # Override if preconditions are needed
       return true
@@ -18,28 +22,35 @@ module Dory
           puts "[DEBUG] Container '#{self.container_name}' is already running. Doing nothing"
         end
       else
-        self.run_preconditions
-        if self.container_exists?
-          puts "[DEBUG] Container '#{self.container_name}' exists.  Deleting" if Dory::Config.debug?
-          self.delete
-        end
-        if Dory::Config.debug?
-          puts "[DEBUG] '#{self.container_name} does not exist.  Creating/starting " \
-               "'#{self.container_name}' with '#{self.run_command}'"
-        end
-        status = Sh.run_command(self.run_command)
-        unless status.success?
-          if !handle_error || !self.handle_error(status)
-            raise RuntimeError.new(
-              "Failed to run #{self.container_name}.  Command #{self.run_command} failed"
-            )
+        if docker_installed?
+          self.run_preconditions
+          if self.container_exists?
+            puts "[DEBUG] Container '#{self.container_name}' exists.  Deleting" if Dory::Config.debug?
+            self.delete
+          end
+          if Dory::Config.debug?
+            puts "[DEBUG] '#{self.container_name}' does not exist.  Creating/starting " \
+                 "'#{self.container_name}' with '#{self.run_command}'"
+          end
+          status = Sh.run_command(self.run_command)
+          unless status.success?
+            if !handle_error || !self.handle_error(status)
+              puts "Failed to start docker container '#{self.container_name}' " \
+                   ".  Command '#{self.run_command}' failed".red
+            end
           end
+        else
+          err_msg = "Docker does not appear to be installed /o\\\n" \
+            "Docker is required for DNS and Nginx proxy.  These can be " \
+            "disabled in the config file if you don't need them."
+          puts err_msg.red
         end
       end
       self.running?
     end
 
     def running?(container_name = self.container_name)
+      return false unless docker_installed?
       !!(self.ps =~ /#{container_name}/)
     end
 

data/lib/dory/resolv.rb

@@ -7,14 +7,6 @@ module Dory
       Dory::Resolv::Linux
     end
 
-#    def self.method_missing(method_sym, *arguments, &block)
-#      self.get_module.send(method_sym, arguments, &block)
-#    end
-
-#    def self.respond_to?(method_sym, include_private = false)
-#      self.get_module.respond_to?(method_sym, include_private)
-#    end
-
     def self.has_our_nameserver?
       self.get_module.has_our_nameserver?
     end

data/lib/dory/version.rb

@@ -1,4 +1,4 @@
 module Dory
-  VERSION = '0.3.2'
-  DATE    = '2016-06-30'
+  VERSION = '0.3.3'
+  DATE    = '2016-07-10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dory
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -174,4 +174,3 @@ specification_version: 4
 summary: slackbot_frd provides a dirt-simple framework for implementing one or more
   slack bots
 test_files: []
-has_rdoc: