build_eval 0.0.11 → 0.0.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTdkM2EyNDlhMjZkNzZmNTNhOTg0YmMxNzVkZmEzMjY1YzQzZmU4NA==
+    NDBkZjU0NzI5ODI4NDE2YTA5ZTJjZWZjNWMzZGRlMzM0MzM0YTYzYQ==
   data.tar.gz: !binary |-
-    M2M2NmIwYjQ1NjNkYmE4YTZjZDYyYTBkN2I2NzIzNjNhNTU5ZDE4Ng==
+    MjMxMzI4MGVlMjVjYTQzZTIzN2YyNWY2MDI5Nzg4MDg5MDAzOTc4YQ==
 SHA512:
   metadata.gz: !binary |-
-    NWVhYWUzOTNhMmEyY2Y2ZjNkNWVkYmE3ZGQ4Nzk0ZTVlZTM5MjUwN2UyNmMw
-    ZmY4YjY1MjJkNjA5ZjYxODUyZjE3NzJmYzk0Y2VmZTExYTg4MDFhOWNjNjRh
-    ZmY3NmVjY2UyNWIwMmVkMjk1M2Y0YzU2NTc0YjA2ZjQ1NDVhOWQ=
+    ODNmMjliMWM2YzMwZGY1OWIzZjRkNmYxMWI4MzJmMjM3N2UyYmVhMWZlZGFh
+    ODc4ZTdhOWQzMjhkZGYwMGViOWFlMzBiZDJiNjQ3MzdmZjEzYzhhZDJiY2Ji
+    YjM5NjAwYjYzOGQyMWRlZDliNjc5M2JlNmYwYzQ3YmEwODY5MzA=
   data.tar.gz: !binary |-
-    ZTkzNzE4M2UxN2U0ODJmZmQ1MTFlNmI4YWJjYjgzYmRlMGQ1Y2Q3ZTBhNWVk
-    ODY3ZjJhODI2Y2U5OGI0OTIyZjI3OWNhM2Y5NmM3OGZhNzdkMTQzZTk4YTcy
-    ZmIwNWM4YzExYWIxZTVlMDQzZDY1MTA4MzU5NWYyNmQ4YzcxOTg=
+    NGJlYTg2ZjAxOTMxMjExM2I4OTRkM2UxMGZlYjI4YmQ4ODIwOThhZWE1MGVm
+    ZWZhZjI3MmUyNzc5M2JmNjk1MmEyZGU2YjQxZjBhODkwODE4ODQ4NTFlZWJk
+    ZTdiNmE5MGNmMTdjM2U4MzMzMjgzZWI2MTA0YTJlYjBkNjFiNmM=

data/lib/build_eval/server/travis.rb

@@ -8,10 +8,10 @@ module BuildEval
       end
 
       def build_result(name)
-        build_path = "#{@username}/#{name}"
+        repository_path = "#{@username}/#{name}"
         BuildEval::Result::BuildResult.create(
-          build_name:  build_path,
-          status_name: BuildEval::Travis.last_build_status(build_path: build_path)
+          build_name:  repository_path,
+          status_name: BuildEval::Travis.last_build_status(repository_path: repository_path)
         )
       end
 

data/lib/build_eval/server/travis_pro.rb

@@ -9,10 +9,11 @@ module BuildEval
       end
 
       def build_result(name)
-        build_path = "#{@username}/#{name}"
+        repository_path = "#{@username}/#{name}"
         BuildEval::Result::BuildResult.create(
-          build_name:  build_path,
-          status_name: BuildEval::Travis.last_build_status(github_token: @github_token, build_path: build_path)
+          build_name:  repository_path,
+          status_name: BuildEval::Travis.last_build_status(github_token:    @github_token,
+                                                           repository_path: repository_path)
         )
       end
 

data/lib/build_eval/travis.rb

@@ -5,7 +5,7 @@ module BuildEval
     class << self
 
       def last_build_status(args)
-        repository = travis_module_for(args)::Repository.find(args[:build_path])
+        repository = create_session(args).repo(args[:repository_path])
         repository.recent_builds.find(&:finished?).passed? ? "Success" : "Failure"
       rescue ::Travis::Client::Error
         "Unknown"
@@ -13,13 +13,11 @@ module BuildEval
 
       private
 
-      def travis_module_for(args)
-        travis_module = ::Travis
-        if args[:github_token]
-          travis_module = ::Travis::Pro
-          travis_module.github_auth(args[:github_token])
+      def create_session(args)
+        travis_uri = args[:github_token] ? ::Travis::Client::PRO_URI : ::Travis::Client::ORG_URI
+        ::Travis::Client::Session.new(uri: travis_uri, ssl: {}).tap do |session|
+          session.github_auth(args[:github_token]) if args[:github_token]
         end
-        travis_module
       end
 
     end

data/lib/build_eval/version.rb

@@ -1,3 +1,3 @@
 module BuildEval
-  VERSION = "0.0.11".freeze
+  VERSION = "0.0.12".freeze
 end

data/lib/build_eval.rb

@@ -2,8 +2,7 @@ require 'nokogiri'
 require 'uri'
 require 'net/http'
 require 'net/https'
-require 'travis'
-require 'travis/tools/github'
+require 'travis/client/session'
 
 require_relative 'build_eval/error'
 require_relative 'build_eval/http'

data/spec/lib/build_eval/server/travis_pro_spec.rb

@@ -1,16 +1,10 @@
 describe BuildEval::Server::TravisPro do
-  include_context "stubbed Travis API interactions"
 
   let(:username)     { "some_username" }
   let(:github_token) { "ABCD1234" }
-  let(:constructor_args) do
-    {
-      username:     username,
-      github_token: github_token
-    }
-  end
+  let(:args)         { { username: username, github_token: github_token } }
 
-  let(:travis_pro_server) { described_class.new(constructor_args) }
+  let(:travis_pro_server) { described_class.new(args) }
 
   describe "#build_result" do
 
@@ -35,7 +29,7 @@ describe BuildEval::Server::TravisPro do
 
     it "retrieves the last build status from Travis for the users build" do
       expect(BuildEval::Travis).to(
-        receive(:last_build_status).with(hash_including(build_path: "#{username}/#{build_name}"))
+        receive(:last_build_status).with(hash_including(repository_path: "#{username}/#{build_name}"))
       )
 
       subject

data/spec/lib/build_eval/server/travis_spec.rb

@@ -1,5 +1,4 @@
 describe BuildEval::Server::Travis do
-  include_context "stubbed Travis API interactions"
 
   let(:username)         { "some_username" }
   let(:constructor_args) { { username: username } }
@@ -21,7 +20,7 @@ describe BuildEval::Server::Travis do
 
     it "retrieves the last build status from Travis for the users build" do
       expect(BuildEval::Travis).to(
-        receive(:last_build_status).with(hash_including(build_path: "#{username}/#{build_name}"))
+        receive(:last_build_status).with(hash_including(repository_path: "#{username}/#{build_name}"))
       )
 
       subject

data/spec/lib/build_eval/travis_spec.rb

@@ -1,10 +1,9 @@
 describe BuildEval::Travis do
-  include_context "stubbed Travis API interactions"
 
   describe "::last_build_status" do
 
-    let(:build_path)    { "some/build_path" }
-    let(:optional_args) { {} }
+    let(:repository_path) { "some/repository_path" }
+    let(:optional_args)   { {} }
 
     let(:recent_builds)                   do
       (1..3).map { |i| instance_double(::Travis::Client::Build, finished?: i > 1) }
@@ -14,11 +13,12 @@ describe BuildEval::Travis do
     let(:travis_repository)               do
       instance_double(::Travis::Client::Repository, recent_builds: recent_builds)
     end
+    let(:travis_session)                  { instance_double(::Travis::Client::Session, repo: travis_repository) }
 
-    subject { described_class.last_build_status({ build_path: build_path }.merge(optional_args)) }
+    subject { described_class.last_build_status({ repository_path: repository_path }.merge(optional_args)) }
 
     before(:example) do
-      allow(::Travis::Repository).to receive(:find).and_return(travis_repository)
+      allow(::Travis::Client::Session).to receive(:new).and_return(travis_session)
       allow(last_finished_build).to receive(:passed?).and_return(last_finished_build_passed_flag)
     end
 
@@ -27,22 +27,24 @@ describe BuildEval::Travis do
       let(:github_token)  { "SOMEGITHUBAUTHTOKEN" }
       let(:optional_args) { { github_token: github_token } }
 
-      it "logs-in to the Travis Pro API with the provided GitHub token" do
-        expect(::Travis::Pro).to receive(:github_auth).with(github_token)
+      before(:example) { allow(travis_session).to receive(:github_auth) }
+
+      it "creates a Travis session connecting to the Travis Pro site" do
+        expect(::Travis::Client::Session).to receive(:new).with(hash_including(uri: ::Travis::Client::PRO_URI))
 
         subject
       end
 
-      it "uses the Travis Pro modules Repository" do
-        expect(::Travis::Pro::Repository).to receive(:find)
+      it "logs-in using the provided GitHub token via the session" do
+        expect(travis_session).to receive(:github_auth).with(github_token)
 
         subject
       end
 
-      context "when a Travis Client error occurs on log-in" do
+      context "when an error occurs on log-in" do
 
         before(:example) do
-          allow(::Travis::Pro).to receive(:github_auth).and_raise(::Travis::Client::Error.new("Forced error"))
+          allow(travis_session).to receive(:github_auth).and_raise(::Travis::Client::Error.new("Forced error"))
         end
 
         it "returns 'Unknown'" do
@@ -57,16 +59,28 @@ describe BuildEval::Travis do
 
       let(:optional_args) { {} }
 
-      it "uses the Travis modules Repository" do
-        expect(::Travis::Repository).to receive(:find)
+      it "creates a Travis session connecting to the Travis Org site" do
+        expect(::Travis::Client::Session).to receive(:new).with(hash_including(uri: ::Travis::Client::ORG_URI))
+
+        subject
+      end
+
+      it "does not log-in" do
+        expect(travis_session).to_not receive(:github_auth)
 
         subject
       end
 
     end
 
-    it "retrieves the repository for the provided build path" do
-      expect(::Travis::Repository).to receive(:find).with(build_path)
+    it "creates a Travis session with empty SSL settings to avoid using local security certificates" do
+      expect(::Travis::Client::Session).to receive(:new).with(hash_including(ssl: {}))
+
+      subject
+    end
+
+    it "retrieves the Travis repository for the provided repository path" do
+      expect(travis_session).to receive(:repo).with(repository_path)
 
       subject
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: build_eval
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Matthew Ueckerman
@@ -184,7 +184,6 @@ files:
 - ./spec/lib/build_eval/server/team_city_spec.rb
 - ./spec/lib/build_eval/server/travis_pro_spec.rb
 - ./spec/lib/build_eval/server/travis_spec.rb
-- ./spec/lib/build_eval/travis_shared_context.rb
 - ./spec/lib/build_eval/travis_spec.rb
 - ./spec/lib/build_eval_smoke_spec.rb
 - ./spec/lib/build_eval_spec.rb
@@ -234,7 +233,6 @@ test_files:
 - ./spec/lib/build_eval/server/team_city_spec.rb
 - ./spec/lib/build_eval/server/travis_pro_spec.rb
 - ./spec/lib/build_eval/server/travis_spec.rb
-- ./spec/lib/build_eval/travis_shared_context.rb
 - ./spec/lib/build_eval/travis_spec.rb
 - ./spec/lib/build_eval_smoke_spec.rb
 - ./spec/lib/build_eval_spec.rb

data/spec/lib/build_eval/travis_shared_context.rb

@@ -1,50 +0,0 @@
-shared_context "stubbed Travis API interactions" do
-
-  module StubTravisBuild
-
-    def finished?
-      # Intentionally blank
-    end
-
-    def passed?
-      # Intentionally blank
-    end
-
-  end
-
-    module StubTravisRepository
-
-    def recent_builds
-      # Intentionally blank
-    end
-
-  end
-
-  module StubTravisPro
-
-    Repository = StubTravisRepository
-
-    def self.github_auth(auth_token)
-      # Intentionally blank
-    end
-
-  end
-
-  module StubTravis
-
-    Repository = StubTravisRepository
-    Pro = StubTravisPro
-
-    module Client
-      Repository = StubTravisRepository
-      Build = StubTravisBuild
-      Error = ::StandardError
-    end
-
-  end
-
-  before(:context) do
-    ::Travis = StubTravis
-  end
-
-end