pra 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b05dfc4974f5278e4d5087b0fab5d2cc908f9610
-  data.tar.gz: a36c0354adc7ee9d909cb5994a7f50aeba73b7f6
+  metadata.gz: 03c59b837ccbcf54d3ac74f7f8a17f4fcbdb9923
+  data.tar.gz: 8a131655f65e9c78aeefe47437c535effefe9df9
 SHA512:
-  metadata.gz: 30ea96a3f2611358e6aacbe25448ce50c87ea925a0afafe3b722f71ca2855d94ae2b21c8d34505b60672c4b0e17f05b4a36c569ef6498c9509af74b6bae46764
-  data.tar.gz: bd02aa5874a98fcc7337fccdf6eba273e934dbaf0e44679bf0557cd0b61c5fdb8171746881e108e68c7bc3a5132c76b6cc52738b74ba824094bc6ea5a3daea71
+  metadata.gz: df4b092a5dff5a08824616d9e3a5b81abf9a297a322d377ae82dcb34192325d84b8dfe2e9bdc64357ddd48985215fc4528f4404e901b847aaea1da6ec6e682b2
+  data.tar.gz: a89c5bb3946700258e83554aaa35822ef61751955fb4b9adf758cd3bef30c32345315c0f65ab926a2a28748d38b859a86607545eb8720dfebfaa31e91d6a3377

data/.ruby-version

@@ -1 +1 @@
-2.1.0
+2.1.5

data/ChangeLog.md

@@ -6,6 +6,8 @@ versions as well as provide a rough history.
 
 #### Next Release
 
+* Switch to using Faraday instead of RestClient.
+
 #### v1.5.1
 
 * Fix bug where failed if no `assignee_blacklist` was found in config. Thanks

data/README.md

@@ -182,41 +182,36 @@ following:
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-##### RVM
+##### RVM/rbenv
 
-We use [RVM](http://rvm.io/) with `pra` to encapsulate the dependency gems in our
-development environments. Therefore, we have the `.ruby-version` and
-`.ruby-gemset` files in the repository which define the current version of
-ruby and the gemset that we are developing with.
+We use [RVM](http://rvm.io/) or [rbenv](https://github.com/sstephenson/rbenv)
+with `pra` to encapsulate the dependency gems in our development environments.
+Therefore, we have the `.ruby-version` file in the repository which define the
+current version of ruby that we are developing with.
 
-You should have [RVM](http://rvm.io) installed of course and when you change
-into the project root directory it should switch to the proper ruby version if
-you have it intsalled via [RVM](http://rvm.io). It should also create and
-switch to the proper gemset.
+You should have [RVM](http://rvm.io) or
+[rbenv](https://github.com/sstephenson/rbenv) installed of course and when you
+change into the project root directory it should switch to the proper ruby
+version if you have it intsalled via [RVM](http://rvm.io) or
+[rbenv](https://github.com/sstephenson/rbenv).
 
-If the proper version of ruby is NOT installed via [RVM](http://rvm.io) you
-should first install that version of ruby and then change out of the project
-root directory, then change back into it and verify that you are in the
-proper ruby version and gemset. This can be done with the following command.
-
-    rvm current
-
-The above command should have output the following
-
-    ruby-2.0.0-p247@pra
+If the proper version of ruby is NOT installed via [RVM](http://rvm.io) or
+[rbenv](https://github.com/sstephenson/rbenv) you should first install that
+version of ruby and then change out of the project root directory, then change
+back into it and verify that you are in the proper ruby version.
 
 ##### Bundler
 
 We use [Bundler](http://bundler.io/) to manage the development dependencies of
-`pra`. Once you got setup with [RVM](http://rvm.io) as described above you
-should be able to install all the development dependencies using the following
-command:
+`pra`. Once you are setup with [RVM](http://rvm.io) or
+[rbenv](https://github.com/sstephenson/rbenv) as described above you should be
+able to install all the development dependencies using the following command:
 
     bundle
 
 ##### Test Driven Development
 
-I eveloped `pra` using the TDD methodology with
+I developed `pra` using the TDD methodology with
 [RSpec](http://www.relishapp.com/rspec) as the testing tool of choice.
 Therefore, if you are going to contribute code to `pra` please TDD your code
 changes using [RSpec](http://www.relishapp.com/rspec). If you do not submit
@@ -225,12 +220,13 @@ you add appropriate test coverage.
 
 ##### Run Development Version Manually
 
-If you have setup [RVM](http://rvm.io) as described above and installed the
-development dependencies using [Bundler](http://bundler.io/) as described
+If you have setup [RVM](http://rvm.io) or
+[rbenv](https://github.com/sstephenson/rbenv) as described above and installed
+the development dependencies using [Bundler](http://bundler.io/) as described
 above you should be able to run the development version of `pra` by running
 the following command:
 
-    ./bin/pra
+    bundle exec ./bin/pra
 
 *Note:* The above of course assumes that you have a `~/.pra.json` file
 already configured.

data/lib/pra/github_pull_source.rb

@@ -1,7 +1,7 @@
 require 'pra/pull_source'
 require 'pra/pull_request'
-require 'rest_client'
 require 'json'
+require 'faraday'
 
 module Pra
   class GithubPullSource < Pra::PullSource
@@ -19,7 +19,7 @@ module Pra
 
     def get_repo_pull_requests(repository_config)
       requests = []
-      JSON.parse(rest_api_pull_request_resource(repository_config).get).each do |request|
+      JSON.parse(rest_api_pull_request_resource(repository_config)).each do |request|
         requests << Pra::PullRequest.new(title: request["title"], from_reference: request["head"]["label"], to_reference: request["base"]["label"], author: request["user"]["login"], assignee: request["assignee"] ? request["assignee"]["login"] : nil, link: request['html_url'], service_id: 'github', repository: repository_config["repository"])
       end
       return requests
@@ -30,7 +30,14 @@ module Pra
     end
 
     def rest_api_pull_request_resource(repository_config)
-      RestClient::Resource.new(rest_api_pull_request_url(repository_config), user: @config['username'], password: @config['password'], content_type: :json, accept: :json)
+      conn = Faraday.new
+      conn.basic_auth(@config['username'], @config['password'])
+      resp = conn.get do |req|
+        req.url rest_api_pull_request_url(repository_config)
+        req.headers['Content-Type'] = 'application/json'
+        req.headers['Accept'] = 'application/json'
+      end
+      resp.body
     end
   end
 end

data/lib/pra/stash_pull_source.rb

@@ -1,6 +1,6 @@
 require 'pra/pull_source'
 require 'pra/pull_request'
-require 'rest_client'
+require 'faraday'
 require 'json'
 
 module Pra
@@ -19,7 +19,7 @@ module Pra
 
     def get_repo_pull_requests(repository_config)
       requests = []
-      JSON.parse(rest_api_pull_request_resource(repository_config).get)["values"].each do |request|
+      JSON.parse(rest_api_pull_request_resource(repository_config))["values"].each do |request|
         requests << Pra::PullRequest.new(title: request["title"], from_reference: request["fromRef"]["id"], to_reference: request["toRef"]["id"], assignee: request["reviewers"].length > 0 ? request["reviewers"].first["user"]["name"] : nil, author: request["author"]["user"]["name"], link: "#{@config['protocol']}://#{@config['host']}#{request['link']['url']}", service_id: 'stash', repository: repository_config["repository_slug"])
       end
       return requests
@@ -34,7 +34,14 @@ module Pra
     end
 
     def rest_api_pull_request_resource(repository_config)
-      RestClient::Resource.new(rest_api_pull_request_url(repository_config), user: @config['username'], password: @config['password'], content_type: :json, accept: :json)
+      conn = Faraday.new
+      conn.basic_auth(@config['username'], @config['password'])
+      resp = conn.get do |req|
+        req.url rest_api_pull_request_url(repository_config)
+        req.headers['Content-Type'] = 'application/json'
+        req.headers['Accept'] = 'application/json'
+      end
+      resp.body
     end
   end
 end

data/lib/pra/version.rb

@@ -1,3 +1,3 @@
 module Pra
-  VERSION = "1.5.1"
+  VERSION = "1.6.0"
 end

data/pra.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.1"
   spec.add_development_dependency "rspec", "~> 2.14"
 
-  spec.add_dependency "rest-client", "~> 1.6"
+  spec.add_dependency "faraday", "~> 0.9"
   spec.add_dependency "launchy", "~> 2.4"
   spec.add_dependency "curses", "~> 1.0"
 end

data/spec/lib/pra/github_pull_source_spec.rb

@@ -70,9 +70,7 @@ describe Pra::GithubPullSource do
         ]
       }
       pull_source = Pra::GithubPullSource.new(config)
-      the_resource = double
-      pull_source.stub(:rest_api_pull_request_resource).with({ "owner" => "reachlocal", "repository" => "snapdragon" }).and_return(the_resource)
-      the_resource.should_receive(:get).and_return('[]')
+      pull_source.stub(:rest_api_pull_request_resource).with({ "owner" => "reachlocal", "repository" => "snapdragon" }).and_return('[]')
       pull_source.get_repo_pull_requests({ "owner" => "reachlocal", "repository" => "snapdragon" })
     end
   end
@@ -113,16 +111,30 @@ describe Pra::GithubPullSource do
 
     subject { Pra::GithubPullSource.new(config) }
 
-    it "gets the repository url compiled from the config options" do
-      subject.should_receive(:rest_api_pull_request_url).with(repo_config)
+    it "creates a Faraday connection" do
+      expect(Faraday).to receive(:new).and_return(double.as_null_object)
       subject.rest_api_pull_request_resource(repo_config)
     end
 
-    it "builds a restclient resource using the pull request url and user credentials" do
-      url = "https://my.github.instance/repos/reachlocal/snapdragon/pulls"
-      subject.stub(:rest_api_pull_request_url).and_return(url)
-      RestClient::Resource.should_receive(:new).with(url, {user: "foo", password: "bar", content_type: :json, accept: :json})
+    it "set the http basic auth credentials" do
+      conn = double('faraday connection').as_null_object
+      allow(Faraday).to receive(:new).and_return(conn)
+      expect(conn).to receive(:basic_auth).with("foo", "bar")
       subject.rest_api_pull_request_resource(repo_config)
     end
+
+    it "makes request using faraday connection" do
+      conn = double('faraday connection').as_null_object
+      allow(Faraday).to receive(:new).and_return(conn)
+      expect(conn).to receive(:get)
+      subject.rest_api_pull_request_resource(repo_config)
+    end
+
+    it "returns the responses body" do
+      conn = double('faraday connection').as_null_object
+      allow(Faraday).to receive(:new).and_return(conn)
+      expect(conn).to receive(:get).and_return(double('response', body: 'hoopytbody'))
+      expect(subject.rest_api_pull_request_resource(repo_config)).to eq('hoopytbody')
+    end
   end
 end

data/spec/lib/pra/pull_request_service/fetch_status_spec.rb

@@ -52,7 +52,7 @@ describe Pra::PullRequestService::FetchStatus do
       subject { Pra::PullRequestService::FetchStatus.new(:success, double) }
 
       it 'returns true' do
-        expect(subject.success?).to be_true
+        expect(subject.success?).to be_truthy
       end
     end
 
@@ -60,7 +60,7 @@ describe Pra::PullRequestService::FetchStatus do
       subject { Pra::PullRequestService::FetchStatus.new(double, double) }
 
       it 'returns false' do
-        expect(subject.success?).to be_false
+        expect(subject.success?).to be_falsey
       end
     end
   end
@@ -70,7 +70,7 @@ describe Pra::PullRequestService::FetchStatus do
       subject { Pra::PullRequestService::FetchStatus.new(:error, double) }
 
       it 'returns true' do
-        expect(subject.error?).to be_true
+        expect(subject.error?).to be_truthy
       end
     end
 
@@ -78,7 +78,7 @@ describe Pra::PullRequestService::FetchStatus do
       subject { Pra::PullRequestService::FetchStatus.new(double, double) }
 
       it 'returns false' do
-        expect(subject.error?).to be_false
+        expect(subject.error?).to be_falsey
       end
     end
   end
@@ -124,4 +124,4 @@ describe Pra::PullRequestService::FetchStatus do
       end
     end
   end
-end
+end

data/spec/lib/pra/stash_pull_source_spec.rb

@@ -70,9 +70,7 @@ describe Pra::StashPullSource do
         ]
       }
       pull_source = Pra::StashPullSource.new(config)
-      the_resource = double
-      pull_source.stub(:rest_api_pull_request_resource).with({ "project_slug" => "CAP", "repository_slug" => "capture_api" }).and_return(the_resource)
-      the_resource.should_receive(:get).and_return('{ "values": [] }')
+      pull_source.stub(:rest_api_pull_request_resource).with({ "project_slug" => "CAP", "repository_slug" => "capture_api" }).and_return('{ "values": [] }')
       pull_source.get_repo_pull_requests({ "project_slug" => "CAP", "repository_slug" => "capture_api" })
     end
   end
@@ -134,16 +132,30 @@ describe Pra::StashPullSource do
 
     subject { Pra::StashPullSource.new(config) }
 
-    it "gets the repository url compiled from the config options" do
-      subject.should_receive(:rest_api_pull_request_url).with(repo_config)
+    it "creates a Faraday connection" do
+      expect(Faraday).to receive(:new).and_return(double.as_null_object)
       subject.rest_api_pull_request_resource(repo_config)
     end
 
-    it "builds a restclient resource using the pull request url and user credentials" do
-      url = "https://my.stash.instance/rest/api/1.0/projects/CAP/repos/capture_api/pull-requests"
-      subject.stub(:rest_api_pull_request_url).and_return(url)
-      RestClient::Resource.should_receive(:new).with(url, {user: "foo", password: "bar", content_type: :json, accept: :json})
+    it "set the http basic auth credentials" do
+      conn = double('faraday connection').as_null_object
+      allow(Faraday).to receive(:new).and_return(conn)
+      expect(conn).to receive(:basic_auth).with("foo", "bar")
       subject.rest_api_pull_request_resource(repo_config)
     end
+
+    it "makes request using faraday connection" do
+      conn = double('faraday connection').as_null_object
+      allow(Faraday).to receive(:new).and_return(conn)
+      expect(conn).to receive(:get)
+      subject.rest_api_pull_request_resource(repo_config)
+    end
+
+    it "returns the responses body" do
+      conn = double('faraday connection').as_null_object
+      allow(Faraday).to receive(:new).and_return(conn)
+      expect(conn).to receive(:get).and_return(double('response', body: 'hoopytbody'))
+      expect(subject.rest_api_pull_request_resource(repo_config)).to eq('hoopytbody')
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pra
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Andrew De Ponte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +104,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-gemset"
 - ".ruby-version"
 - ChangeLog.md
 - Gemfile
@@ -164,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: CLI tool that shows open pull-requests across systems.

data/.ruby-gemset

@@ -1 +0,0 @@
-pra