git_swap 1.0.0 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a991bd670b579c23e29abdcc9a98b7400d85447f7f48508a628e15a4adff303c
-  data.tar.gz: ceb06a4bab1f1ccb5e337d68a35c58798d9bc5bfd6329e373e57dc9883b1586e
+  metadata.gz: 14e3a56f38c6ebe871a9e86ad054002bf11069f32966c9f9b61b133450644676
+  data.tar.gz: ff7aea19f7b05bcfe3c4edb7c856330b3fd620a66bd9fa8229e426dc66a98c9d
 SHA512:
-  metadata.gz: bcaea6bfa551bd6c58e8a1b93165046f7b77b121a73e0cb6c6b48cc5ea7d4d299fbc39d57bcdf34f3f88658de39d9ebd823047e20082d20f0d0a824eb2dceb9a
-  data.tar.gz: 4f11f20f56adbb64f8bc54589b38333444f00ed5cb0f2cba1849b54bc0e1d9b3656e4a97cc695898debb35b0b43d53e00d2254a316d7309cbd2edfca7262e885
+  metadata.gz: c593ebf136a376e28c75f834b5c20e374229695a0d2ef460df6f22879333a18cd5d614ad24a462f255faf3b1d2b1ad93e51bb5b725784bf29f2c1af9429885a0
+  data.tar.gz: 25f2a3060e9ff5930773c9be8423ca03f14b88e5149ead159a44aaf237b89513d39c282af7413403c3d0a727a48bf174199c1bf97a63f009c513f423f749f34a

data/bin/git-swap

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
 require_relative '../lib/git_swap'
 
+trap("SIGINT") { print "\n"; exit 130 }
+
 GitSwap::Swapper.new(ARGV).run

data/lib/git_swap/config.rb

@@ -52,6 +52,8 @@ module GitSwap
     end
 
     def edit!
+      # We are using the same message as git rebase -i
+      print "hint: Waiting for your editor to close the file..."
       system("#{ENV['EDITOR']} '#{File.expand_path('~/.gitswap')}'")
     end
 

data/lib/git_swap/swapper.rb

@@ -80,10 +80,11 @@ module GitSwap
 
     def set_ssh
       `git config #{git_config_flag} core.sshCommand "#{ssh_command}"`
+      # Include the --apple-use-keychain option to retrieve the passphrase
       if options.verbose?
-        `ssh-add #{ssh}`
+        `ssh-add --apple-use-keychain #{ssh}`
       else
-        `ssh-add #{ssh} 2>/dev/null`
+        `ssh-add --apple-use-keychain #{ssh} 2>/dev/null`
       end
     end
 

data/lib/git_swap/version.rb

@@ -1,3 +1,3 @@
 module GitSwap
-  VERSION = "1.0.0"
+  VERSION = "1.1.3" unless defined? VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_swap
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.3
 platform: ruby
 authors:
 - Randall Reed, Jr.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ homepage: https://www.github.com/randallreedjr/git_swap
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -114,8 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Swap between git profiles
 test_files: []