github-auth 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ed96df336ef90a6312aace8d6c3e2aa33be4bbe
-  data.tar.gz: ed9ff502f8ff004a45d1026fb4061035932031a0
+  metadata.gz: 13910bb7a77151c5be95f4fda4fcd3dde4e2bd67
+  data.tar.gz: 3ad56d064832e34b9510745ca8f3514e59e3a0ac
 SHA512:
-  metadata.gz: 928de18477f4ab0ed074741d2045594733175fa803bd0240429555012f1ea8ef03884fae4545c6f4208a80960663c618999cb3168b29d5d86034821d4f9a0a30
-  data.tar.gz: cdcf7345687a26546cff7980bc625721b41db2f7b81af0ced07f5e133007eaa6d372990f4e60e234fcb8715cc45c58196ca743670755fcbedb88d21247f103cf
+  metadata.gz: a4a4de892ab9447007bf7ea946502d5f61393676585bb0b03876d25684ac89fe849bd206a80d08345a01f94a62a8027e287377ac3dea77e300e4f4f6f47ab922
+  data.tar.gz: b7fe980cc445036dc62c743dd778794f4647fd13432d3912be7ac68ce8a961185c4d41f80515be4e1162b7ceea44609337dad8d043d451c92602b8ec639fabc2

data/lib/github/auth/keys_file.rb

@@ -13,9 +13,12 @@ module Github::Auth
     end
 
     def write!(keys)
-      append_keys_file do |keys_file|
-        Array(keys).each do |key|
-          keys_file.write "\n#{key}" unless keys_file_content.include? key
+      Array(keys).each do |key|
+        unless keys_file_content.include? key
+          append_keys_file do |keys_file|
+            keys_file.write "\n" unless keys_file_content.empty?
+            keys_file.write key
+          end
         end
       end
     end
@@ -36,6 +39,10 @@ module Github::Auth
       with_keys_file 'w', block
     end
 
+    def keys_file_content
+      with_keys_file 'r', Proc.new { |keys_file| keys_file.read }
+    end
+
     def with_keys_file(mode, block)
       File.open(path, mode) { |keys_file| block.call keys_file }
     rescue Errno::EACCES => e
@@ -44,10 +51,6 @@ module Github::Auth
       raise FileDoesNotExistError.new e
     end
 
-    def keys_file_content
-      File.read path
-    end
-
     def keys_file_content_without(keys)
       keys_file_content.tap do |content|
         Array(keys).each {|k| content.gsub! /#{Regexp.escape k}( .*)?$\n?/, '' }

data/lib/github/auth/version.rb

@@ -1,5 +1,5 @@
 module Github
   module Auth
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/spec/unit/github/auth/keys_file_spec.rb

@@ -5,7 +5,6 @@ require 'github/auth/keys_file'
 describe Github::Auth::KeysFile do
   subject { described_class.new path: path }
 
-  let(:keys) { %w(abc123 def456 ghi789) }
   let(:keys_file) { Tempfile.new 'authorized_keys' }
   let(:path) { keys_file.path }
 
@@ -38,39 +37,60 @@ describe Github::Auth::KeysFile do
   end
 
   describe '#write!' do
-    it 'writes each key to the keys file' do
-      subject.write! keys
+    shared_examples_for 'a successful key addition' do
+      it 'writes the key to the keys file' do
+        subject.write! keys
+
+        keys_file.read.tap do |keys_file_content|
+          keys.each { |key| expect(keys_file_content).to include key }
+        end
+      end
 
-      keys_file.read.tap do |keys_file_content|
-        keys.each { |key| expect(keys_file_content).to include key }
+      it 'does not leave a blank line' do
+        subject.write! keys
+
+        expect(
+          keys_file.readlines.select { |line| line =~ /^$\n/ }
+        ).to be_empty
       end
     end
 
+    context 'with many keys' do
+      let(:keys) { %w(abc123 def456 ghi789) }
+
+      it_should_behave_like 'a successful key addition'
+    end
+
     context 'with a single key' do
-      let(:key) { 'abc123' }
+      let(:keys) { %w(abc123) }
 
-      it 'writes the single key to the keys file' do
-        subject.write! key
-        expect(keys_file.read).to include key
-      end
+      it_should_behave_like 'a successful key addition'
     end
 
     context 'with existing keys in the keys file' do
-      let(:existing_keys) { %w(ghi789 jkl123) }
+      let(:existing_keys) { %w(abc123 def456 ghi789) }
+      let(:keys) { %w(jkl012) }
 
       before do
         keys_file.write existing_keys.join("\n")
         keys_file.rewind
       end
 
+      it_should_behave_like 'a successful key addition'
+
       it 'preserves the existing keys' do
         subject.write! keys
-        file_lines = keys_file.readlines
-        existing_keys.each { |key| expect(file_lines).to include "#{key}\n" }
+
+        keys_file.read.tap do |keys_file_content|
+          existing_keys.each do |key|
+            expect(keys_file_content).to include "#{key}\n"
+          end
+        end
       end
 
       it 'does not write duplicate keys into the keys file' do
         subject.write! existing_keys.first
+
         expect(keys_file.readlines.count).to eq existing_keys.count
       end
     end
@@ -80,7 +100,7 @@ describe Github::Auth::KeysFile do
 
       it 'raises PermissionDeniedError' do
         expect {
-          subject.write! keys
+          subject.write! %w(abc123 def456)
         }.to raise_error Github::Auth::KeysFile::PermissionDeniedError
       end
     end
@@ -90,13 +110,15 @@ describe Github::Auth::KeysFile do
 
       it 'raises FileDoesNotExistError' do
         expect {
-          subject.write! keys
+          subject.write! %w(abc123 def456)
         }.to raise_error Github::Auth::KeysFile::FileDoesNotExistError
       end
     end
   end
 
   describe '#delete!' do
+    let(:keys) { %w(abc123 def456 ghi789) }
+
     before do
       keys_file.write keys.join("\n")
       keys_file.rewind

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github-auth
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Chris Hunt