vinz-clortho 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e824892bb1bc45ec04ca1320b0cbebe7438cdc9f
-  data.tar.gz: b5337b8ee3585da400042b7cbb57c65479680e3a
+  metadata.gz: 1c7d1dc9a67cbe8dbb7fed2576a513dbbf1893a2
+  data.tar.gz: 0ae8f1d61cce96605e507ea754a29174c8ae0f2d
 SHA512:
-  metadata.gz: 07751f3a4954589e3836f77e0bac528d4e2cd854683401770b9db6c288958b31ba24c6b1490eb6a0d1f70fb103f25bb2ac635188919ba859573af2baa16e4175
-  data.tar.gz: 595234d57b070c7007425f67cef93cd1a2eb2b6b14c02e2b6379e3f8c6ee206d51981804282812c9ff6bf9d04f46016df2de3ed6dbf8d740ea3abe82d3f69d03
+  metadata.gz: 1c45a032491881e39f991ccc4c74d6c365fba9b73d31c28b23e7b13f18401e99010055758f5616a52486bb401e2216ecfeee2309a07cf195b355fd89ae190ab3
+  data.tar.gz: a94adbb62af2e8dc09556b71459631e2f662f8fcd02007b6ab86dc9740c2d02b698191b7c2084d2ac9344e1142ff7e1eb228ac51fc1d1927d09a14ea9a3fea3c

data/README.md

@@ -15,13 +15,13 @@ sshkey_paths:
 ```
 See the [.git-authors](.git-authors) file in this repository as a full example.
 
-Vinz Clortho also requires the [Octokit](https://github.com/octokit/octokit.rb) rubygem for communicating with GitHub. You can install this via `gem install octokit`.
 
 ## Usage
-Run `git ssh-login (committer-initials)` to add the SSH key corresponding to the committer's initials. The key expiry is set to 12:30 PM if executed before 12:30 PM, 6:00 PM if executed after that but before 6:00 PM, or within 15 minutes if executed after 6:00 PM.
+
+Run `git ssh-login [committer-initials]` to add the SSH key corresponding to the committer's initials. If no committer initials are included, then all available keys will be added. The key expiry is set to 12:30 PM if executed before 12:30 PM, 6:00 PM if executed after that but before 6:00 PM, or within 15 minutes if executed after 6:00 PM.
 
 ```
-Usage: git ssh-login [options] (committer-initials)
+Usage: git ssh-login [options] [committer-initials]
 
     -h, --help                       Shows help
     -v, --version                    Returns version

data/lib/vinz/clortho.rb

@@ -1,4 +1,4 @@
 require 'vinz/clortho/version'
-require 'vinz/clortho/git_authors_manager'
+require 'vinz/clortho/ssh_key_path_manager'
 require 'vinz/clortho/ssh_setup'
 require 'vinz/clortho/github_key_uploader'

data/lib/vinz/clortho/github_key_uploader.rb

@@ -4,7 +4,7 @@ module Vinz
   module Clortho
     class GitHubKeyUploader
       def initialize(initials, username, password)
-        @manager = GitAuthorsManager.new
+        @manager = SSHKeyPathManager.new
         @initials = initials
         @username, @password = username, password
       end

data/lib/vinz/clortho/ssh_key_path_manager.rb

@@ -0,0 +1,62 @@
+require 'yaml'
+
+module Vinz
+  module Clortho
+    class UserNotFoundError < StandardError
+    end
+
+    class KeyPathEntry
+      attr_reader :initials, :path
+      def initialize(path, initials = nil)
+        @initials = initials
+        @path = path
+      end
+    end
+
+    class SSHKeyPathManager
+      attr_reader :key_paths
+
+      DEFAULT_KEY_PATH = '/Volumes/*/.ssh/id_rsa'
+
+      def initialize
+        @key_paths = if git_authors_file.nil?
+          Dir[DEFAULT_KEY_PATH].map { |path| KeyPathEntry.new(path) }
+        else
+          git_authors = YAML::load_file(git_authors_file)
+          git_authors['sshkey_paths'].map do |initials, path|
+            KeyPathEntry.new(path, initials)
+          end
+        end
+      end
+
+      def key_path_for(initials)
+        raise ArgumentError.new('Committer initials are required') unless initials
+        key_path = @key_paths.detect { |kp| kp.initials == initials }
+        if key_path.nil?
+          raise UserNotFoundError.new(user_not_found_msg)
+        else
+          key_path.path
+        end
+      end
+
+      private
+
+      def git_authors_file(current_dir = Dir.pwd)
+        @git_authors_file ||= begin
+          git_authors_location = File.join(current_dir, '.git-authors')
+          if File.exist?(git_authors_location)
+            git_authors_location
+          elsif current_dir == '/'
+            nil
+          else
+            git_authors_file(File.expand_path('..', current_dir))
+          end
+        end
+      end
+
+      def user_not_found_msg
+        "ERROR: Unable to find committer initials in .git-authors (check the \"sshkey_paths\" mapping for your initials)."
+      end
+    end
+  end
+end

data/lib/vinz/clortho/ssh_setup.rb

@@ -4,15 +4,19 @@ module Vinz
       attr_reader :key_expiry
 
       def initialize
-        @git_authors_mgr = GitAuthorsManager.new
+        @ssh_key_path_mgr = SSHKeyPathManager.new
       end
 
-      def login(initials)
+      def login(initials = nil)
         set_key_expiry
         key_ttl = @key_expiry.to_i - Time.now.to_i
-        key_path = @git_authors_mgr.key_path_for initials
-        raise Errno::ENOENT.new unless File.exist? key_path
-        ssh_add(key_ttl, key_path)
+        if initials.nil?
+          login_all key_ttl
+        else
+          key_path = @ssh_key_path_mgr.key_path_for initials
+          raise Errno::ENOENT.new unless File.exist? key_path
+          ssh_add(key_ttl, key_path)
+        end
       end
 
       def login_all(key_ttl = nil)
@@ -21,7 +25,8 @@ module Vinz
           key_ttl = @key_expiry.to_i - Time.now.to_i
         end
 
-        @git_authors_mgr.all_key_paths.values.each do |path|
+        @ssh_key_path_mgr.key_paths.each do |key_path|
+          path = key_path.path
           ssh_add(key_ttl, path) if File.exist?(path)
         end
       end
@@ -31,11 +36,11 @@ module Vinz
       end
 
       def usage_msg
-        committers_and_keypaths = @git_authors_mgr.all_key_paths.map do |committer_initials, keypath|
-          "\t#{committer_initials} : #{keypath}"
+        committers_and_keypaths = @ssh_key_path_mgr.key_paths.map do |key_path|
+          "\t#{key_path.initials} : #{key_path.path}"
         end
         msg = <<-MSG
-Usage: git ssh-login [options] (committer-initials)
+Usage: git ssh-login [options] [committer-initials]
 
 known committers:
 #{committers_and_keypaths.join("\n")}

data/lib/vinz/clortho/version.rb

@@ -1,5 +1,5 @@
 module Vinz
   module Clortho
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vinz-clortho
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Liam Morley
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -104,8 +104,8 @@ files:
 - exe/git-ssh-login-all
 - exe/git-ssh-login-install-hook
 - lib/vinz/clortho.rb
-- lib/vinz/clortho/git_authors_manager.rb
 - lib/vinz/clortho/github_key_uploader.rb
+- lib/vinz/clortho/ssh_key_path_manager.rb
 - lib/vinz/clortho/ssh_setup.rb
 - lib/vinz/clortho/version.rb
 - vinz-clortho.gemspec

data/lib/vinz/clortho/git_authors_manager.rb

@@ -1,40 +0,0 @@
-require 'yaml'
-
-module Vinz
-  module Clortho
-    class UserNotFoundError < StandardError
-    end
-
-    class GitAuthorsManager
-      def initialize
-        @git_authors = YAML::load_file(git_authors_file)
-      end
-
-      def all_key_paths
-        @git_authors['sshkey_paths']
-      end
-
-      def key_path_for(initials)
-        raise ArgumentError.new('Committer initials are required') unless initials
-        @git_authors['sshkey_paths'][initials] or raise UserNotFoundError.new(user_not_found_msg)
-      end
-
-      private
-
-      def git_authors_file(current_dir = Dir.pwd)
-        git_authors_location = File.join(current_dir, '.git-authors')
-        if File.exist?(git_authors_location)
-          git_authors_location
-        elsif current_dir == '/'
-          raise Errno::ENOENT.new
-        else
-          git_authors_file(File.expand_path('..', current_dir))
-        end
-      end
-
-      def user_not_found_msg
-        "ERROR: Unable to find committer initials in mapping (check the \"sshkey_paths\" mapping for your initials)."
-      end
-    end
-  end
-end