dory 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24ed2be8a0779c79e065254bb945ec059a634311
-  data.tar.gz: 72ff9651d83a7c410e4da03c57b66aae256aab2c
+  metadata.gz: 196d9910bf31763f06ed08499b96037f0dd48bd5
+  data.tar.gz: f769f02eb1fb2ddeef4efc47f33230702b7ab639
 SHA512:
-  metadata.gz: ec1f1020ece19da5c743020935467144bbdbc82f88f5e691f00776a3756093f1e5164b8417f9e2c502b6ac82bf729abd239ccc14b40decbe68ee8ff720da3a50
-  data.tar.gz: 56942f8bfaaa25e2acf542a8b48f477b2ae348959bddff4585fb6585e51990701c693aba36d1026d87aedd8fa53e4fba6cd590eacfe1b0a4859d4d9607310bf3
+  metadata.gz: 5cfb53d3a093dee270d3babbcff2d6f7cbda9d7a374e3d332c80cccfc1ab1377b0636ea137b9af4b84ae7531af2a05a9bf82a0c8a488231b215d6b887487b6ff
+  data.tar.gz: 7f70527e8e7ac8aa1bf3ea71cdca554d4b02fa07cf767ce62dcfe53d547f2b5ea693353b9b2985eca9fc242920745133ea36f3c2303696235226eba7df7d9a15

data/bin/dory

@@ -17,16 +17,8 @@ class DoryBin < Thor
     for your custom domain to the nginx proxy.  The local resolver
     will also be configured to use the dnsmasq instance as a nameserver
 
-    You can optionally pass in [-s|--server] or [-c|--client] if doing
-    development on a cloud server.  This will tell dory to only bring
-    up the nginx proxy container if passed --server or only the
-    dnsmasq/resolv if passed --client.  If both server and client
-    are passed, it is equivalent to a naked 'up'
-
-    > $ dory up [-s|--server] [-c|--client]
+    > $ dory up
   LONGDESC
-  option :client, type: :boolean, aliases: 'c', default: false
-  option :server, type: :boolean, aliases: 's', default: false
   def up
     exec_up(options)
   end
@@ -52,10 +44,8 @@ class DoryBin < Thor
   long_desc <<-LONGDESC
     Stop and restart dory services (nginx-proxy, dnsmasq, resolv)
 
-    > $ dory restart [-d|--destroy] [-s|--server] [-c|--client]
+    > $ dory restart [-d|--destroy]
   LONGDESC
-  option :client, type: :boolean, aliases: 'c', default: false
-  option :server, type: :boolean, aliases: 's', default: false
   option :destroy, type: :boolean, aliases: 'd', default: true
   def restart
     exec_down(options)
@@ -85,7 +75,7 @@ class DoryBin < Thor
 
   private
 
-  def exec_config_file(options)
+  def exec_config_file(_options)
     if File.exist?(Dory::Config.filename)
       print "A config file already exists at #{Dory::Config.filename}.  Overwrite with default settings? (Y/N): ".yellow
       conf = STDIN.gets.chomp
@@ -99,9 +89,6 @@ class DoryBin < Thor
   end
 
   def exec_up(options)
-    full = (!options[:server] && !options[:client]) ||
-           ( options[:server] &&  options[:client])
-
     puts "Reading settings file at '#{Dory::Config.filename}'".green if options[:verbose]
     settings = Dory::Config.settings
     if settings[:dory][:nginx_proxy][:enabled]
@@ -138,7 +125,7 @@ class DoryBin < Thor
     end
   end
 
-  def exec_status(options)
+  def exec_status(_options)
     settings = Dory::Config.settings
 
     if Dory::Proxy.running?
@@ -167,8 +154,6 @@ class DoryBin < Thor
   end
 
   def exec_down(options)
-    destroy = options[:destroy]
-    
     if Dory::Resolv.clean
       puts "nameserver removed from resolv file".green
     else

data/lib/dory/dnsmasq.rb

@@ -23,7 +23,7 @@ module Dory
     def self.run_cmd(domain = self.domain, addr = self.addr)
       "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(self.domain)} #{Shellwords.escape(self.addr)}"
+      "#{Shellwords.escape(domain)} #{Shellwords.escape(addr)}"
     end
   end
 end

data/lib/dory/docker_service.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module Dory
   module DockerService
     def start
@@ -9,7 +11,7 @@ module Dory
                   end
         unless success
           raise RuntimeError.new(
-            "Failed to run nginx proxy.  Command #{self.run_cmd} failed"
+            "Failed to run #{self.container_name}.  Command #{self.run_cmd} failed"
           )
         end
       end

data/lib/dory/version.rb

@@ -1,3 +1,3 @@
 module Dory
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dory
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -53,47 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '10.5'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '0.5'
 description: The slack web api is good, but very raw.  What you need is a great ruby
   framework to abstract away all that.  This is it!  This framework allows you to
   write bots easily by providing methods that are easy to call.  Behind the scenes,