dory 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7d729d754ce11e1287274206933888c1248ef3e07ae55d32c708aec95616875
-  data.tar.gz: 0eef50c6630c834f7bfce5a735ee83ae34731ed5bb9643509932deceb8cf4a8c
+  metadata.gz: 659312d1fe7a5260a3d79f8a66858a14bc31fc60c6a7401e3b687237d51f4ba4
+  data.tar.gz: aff69e2a2a6cc4b489de2ad0ea34fe82af138588bd8abe78987e444d66a7048c
 SHA512:
-  metadata.gz: 9ccd9f68e0e9c54294772c6f1d1dea53d5d9c6dd0369f066d9c4640aaa67f6dc881888b4d355db5b288ffd3dc56d9ff3ffed42d38e04b208fab310304b6d2b60
-  data.tar.gz: 84a489441dcb208b1ea21f4ff78802ae6beeb19833ec90ad2e8605a7910254df8424ccba2e797d6a9926577fdda941db02c6f001ca285b0ff74772de1eec3bc6
+  metadata.gz: a1f644b260ee0b79beb65ec308ab3cbaad934ae5d214bf60ba88fd0037f10bcb9e50d259a573a6344f91eca8d91fbf6f27902149390bab4da836f360e055b53c
+  data.tar.gz: 49c3141b65dd1cc1e3a98bb4d23602eaa43f04d524c451a8cd1ad52709d1e88d841a69cb6dfde103f22724ea5fef5c9d8db2b8735bd9a46aa68a23d4bece626e

data/bin/dory

@@ -60,7 +60,7 @@ class DoryBin < Thor
 
   desc 'version', 'Check current installed version of dory'
   def version
-    puts "Dory - Version: #{Dory::VERSION}"
+    puts "Dory - Version: #{Dory.version}"
   end
 
   desc 'restart', 'Stop and restart all dory services'
@@ -250,7 +250,7 @@ class DoryBin < Thor
     new_version = Dory::Upgrade.new_version
     if new_version
       if Dory::Upgrade.outdated?(new_version)
-        puts "New version #{new_version} is available.  You currently have #{Dory::VERSION}.".yellow
+        puts "New version #{new_version} is available.  You currently have #{Dory.version}.".yellow
         print "Would you like to install the update? (Y/N): ".yellow
         if STDIN.gets.chomp =~ /y/i
           puts "Upgrading dory...".green
@@ -523,7 +523,7 @@ aliases = {
 }
 
 if !ARGV.empty? && %w[-v --version].include?(ARGV.first)
-  puts "Dory - Version: #{Dory::VERSION}"
+  puts "Dory - Version: #{Dory.version}"
 else
   DoryBin.start(ARGV.map { |a| aliases.keys.include?(a) ? aliases[a] : a })
 end

data/lib/dory/config.rb

@@ -41,8 +41,6 @@ module Dory
             domains:               # array of domains that will be resolved to the specified address
               - domain: docker     # you can set '#' for a wilcard
                 address: 127.0.0.1 # return for queries against the domain
-              - domain: dev
-                address: 127.0.0.1
             container_name: dory_dnsmasq
             port: 53  # port to listen for dns requests on.  must be 53 on linux. can be anything that's open on macos
             # kill_others: kill processes bound to the port we need (see previous setting 'port')
@@ -57,6 +55,8 @@ module Dory
             container_name: dory_dinghy_http_proxy
             https_enabled: true
             ssl_certs_dir: ''  # leave as empty string to use default certs
+            port: 80           # port 80 is default for http
+            tls_port: 443      # port 443 is default for https
           resolv:
             enabled: true
             nameserver: 127.0.0.1
@@ -122,6 +122,14 @@ module Dory
         newsettings[:dory][:dnsmasq][:service_start_delay] = 5
       end
 
+      # add settings for nginx proxy port
+      unless newsettings[:dory][:nginx_proxy][:port]
+        newsettings[:dory][:nginx_proxy][:port] = 80
+      end
+      unless newsettings[:dory][:nginx_proxy][:tls_port]
+        newsettings[:dory][:nginx_proxy][:tls_port] = 443
+      end
+
       newsettings
     end
   end

data/lib/dory/dnsmasq.rb

@@ -11,7 +11,8 @@ module Dory
     @@handle_systemd_services = []
 
     def self.dnsmasq_image_name
-      'freedomben/dory-dnsmasq:1.1.0'
+      setting = Dory::Config.settings[:dory][:dnsmasq][:image]
+      setting ? setting : 'freedomben/dory-dnsmasq:1.1.0'
     end
 
     def self.first_attempt_failed?

data/lib/dory/proxy.rb

@@ -8,7 +8,7 @@ module Dory
       setting = Dory::Config.settings[:dory][:nginx_proxy][:image]
       return setting if setting
       certs_dir && !certs_dir.empty? \
-        ? 'codekitchen/dinghy-http-proxy:2.5.9' \
+        ? 'codekitchen/dinghy-http-proxy:2.5.10' \
         : 'freedomben/dory-http-proxy:2.5.9.1'
     end
 
@@ -32,14 +32,18 @@ module Dory
       if [:tls_enabled, :ssl_enabled, :https_enabled].any? { |s|
           Dory::Config.settings[:dory][:nginx_proxy][s]
          }
-        "-p 443:443"
+        "-p #{Dory::Config.settings[:dory][:nginx_proxy][:tls_port]}:443"
       else
         ''
       end
     end
 
+    def self.http_port
+      Dory::Config.settings[:dory][:nginx_proxy][:port]
+    end
+
     def self.run_command
-      "docker run -d -p 80:80 #{self.tls_arg} #{self.certs_arg} "\
+      "docker run -d -p #{http_port}: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)}' " \

data/lib/dory/resolv/linux.rb

@@ -74,7 +74,7 @@ module Dory
       def self.write_to_file(contents)
         # have to use this hack cuz we don't run as root :-(
         puts "Requesting sudo to write to #{self.resolv_file}".green
-        Bash.run_command("echo -e '#{contents}' | sudo tee #{Shellwords.escape(self.resolv_file)} >/dev/null")
+        Bash.run_command("echo -e '#{contents}' | sudo /usr/bin/tee #{Shellwords.escape(self.resolv_file)} >/dev/null")
       end
 
       def self.resolv_file_contents

data/lib/dory/resolv/macos.rb

@@ -63,7 +63,7 @@ module Dory
         end
         self.resolv_files.each do |filename|
           puts "Requesting sudo to write to #{filename}".green
-          Bash.run_command("echo -e '#{self.resolv_contents}' | sudo tee #{Shellwords.escape(filename)} >/dev/null")
+          Bash.run_command("echo -e '#{self.resolv_contents}' | sudo /usr/bin/tee #{Shellwords.escape(filename)} >/dev/null")
         end
       rescue DinghyError => e
         puts e.message.red

data/lib/dory/upgrade.rb

@@ -9,7 +9,7 @@ module Dory
     end
 
     def self.outdated?(new_version = self.new_version)
-      return Dory::VERSION != new_version
+      return Dory.version != new_version
     end
 
     def self.install

data/lib/dory/version.rb

@@ -1,4 +1,9 @@
 module Dory
-  VERSION = '1.0.1'
-  DATE    = '2018-08-22'
+  def self.version
+    '1.1.1'
+  end
+
+  def self.date
+    '2021-04-06'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dory
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-22 00:00:00.000000000 Z
+date: 2021-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -56,16 +56,22 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -183,8 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Your development proxy for Docker