dory 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9406dd6b3ce94814c3f20b73eaf93f019bf641b
-  data.tar.gz: 46f5d75ffe41ed8b36636c43536033f33b3e9e38
+  metadata.gz: 71cac368fe70a08b19c094885c8aadf9272036db
+  data.tar.gz: 3e265b1c03f00a374847bcdc60e85a1be40d76f0
 SHA512:
-  metadata.gz: 2b9f8df7b16d6a5871f96632872f3dee085f7bbf80f2ed31761df7da7b701631f8ee925b6c787d0f08dbbd6e80e88dbd05204921f1e25a861a03ca612c3510bf
-  data.tar.gz: d00f0d92c7d1fcb7d785bc80051e51a769df70b0260fa4845270a9575f7321a908ba0b58a27f07735f818463642e71c0d67f06dad9af2d17263c4ef5c914389f
+  metadata.gz: 9cfd8f71d1ae253e8877503f84ce891d57f731dc4c4703343a4c101fe2b6cc95b81953c3ef7de50f61a3c0b06a352a29e3f3dc373e5de5c933838e616760f394
+  data.tar.gz: 8bb53d03fedd6da7c654431e12a1f99c844654f654a9c682002a362361e8628da5889cf2a7c1847afc6a20efc2719f17b7a5a43a2dcd16f06e577b2d9052b7ff

data/bin/dory

@@ -188,8 +188,13 @@ class DoryBin < Thor
   end
 end
 
+aliases = {
+  'start' => 'up',
+  'stop'  => 'down',
+}
+
 if !ARGV.empty? && %w[-v --version].include?(ARGV.first)
   puts "Dory - Version: #{Dory::VERSION}"
 else
-  DoryBin.start(ARGV)
+  DoryBin.start(ARGV.map { |a| aliases.keys.include?(a) ? aliases[a] : a })
 end

data/lib/dory/config.rb

@@ -25,7 +25,8 @@ module Dory
           :nginx_proxy:
             :enabled: true
             :container_name: dory_dinghy_http_proxy
-            :ssl_certs_dir: ''  # leave as empty string to disable
+            :https_enabled: true
+            :ssl_certs_dir: ''  # leave as empty string to use default certs
           :resolv:
             :enabled: true
             :nameserver: 127.0.0.1
@@ -43,6 +44,7 @@ module Dory
         [:dnsmasq, :nginx_proxy, :resolv].each do |service|
           default_settings[:dory][service].merge!(config_file_settings[:dory][service] || {})
         end
+        default_settings[:dory][:debug] = config_file_settings[:dory][:debug]
         default_settings
       else
         self.default_settings
@@ -57,5 +59,9 @@ module Dory
     def self.write_default_settings_file(filename = self.filename)
       self.write_settings(self.default_yaml, filename, is_yaml: true)
     end
+
+    def self.debug?
+      self.settings[:dory][:debug]
+    end
   end
 end

data/lib/dory/docker_service.rb

@@ -5,8 +5,16 @@ module Dory
     def start
       unless self.running?
         success = if self.container_exists?
-                    Sh.run_command("docker start #{Shellwords.escape(self.container_name)}")
+                    if Dory::Config.debug?
+                      puts "[DEBUG] Container '#{self.container_name}' already exists.  " \
+                           "Starting with '#{self.start_cmd}'"
+                    end
+                    Sh.run_command(self.start_cmd).success?
                   else
+                    if Dory::Config.debug?
+                      puts "[DEBUG] Container '#{self.container_name}' does not exist.  " \
+                           "Creating/starting with '#{self.run_cmd}'"
+                    end
                     Sh.run_command(self.run_cmd).success?
                   end
         unless success
@@ -52,5 +60,9 @@ module Dory
       end
       !self.container_exists?
     end
+
+    def start_cmd
+      "docker start #{Shellwords.escape(self.container_name)}"
+    end
   end
 end

data/lib/dory/proxy.rb

@@ -4,8 +4,10 @@ module Dory
   class Proxy
     extend Dory::DockerService
 
-    def self.dinghy_http_proxy_image_name
-      'codekitchen/dinghy-http-proxy:2.0.3'
+    def self.dory_http_proxy_image_name
+      setting = Dory::Config.settings[:dory][:nginx_proxy][:image]
+      return setting if setting
+      'freedomben/dory-http-proxy:2.0.4.2'
     end
 
     def self.container_name
@@ -21,12 +23,26 @@ module Dory
       end
     end
 
+    def self.tls_arg
+      if [:tls_enabled, :ssl_enabled, :https_enabled].any? { |s|
+          Dory::Config.settings[:dory][:nginx_proxy][s]
+        }
+        "-p 443:443"
+      else
+        ''
+      end
+    end
+
     def self.run_cmd
-      "docker run -d -p 80:80 -v /var/run/docker.sock:/tmp/docker.sock "\
-        "#{self.certs_arg} -e " \
+      "docker run -d -p 80:80 #{self.tls_arg} #{self.certs_arg} "\
+        "-v /var/run/docker.sock:/tmp/docker.sock -e " \
         "'CONTAINER_NAME=#{Shellwords.escape(self.container_name)}' --name " \
         "'#{Shellwords.escape(self.container_name)}' " \
-        "#{Shellwords.escape(dinghy_http_proxy_image_name)}"
+        "#{Shellwords.escape(dory_http_proxy_image_name)}"
+    end
+
+    def self.start_cmd
+      "docker start #{Shellwords.escape(self.container_name)}"
     end
   end
 end

data/lib/dory/version.rb

@@ -1,3 +1,3 @@
 module Dory
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dory
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.5'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +152,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: slackbot_frd provides a dirt-simple framework for implementing one or more