github-auth 3.0.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 997fb7cdb03c03be0562d687e2cb555b3dcb26f9
-  data.tar.gz: f267ea59d3adeb1f950e7d07aefcd227b6de4efc
+  metadata.gz: 866015fe862fbab302717fd2a69a8c5814b295b9
+  data.tar.gz: 26553482cc60a5fcfa47c488f54cb32588eb180d
 SHA512:
-  metadata.gz: 23e2dc72674a5e8e6167e55076463eee83c6ed8bc8fa1d30629184aa1448d10495d0fb32db31697343b1e13c0abf4248b901b1220069dc0547f4e2015f472126
-  data.tar.gz: 30f1000f6cf4ed22a3f364dc060c4e936594f6068bf0aa0fa6cd5eff4cde25e91a6ea743cc0d28ba72a0e60f9f647e3c0a99f380d557aba49600abff24392ff3
+  metadata.gz: 329a7874a4f041f1e5a95c63d3cf268ce7da441a2fbc03d108c76a323bbc40414f291a5eed4cc1c2479351c2b60d28aac48d73b6d96a60f5e9820c21c1345f36
+  data.tar.gz: efa20d0e9eeeb1f50727476704d0d30ec944f84f4af7e2f5a38fb6fad6b412d36907c18a76937a8200fe78166285d385c3952392e40742b0243dc3db2bcdc2f6

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+##v3.1.0
+*2014-03-04*
+
+- [Use Faraday instead of HTTParty](https://github.com/chrishunt/github-auth/pull/31)
+- [Update gems](https://github.com/chrishunt/github-auth/pull/32)
+
 ##v3.0.2
 *2014-01-19*
 

data/github-auth.gemspec

@@ -18,17 +18,17 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler',        '~> 1.5'
+  spec.add_development_dependency 'bundler',        '~> 1.5.3'
   spec.add_development_dependency 'cane',           '~> 2.6.1'
   spec.add_development_dependency 'cane-hashcheck', '~> 1.2.0'
   spec.add_development_dependency 'coveralls',      '~> 0.7.0'
-  spec.add_development_dependency 'mute',           '~> 1.0.0'
-  spec.add_development_dependency 'pry',            '~> 0.9.12.4'
+  spec.add_development_dependency 'mute',           '~> 1.1.0'
+  spec.add_development_dependency 'pry',            '~> 0.9.12.6'
   spec.add_development_dependency 'rake',           '~> 10.1.1'
   spec.add_development_dependency 'rspec',          '~> 2.14.1'
   spec.add_development_dependency 'sinatra',        '~> 1.4.4'
-  spec.add_development_dependency 'thin',           '~> 1.6.1'
+  spec.add_development_dependency 'thin',           '~> 1.6.2'
 
-  spec.add_runtime_dependency 'httparty', '~> 0.12.0'
-  spec.add_runtime_dependency 'thor',     '~> 0.18.1'
+  spec.add_runtime_dependency 'faraday', '~> 0.9.0'
+  spec.add_runtime_dependency 'thor',    '~> 0.18.1'
 end

data/lib/github/auth/keys_client.rb

@@ -1,5 +1,6 @@
 require 'cgi'
-require 'httparty'
+require 'json'
+require 'faraday'
 
 module Github::Auth
   # Client for fetching public SSH keys using the Github API
@@ -35,17 +36,18 @@ module Github::Auth
     private
 
     def github_response
-      response = http_client.get(
+      response = http_client.get \
         "#{hostname}/users/#{username}/keys", headers: headers
-      )
-      raise GithubUserDoesNotExistError if response.code == 404
-      response.parsed_response
-    rescue SocketError, Errno::ECONNREFUSED => e
+
+      raise GithubUserDoesNotExistError if response.status == 404
+
+      JSON.parse response.body
+    rescue Faraday::Error => e
       raise GithubUnavailableError, e
     end
 
     def http_client
-      HTTParty
+      Faraday
     end
 
     def headers

data/lib/github/auth/version.rb

@@ -1,5 +1,5 @@
 module Github
   module Auth
-    VERSION = "3.0.2"
+    VERSION = "3.1.0"
   end
 end

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

@@ -19,17 +19,13 @@ describe Github::Auth::CLI do
     end
 
     it 'adds and removes keys from the keys file' do
-      Mute::IO.capture_stdout do
-        cli %w(add --users=chrishunt)
-      end
+      cli %w(add --users=chrishunt)
 
       keys_file.read.tap do |keys_file_content|
         keys.each { |key| expect(keys_file_content).to include key.to_s }
       end
 
-      Mute::IO.capture_stdout do
-        cli %w(remove --users=chrishunt)
-      end
+      cli %w(remove --users=chrishunt)
 
       expect(keys_file.read).to be_empty
 
@@ -37,9 +33,7 @@ describe Github::Auth::CLI do
     end
 
     it 'lists users from the keys file' do
-      Mute::IO.capture_stdout do
-        cli %w(add --users=chrishunt)
-      end
+      cli %w(add --users=chrishunt)
 
       output = Mute::IO.capture_stdout do
         cli %w(list)
@@ -49,17 +43,13 @@ describe Github::Auth::CLI do
     end
 
     it 'supports ssh commands' do
-      Mute::IO.capture_stdout do
-        cli %w(add --users=chrishunt) << '--command=tmux attach'
-      end
+      cli %w(add --users=chrishunt) << '--command=tmux attach'
 
       expect(keys_file.read).to include 'command="tmux attach"'
 
       keys_file.rewind
 
-      Mute::IO.capture_stdout do
-        cli %w(remove --users=chrishunt)
-      end
+      cli %w(remove --users=chrishunt)
 
       expect(keys_file.read.strip).to be_empty
     end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 require 'pry'
 require 'mute'
 require 'coveralls'
+
+Mute::IO.capture_stdout
 Coveralls.wear!

data/spec/support/mock_github_server.rb

@@ -1,4 +1,4 @@
-require 'httparty'
+require 'faraday'
 require 'sinatra/base'
 require 'json'
 
@@ -34,9 +34,9 @@ def with_mock_github_server
 
   while true
     begin
-      HTTParty.get(hostname)
+      Faraday.get hostname
       break
-    rescue Errno::ECONNREFUSED
+    rescue Faraday::ConnectionFailed
       # Do nothing, try again
     end
   end

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

@@ -8,11 +8,11 @@ describe Github::Auth::KeysClient do
   let(:username) { 'chrishunt' }
   let(:http_client) { double('HttpClient', get: response) }
   let(:response_code) { 200 }
-  let(:parsed_response) { nil }
+  let(:body) { [] }
   let(:response) {
-    double('HTTParty::Response', {
-      code: response_code,
-      parsed_response: parsed_response
+    double('Faraday::Response', {
+      status: response_code,
+      body: JSON.generate(body)
     })
   }
 
@@ -55,13 +55,13 @@ describe Github::Auth::KeysClient do
     end
 
     context 'when the github user has keys' do
-      let(:parsed_response) {[
+      let(:body) {[
         { 'id' => 123, 'key' => 'abc123' },
         { 'id' => 456, 'key' => 'def456' }
       ]}
 
       it 'returns the keys' do
-        expected_keys = parsed_response.map do |entry|
+        expected_keys = body.map do |entry|
           Github::Auth::Key.new username, entry.fetch('key')
         end
 
@@ -70,7 +70,7 @@ describe Github::Auth::KeysClient do
     end
 
     context 'when the github user does not have keys' do
-      let(:parsed_response) { [] }
+      let(:body) { [] }
 
       it 'returns an empty array' do
         expect(subject.keys).to eq []
@@ -88,14 +88,16 @@ describe Github::Auth::KeysClient do
     end
 
     context 'when there is an issue connecting to Github' do
-      [SocketError, Errno::ECONNREFUSED].each do |exception|
-        before { http_client.stub(:get).and_raise exception }
+      before do
+        http_client
+          .stub(:get)
+          .and_raise Faraday::Error::ConnectionFailed.new('Oops!')
+      end
 
-        it 'raises a GithubUnavailableError' do
-          expect {
-            subject.keys
-          }.to raise_error Github::Auth::KeysClient::GithubUnavailableError
-        end
+      it 'raises a GithubUnavailableError' do
+        expect {
+          subject.keys
+        }.to raise_error Github::Auth::KeysClient::GithubUnavailableError
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-auth
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - Chris Hunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.12.4
+        version: 0.9.12.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.12.4
+        version: 0.9.12.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -142,28 +142,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement