ssh-locate 0.1.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: cc7830c637948887cfa9eede807ab7711c35a59c01639dacfe5a91f63ac0b741
+  data.tar.gz: 46d307a723df4ba12ad17e15281025e9267f702c18d082fbaab955de8206861c
+SHA512:
+  metadata.gz: bf11790093cf5c3b403970686e605c4955768fbca8a76bb1f181f99a2e634a672cff9f433372c228729a5157aa4c1eee3ccd3131d6a1618a4f0aae791460b435
+  data.tar.gz: 705054a24018b873d254c51ae650a167381133c5c0e68f4f4d52f2c66dc2eaf88a3ec9c3cb2b698532bd916e297886984b34258612490b1472d920544ca30675

data/.travis.yml

@@ -1,2 +1,4 @@
-rvm: 1.9.2
+rvm:
+  - 2.6.3
+  
   

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec
 
@@ -8,7 +8,8 @@ group :dev do
   gem "rb-inotify"
   gem "libnotify"
   gem "cucumber"
-  gem "aruba", git: "git://github.com/ameuret/aruba.git"
+  gem "aruba"
   gem "guard-cucumber"
+  gem "rspec-expectations"
 end
 

data/README.md

@@ -13,7 +13,9 @@ Features
     SSH_AGENT_PID=12427; export SSH_AGENT_PID;
     echo Agent pid 12427;
 ```
-  
+
+  - supports the Fish shell
+
 Installation
 ------------
   
@@ -31,6 +33,14 @@ In a later shell (or any process running for the user who owns the agent):
     $ eval `ssh-locate`
     Agent pid 13457
 
+Fish startup
+------------
+
+You can launch and activate an agent at startup by adding this to your config.fish:
+
+    ssh-agent -a /tmp/arnaud
+    source (ssh-locate|psub -f)
+
 Caveat
 ------
 

data/features/agent-ids.feature

@@ -5,6 +5,7 @@ Feature: Agent IDs
   
   Scenario: Locate a running agent
     Given an ssh agent has been launched without parameters
+    Given the user's shell is Bash
     When I run `ssh-locate`
     Then the output should contain "SSH_AUTH_SOCK="
     And the output should contain "export SSH_AUTH_SOCK;"
@@ -20,6 +21,7 @@ Feature: Agent IDs
     
   Scenario: Locate an agent that shows its socket
     Given an ssh agent has been launched with a specific socket
+    Given the user's shell is Bash
     When I run `ssh-locate`
     Then the output should contain "SSH_AUTH_SOCK="
     And the output should contain "export SSH_AUTH_SOCK;"
@@ -43,3 +45,13 @@ Feature: Agent IDs
     And no ssh agent is running for me
     When I run `ssh-locate`
     Then the output should contain "no agent found"
+
+  Scenario: Support Fish
+    Given an ssh agent has been launched with a specific socket
+    Given the user's shell is Fish
+    When I run `ssh-locate`
+    Then the output should contain "set -x SSH_AUTH_SOCK"
+    And the output should contain "set -x SSH_AGENT_PID"
+    And the output should contain the correct agent PID
+    And the output should contain the correct agent socket
+    

data/features/step_definitions/agent-ids.rb

@@ -29,7 +29,7 @@ Given /^no ssh agent is running for me$/ do
 end
 
 Then /^the output should be empty$/ do
-  assert_exact_output('', all_output)
+  expect(all_output).to be_empty
 end
 
 Then /^the output should contain the correct agent PID$/ do
@@ -39,3 +39,15 @@ end
 Then /^the output should contain the correct agent socket$/ do
   assert_partial_output( @agentSocket.to_s, all_output )
 end
+
+Given("the user's shell is Fish") do
+  pending "Should check the actual parent process. Not just the default shell setting."
+  # passwdEntry = `getent passwd #{ENV['USER']}`
+  # expect(passwdEntry).to match(/fish$/)
+end
+
+Given("the user's shell is Bash") do
+  pending "Should check the actual parent process. Not just the default shell setting."
+  # passwdEntry = `getent passwd #{ENV['USER']}`
+  # expect(passwdEntry).to match(/fish$/)
+end

data/lib/net/ssh/locate.rb

@@ -15,12 +15,31 @@ module Net
         
         def print_shell_commands
           return unless @scanner.found?
-          print "SSH_AUTH_SOCK=#{@scanner.agentSocket}; "
-          puts "export SSH_AUTH_SOCK;"
-          print "SSH_AGENT_PID=#{@scanner.agentPID}; "
-          puts "export SSH_AGENT_PID;"
-          puts "echo Agent pid #{@scanner.agentPID};"
+          if usingFish?
+            fishOutput
+          else
+            bashOutput
+          end
         end
+
+        private
+          def usingFish?
+            passwdEntry = `getent passwd #{ENV['USER']}`
+            passwdEntry =~ /fish$/
+          end
+
+          def bashOutput
+            print "SSH_AUTH_SOCK=#{@scanner.agentSocket};"
+            puts "export SSH_AUTH_SOCK;"
+            print "SSH_AGENT_PID=#{@scanner.agentPID};"
+            puts "export SSH_AGENT_PID;"
+            puts "echo Agent pid #{@scanner.agentPID};"
+          end          
+
+          def fishOutput
+            puts "set -x SSH_AUTH_SOCK #{@scanner.agentSocket}"
+            puts "set -x SSH_AGENT_PID #{@scanner.agentPID}"
+          end          
       end
   
       class Scanner

data/lib/net/ssh/locate/version.rb

@@ -2,7 +2,7 @@ module Net
   module SSH
     module Locate
       # Honoring http://semver.org/
-      VERSION = "0.1.0"
+      VERSION = "0.3.0"
     end
   end
 end

metadata

@@ -1,38 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ssh-locate
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Arnaud Meuret
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-07 00:00:00.000000000Z
+date: 2019-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable
-  requirement: &72542240 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72542240
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &72541570 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72541570
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A CLI tool and its associated Ruby library that help you locate and reconnect
   to a running SSH agent. Useful in automation scenarios where multiple processes
   must repeatedly open SSH connections leveraging a one-time authentication pass
@@ -43,8 +48,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - README.md
@@ -59,26 +64,28 @@ files:
 - ssh-locate.gemspec
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: ssh-locate
-rubygems_version: 1.8.11
+rubygems_version: 3.0.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A tool (+ a Ruby lib) to locate a running SSH agent
-test_files: []
+test_files:
+- features/agent-ids.feature
+- features/step_definitions/agent-ids.rb
+- features/support/env.rb
+- features/support/hooks.rb