pygmy 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 041187beda35db4ae502da0b791588e1e90f21e7
-  data.tar.gz: b63152efa04c1034f9709b64fa63c1003e507998
+  metadata.gz: f9dc9f80151481281c05185a8dd4caba35a341a3
+  data.tar.gz: 32ab377238a95816aa332fc0208e33f30b5db1da
 SHA512:
-  metadata.gz: 23bc76d456d32944ef1127033d9c3a326492ef1b8dc4d68c14c09ee7cbdd055bdeceee3b6fe389259eb02072ee3887ad9152df9aef9702285ef3bd897d377a01
-  data.tar.gz: cfad0e79a67d8da01487f9f742d0b78e09a7a9353fe229bd60e16e730923e4482bd8095ae70068914eba866deaed1e0b059196eecb8be9e1a601b2f3b8f3ca25
+  metadata.gz: 1fb25727ecc36665f1b77a4b3bf80bd0a8b47b3ed5a25791586c2ccc714097a25859eb5e02ef2e54b3e2706dd667d3493d02b1f0176131634a00e5b31c41ee8f
+  data.tar.gz: 9ceeddaa24504cba2d8ec6b8e9dbd2ec8ccf924818d893e7cf8eeebd723885bf796366f6079a0716ca44a27d652bfedc007c59f8dd9d737c2807ed69edaf2597

data/bin/pygmy

@@ -50,7 +50,7 @@ class PygmyBin < Thor
 
     > $ pygmy addkey [~/.ssh/other_key]
   LONGDESC
-  def addkey(key = "$HOME/.ssh/id_rsa")
+  def addkey(key = "#{Dir.home}/.ssh/id_rsa")
     add_ssh_key(key)
   end
 
@@ -105,17 +105,17 @@ class PygmyBin < Thor
       puts "Error starting ssh-agent".red
     end
 
-    if Pygmy::SshAgentAddKey.add_ssh_key
-      puts "Successfully injected ssh key".green
-    else
-      puts "Error injected ssh key".red
-    end
-
     if Pygmy::Resolv.configure
       puts "Successfully configured local resolver".green
     else
       puts "Error configuring local resolver".red
     end
+
+    if Pygmy::SshAgentAddKey.add_ssh_key
+      puts "Successfully injected ssh key".green
+    else
+      puts "Error injected ssh key".red
+    end
   end
 
   def exec_status(_options)

data/lib/pygmy/linux.rb

@@ -1,4 +1,4 @@
-module Dory
+module Pygmy
   module Linux
     def self.bash(command)
       system("bash -c '#{command}'")

data/lib/pygmy/ssh_agent_add_key.rb

@@ -8,13 +8,18 @@ module Pygmy
       'amazeeio-ssh-agent-add-key'
     end
 
-    def self.add_ssh_key(key = "$HOME/.ssh/id_rsa")
-      system("docker run --rm -it " \
-      "--volume=#{key}:/#{key} " \
-      "--volumes-from=amazeeio-ssh-agent " \
-      "--name=#{Shellwords.escape(self.container_name)} " \
-      "#{Shellwords.escape(self.image_name)} " \
-      "ssh-add #{key}")
+    def self.add_ssh_key(key = "#{Dir.home}/.ssh/id_rsa")
+      if File.file?(key)
+        system("docker run --rm -it " \
+        "--volume=#{key}:/#{key} " \
+        "--volumes-from=amazeeio-ssh-agent " \
+        "--name=#{Shellwords.escape(self.container_name)} " \
+        "#{Shellwords.escape(self.image_name)} " \
+        "ssh-add #{key}")
+      else
+        puts "ssh key: #{key}, does not exist, ignoring...".yellow
+      end
+
     end
   end
 end

data/lib/pygmy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pygmy
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Michael Schmid