cabal 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cecf9ec3105375d57486f38da51b9b6de9550c52
-  data.tar.gz: a7b000ae04cc6b66b6217d498f948e6e979b3e7a
+  metadata.gz: 1911f5bc4c94b10fa7b62a071ae93dfdcbd66eec
+  data.tar.gz: 6d118c1dbecf0394f7197ca0a1c350ef09b2ee73
 SHA512:
-  metadata.gz: 55952970940db72b4e2e2836bea5885b26f7339a63f556d573dadcb21027370b58d90a2efb9f0580f4d48c2f9be75899dea0979e711fb812e4d83c4df66e0387
-  data.tar.gz: 04d16fe8c29d116e9606c35df5fe942a50ffd841726dedf9086ed8bd7cf1bf15eaaf2d2caf99134035a8805f3cb3c408d4345818c7ca3a008f4847b879aea940
+  metadata.gz: 4777b7b6b3881852f0bdb365e35316f889e73e0ff86ba821d37fb8a178c401e87c56e6f3e6d3dc7ff3f5dfa0a497b6f22a9994597399000de31fdb5ae7abe8a9
+  data.tar.gz: e9a2f6cd1155d03a5c394b5ab2b6ff3d451fb1005d840325785cdfada262be305bffbcfb7ff7555e78ee8a8a1bc14bfff5886687a233134e56c6d68ee5fc5f99

data/lib/cabal/identity_manager.rb

@@ -0,0 +1,16 @@
+module Cabal
+  class IdentityManager
+    attr_reader :env
+
+    def start
+      @env = `ssh-agent`.
+        split(/(\;|\n)/).
+        select {|x| x =~ /^SSH_/}.
+        join(' ')
+    end
+
+    def stop
+      `#{env} ssh-agent -k`
+    end
+  end
+end

data/lib/cabal/ssh.rb

@@ -1,5 +1,6 @@
 require 'cabal/util'
 require 'cabal/client'
+require 'cabal/identity_manager'
 require 'tempfile'
 require 'securerandom'
 require 'uri'
@@ -26,10 +27,12 @@ module Cabal
 
       begin
         FileUtils.chmod(0700, key_file.path)
-        Kernel.system("ssh-add #{key_file.path} > /dev/null 2>&1")
-        Kernel.system("ssh -A #{ssh_signature}")
+        agent.start
+        Kernel.system("#{agent.env} ssh-add #{key_file.path} > /dev/null 2>&1")
+        Kernel.system("#{agent.env} ssh -A #{ssh_signature}")
       ensure
-        Kernel.system("ssh-add -D > /dev/null 2>&1")
+        Kernel.system("#{agent.env} ssh-add -D > /dev/null 2>&1")
+        agent.stop
         key_file.unlink
       end
     end
@@ -50,5 +53,9 @@ module Cabal
     def cluster
       @cluster
     end
+
+    def agent
+      @agent ||= Cabal::IdentityManager.new
+    end
   end
 end

data/lib/cabal/version.rb

@@ -1,3 +1,3 @@
 module Cabal
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cabal
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Dennis Walters
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -216,6 +216,7 @@ files:
 - lib/cabal/client.rb
 - lib/cabal/commands/key.rb
 - lib/cabal/commands/ssh.rb
+- lib/cabal/identity_manager.rb
 - lib/cabal/ssh.rb
 - lib/cabal/version.rb
 homepage: https://github.com/engineyard/cabal