pygmy 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9dc9f80151481281c05185a8dd4caba35a341a3
-  data.tar.gz: 32ab377238a95816aa332fc0208e33f30b5db1da
+  metadata.gz: a01f3f5b33da9753d56df7bb251645e1cf0cc961
+  data.tar.gz: a9e466393f6eaeb238e55f6ee9716dd01e7dd6f2
 SHA512:
-  metadata.gz: 1fb25727ecc36665f1b77a4b3bf80bd0a8b47b3ed5a25791586c2ccc714097a25859eb5e02ef2e54b3e2706dd667d3493d02b1f0176131634a00e5b31c41ee8f
-  data.tar.gz: 9ceeddaa24504cba2d8ec6b8e9dbd2ec8ccf924818d893e7cf8eeebd723885bf796366f6079a0716ca44a27d652bfedc007c59f8dd9d737c2807ed69edaf2597
+  metadata.gz: 1902a2367c478394ef2b162aace8a8a5dc2c36a0e1ca20c4e46b066949742ee5b34e7e5f5e6924efe2018ba249a3ee0b9b4c65840b5aba6daab54fa001d119e5
+  data.tar.gz: c032329491620456068a6fa59f127b325963dcb60d323626ec5662e4e153d3c385a3aea1a632997c9e02ae4d5fe33acc5f09e317cabe7c8dff49d490312743b3

data/bin/pygmy

@@ -30,16 +30,26 @@ class PygmyBin < Thor
     exec_up(options)
   end
 
-  desc 'down', 'Stop all pygmy services'
+  desc 'stop', 'Stop all pygmy services'
   long_desc <<-LONGDESC
     Stops all pygmy services.  Can optionally pass [-d|--destroy]
     to destroy the containers when they stop.
 
-    > $ pygmy down [-d|--destroy]
+    > $ pygmy stop [-d|--destroy]
+  LONGDESC
+  option :destroy, type: :boolean, aliases: '-d', default: false
+  def stop
+    exec_stop(options)
+  end
+
+  desc 'down', 'Stop and destroy all pygmy services'
+  long_desc <<-LONGDESC
+    Stops all pygmy services and destroy the containers when they stop.
+
+    > $ pygmy down
   LONGDESC
-  option :destroy, type: :boolean, aliases: 'd', default: false
   def down
-    exec_down(options)
+    exec_stop({:destroy => true})
   end
 
   desc 'addkey [~/.ssh/id_rsa]', 'Add additional ssh-key'
@@ -61,13 +71,13 @@ class PygmyBin < Thor
 
   desc 'restart', 'Stop and restart all pygmy services'
   long_desc <<-LONGDESC
-    Stop and restart pygmy services (dnsmasq, resolv)
+    Stop and restart pygmy services (dnsmasq, resolv, haproxy, ssh-agent)
 
     > $ pygmy restart [-d|--destroy]
   LONGDESC
-  option :destroy, type: :boolean, aliases: 'd', default: false
+  option :destroy, type: :boolean, aliases: '-d', default: false
   def restart
-    exec_down(options)
+    exec_stop(options)
     exec_up(options)
   end
 
@@ -126,23 +136,25 @@ class PygmyBin < Thor
       puts "[*] Dnsmasq is not running".red
     end
 
-    if Pygmy::SshAgent.running?
-      puts "[*] ssh-agent: Running as docker container #{Pygmy::Haproxy.container_name}".green
+    if Pygmy::Haproxy.running?
+      puts "[*] Haproxy: Running as docker container #{Pygmy::Haproxy.container_name}".green
     else
-      puts "[*] ssh-agent is not running".red
+      puts "[*] Haproxy is not running".red
     end
 
-    if Pygmy::Dnsmasq.running?
-      puts "[*] Dnsmasq: Running as docker container #{Pygmy::Dnsmasq.container_name}".green
+    if Pygmy::Resolv.has_our_nameserver?
+      puts "[*] Resolv is properly configured".green
     else
-      puts "[*] Dnsmasq is not running".red
+      puts "[*] Resolv is not configured".red
     end
 
-    if Pygmy::Resolv.has_our_nameserver?
-      puts "[*] Resolv: configured with #{Pygmy::Resolv.file_nameserver_line}".green
+    if Pygmy::SshAgent.running?
+      puts "[*] ssh-agent: Running as docker container #{Pygmy::SshAgent.container_name}, loaded keys:".green
+      Pygmy::SshAgentAddKey.show_ssh_keys
     else
-      puts "[*] Resolv is not configured".red
+      puts "[*] ssh-agent is not running".red
     end
+
   end
 
 
@@ -160,11 +172,11 @@ class PygmyBin < Thor
 
   end
 
-  def exec_down(options)
+  def exec_stop(options)
     if Pygmy::Resolv.clean
-      puts "nameserver removed from resolv file".green
+      puts "Resolver removed".green
     else
-      puts "Unable to remove nameserver from resolv file".red
+      puts "Unable to remove resolver".red
     end
 
     if Pygmy::Dnsmasq.stop
@@ -211,7 +223,6 @@ end
 
 aliases = {
   'start' => 'up',
-  'stop'  => 'down',
 }
 
 if !ARGV.empty? && %w[-v --version].include?(ARGV.first)

data/lib/pygmy/docker_service.rb

@@ -41,7 +41,7 @@ module Pygmy
     end
 
     def stop(container_name = self.container_name)
-      Sh.run_command("docker kill #{Shellwords.escape(container_name)}") if self.running?
+      Sh.run_command("docker stop -t 1 #{Shellwords.escape(container_name)}") if self.running?
       !self.running?
     end
 

data/lib/pygmy/haproxy.rb

@@ -12,7 +12,7 @@ module Pygmy
       'amazeeio-haproxy'
     end
 
-    def self.run_cmd()
+    def self.run_cmd
       "docker run -d " \
       "-p 80:80 -p 443:443 " \
       "--volume=/var/run/docker.sock:/tmp/docker.sock " \

data/lib/pygmy/resolv.rb

@@ -1,4 +1,6 @@
 require 'colorize'
+require 'tempfile'
+require 'pathname'
 
 module Pygmy
   module Resolv
@@ -13,7 +15,7 @@ module Pygmy
     end
 
     def self.file_comment
-      '# added by pygmy'
+      '# added by amazee.io pygmy'
     end
 
     def self.nameserver
@@ -30,7 +32,7 @@ module Pygmy
 
     def self.resolv_file
       if Linux.ubuntu?
-        return self.ubuntu_resolv_file if Linux.ubuntu?
+        return self.ubuntu_resolv_file
       elsif Linux.fedora? || Linux.arch? || File.exist?(self.common_resolv_file)
         return self.common_resolv_file
       else
@@ -40,7 +42,11 @@ module Pygmy
       end
     end
 
+
     def self.configure
+      if Linux.osx?
+        return ResolvOsx.create_resolver?
+      end
       # we want to be the first nameserver in the list for performance reasons
       # we only want to add the nameserver if it isn't already there
       prev_conts = self.resolv_file_contents
@@ -57,6 +63,9 @@ module Pygmy
     end
 
     def self.clean
+      if Linux.osx?
+        return ResolvOsx.clean?
+      end
       prev_conts = self.resolv_file_contents
       if self.contents_has_our_nameserver?(prev_conts)
         prev_conts.gsub!(/#{Regexp.escape(self.nameserver_contents + "\n")}/, '')
@@ -77,6 +86,9 @@ module Pygmy
     end
 
     def self.has_our_nameserver?
+      if Linux.osx?
+        return ResolvOsx.resolver_file_exists?
+      end
       self.contents_has_our_nameserver?(self.resolv_file_contents)
     end
 

data/lib/pygmy/resolv_osx.rb

@@ -0,0 +1,52 @@
+require 'colorize'
+require 'tempfile'
+require 'pathname'
+
+module Pygmy
+  module ResolvOsx
+    def self.resolver_dir
+      Pathname("/etc/resolver")
+    end
+
+    def self.resolver_file
+      "/etc/resolver/docker.amazee.io"
+    end
+
+    def self.create_resolver?
+      puts "setting up DNS resolution, this may require sudo".green
+      unless self.resolver_dir.directory?
+        self.system!("creating #{self.resolver_dir}", "sudo", "mkdir", "-p", self.resolver_dir)
+      end
+      Tempfile.open('amazeeio_pygmy-dnsmasq') do |f|
+        f.write(self.resolver_contents)
+        f.close
+        self.system!("creating #{self.resolver_file}", "sudo", "cp", f.path, self.resolver_file)
+        self.system!("creating #{self.resolver_file}", "sudo", "chmod", "644", self.resolver_file)
+      end
+      self.system!("restarting mDNSResponder", "sudo", "killall", "mDNSResponder")
+    end
+
+    def self.clean?
+      self.system!("removing resolverfile", "sudo", "rm", "-f", self.resolver_file)
+    end
+
+    def self.system!(step, *args)
+      system(*args.map(&:to_s)) || raise("Error with the #{name} daemon during #{step}")
+    end
+
+    def self.resolver_contents; <<-EOS.gsub(/^      /, '')
+      # Generated by amazeeio pygmy
+      nameserver 127.0.0.1
+      port 53
+      EOS
+    end
+
+    def self.resolver_file_contents
+      File.read(self.resolver_file) unless !File.file?(self.resolver_file)
+    end
+
+    def self.resolver_file_exists?
+      (self.resolver_file_contents == self.resolver_contents)
+    end
+  end
+end

data/lib/pygmy/ssh_agent.rb

@@ -12,7 +12,7 @@ module Pygmy
       'amazeeio-ssh-agent'
     end
 
-    def self.run_cmd()
+    def self.run_cmd
       "docker run -d " \
       "--restart=always " \
       "--name=#{Shellwords.escape(self.container_name)} " \

data/lib/pygmy/ssh_agent_add_key.rb

@@ -18,8 +18,17 @@ module Pygmy
         "ssh-add #{key}")
       else
         puts "ssh key: #{key}, does not exist, ignoring...".yellow
+        return false
       end
+    end
 
+    def self.show_ssh_keys
+      system("docker run --rm -it " \
+      "--volumes-from=amazeeio-ssh-agent " \
+      "--name=#{Shellwords.escape(self.container_name)} " \
+      "#{Shellwords.escape(self.image_name)} " \
+      "ssh-add -l")
     end
+
   end
 end

data/lib/pygmy/version.rb

@@ -1,4 +1,4 @@
 module Pygmy
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
   DATE    = '2016-04-30'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pygmy
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Michael Schmid
@@ -125,9 +125,9 @@ files:
 - lib/pygmy/dnsmasq.rb
 - lib/pygmy/docker_service.rb
 - lib/pygmy/haproxy.rb
-- lib/pygmy/inst_vars_to_hash.rb
 - lib/pygmy/linux.rb
 - lib/pygmy/resolv.rb
+- lib/pygmy/resolv_osx.rb
 - lib/pygmy/shell.rb
 - lib/pygmy/ssh_agent.rb
 - lib/pygmy/ssh_agent_add_key.rb

data/lib/pygmy/inst_vars_to_hash.rb

@@ -1,33 +0,0 @@
-module InstVarsToHash
-  def to_s
-    to_h.to_s
-  end
-
-  def to_h
-    retval = {}
-    instance_variables.each do |iv|
-      retval[iv.to_s.delete('@').to_sym] = elem_to_h(instance_variable_get(iv))
-    end
-    retval
-  end
-
-  private
-
-  def expandable_classes
-    [ InstVarsToHash ]
-  end
-
-  def expandable_to_hash(klass)
-    expandable_classes.any?{ |k| klass == k || klass < k }
-  end
-
-  def elem_to_h(elem)
-    if elem.class == Array
-      elem.map { |el| elem_to_h(el) }
-    elsif expandable_to_hash(elem.class)
-      elem.to_h
-    else
-      elem
-    end
-  end
-end