dory 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53c6457eeee8b8c77ee2373629fec053be1a38af
-  data.tar.gz: c58d1b2cc83521c5c708b7e3acaa6039fb201687
+  metadata.gz: 9fac20130cea7a196f113155900f525eba858463
+  data.tar.gz: 4f327801e90236e7b2ac714a56d122b89a102f49
 SHA512:
-  metadata.gz: 0f9ce5a80dcc586ff1e274537ad6b92aa8ca8b70280d64ee16e03111dcd7bfed107b87c6ca25e1db75a2f623ac91ccb5af7687c48923cbcf55a9670adbea6265
-  data.tar.gz: 49bb7575f2d686660a5b0d9affa7d05e1c1b312097bf6a1ab3013674ce5ba1761bda705148e040a2913c2854a9b4b6ae724ddbf9e3f80722200814f950925632
+  metadata.gz: e1ccedc5f0042d52b5c1202a4c60a024136e3ab727a84f64cc3063f540131558aeb3d85bc0644c4664c958ae90bf1bd35165e48b7d69201103fd968e46a61aa2
+  data.tar.gz: f852455efc767b44713bc4567d197dc7559a4e7f11c74f26479426c9c6530498b3ee003a4f860424d7836e6eed3e9a38c34be2a4273cd4b5cab30d74712fff30

data/bin/dory

@@ -90,6 +90,8 @@ class DoryBin < Thor
     Writes a dory config file to #{Dory::Config.filename}
     containing the default settings.  This can then be configured
     as preferred.
+
+    > $ dory config-file [--upgrade] [--force]
   LONGDESC
   option :upgrade, type: :boolean, aliases: 'u', default: false
   option :force, type: :boolean, aliases: 'f', default: false
@@ -97,8 +99,45 @@ class DoryBin < Thor
     exec_config_file(options)
   end
 
+  desc 'attach', 'Attach to the output of a docker service container'
+  long_desc <<-LONGDESC
+    For the nginx proxy and dnsmasq containers, this command
+    provides a pass-through to the underlying docker attach command.
+    It is simply more convenient than looking up the docker
+    container name and using the equivalent 'docker attach'
+
+    > $ dory attach [proxy] [dns]
+  LONGDESC
+  def attach(service)
+    exec_attach(service, options)
+  end
+
   private
 
+  def exec_attach(service, _options)
+    s = sanitize_service(service)
+    mod = if s == 'proxy'
+            Dory::Proxy
+          elsif s == 'dns'
+            Dory::Dnsmasq
+          else
+            nil
+          end
+    if mod
+      if mod.running?
+        puts "Note that if you Ctrl + C after attaching,".yellow
+        puts "the service will need to be restarted.".yellow
+        puts "Service '#{service}' is running.".green
+        puts "Attaching to docker container '#{mod.container_name}'...".green
+        exec("docker attach #{mod.container_name}")
+      else
+        puts "Service '#{service}' is not running.  Cannot attach".red
+      end
+    else
+      puts "Can only attach to 'proxy' or 'dns'".red
+    end
+  end
+
   def exec_upgrade(_options)
     puts "Checking if dory has updates available...".green
     new_version = Dory::Upgrade.new_version
@@ -357,6 +396,12 @@ class DoryBin < Thor
     end
   end
 
+  def sanitize_service(service)
+    return false if service.nil? || service.empty?
+    return false unless valid_service?(service)
+    canonical_service(service)
+  end
+
   def sanitize_services(services)
     return valid_services if !services || services.empty?
     return false unless valid_services?(services)

data/lib/dory/version.rb

@@ -1,4 +1,4 @@
 module Dory
-  VERSION = '0.3.3'
-  DATE    = '2016-07-10'
+  VERSION = '0.3.4'
+  DATE    = '2016-07-26'
 end

metadata

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