git_swap 1.1.1 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa985d9abb70dece419c959cce0583e8e7c5578436def2f52ca8ef9186e85d60
-  data.tar.gz: 7ce38a6447558c7e20db1055a4b000faeccf354bebb3014d59b8583399630950
+  metadata.gz: 416696c1a5c3756db61350abe7679e2f3c51d8d30f4c6d87c2e126101935b175
+  data.tar.gz: 746f54b056f15e5b84d1a2207dcd2ae5600cda769b0e64299ae33a03701af862
 SHA512:
-  metadata.gz: 0f014406560ce1775685e268e9930375c9c1c57c52ac7844d2ee2dfae80f202e34f5e8db373c890884b2b18819015a72f0aea285d304e9254f55d79b484b051a
-  data.tar.gz: 02135c1cb06530265ecb43aa9791989ab11e0a108301adb1db3981d9160857613530584739f708041d3527cfb8a56e1b81c3bba03d73a6219820c139ff587be8
+  metadata.gz: f90e005a4b18cf3ac01d0586c3f96545cb80a6651e06f7fb27cf509e92e3dc28e5670197ba676229fb7b797324a6d8b8051d47c992542a96dbff8db1155a1f38
+  data.tar.gz: 65b0526e9abdb9b97fe7427b1f953725a3e4425a4bb14fb712bc1338f8d60b1c3a106bd26e0c92ea1d1a4494d2bd5069970d1544aec62f3a1685dc5583f87c6b

data/lib/git_swap/config.rb

@@ -121,7 +121,8 @@ module GitSwap
     private
 
     def load!
-      # TODO: RCR - Handle missing or empty config file
+      # If configuration file hasn't been created yet, load an empty hash
+      return {} unless File.file?(File.expand_path('~/.gitswap'))
       YAML.load_file(File.expand_path('~/.gitswap')) || {}
     end
 

data/lib/git_swap/swapper.rb

@@ -1,11 +1,8 @@
 require_relative './version'
-require 'active_support/core_ext/module/delegation'
 
 module GitSwap
   class Swapper
     attr_reader :config, :options
-    delegate :usage?, :config?, :edit?, :list?, :version?, :global?, to: :options
-    delegate :profile, :name, :username, :email, :ssh, :ssh_command, :print_list, :configure!, :edit!, :valid_profile?, to: :config
 
     def initialize(args)
       raise ArgumentError unless args.is_a? Array
@@ -66,6 +63,20 @@ module GitSwap
       end
     end
 
+    # Use method_missing for delegation
+    # Original ActiveSupport version
+    # delegate :usage?, :config?, :edit?, :list?, :version?, :global?, to: :options
+    # delegate :profile, :name, :username, :email, :ssh, :ssh_command, :print_list, :configure!, :edit!, :valid_profile?, to: :config
+    def method_missing(method, *args)
+      if @options.respond_to?(method)
+        @options.send(method, *args)
+      elsif @config.respond_to?(method)
+        @config.send(method, *args)
+      else
+        super
+      end
+    end
+
     private
 
     def git_config_flag
@@ -80,10 +91,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.1.1" unless defined? VERSION
+  VERSION = "1.1.5" unless defined? VERSION
 end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: git_swap
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.5
 platform: ruby
 authors:
 - Randall Reed, Jr.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-12 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: 2.3.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: 2.3.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +85,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 +100,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Swap between git profiles
 test_files: []