github-auth 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 352463830e9bd640ff3d636b5ee5053b0be27518
-  data.tar.gz: 9f2ccad8abf686958c2c0a49b99bf838b271ffc2
+  metadata.gz: ac13ba0c9755deb71801dffec21aba397f70d81f
+  data.tar.gz: b2fdba9a799045734f7673ee78bd91f00b8e1682
 SHA512:
-  metadata.gz: 059b81934b81695ba445ba47427c6058c6a1c9e4d185ef7de8674df0c104820544e3d9d100899a7d738bd867cebbaaced781faff952e8c0c15aed3ed2d1b97fa
-  data.tar.gz: ac44f88144f64084e91f1ef74c69bf1ba8e731bd821063583f5886516910740576f0242f628d505db4ab6b3bd6a02bdba94401acdd1491414094a9b91ed078c9
+  metadata.gz: 781c7170d3eee79cb1ceb64fb8a216c09ba23c37c679c26fd0bdb1052c6fa2a3bfb86ff70401a710e123bfb24b3f6c977410a73089300351a4576189e3e6fa8e
+  data.tar.gz: 2cdc629713e926a4ffb4681188c0401df9de7749d582284021451f100f9a2adcbb7fccb537f2da0bbf4a83facdadb0678acd30b0ab90e67af308c835eb669d37

data/.gitignore

@@ -16,3 +16,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.ruby-version

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+##v1.2.0
+*2013-08-20*
+
+[\[18 commits\]](https://github.com/chrishunt/github-auth/compare/v1.1.0...v1.2.0)
+
+- [Add a newline at the very end of the keys file](https://github.com/chrishunt/github-auth/pull/9)
+- [Fix RSpec deprecation warnings](https://github.com/chrishunt/github-auth/pull/11)
+- [Add gem versions to gemspec](https://github.com/chrishunt/github-auth/commit/1296e2ebd4e4e13d80775c81ec8ca2ac3710d20c)
+
 ##v1.1.0
 *2013-05-29*
 

data/README.md

@@ -126,8 +126,8 @@ $ chmod 600 ~/.ssh/authorized_keys
 If you'd like to verify that everything is working as expected, you can test
 locally on your own machine.
 
-First, authorized yourself for ssh. (Make sure to replace 'chrishunt' with
-*your* Github username)
+First, authorize yourself for ssh. (Make sure to replace 'chrishunt' with
+*your* GitHub username)
 
 ```bash
 $ gh-auth add chrishunt
@@ -150,7 +150,7 @@ $ gh-auth remove chrishunt
 Removing 2 key(s) from '/Users/chris/.ssh/authorized_keys'
 ```
 
-Since you've removed your keys, verify now that you can no longer login to your
+Now that you've removed your keys, verify that you can no longer log in to your
 machine with public key authentication:
 
 ```bash
@@ -193,7 +193,7 @@ $ curl http://remote-ip.herokuapp.com
 ### It's still not working! :(
 
 In almost all cases, your laptop is not directly plugged into your modem.
-You're on a wirelress network or plugged directly into a router or switch. This
+You're on a wireless network or plugged directly into a router or switch. This
 means the external IP address that your pair is connecting to is not your
 machine, it's actually your router.
 
@@ -214,7 +214,7 @@ ssh -p <port> username@external-ip-address
 Yes! A nice solution to this is to have a machine **somewhere else** that both
 of you can ssh into. Place this machine on a network that you *do* have the
 ability to forward ports. Maybe this machine is at home, a friend's house, or
-at a company your worked for in the past that forgot to turn it off.
+at a company you worked for in the past that forgot to turn it off.
 
 If this isn't possible, then you can use a VPS provider like
 [Linode](http://www.linode.com) to setup a pairing machine in the cloud or a

data/github-auth.gemspec

@@ -19,13 +19,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'cane'
-  spec.add_development_dependency 'cane-hashcheck'
-  spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'sinatra'
-  spec.add_development_dependency 'thin'
+  spec.add_development_dependency 'cane', '~> 2.6.0'
+  spec.add_development_dependency 'cane-hashcheck', '~> 1.2.0'
+  spec.add_development_dependency 'coveralls', '~> 0.6.7'
+  spec.add_development_dependency 'rake', '~> 10.1.0'
+  spec.add_development_dependency 'rspec', '~> 2.14'
+  spec.add_development_dependency 'sinatra', '~> 1.4.3'
+  spec.add_development_dependency 'thin', '~> 1.5.1'
 
-  spec.add_runtime_dependency 'httparty'
+  spec.add_runtime_dependency 'httparty', '~> 0.11.0'
 end

data/lib/github/auth/key.rb

@@ -1,3 +1,4 @@
+# :nodoc:
 module Github::Auth
   # Represents a username/key pair from GitHub
   Key = Struct.new(:username, :key) do

data/lib/github/auth/keys_client.rb

@@ -40,7 +40,7 @@ module Github::Auth
       raise GithubUserDoesNotExistError if response.code == 404
       response.parsed_response
     rescue SocketError, Errno::ECONNREFUSED => e
-      raise GithubUnavailableError.new e
+      raise GithubUnavailableError, e
     end
 
     def http_client

data/lib/github/auth/keys_file.rb

@@ -16,8 +16,10 @@ module Github::Auth
       Array(keys).each do |key|
         unless keys_file_content.include? key.key
           append_keys_file do |keys_file|
-            keys_file.write "\n" unless keys_file_content.empty?
-            keys_file.write key
+            unless keys_file_content.empty? || keys_file_content.end_with?("\n")
+              keys_file.write "\n"
+            end
+            keys_file.write "#{key}\n"
           end
         end
       end
@@ -46,9 +48,9 @@ module Github::Auth
     def with_keys_file(mode, block)
       File.open(path, mode) { |keys_file| block.call keys_file }
     rescue Errno::EACCES => e
-      raise PermissionDeniedError.new e
+      raise PermissionDeniedError, e
     rescue Errno::ENOENT => e
-      raise FileDoesNotExistError.new e
+      raise FileDoesNotExistError, e
     end
 
     def keys_file_content_without(keys)
@@ -57,7 +59,7 @@ module Github::Auth
           content.gsub! /#{Regexp.escape key.key}( .*)?$\n?/, ''
         end
 
-        content.strip!
+        content << "\n" unless content.empty? || content.end_with?("\n")
       end
     end
   end

data/lib/github/auth/version.rb

@@ -1,5 +1,5 @@
 module Github
   module Auth
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

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

@@ -6,11 +6,11 @@ describe Github::Auth::KeysClient do
   subject { described_class.new username: username }
 
   let(:username) { 'chrishunt' }
-  let(:http_client) { stub('HttpClient', get: response) }
+  let(:http_client) { double('HttpClient', get: response) }
   let(:response_code) { 200 }
   let(:parsed_response) { nil }
   let(:response) {
-    stub('HTTParty::Response', {
+    double('HTTParty::Response', {
       code: response_code,
       parsed_response: parsed_response
     })

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

@@ -49,12 +49,16 @@ describe Github::Auth::KeysFile do
         end
       end
 
-      it 'does not leave a blank line' do
+      it 'does not include a blank before the first key' do
         subject.write! keys
 
-        expect(
-          keys_file.readlines.select { |line| line =~ /^$\n/ }
-        ).to be_empty
+        expect(keys_file.read).to_not start_with("\n")
+      end
+
+      it 'includes a newline after the last key' do
+        subject.write! keys
+
+        expect(keys_file.read).to end_with("\n")
       end
     end
 
@@ -80,6 +84,7 @@ describe Github::Auth::KeysFile do
 
       before do
         keys_file.write existing_keys.join("\n")
+        keys_file.write "\n"
         keys_file.rewind
       end
 
@@ -132,6 +137,7 @@ describe Github::Auth::KeysFile do
 
     before do
       keys_file.write keys.join("\n")
+      keys_file.write "\n"
       keys_file.rewind
     end
 
@@ -152,12 +158,10 @@ describe Github::Auth::KeysFile do
         end
       end
 
-      it 'does not leave a blank line' do
+      it 'includes a newline after the last key' do
         subject.delete! key
 
-        expect(
-          keys_file.readlines.select { |line| line =~ /^$\n/ }
-        ).to be_empty
+        expect(keys_file.read).to end_with("\n")
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-auth
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Chris Hunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,117 +25,117 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: cane-hashcheck
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: cane
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.7
 - !ruby/object:Gem::Dependency
-  name: cane-hashcheck
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.0
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.0
 description: SSH key management for Github users
 email:
 - c@chrishunt.co