vinz-clortho 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c7d1dc9a67cbe8dbb7fed2576a513dbbf1893a2
-  data.tar.gz: 0ae8f1d61cce96605e507ea754a29174c8ae0f2d
+  metadata.gz: 704ac9fcd6af0c2f23318b8dbe9373a9019abf68
+  data.tar.gz: ba18d38827dc852d1369065a7278b2a9a96459cb
 SHA512:
-  metadata.gz: 1c45a032491881e39f991ccc4c74d6c365fba9b73d31c28b23e7b13f18401e99010055758f5616a52486bb401e2216ecfeee2309a07cf195b355fd89ae190ab3
-  data.tar.gz: a94adbb62af2e8dc09556b71459631e2f662f8fcd02007b6ab86dc9740c2d02b698191b7c2084d2ac9344e1142ff7e1eb228ac51fc1d1927d09a14ea9a3fea3c
+  metadata.gz: b7f57270367f369d3512bec73121b92d60162cd698f8d226ecfb9433c31e32edf6daeed3c673a634504c45299fb85695ffcea2a810531184c2987867dbd7b6dd
+  data.tar.gz: eda626e590e9bc29f90cf57a9a51b117895148fe04a012069760b94323524e72b62f160aff8aa9ca62c695a856e74eaae6d912729ed05ee281f2f1cb96fc84a1

data/Guardfile

@@ -0,0 +1,6 @@
+guard :minitest do
+  # with Minitest::Unit
+  watch(%r{^test/(.*)\/?(.*)_test\.rb$})
+  watch(%r{^lib/(.*/)?([^/]+)\.rb$})     { |m| "test/#{m[1]}#{m[2]}_test.rb" }
+  watch(%r{^test/test_helper\.rb$})      { 'test' }
+end

data/README.md

@@ -1,4 +1,4 @@
-# Vinz Clortho
+# Vinz Clortho [![Build Status](https://travis-ci.org/pivotal/vinz-clortho.svg?branch=master)](https://travis-ci.org/pivotal/vinz-clortho)
 
 <img src="http://i.giphy.com/Sf0xvEgdWyraU.gif" alt="Vinz Clortho" width="100%">
 
@@ -15,6 +15,11 @@ sshkey_paths:
 ```
 See the [.git-authors](.git-authors) file in this repository as a full example.
 
+## Installation
+
+```
+gem install vinz-clortho
+```
 
 ## Usage
 
@@ -28,4 +33,4 @@ Usage: git ssh-login [options] [committer-initials]
         --add-to-github              Adds a public key to GitHub
 ```
 
-You can also use `git push-authenticated [args]` to authenticate all existing keys for a period of 5 seconds and then push immediately. It takes the same arguments as `git push` (and just passes them on).
+You can also use `git push-authenticated [args]` to authenticate all existing keys for a period of 5 seconds and then push immediately. It takes the same arguments as `git push` (and just passes them on).

data/exe/git-push-authenticated

@@ -1,10 +1,4 @@
 #!/usr/bin/env ruby
 require 'vinz/clortho'
 
-begin
-  Vinz::Clortho::SSHSetup.new.login_all(5)
-  `git push #{ARGV.join ' '}`
-rescue => e
-  puts e.message
-  exit 1
-end
+Vinz::Clortho::Cli::PushAuthenticated.new.perform(*ARGV)

data/exe/git-ssh-login

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 require 'optparse'
-require 'io/console'
 require 'vinz/clortho'
 
 begin
   ssh_setup = Vinz::Clortho::SSHSetup.new
   initials = ARGV[0]
+  sshlogin_cli = Vinz::Clortho::Cli::SSHLogin.new
 
   parser = OptionParser.new do |opts|
     opts.banner = ssh_setup.usage_msg
@@ -18,22 +18,15 @@ begin
       puts Vinz::Clortho::VERSION
       exit 0
     end
-    opts.on('--add-to-github', 'Adds a public key to GitHub') do |v|
-      print "Enter your username: "
-      username = gets.chomp
-      print "Enter your password: "
-      password = STDIN.noecho(&:gets).chomp
-      puts # because previous line of code doesn't insert newline
-      uploader = Vinz::Clortho::GitHubKeyUploader.new(initials, username, password)
-      print "Enter title for key: "
-      title = gets.chomp
-      uploader.upload title
+    opts.on('--add-to-github', 'Adds a public key to Github') do |v|
+      sshlogin_cli.add_to_github(initials)
       exit 0
     end
   end
 
   parser.parse!
-  ssh_setup.login(initials)
+  sshlogin_cli.perform(initials)
+
 rescue OptionParser::InvalidOption => e
   puts parser
   exit 1
@@ -43,4 +36,3 @@ rescue => e
   exit (e.is_a? Vinz::Clortho::UserNotFoundError) ? 2 : 1
 end
 
-puts "Key will expire at #{ssh_setup.key_expiry}"

data/lib/vinz/clortho.rb

@@ -2,3 +2,7 @@ require 'vinz/clortho/version'
 require 'vinz/clortho/ssh_key_path_manager'
 require 'vinz/clortho/ssh_setup'
 require 'vinz/clortho/github_key_uploader'
+require 'vinz/clortho/cli/push_authenticated'
+require 'vinz/clortho/cli/ssh_login'
+require 'vinz/clortho/github_client_wrapper'
+require 'vinz/clortho/file_wrapper'

data/lib/vinz/clortho/cli.rb

@@ -0,0 +1,6 @@
+module Vinz
+  module Clortho
+    module Cli
+    end
+  end
+end

data/lib/vinz/clortho/cli/push_authenticated.rb

@@ -0,0 +1,18 @@
+module Vinz
+  module Clortho
+    module Cli
+
+      class PushAuthenticated
+        def perform *args
+          SSHSetup.new.login_all(5)
+          kernel.system "git push #{args.join(' ')}"
+        end
+
+        def kernel
+          Kernel
+        end
+      end
+
+    end
+  end
+end

data/lib/vinz/clortho/cli/ssh_login.rb

@@ -0,0 +1,32 @@
+require 'io/console'
+
+module Vinz
+  module Clortho
+    module Cli
+      class SSHLogin
+        def kernel
+          Kernel
+        end
+        
+        def perform(initials)
+          setup = SSHSetup.new
+          setup.login(initials)
+          kernel.puts "Key will expire at #{setup.key_expiry}"
+        end
+
+        def add_to_github initials
+          kernel.print "Enter your username: "
+          username = kernel.gets.chomp
+          kernel.print "Enter your password: "
+          password = STDIN.noecho(&:gets).chomp
+
+          kernel.puts # because previous line of code doesn't insert newline
+          uploader = Vinz::Clortho::GithubKeyUploader.new(initials, username, password)
+          kernel.print "Enter title for key: "
+          title = kernel.gets.chomp
+          uploader.upload title
+        end
+      end
+    end
+  end
+end

data/lib/vinz/clortho/file_wrapper.rb

@@ -0,0 +1,19 @@
+module Vinz
+  module Clortho
+    class FileWrapper
+
+      def initialize(path, mode)
+        @file = File.new(path, mode)
+      end
+
+      def self.open(path, mode)
+        new(path, mode)
+      end
+
+      def read
+        @file.read
+      end
+
+    end
+  end
+end

data/lib/vinz/clortho/github_client_wrapper.rb

@@ -0,0 +1,13 @@
+module Vinz
+  module Clortho
+    class GithubClientWrapper
+      def initialize(options = {})
+        @client = Octokit::Client.new(login: options[:login], password: options[:password])
+      end
+
+      def add_key(title, key)
+        @client.add_key(title, key)
+      end
+    end
+  end
+end

data/lib/vinz/clortho/github_key_uploader.rb

@@ -2,7 +2,7 @@ require 'octokit'
 
 module Vinz
   module Clortho
-    class GitHubKeyUploader
+    class GithubKeyUploader
       def initialize(initials, username, password)
         @manager = SSHKeyPathManager.new
         @initials = initials
@@ -10,14 +10,19 @@ module Vinz
       end
 
       def upload(title)
-        key = File.open("#{@manager.key_path_for(@initials)}.pub", "r").read
+        key = file.read
         client.add_key(title, key)
       end
 
       private
+
       def client
-        @client ||= Octokit::Client.new(login: @username, password: @password)
+        @client ||= GithubClientWrapper.new(login: @username, password: @password)
+      end
+
+      def file
+        @file ||= FileWrapper.open("#{@manager.key_path_for(@initials)}.pub", "r")
       end
     end
   end
-end
+end

data/lib/vinz/clortho/ssh_key_path_manager.rb

@@ -16,15 +16,19 @@ module Vinz
     class SSHKeyPathManager
       attr_reader :key_paths
 
-      DEFAULT_KEY_PATH = '/Volumes/*/.ssh/id_rsa'
+      DEFAULT_KEYS = lambda { Dir['/Volumes/*/.ssh/id_rsa'].map { |path| KeyPathEntry.new(path) } }
 
       def initialize
         @key_paths = if git_authors_file.nil?
-          Dir[DEFAULT_KEY_PATH].map { |path| KeyPathEntry.new(path) }
+          DEFAULT_KEYS.call
         else
           git_authors = YAML::load_file(git_authors_file)
-          git_authors['sshkey_paths'].map do |initials, path|
-            KeyPathEntry.new(path, initials)
+          if git_authors.has_key? 'sshkey_paths'
+            git_authors['sshkey_paths'].map do |initials, path|
+              KeyPathEntry.new(path, initials)
+            end
+          else
+            DEFAULT_KEYS.call
           end
         end
       end

data/lib/vinz/clortho/ssh_setup.rb

@@ -1,5 +1,8 @@
 module Vinz
   module Clortho
+    class UnableToLoginError < StandardError
+    end
+
     class SSHSetup
       attr_reader :key_expiry
 
@@ -14,7 +17,6 @@ module Vinz
           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
@@ -25,6 +27,8 @@ module Vinz
           key_ttl = @key_expiry.to_i - Time.now.to_i
         end
 
+        raise UnableToLoginError.new('no key paths available') unless @ssh_key_path_mgr.key_paths.any?
+
         @ssh_key_path_mgr.key_paths.each do |key_path|
           path = key_path.path
           ssh_add(key_ttl, path) if File.exist?(path)
@@ -32,6 +36,7 @@ module Vinz
       end
 
       def ssh_add(key_ttl, key_path)
+        raise UnableToLoginError.new(Errno::ENOENT.new) unless File.exist? key_path
         `ssh-add -t #{key_ttl} #{key_path}`
       end
 

data/lib/vinz/clortho/version.rb

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

data/vinz-clortho.gemspec

@@ -21,7 +21,11 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'octokit', '~> 4.1.1'
 
   spec.add_development_dependency 'bundler', '~> 1.10'
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-minitest'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'minitest'
+  # spec.add_development_dependency 'minitest-reporters'
+  spec.add_development_dependency 'webmock'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vinz-clortho
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Liam Morley
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -39,6 +39,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +109,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - lmorley@pivotal.io
@@ -96,6 +138,7 @@ files:
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
+- Guardfile
 - LICENSE.md
 - README.md
 - Rakefile
@@ -104,6 +147,11 @@ files:
 - exe/git-ssh-login-all
 - exe/git-ssh-login-install-hook
 - lib/vinz/clortho.rb
+- lib/vinz/clortho/cli.rb
+- lib/vinz/clortho/cli/push_authenticated.rb
+- lib/vinz/clortho/cli/ssh_login.rb
+- lib/vinz/clortho/file_wrapper.rb
+- lib/vinz/clortho/github_client_wrapper.rb
 - lib/vinz/clortho/github_key_uploader.rb
 - lib/vinz/clortho/ssh_key_path_manager.rb
 - lib/vinz/clortho/ssh_setup.rb
@@ -129,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Git plugin for managing SSH authentication