build_eval 0.0.12 → 0.0.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDBkZjU0NzI5ODI4NDE2YTA5ZTJjZWZjNWMzZGRlMzM0MzM0YTYzYQ==
+    MWJiNTEyNDFmYTUxNmZmMGE3NjRhZWQ2MjVjNWFkMDFiNGUwZGVkYw==
   data.tar.gz: !binary |-
-    MjMxMzI4MGVlMjVjYTQzZTIzN2YyNWY2MDI5Nzg4MDg5MDAzOTc4YQ==
+    YWYyYTUxYjZlNDM2M2VlNzQ1YmY1NWIxZjdiM2YxOTQ0NmQyNDE3Yg==
 SHA512:
   metadata.gz: !binary |-
-    ODNmMjliMWM2YzMwZGY1OWIzZjRkNmYxMWI4MzJmMjM3N2UyYmVhMWZlZGFh
-    ODc4ZTdhOWQzMjhkZGYwMGViOWFlMzBiZDJiNjQ3MzdmZjEzYzhhZDJiY2Ji
-    YjM5NjAwYjYzOGQyMWRlZDliNjc5M2JlNmYwYzQ3YmEwODY5MzA=
+    MDI3YTlmMGI0NzI4ZGMwZjYzMjM4NjllYjcyZTBjM2RhYTcxMDA1MDc0MjM4
+    ZWFhYjhhMjgxNGU0ZDA0NjkxMzViZTFkMjM2YmJiZGVhNmFlNjJiYjE5YjJm
+    MDNlZGYxMDY1YTljODQ5YmQwNGFmYTU1MGQxNmYxNjZkM2ZkYTg=
   data.tar.gz: !binary |-
-    NGJlYTg2ZjAxOTMxMjExM2I4OTRkM2UxMGZlYjI4YmQ4ODIwOThhZWE1MGVm
-    ZWZhZjI3MmUyNzc5M2JmNjk1MmEyZGU2YjQxZjBhODkwODE4ODQ4NTFlZWJk
-    ZTdiNmE5MGNmMTdjM2U4MzMzMjgzZWI2MTA0YTJlYjBkNjFiNmM=
+    Y2JmMjJhODM4MzJmNzc5OTE0M2M1NjUwMmIyYjBhNWI0N2Y5NTFlZmE1MjU1
+    NTFkM2FmZWM0ODViMTA0ZWE0OThhMmE1MjE2Y2MwZTE4OGY2ZmI1ZDhhODdl
+    MzgxOTM1ODJlYmQ5Yjc1YjYwNDJjMTlhMzAyZjQyYzIxZmVlYjc=

data/lib/build_eval/travis/session_factory.rb

@@ -0,0 +1,38 @@
+module BuildEval
+  module Travis
+
+    class SessionFactory
+
+      class << self
+
+        def create(github_token)
+          find_session(github_token) || create_session(github_token)
+        end
+
+        def clear_cache
+          @sessions = {}
+        end
+
+        private
+
+        def find_session(github_token)
+          sessions[github_token]
+        end
+
+        def create_session(github_token)
+          travis_uri = github_token ? ::Travis::Client::PRO_URI : ::Travis::Client::ORG_URI
+          sessions[github_token] = ::Travis::Client::Session.new(uri: travis_uri, ssl: {}).tap do |session|
+            session.github_auth(github_token) if github_token
+          end
+        end
+
+        def sessions
+          @sessions ||= {}
+        end
+
+      end
+
+    end
+
+  end
+end

data/lib/build_eval/travis.rb

@@ -1,25 +1,13 @@
 module BuildEval
 
-  class Travis
-
-    class << self
-
-      def last_build_status(args)
-        repository = create_session(args).repo(args[:repository_path])
-        repository.recent_builds.find(&:finished?).passed? ? "Success" : "Failure"
-      rescue ::Travis::Client::Error
-        "Unknown"
-      end
-
-      private
-
-      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
-      end
-
+  module Travis
+
+    def self.last_build_status(args)
+      session = BuildEval::Travis::SessionFactory.create(args[:github_token])
+      repository = session.repo(args[:repository_path])
+      repository.recent_builds.find(&:finished?).passed? ? "Success" : "Failure"
+    rescue ::Travis::Client::Error
+      "Unknown"
     end
 
   end

data/lib/build_eval/version.rb

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

data/lib/build_eval.rb

@@ -6,6 +6,7 @@ require 'travis/client/session'
 
 require_relative 'build_eval/error'
 require_relative 'build_eval/http'
+require_relative 'build_eval/travis/session_factory'
 require_relative 'build_eval/travis'
 require_relative 'build_eval/result/status'
 require_relative 'build_eval/result/build_result'

data/spec/lib/build_eval/travis/session_factory_spec.rb

@@ -0,0 +1,91 @@
+describe BuildEval::Travis::SessionFactory do
+
+  describe "::create" do
+
+    let(:github_token)   { nil }
+    let(:travis_session) { instance_double(::Travis::Client::Session) }
+
+    subject { described_class.create(github_token) }
+
+    before(:example) { allow(::Travis::Client::Session).to receive(:new).and_return(travis_session) }
+    after(:example)  { described_class.clear_cache }
+
+    shared_examples_for "a call creating a new session" do
+
+      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 "returns the created session" do
+        expect(subject).to eql(travis_session)
+      end
+
+    end
+
+    context "when a session for the GitHub token has not been retrieved previously" do
+
+      context "and a non-nil GitHub token is provided" do
+
+        let(:github_token)  { "SOMEGITHUBAUTHTOKEN" }
+
+        before(:example) { allow(travis_session).to receive(:github_auth) }
+
+        it_behaves_like "a call creating a new session"
+
+        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 "logs-in using the provided GitHub token via the session" do
+          expect(travis_session).to receive(:github_auth).with(github_token)
+
+          subject
+        end
+
+      end
+
+      context "and a nil GitHub token is provided" do
+
+        let(:github_token)  { nil }
+
+        it_behaves_like "a call creating a new session"
+
+        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
+
+    end
+
+    context "when a session for the GitHub token has been retrieved previously" do
+
+      before(:example) { subject }
+
+      it "does not create a new session" do
+        expect(::Travis::Client::Session).to_not receive(:new)
+
+        subject
+      end
+
+      it "returns the previously retrieved session" do
+        expect(subject).to eql(travis_session)
+      end
+
+    end
+
+  end
+
+end

data/spec/lib/build_eval/travis_spec.rb

@@ -18,68 +18,37 @@ describe BuildEval::Travis do
     subject { described_class.last_build_status({ repository_path: repository_path }.merge(optional_args)) }
 
     before(:example) do
-      allow(::Travis::Client::Session).to receive(:new).and_return(travis_session)
+      allow(BuildEval::Travis::SessionFactory).to receive(:create).and_return(travis_session)
       allow(last_finished_build).to receive(:passed?).and_return(last_finished_build_passed_flag)
     end
 
-    context "when a GitHub token is provided" do
+    context "when a Github authentication token is provided" do
 
       let(:github_token)  { "SOMEGITHUBAUTHTOKEN" }
       let(:optional_args) { { github_token: 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))
+      it "creates a Travis session using the token" do
+        expect(BuildEval::Travis::SessionFactory).to receive(:create).with(github_token)
 
         subject
       end
 
-      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 an error occurs on log-in" do
-
-        before(:example) do
-          allow(travis_session).to receive(:github_auth).and_raise(::Travis::Client::Error.new("Forced error"))
-        end
-
-        it "returns 'Unknown'" do
-          expect(subject).to eql("Unknown")
-        end
-
-      end
-
     end
 
-    context "when no GitHub token is provided" do
+    context "when a Github authentication token is not provided" do
 
       let(:optional_args) { {} }
 
-      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)
+      it "creates a Travis session for a nil token" do
+        expect(BuildEval::Travis::SessionFactory).to receive(:create).with(nil)
 
         subject
       end
 
     end
 
-    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
+    it "retrieves the Travis repository for the provided repository path from the session" do
       expect(travis_session).to receive(:repo).with(repository_path)
 
       subject
@@ -117,7 +86,21 @@ describe BuildEval::Travis do
 
     end
 
-    context "when an Travis Client error occurs" do
+    context "when an error occurs obtaining a session" do
+
+      before(:example) do
+        allow(BuildEval::Travis::SessionFactory).to(
+          receive(:create).and_raise(::Travis::Client::Error.new("Forced error"))
+        )
+      end
+
+      it "returns 'Unknown'" do
+        expect(subject).to eql("Unknown")
+      end
+
+    end
+
+    context "when an error occurs retrieving the recent builds" do
 
       before(:example) do
         allow(travis_repository).to receive(:recent_builds).and_raise(::Travis::Client::Error.new("Forced error"))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: build_eval
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Matthew Ueckerman
@@ -163,6 +163,7 @@ files:
 - ./lib/build_eval/server/travis.rb
 - ./lib/build_eval/server/travis_pro.rb
 - ./lib/build_eval/travis.rb
+- ./lib/build_eval/travis/session_factory.rb
 - ./lib/build_eval/version.rb
 - ./spec/lib/build_eval/error_spec.rb
 - ./spec/lib/build_eval/http_shared_context.rb
@@ -184,6 +185,7 @@ 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/session_factory_spec.rb
 - ./spec/lib/build_eval/travis_spec.rb
 - ./spec/lib/build_eval_smoke_spec.rb
 - ./spec/lib/build_eval_spec.rb
@@ -233,6 +235,7 @@ 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/session_factory_spec.rb
 - ./spec/lib/build_eval/travis_spec.rb
 - ./spec/lib/build_eval_smoke_spec.rb
 - ./spec/lib/build_eval_spec.rb