dory 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 453ef08977df972322e1995689d8b358cb6f345d
-  data.tar.gz: 40e16950427429b82d877302f465183f71ced5b8
+  metadata.gz: 1c9a8eb4e309988a08bc4418c313cc5fcd942fef
+  data.tar.gz: ea5da1d8d1541824b3566669565c614414e27ad3
 SHA512:
-  metadata.gz: 8d883026dd79a18d5ec040e4df9ff81fd055f4b517071eb1ebd936f250343f71063aa05f258a0f6db084a7287a746af97a2bc457e2a4daa2b85e91f473a1e13a
-  data.tar.gz: d35f5e27adebcca7de68609ab7dab69e8aae9fc31705c40441a3c4f6c753d21beda006bfd5fb335b29b0a301bb7ada397f62e3c295319096812136dda2fe1400
+  metadata.gz: af839401db81b131b4bdd0a7f45d401f3cb796240dc8b256647f8073386dfc84093ab403d1d1adc31a5cb451e0ae67e6417c13b2beb19bb989ca959d4c683c3b
+  data.tar.gz: eb51a6604b6539d11c164113557718ac2f028b636f283ee8293477416a3f4d88bbe038db5884bcf8bc070664614a0a1bfa26c053564313bdbc74608d57c066bc

data/lib/dory/dnsmasq.rb

@@ -8,22 +8,45 @@ module Dory
     # I really hate these globals.  It would be great to refactor these out
     #
     @@first_attempt_failed = false
-    @@handle_systemd_services = false
+    @@handle_systemd_services = []
 
     def self.dnsmasq_image_name
       'freedomben/dory-dnsmasq:1.1.0'
     end
 
+    def self.first_attempt_failed?
+      @@first_attempt_failed ||= false if @first_attempt_failed.nil?
+      @@first_attempt_failed
+    end
+
+    def self.set_first_attempt_failed(failed)
+      @@first_attempt_failed = failed
+    end
+
+    def self.systemd_services?
+      return false unless self.systemd_services
+      self.systemd_services.count > 0
+    end
+
+    def self.systemd_services
+      @@systemd_services ||= []
+      @@systemd_services
+    end
+
+    def self.set_systemd_services(services)
+      @@systemd_services = services
+    end
+
     def self.run_preconditions
       puts "[DEBUG] dnsmasq service running preconditions" if Dory::Config.debug?
 
       # we don't want to hassle the user with checking the port unless necessary
-      if @@first_attempt_failed
-        @@handle_systemd_services = self.has_systemd? && self.has_services_that_block_dnsmasq?
-        self.down_systemd_services if @@handle_systemd_services
+      if first_attempt_failed?
+        self.set_systemd_services(self.running_services_that_block_dnsmasq)
+        self.down_systemd_services if self.systemd_services?
 
         puts "[DEBUG] First attempt failed.  Checking port #{self.port}" if Dory::Config.debug?
-        listener_list = self.check_port(self.port)
+        listener_list = Dory::PortUtils.check_port(self.port)
         unless listener_list.empty?
           return self.offer_to_kill(listener_list)
         end
@@ -37,13 +60,13 @@ module Dory
 
     def self.run_postconditions
       puts "[DEBUG] dnsmasq service running postconditions" if Dory::Config.debug?
-      self.up_systemd_services if @@handle_systemd_services
+      self.up_systemd_services if self.systemd_services?
     end
 
-    def self.handle_error(command_output)
+    def self.handle_error(_command_output)
       puts "[DEBUG] handling dnsmasq start error" if Dory::Config.debug?
       # If we've already tried to handle failure, prevent infinite recursion
-      if @@first_attempt_failed
+      if first_attempt_failed?
         puts "[DEBUG] Attempt to kill conflicting service failed" if Dory::Config.debug?
         return false
       else
@@ -51,7 +74,7 @@ module Dory
           puts "[DEBUG] First attempt to start dnsmasq failed." \
                "There is probably a conflicting service present"
         end
-        @@first_attempt_failed = true
+        set_first_attempt_failed(true)
         self.start(handle_error: false)
       end
     end
@@ -101,36 +124,13 @@ module Dory
       end
     end
 
-    def self.run_command(domains = self.domains)
+    def self.run_command
       "docker run -d -p #{self.port}:#{self.port}/tcp -p #{self.port}:#{self.port}/udp " \
       "--name=#{Shellwords.escape(self.container_name)} " \
       "--cap-add=NET_ADMIN #{Shellwords.escape(self.dnsmasq_image_name)} " \
       "#{self.domain_addr_arg_string}"
     end
 
-    def self.check_port(port_num)
-      puts "Requesting sudo to check if something is bound to port #{self.port}".green
-      ret = Sh.run_command("sudo lsof -i :#{self.port}")
-      return [] unless ret.success?
-
-      list = ret.stdout.split("\n")
-      list.shift  # get rid of the column headers
-      list.map! do |process|
-        command, pid, user, fd, type, device, size, node, name = process.split(/\s+/)
-        OpenStruct.new({
-          command: command,
-          pid: pid,
-          user: user,
-          fd: fd,
-          type: type,
-          device: device,
-          size: size,
-          node: node,
-          name: name
-        })
-      end
-    end
-
     def self.offer_to_kill(listener_list, answer: nil)
       listener_list.each do |process|
         puts "Process '#{process.command}' with PID '#{process.pid}' is listening on #{process.node} port #{self.port}.".yellow
@@ -149,14 +149,6 @@ module Dory
       end
     end
 
-    def self.has_systemd?
-      Sh.run_command('which systemctl').success?
-    end
-
-    def self.systemd_service_installed?(service)
-      !(Sh.run_command("systemctl status #{service} | head -1").stdout =~ /unit.*not.*found/i)
-    end
-
     def self.services_that_block_dnsmasq
       %w[
         NetworkManager.service
@@ -165,23 +157,22 @@ module Dory
     end
 
     def self.has_services_that_block_dnsmasq?
-      !self.enabled_services_that_block_dnsmasq.empty?
+      !self.running_services_that_block_dnsmasq.empty?
     end
 
-    def self.enabled_services_that_block_dnsmasq
+    def self.running_services_that_block_dnsmasq
       self.services_that_block_dnsmasq.select do |service|
-        self.systemd_service_installed?(service)
+        Dory::Systemd.systemd_service_running?(service)
       end
     end
 
     def self.down_systemd_services
       puts "[DEBUG] Putting systemd services down" if Dory::Config.debug?
 
-      services = self.enabled_services_that_block_dnsmasq
       conf = if ask_about_killing?
                puts "You have some systemd services running that will race against us \n" \
                     "to bind to port 53 (and usually they win):".yellow
-               puts "\n     #{services.join(', ')}\n".yellow
+               puts "\n     #{self.systemd_services.join(', ')}\n".yellow
                puts "If we don't stop these services temporarily while putting up the \n" \
                     "dnsmasq container, starting it will likely fail.".yellow
                print "Would you like me to put them down while we start dns \n" \
@@ -190,42 +181,35 @@ module Dory
              else
                answer_from_settings
              end
-      @@handle_systemd_services = conf =~ /y/i
-      if @@handle_systemd_services
-        if services.all? { |service|
-          self.set_systemd_service(service: service, up: false)
+      if conf =~ /y/i
+        if self.systemd_services.all? { |service|
+          Dory::Systemd.set_systemd_service(service: service, up: false)
         }
           puts "Putting down services succeeded".green
         else
-          puts "One or more services failed to go down".red
+          puts "One or more services failed to stop".red
         end
       else
         puts 'OK, not putting down the services'.yellow
+        set_systemd_services([])
       end
     end
 
     def self.up_systemd_services
-      if @@handle_systemd_services
-        puts "[DEBUG] Putting systemd services back up" if Dory::Config.debug?
-        services = self.enabled_services_that_block_dnsmasq
-        if services.reverse.all? { |service|
-          self.set_systemd_service(service: service, up: true)
+      if self.systemd_services?
+        puts "[DEBUG] Putting systemd services back up: #{self.systemd_services.join(', ')}" if Dory::Config.debug?
+        if self.systemd_services.reverse.all? { |service|
+          Dory::Systemd.set_systemd_service(service: service, up: true)
         }
-          puts "#{services.join(', ')} were successfully restarted".green
+          puts "#{self.systemd_services.join(', ')} were successfully restarted".green
         else
-          puts "#{services.join(', ')} failed to restart".red
+          puts "#{self.systemd_services.join(', ')} failed to restart".red
         end
       else
-        puts "[DEBUG] Not putting systemd services back up cause skipped " if Dory::Config.debug?
+        puts "[DEBUG] Not putting systemd services back up cause array was empty " if Dory::Config.debug?
       end
     end
 
-    def self.set_systemd_service(service:, up:)
-      action = up ? 'start' : 'stop'
-      puts "Requesting sudo to #{action} #{service}".green
-      Sh.run_command("sudo systemctl #{action} #{service}").success?
-    end
-
     def self.ask_about_killing?
       !self.answer_from_settings
     end

data/lib/dory/docker_service.rb

@@ -21,7 +21,7 @@ module Dory
       return true
     end
 
-    def handle_error(command_output)
+    def handle_error(_command_output)
       # Override to provide error handling
       return false
     end

data/lib/dory/port_utils.rb

@@ -0,0 +1,28 @@
+require_relative 'docker_service'
+
+module Dory
+  module PortUtils
+    def self.check_port(port_num = self.port)
+      puts "Requesting sudo to check if something is bound to port #{port_num}".green
+      ret = Dory::Sh.run_command("sudo lsof -i :#{port_num}")
+      return [] unless ret.success?
+
+      list = ret.stdout.split("\n")
+      list.shift  # get rid of the column headers
+      list.map! do |process|
+        command, pid, user, fd, type, device, size, node, name = process.split(/\s+/)
+        OpenStruct.new({
+          command: command,
+          pid: pid,
+          user: user,
+          fd: fd,
+          type: type,
+          device: device,
+          size: size,
+          node: node,
+          name: name
+        })
+      end
+    end
+  end
+end

data/lib/dory/proxy.rb

@@ -31,7 +31,7 @@ module Dory
     def self.tls_arg
       if [:tls_enabled, :ssl_enabled, :https_enabled].any? { |s|
           Dory::Config.settings[:dory][:nginx_proxy][s]
-        }
+         }
         "-p 443:443"
       else
         ''

data/lib/dory/systemd.rb

@@ -0,0 +1,30 @@
+require_relative 'docker_service'
+
+module Dory
+  module Systemd
+    def self.has_systemd?
+      Sh.run_command('which systemctl').success?
+    end
+
+    def self.systemd_service_installed?(service)
+      return false unless self.has_systemd?
+      !(Sh.run_command("systemctl status #{service} | head -1").stdout =~ /not-found/)
+    end
+
+    def self.systemd_service_running?(service)
+      return false unless self.has_systemd?
+      !!(Sh.run_command("systemctl status #{service} | head -3").stdout =~ /Active:\s+active.*running/)
+    end
+
+    def self.systemd_service_enabled?(service)
+      return false unless self.has_systemd?
+      !!(Sh.run_command("systemctl status #{service} | head -3").stdout.gsub(/Loaded.*?;/, '') =~ /^\s*enabled;/)
+    end
+
+    def self.set_systemd_service(service:, up:)
+      action = up ? 'start' : 'stop'
+      puts "Requesting sudo to #{action} #{service}".green
+      Sh.run_command("sudo systemctl #{action} #{service}").success?
+    end
+  end
+end

data/lib/dory/version.rb

@@ -1,4 +1,4 @@
 module Dory
-  VERSION = '0.5.0'
-  DATE    = '2016-02-13'
+  VERSION = '0.5.1'
+  DATE    = '2016-02-15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dory
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-13 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.47'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.47'
 description: 'Dory lets you forget about IP addresses and port numbers while you are
   developing your application. Through the magic of local DNS and a reverse proxy,
   you can access your app at the domain of your choosing. For example, http://myapp.docker
@@ -140,11 +154,13 @@ files:
 - lib/dory/dnsmasq.rb
 - lib/dory/docker_service.rb
 - lib/dory/os.rb
+- lib/dory/port_utils.rb
 - lib/dory/proxy.rb
 - lib/dory/resolv.rb
 - lib/dory/resolv/linux.rb
 - lib/dory/resolv/macos.rb
 - lib/dory/shell.rb
+- lib/dory/systemd.rb
 - lib/dory/upgrade.rb
 - lib/dory/version.rb
 homepage: https://github.com/FreedomBen/dory
@@ -167,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Your development proxy for Docker