pygmy 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51b3f584f5483a34121bd2a1677f734b6cb80a6f
-  data.tar.gz: e729dd858c0d21c8167c802d6c46a33c59b093d6
+  metadata.gz: fc64b47fe8d582a95977f3146c7be36a1616b94f
+  data.tar.gz: 3b3a8005b4a7a9ee55aa077f4d9b89b06c9fb546
 SHA512:
-  metadata.gz: 7ebfe1539d456e2e180dca78611efd49277464ad99bdb56daa094d5ae5d36ee7dec4b5cab24c7b3a2d3da1783c1f9b88c542649795c33c1301282d2d71c239e3
-  data.tar.gz: 674f730b3342ea05aff81acd135b1aa1e79931191500e66321094e70a2590414d43b440521595dba8fe0392d65b3dd6326e063b43aae57f6c6ed538b0f170379
+  metadata.gz: 96dbdc3d3b98ec064708cf51c4de5559f25d0448138107cef636e5d7c16a7d54812ee8c6f798663fa5beea61a81963d9612f0c8078ee324599af64a51a455568
+  data.tar.gz: 4a78c85c6c9954a851c299816ae94275ea44a3d835f183196d69a3696c8abfae8673515e24a9bb9835d258de23c1a647b8bdff4bd4ca57262507c8a0692e3cb9

data/bin/pygmy

@@ -170,7 +170,7 @@ class PygmyBin < Thor
       if Pygmy::SshAgentAddKey.add_ssh_key
         puts "Successfully injected ssh key".green
       else
-        puts "Error injected ssh key".red
+        puts "Error injecting ssh key".red
       end
     end
   end
@@ -229,7 +229,7 @@ class PygmyBin < Thor
       if Pygmy::SshAgentAddKey.add_ssh_key(key)
         puts "Successfully added ssh key".green
       else
-        puts "Error added ssh key".red
+        puts "Error adding ssh key".red
       end
     else
       puts "ssh-agent is not running, cannot add key".red

data/lib/pygmy/amazee.rb

@@ -1,9 +1,18 @@
 require_relative 'docker_service'
+require 'colorize'
 
 module Pygmy
   class Amazee
     extend Pygmy::DockerService
 
+    def self.prefix
+      "amazeeio/"
+    end
+
+    def self.ignore_list
+      %w(none ssh-agent haproxy)
+    end
+
     def self.pull(image_name)
       puts "Pulling Docker Image #{Shellwords.escape(image_name)}".yellow
       pull_cmd = "docker pull #{Shellwords.escape(image_name)}"
@@ -26,11 +35,15 @@ module Pygmy
       amazee_containers = []
       containers.each do |container|
         # Selectively target amazeeio/* images.
-        if container.include?('amazeeio/')
+        if container.include?(self.prefix)
+          include_container = true
           # Filter out items which we don't want.
-          unless container.include?("none") || container.include?("ssh-agent") || container.include?("haproxy")
-            amazee_containers.push(container)
+          self.ignore_list.each do |item|
+            if container.include?(item)
+              include_container = false
+            end
           end
+          amazee_containers.push(container) if include_container
         end
       end
       amazee_containers
@@ -40,7 +53,7 @@ module Pygmy
       list = self.ls_cmd
       unless list.nil?
         list.each do |image|
-          pull(image)
+          self.pull(image)
         end
       end
     end

data/lib/pygmy/dnsmasq.rb

@@ -5,7 +5,7 @@ module Pygmy
     extend Pygmy::DockerService
 
     def self.image_name
-      'andyshinn/dnsmasq:2.75'
+      'andyshinn/dnsmasq:2.78'
     end
 
     def self.container_name
@@ -21,7 +21,7 @@ module Pygmy
     end
 
     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)} " \
+      "docker run -d -p 6053:53/tcp -p 6053:53/udp --name=#{Shellwords.escape(self.container_name)} " \
       "--cap-add=NET_ADMIN #{Shellwords.escape(self.image_name)} -A /#{Shellwords.escape(domain)}/#{Shellwords.escape(addr)}"
     end
   end

data/lib/pygmy/resolv_osx.rb

@@ -45,7 +45,7 @@ module Pygmy
     def self.resolver_contents; <<-EOS.gsub(/^      /, '')
       # Generated by amazeeio pygmy
       nameserver 127.0.0.1
-      port 53
+      port 6053
       EOS
     end
 

data/lib/pygmy/version.rb

@@ -1,4 +1,4 @@
 module Pygmy
-  VERSION = '0.9.10'
-  DATE    = '2018-11-19'
+  VERSION = '0.9.11'
+  DATE    = '2019-08-05'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pygmy
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Michael Schmid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2019-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize