pygmy 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00a46ea619743f8afd0f6ae4677b9c22bdeb1e54
-  data.tar.gz: 117ecfd91e7959eb58b059336769374da7222398
+  metadata.gz: e82562973fb2853bbe605317d6a98c5873687811
+  data.tar.gz: 2a3650c50aefbbc39a0f69ee41009b68052f7730
 SHA512:
-  metadata.gz: 220f6c215177a1e1d65c54636beffd5df094c7655d8be629b35c08fd3289fa978b30a90820022ca58f3d06096732fe27e7e4220feb0d174ce80a06623642030f
-  data.tar.gz: 0f4574a22269f18464fa99abd6589a60cf9d2770be0d499e92b76fe739bfc4ccad5624705a380c0dbd87c74da059620ab4a446ee95133541140ecfbb5ff78fb2
+  metadata.gz: 05492133c39267f75c87f2acb6a81ec2df1b8af3f108809dafbea92c24e6619a087837db60ef1c8b7a3a3e4fd42cc4ed88cc0017fa3f7e1329d9171cdbda46ca
+  data.tar.gz: 012c350edeaab93252b9c8289d8423a30ef4b18a8fec0385d900da558026a923dd11b17b8a4879e1bfc0a69da143051950bab7ca41fc550662b2c2bfc4a75594

data/bin/pygmy

@@ -129,6 +129,18 @@ class PygmyBin < Thor
       puts "Error starting haproxy".red
     end
 
+    if Pygmy::DockerNetwork.create
+      puts "Successfully created amazeeio network".green
+    else
+      puts "Error creating amazeeio network".red
+    end
+
+    if Pygmy::DockerNetwork.connect
+      puts "Successfully connected haproxy to amazeeio network".green
+    else
+      puts "Error connecting haproxy to amazeeio network".red
+    end
+
     if Pygmy::Mailhog.start
       puts "Successfully started mailhog".green
     else
@@ -168,6 +180,18 @@ class PygmyBin < Thor
       puts "[*] Haproxy is not running".red
     end
 
+    if Pygmy::DockerNetwork.exists?
+      puts "[*] Network: Exists as name #{Pygmy::DockerNetwork.network_name}".green
+    else
+      puts "[*] Network does not exist".red
+    end
+
+    if Pygmy::DockerNetwork.haproxy_connected?
+      puts "[*] Network: Haproxy #{Pygmy::DockerNetwork.haproxy_name} connected to #{Pygmy::DockerNetwork.network_name}".green
+    else
+      puts "[*] Haproxy is not connected to #{Pygmy::DockerNetwork.network_name}".red
+    end
+
     if Pygmy::Mailhog.running?
       puts "[*] Mailhog: Running as docker container #{Pygmy::Mailhog.container_name}".green
     else
@@ -208,7 +232,7 @@ class PygmyBin < Thor
     if Pygmy::Resolv.clean
       puts "Resolver removed".green
     else
-      puts "Unable to remove resolver".red
+      puts "Error while removing the resolver".red
     end
 
     if Pygmy::Dnsmasq.stop

data/lib/pygmy/docker_network.rb

@@ -0,0 +1,74 @@
+require_relative 'docker_service'
+
+module Pygmy
+  class DockerNetwork
+    extend Pygmy::DockerService
+
+    def self.network_name
+      'amazeeio-network'
+    end
+
+    def self.haproxy_name
+      'amazeeio-haproxy'
+    end
+
+    def self.create_cmd
+      "docker network create #{self.network_name}"
+    end
+
+    def self.connect_haproxy_cmd
+      "docker network connect #{self.network_name} #{self.haproxy_name}"
+    end
+
+    def self.create
+      unless self.exists?
+        unless Sh.run_command(self.create_cmd).success?
+          raise RuntimeError.new(
+            "Failed to create #{self.network_name}.  Command #{self.create_cmd} failed"
+          )
+        end
+      end
+      self.exists?
+    end
+
+    def self.connect
+      unless self.haproxy_connected?
+        unless Sh.run_command(self.connect_haproxy_cmd).success?
+          raise RuntimeError.new(
+            "Failed to connect #{self.haproxy_name} to #{self.network_name}.  Command #{self.connect_haproxy_cmd} failed"
+          )
+        end
+      end
+      self.haproxy_connected?
+    end
+
+    def self.haproxy_connected?(network_name = self.network_name, haproxy_name = self.haproxy_name)
+      !!(self.inspect_containers(network_name) =~ /#{haproxy_name}/)
+    end
+
+    def self.exists?(network_name = self.network_name)
+      !!(self.ls =~ /#{network_name}/)
+    end
+
+    def self.inspect_containers(network_name = self.network_name)
+      cmd = "docker network inspect #{self.network_name} -f '{{.Containers}}'"
+      ret = Sh.run_command(cmd)
+      if ret.success?
+        return ret.stdout
+      else
+        raise RuntimeError.new("Failure running command '#{cmd}'")
+      end
+    end
+
+    def self.ls
+      cmd = "docker network ls"
+      ret = Sh.run_command(cmd)
+      if ret.success?
+        return ret.stdout
+      else
+        raise RuntimeError.new("Failure running command '#{cmd}'")
+      end
+    end
+
+  end
+end

data/lib/pygmy/resolv_osx.rb

@@ -29,9 +29,13 @@ module Pygmy
 
     def self.clean?
       puts "Removing resolver file and loopback alias IP, this may require sudo".green
-      self.system!("removing resolverfile", "sudo", "rm", "-f", self.resolver_file)
-      self.system!("removing loopback IP alias 172.16.172.16", "sudo", "ifconfig", "lo0", "-alias", "172.16.172.16")
-      system!("restarting mDNSResponder", "sudo", "killall", "mDNSResponder")
+      begin
+        self.system!("removing resolverfile", "sudo", "rm", "-f", self.resolver_file)
+        self.system!("removing loopback IP alias 172.16.172.16", "sudo", "ifconfig", "lo0", "-alias", "172.16.172.16")
+        system!("restarting mDNSResponder", "sudo", "killall", "mDNSResponder")
+      rescue Exception => e
+        puts e.message
+      end
     end
 
     def self.system!(step, *args)

data/lib/pygmy/version.rb

@@ -1,4 +1,4 @@
 module Pygmy
-  VERSION = '0.9.7'
-  DATE    = '2017-01-31'
+  VERSION = '0.9.8'
+  DATE    = '2017-08-08'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pygmy
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Michael Schmid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -122,6 +122,7 @@ extra_rdoc_files: []
 files:
 - lib/pygmy.rb
 - lib/pygmy/dnsmasq.rb
+- lib/pygmy/docker_network.rb
 - lib/pygmy/docker_service.rb
 - lib/pygmy/haproxy.rb
 - lib/pygmy/linux.rb