github-auth 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7923f1e812f33164bee01033c7e54e16358c0857
-  data.tar.gz: 466758b305e513e1542116c15247acf2a4373ddb
+  metadata.gz: 925a47ece6e17d63b118306d952b7f05de6334dd
+  data.tar.gz: 8994acc3a3c067d7cf60524d2d8da9be40beb77c
 SHA512:
-  metadata.gz: 75952cf2d96daf67cf1a296ca5e41ac88ec4009d50a158d8b24543b64aa81786788bdddf97ec57e1128474954788d2114b1045ac261a488b1d5bb3fdcf679148
-  data.tar.gz: 34e3772b40d381d16159ef81b3d5cdf53e7f5d444a48d3e7dae2865b50bd52166b99484f59c8451e92881d8bb4baf9d8c38db2008ba33660246e765d4bf44514
+  metadata.gz: b4d5eeec641cb3da34d54b38735906030bcca3b9814b069455567045d1ccd07424865572447eb6a4c2538aa4e1dc2b53912d53202d52e7335b850bcf1d474e70
+  data.tar.gz: 291fb365b5d28120baee5ced839a191bf07efbeb263f674dff564732410f48859b84643101d164a0571cc72045eb37b8efdc4018ccb5913daded3098645ed480

data/lib/github/auth/keys_file.rb

@@ -49,7 +49,7 @@ module Github::Auth
 
     def keys_file_content_without(keys)
       keys_file_content.tap do |content|
-        Array(keys).each { |key| content.gsub! key, '' }
+        Array(keys).each { |k| content.gsub! /#{Regexp.escape(k)}( .*)?/, '' }
         content.strip!
       end
     end

data/lib/github/auth/version.rb

@@ -1,5 +1,5 @@
 module Github
   module Auth
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/spec/acceptance/github/auth/cli_spec.rb

@@ -3,10 +3,10 @@ require 'support/mock_github_server'
 require 'github/auth'
 
 describe Github::Auth::CLI do
-  with_mock_github_server do |mock_server_hostname|
+  with_mock_github_server do |mock_server_hostname, mock_keys|
     let(:hostname) { mock_server_hostname }
     let(:keys_file) { Tempfile.new 'authorized_keys' }
-    let(:keys) { Github::Auth::MockGithubServer::KEYS }
+    let(:keys) { mock_keys }
 
     after { keys_file.unlink }
 

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

@@ -6,17 +6,22 @@ describe Github::Auth::KeysFile do
   it 'writes and deletes keys from the keys file' do
     tempfile  = Tempfile.new 'authorized_keys'
     keys_file = described_class.new path: tempfile.path
-    keys = %w(abc123 def456)
+    keys      = %w(abc123 def456)
 
     keys_file.write! keys
     expect(tempfile.read).to include keys.join("\n")
 
+    tempfile.rewind
+
     keys_file.delete! keys.first
-    expect(tempfile.read).to_not include keys.first
+    tempfile.read.tap do |tempfile_content|
+      expect(tempfile_content).to_not include keys.first
+      expect(tempfile_content).to include keys.last
+    end
 
-    keys_file.delete! keys.last
-    expect(tempfile.read).to_not include keys.last
+    tempfile.rewind
 
+    keys_file.delete! keys.last
     expect(tempfile.read).to be_empty
   end
 end

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

@@ -134,5 +134,27 @@ describe Github::Auth::KeysFile do
         expect(keys_file.read).to eq original_keys_file
       end
     end
+
+    context 'when the key has a comment' do
+      let(:key)     { 'WW6dx9mW/paKl9pznYypl+X617WHP' }
+      let(:comment) { 'this is a comment' }
+      let(:keys)    { ["#{key} #{comment}", 'def456'] }
+      let(:other_key) { keys[1] }
+
+      it 'removes the key from the keys file' do
+        subject.delete! key
+        expect(keys_file.read).to_not include key
+      end
+
+      it 'removes the comment from the keys file' do
+        subject.delete! key
+        expect(keys_file.read).to_not include comment
+      end
+
+      it 'does not remove the other key from the keys file' do
+        subject.delete! key
+        expect(keys_file.read).to include other_key
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-auth
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Hunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler