dory 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b636e5e451b94e93e9ef2ce598f7b41af8e49463
-  data.tar.gz: 4513ecc2eace13190f46355ff93ec0ca0f9a0b57
+  metadata.gz: dd130b3cf0b939ac79261dced4f91430d1c391ba
+  data.tar.gz: 2f7465a0c96d42c3a13f2d725f8b8f8e0c931a9d
 SHA512:
-  metadata.gz: 12db07585ec03aa4478c969586976c1365595bbbd72dd8dba8dce2daede46aedd96d59b3cff68247a9b1285183e8213d56d71ae4fd0216a63963d9ec9ff078f6
-  data.tar.gz: 4efa86ae20f8bf1ef7386f4ef61891396e6c84016fc68742d843a66513a9c1f491c47cb5a9b932e3771af3ec03e01d3132b764a3e619f09b4cb0617458917ac6
+  metadata.gz: 2efd954506347e634028b6c5f7aebd0305736eba68921d3e415574bc5922def0bc4a17639054e60cfdf4796dda0b8b23b5ecd32f1e3e453a107a6f3b731e4ea5
+  data.tar.gz: 2393eac90e2b129a9cc60d77c1f6f35fe3bd63771d7454d129ad75769e6ce8dbeb4a1e920588f650a23f335a2f7114c5cc267643a029f17dc1e291154de12508

data/lib/dory/config.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'active_support/core_ext/hash/indifferent_access'
 
 module Dory
   class Config
@@ -8,7 +9,7 @@ module Dory
 
     def self.default_yaml
       %q(---
-        :dory:
+        dory:
           # Be careful if you change the settings of some of
           # these services.  They may not talk to each other
           # if you change IP Addresses.
@@ -17,35 +18,38 @@ module Dory
           # but if you disable dnsmasq, it
           # will make your system look for a name server that
           # doesn't exist.
-          :dnsmasq:
-            :enabled: true
-            :domain: docker      # domain that will be listened for
-            :address: 127.0.0.1  # address returned for queries against domain
-            :container_name: dory_dnsmasq
-          :nginx_proxy:
-            :enabled: true
-            :container_name: dory_dinghy_http_proxy
-            :https_enabled: true
-            :ssl_certs_dir: ''  # leave as empty string to use default certs
-          :resolv:
-            :enabled: true
-            :nameserver: 127.0.0.1
+          dnsmasq:
+            enabled: true
+            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
+          nginx_proxy:
+            enabled: true
+            container_name: dory_dinghy_http_proxy
+            https_enabled: true
+            ssl_certs_dir: ''  # leave as empty string to use default certs
+          resolv:
+            enabled: true
+            nameserver: 127.0.0.1
       ).split("\n").map{|s| s.sub(' ' * 8, '')}.join("\n")
     end
 
     def self.default_settings
-      YAML.load(self.default_yaml)
+      YAML.load(self.default_yaml).with_indifferent_access
     end
 
     def self.settings(filename = self.filename)
       if File.exist?(filename)
-        default_settings = self.default_settings.dup
-        config_file_settings = YAML.load_file(filename)
+        defaults = self.default_settings.dup
+        config_file_settings = YAML.load_file(filename).with_indifferent_access
         [:dnsmasq, :nginx_proxy, :resolv].each do |service|
-          default_settings[:dory][service].merge!(config_file_settings[:dory][service] || {})
+          defaults[:dory][service].merge!(config_file_settings[:dory][service] || {})
         end
-        default_settings[:dory][:debug] = config_file_settings[:dory][:debug]
-        default_settings
+        defaults[:dory][:debug] = config_file_settings[:dory][:debug]
+        defaults
       else
         self.default_settings
       end
@@ -60,8 +64,28 @@ module Dory
       self.write_settings(self.default_yaml, filename, is_yaml: true)
     end
 
+    def self.upgrade_settings_file(filename = self.filename)
+      self.write_settings(self.upgrade(self.settings), filename, is_yaml: false)
+    end
+
     def self.debug?
       self.settings[:dory][:debug]
     end
+
+    def self.upgrade(old_hash)
+      newsettings = old_hash.dup
+
+      # If there's a single domain and address, upgrade to the array format
+      if newsettings[:dory][:dnsmasq][:domain]
+        newsettings[:dory][:dnsmasq][:domains] = [{
+            domain: newsettings[:dory][:dnsmasq][:domain],
+            address: newsettings[:dory][:dnsmasq][:address] || '127.0.0.1'
+        }]
+        newsettings[:dory][:dnsmasq].delete(:domain)
+        newsettings[:dory][:dnsmasq].delete(:address)
+      end
+
+      newsettings
+    end
   end
 end

data/lib/dory/dnsmasq.rb

@@ -37,25 +37,39 @@ module Dory
     end
 
     def self.dnsmasq_image_name
-      'freedomben/dory-dnsmasq'
+      'freedomben/dory-dnsmasq:1.1.0'
     end
 
     def self.container_name
       Dory::Config.settings[:dory][:dnsmasq][:container_name]
     end
 
-    def self.domain
+    def self.domains
+      Dory::Config.settings[:dory][:dnsmasq][:domains]
+    end
+
+    def self.old_domain
       Dory::Config.settings[:dory][:dnsmasq][:domain]
     end
 
-    def self.addr
+    def self.old_address
       Dory::Config.settings[:dory][:dnsmasq][:address]
     end
 
-    def self.run_command(domain = self.domain, addr = self.addr)
+    def self.domain_addr_arg_string
+      if self.old_domain
+        "#{Shellwords.escape(self.old_domain)} #{Shellwords.escape(self.old_address)}"
+      else
+        self.domains.map do |domain|
+          "#{Shellwords.escape(domain[:domain])} #{Shellwords.escape(domain[:address])}"
+        end.join(" ")
+      end
+    end
+
+    def self.run_command(domains = self.domains)
       "docker run -d -p 53:53/tcp -p 53:53/udp --name=#{Shellwords.escape(self.container_name)} " \
       "--cap-add=NET_ADMIN #{Shellwords.escape(self.dnsmasq_image_name)} " \
-      "#{Shellwords.escape(domain)} #{Shellwords.escape(addr)}"
+      "#{self.domain_addr_arg_string}"
     end
 
     def self.check_port(port_num)

data/lib/dory/docker_service.rb

@@ -16,18 +16,18 @@ module Dory
       unless self.running?
         self.run_preconditions
         status = if self.container_exists?
-                    if Dory::Config.debug?
-                      puts "[DEBUG] Container '#{self.container_name}' already exists.  " \
-                           "Starting with '#{self.start_cmd}'"
-                    end
-                    Sh.run_command(self.start_cmd)
-                  else
-                    if Dory::Config.debug?
-                      puts "[DEBUG] Container '#{self.container_name}' does not exist.  " \
-                           "Creating/starting with '#{self.run_command}'"
-                    end
-                    Sh.run_command(self.run_command)
-                  end
+                   if Dory::Config.debug?
+                     puts "[DEBUG] Container '#{self.container_name}' already exists.  " \
+                          "Starting with '#{self.start_cmd}'"
+                   end
+                   Sh.run_command(self.start_cmd)
+                 else
+                   if Dory::Config.debug?
+                     puts "[DEBUG] Container '#{self.container_name}' does not exist.  " \
+                          "Creating/starting with '#{self.run_command}'"
+                   end
+                   Sh.run_command(self.run_command)
+                 end
         unless status.success?
           if !handle_error || !self.handle_error(status)
             raise RuntimeError.new(

data/lib/dory/version.rb

@@ -1,4 +1,4 @@
 module Dory
-  VERSION = '0.1.0'
-  DATE    = '2016-05-15'
+  VERSION = '0.2.0'
+  DATE    = '2016-06-09'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dory
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-15 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -158,3 +172,4 @@ specification_version: 4
 summary: slackbot_frd provides a dirt-simple framework for implementing one or more
   slack bots
 test_files: []
+has_rdoc: