build_eval 0.0.14 → 0.0.15

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTdkYTU0YWU2NWVlN2EzMjcxYTg4NjdkMDQ0MjQ1MDcwZjdiMzBiOQ==
+    MjgwN2ZiZjMyOWY1YTM2YzZmNmQyZmQ0NjJhZGM4ZTY4YWQ5NTRlMw==
   data.tar.gz: !binary |-
-    NTc2OGJjMWIyOTY3YTQ5ODBlNWJjMTk3MjM4ZWU0NWU5NWYzM2M3Nw==
+    MTZkMmJjYjQyMjc3NWI0ZWNmY2NhMzNlMzU5YWZhMjMzNjk5ZjY3ZA==
 SHA512:
   metadata.gz: !binary |-
-    NzM1OTUxNjIzZjYzZWNkYmFlNTczYTNjNjlkMDlkZjM4NTg5ODNlMTg1Yjli
-    ODZkZTBlOGYyYjM1OTQyMTdiZGRjMzlmYTkwODYxZTlkYjUxOTQyZDFlNzdj
-    Y2YxNzFiZGJkMTk3MTE5NTM3NWYwM2JiMTZiMzNlMGY1NDQ3MTE=
+    MmRhMmNhMWJhNDZkM2RlNDZlYTEwZWE5MDIxMDYyYzJkNmQ3M2ZlMzc5OTJm
+    MjIxOGZjZTU2ZmMwOWFmODhjMTg5YzM2Y2IyNjgyMWJjZTIyMWQxZDc0YTk0
+    YmJiNWM0ZjA1YWIwZDkxMDZlNTYzYTEyZjBjNzMzMThjNTUwZmI=
   data.tar.gz: !binary |-
-    Y2I1ZTBiYTNkZDRlMTdhNzc3YzBkM2ViMDQxYWQzMTlhMDQxNTM5MjhjYzU5
-    MDhkOTZjMGI1ZjJiMDg5YTZlMWRjODRiYjhmNTYwNjE4MjFmZTRlNjg1ZjA2
-    ZDRiZmFjZDk3NTc1YjE3MmUwNGFiNjBlODg2OTI3YjBlZjI3ODc=
+    MTU3YmRhYTZiZGRhYTVhZGJmZTZiNjlmZTliZjk3OTQzNWY0NTViZjQ0OWE1
+    YTZlNTM2NmYxYjI0N2U0MmVlZDRjZTE0ZjU4OGE0MGY5NzRjNzA1OTkzYzUx
+    MDFiOWM3OGQyNzQ3NDdhNDhjYTJmZDc1NjFlZTYwYjZhYzI0MzY=

data/lib/build_eval/monitor/server.rb

@@ -4,12 +4,15 @@ module BuildEval
     class Server < BuildEval::Monitor::Base
 
       def initialize(args)
-        @server      = args[:server]
-        @build_names = args[:build_names]
+        @server               = args[:server]
+        @build_configurations = args[:build_configurations]
       end
 
       def evaluate
-        build_results = @build_names.map { |build_name| @server.build_result(build_name) }
+        build_results = @build_configurations.map do |build_configuration|
+          build_name, branch_name = build_configuration.split(":")
+          @server.build_result(build_name, branch_name)
+        end
         BuildEval::Result::ServerResult.new(@server, build_results)
       end
 

data/lib/build_eval/result/build_result.rb

@@ -6,23 +6,31 @@ module BuildEval
       class << self
 
         def create(args)
-          new(build_name: args[:build_name], status: BuildEval::Result::Status.find(args[:status_name]))
+          new(
+            build_name:  args[:build_name],
+            branch_name: args[:branch_name],
+            status:      BuildEval::Result::Status.find(args[:status_name])
+          )
         end
 
-        def indeterminate(build_name)
-          new(build_name: build_name, status: BuildEval::Result::Status::INDETERMINATE)
+        def indeterminate(args)
+          new(
+            build_name:  args[:build_name],
+            branch_name: args[:branch_name],
+            status:      BuildEval::Result::Status::INDETERMINATE
+          )
         end
 
       end
 
-      attr_reader :build_name
       attr_reader :status
 
       private
 
       def initialize(args)
-        @build_name = args[:build_name]
-        @status     = args[:status]
+        @build_name  = args[:build_name]
+        @branch_name = args[:branch_name]
+        @status      = args[:status]
       end
 
       public
@@ -32,7 +40,7 @@ module BuildEval
       end
 
       def to_s
-        "#{@build_name}: #{@status}"
+        "#{@build_name}#{@branch_name ? ":#{@branch_name}" : ""} -> #{@status}"
       end
 
     end

data/lib/build_eval/result/status.rb

@@ -13,11 +13,12 @@ module BuildEval
 
       public
 
-      SUCCESS       = new(severity: 0, symbol: :success!, description: "succeeded")
-      UNKNOWN       = new(severity: 1, symbol: :warning!, description: "unknown")
-      INDETERMINATE = new(severity: 2, symbol: :warning!, description: "indeterminate")
-      FAILURE       = new(severity: 3, symbol: :failure!, description: "failed")
-      ERROR         = new(severity: 4, symbol: :failure!, description: "errored")
+      SUCCESS       = new(severity: 0, symbol: :success!,  description: "succeeded")
+      BUILDING      = new(severity: 1, symbol: :building!, description: "building")
+      UNKNOWN       = new(severity: 2, symbol: :warning!,  description: "unknown")
+      INDETERMINATE = new(severity: 3, symbol: :warning!,  description: "indeterminate")
+      FAILURE       = new(severity: 4, symbol: :failure!,  description: "failed")
+      ERROR         = new(severity: 5, symbol: :failure!,  description: "errored")
 
       class << self
 
@@ -36,7 +37,7 @@ module BuildEval
       attr_reader :severity
 
       def unsuccessful?
-        self != SUCCESS
+        ![ SUCCESS, BUILDING ].include?(self)
       end
 
       def to_sym

data/lib/build_eval/server/decorator.rb

@@ -7,14 +7,14 @@ module BuildEval
         @delegate = delegate
       end
 
-      def build_result(name)
-        @delegate.build_result(name)
+      def build_result(build_name, branch_name)
+        @delegate.build_result(build_name, branch_name)
       rescue StandardError
-        BuildEval::Result::BuildResult.indeterminate(name)
+        BuildEval::Result::BuildResult.indeterminate(build_name: build_name, branch_name: branch_name)
       end
 
-      def monitor(*build_names)
-        BuildEval::Monitor::Server.new(server: @delegate, build_names: build_names.flatten)
+      def monitor(*build_configurations)
+        BuildEval::Monitor::Server.new(server: @delegate, build_configurations: build_configurations.flatten)
       end
 
     end

data/lib/build_eval/server/jenkins.rb

@@ -8,9 +8,9 @@ module BuildEval
         @base_uri = args[:uri]
       end
 
-      def build_result(name)
+      def build_result(build_name, _branch_name)
         raw_response = @http.get("#{@base_uri}/cc.xml")
-        BuildEval::Server::CruiseControlResponse.new(raw_response).parse_result("//Project[@name=\"#{name}\"]")
+        BuildEval::Server::CruiseControlResponse.new(raw_response).parse_result("//Project[@name=\"#{build_name}\"]")
       end
 
       def to_s

data/lib/build_eval/server/team_city.rb

@@ -8,11 +8,12 @@ module BuildEval
         @base_uri = args[:uri]
       end
 
-      def build_result(name)
-        response = @http.get("#{@base_uri}/httpAuth/app/rest/buildTypes/id:#{name}/builds")
+      def build_result(build_name, _branch_name)
+        response = @http.get("#{@base_uri}/httpAuth/app/rest/buildTypes/id:#{build_name}/builds")
         build_element = Nokogiri::XML(response.body).xpath("//build").first
         raise "Unexpected build response: #{response.message}" unless build_element
-        BuildEval::Result::BuildResult.create(build_name: name, status_name: build_element.attribute("status").value)
+        BuildEval::Result::BuildResult.create(build_name:  build_name,
+                                              status_name: build_element.attribute("status").value)
       end
 
       def to_s

data/lib/build_eval/server/travis.rb

@@ -5,13 +5,15 @@ module BuildEval
 
       def initialize(args)
         @username = args[:username]
+        @branch   = args[:branch]
       end
 
-      def build_result(name)
-        repository_path = "#{@username}/#{name}"
+      def build_result(build_name, branch_name)
+        repository_path = "#{@username}/#{build_name}"
         BuildEval::Result::BuildResult.create(
           build_name:  repository_path,
-          status_name: BuildEval::Travis.last_build_status(repository_path: repository_path)
+          branch_name: branch_name,
+          status_name: BuildEval::Travis.last_build_status(repository_path: repository_path, branch: branch_name)
         )
       end
 

data/lib/build_eval/server/travis_pro.rb

@@ -6,14 +6,17 @@ module BuildEval
       def initialize(args)
         @username     = args[:username]
         @github_token = args[:github_token]
+        @branch       = args[:branch]
       end
 
-      def build_result(name)
-        repository_path = "#{@username}/#{name}"
+      def build_result(build_name, branch_name)
+        repository_path = "#{@username}/#{build_name}"
         BuildEval::Result::BuildResult.create(
           build_name:  repository_path,
+          branch_name: branch_name,
           status_name: BuildEval::Travis.last_build_status(github_token:    @github_token,
-                                                           repository_path: repository_path)
+                                                           repository_path: repository_path,
+                                                           branch:          branch_name)
         )
       end
 

data/lib/build_eval/travis/session/factory.rb

@@ -0,0 +1,31 @@
+module BuildEval
+  module Travis
+    module Session
+
+      class Factory
+
+        class << self
+
+          def create(github_token)
+            BuildEval::Travis::Session::Session.new(create_raw_session(github_token), github_token)
+          end
+
+          private
+
+          def create_raw_session(github_token)
+            ::Travis::Client::Session.new(uri: uri_for(github_token), ssl: {}).tap do |session|
+              session.github_auth(github_token) if github_token
+            end
+          end
+
+          def uri_for(github_token)
+            github_token ? ::Travis::Client::PRO_URI : ::Travis::Client::ORG_URI
+          end
+
+        end
+
+      end
+
+    end
+  end
+end

data/lib/build_eval/travis/session/pool.rb

@@ -0,0 +1,44 @@
+module BuildEval
+  module Travis
+    module Session
+
+      class Pool
+
+        class << self
+
+          def get(github_token)
+            get_session(github_token) || create_session(github_token)
+          end
+
+          def release(session)
+            session.clear_cache
+            sessions_for(session.github_token) << session
+          end
+
+          def clear
+            @pool = {}
+          end
+
+          private
+
+          def get_session(github_token)
+            sessions_for(github_token).shift
+          end
+
+          def create_session(github_token)
+            BuildEval::Travis::Session::Factory.create(github_token)
+          end
+
+          def sessions_for(github_token)
+            @pool ||= {}
+            @pool[github_token] ||= []
+            @pool[github_token]
+          end
+
+        end
+
+      end
+
+    end
+  end
+end

data/lib/build_eval/travis/session/session.rb

@@ -0,0 +1,18 @@
+module BuildEval
+  module Travis
+    module Session
+
+      class Session < DelegateClass(::Travis::Client::Session)
+
+        attr_reader :github_token
+
+        def initialize(raw_session, github_token)
+          super(raw_session)
+          @github_token = github_token
+        end
+
+      end
+
+    end
+  end
+end

data/lib/build_eval/travis/session.rb

@@ -0,0 +1,14 @@
+module BuildEval
+  module Travis
+    module Session
+
+      def self.open(github_token)
+        session = BuildEval::Travis::Session::Pool.get(github_token)
+        yield session
+      ensure
+        BuildEval::Travis::Session::Pool.release(session)
+      end
+
+    end
+  end
+end

data/lib/build_eval/travis.rb

@@ -2,10 +2,16 @@ module BuildEval
 
   module Travis
 
+    STATUS_BY_COLOR = { green: "Success", yellow: "Building", red: "Failure" }.freeze
+
+    private_constant :STATUS_BY_COLOR
+
     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"
+      BuildEval::Travis::Session.open(args[:github_token]) do |session|
+        repository = session.repo(args[:repository_path])
+        build = args[:branch] ? repository.branch(args[:branch]) : repository.last_build
+        STATUS_BY_COLOR[build.color.to_sym]
+      end
     rescue ::Travis::Client::Error
       "Unknown"
     end

data/lib/build_eval/version.rb

@@ -1,3 +1,3 @@
 module BuildEval
-  VERSION = "0.0.14".freeze
+  VERSION = "0.0.15".freeze
 end

data/lib/build_eval.rb

@@ -6,7 +6,10 @@ 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/session/session'
+require_relative 'build_eval/travis/session/factory'
+require_relative 'build_eval/travis/session/pool'
+require_relative 'build_eval/travis/session'
 require_relative 'build_eval/travis'
 require_relative 'build_eval/result/status'
 require_relative 'build_eval/result/build_result'

data/spec/lib/build_eval/monitor/composite_spec.rb

@@ -1,4 +1,5 @@
 describe BuildEval::Monitor::Composite do
+
   let(:monitors) { (1..2).map { double(BuildEval::Monitor::Base) } }
 
   let(:composite) { described_class.new(*monitors) }

data/spec/lib/build_eval/monitor/server_spec.rb

@@ -1,20 +1,28 @@
 describe BuildEval::Monitor::Server do
 
-  let(:server)      { double("BuildEval::Server") }
-  let(:build_names) { (1..3).map { |i| "build##{i}" } }
+  let(:server)               { double("BuildEval::Server") }
+  let(:build_configurations) { %w{ build#1 build#2:branch#1 build#2:branch#2 build#3 } }
 
-  let(:server_monitor) { described_class.new(server: server, build_names: build_names) }
+  let(:server_monitor) { described_class.new(server: server, build_configurations: build_configurations) }
 
   describe "#evaluate" do
 
-    let(:results) { build_names.map { instance_double(BuildEval::Result::BuildResult) } }
+    let(:results) { build_configurations.map { instance_double(BuildEval::Result::BuildResult) } }
 
     subject { server_monitor.evaluate }
 
     before(:example) { allow(server).to receive(:build_result).and_return(*results) }
 
-    it "determines build results for builds of interest" do
-      build_names.each { |build_name| expect(server).to receive(:build_result).with(build_name) }
+    it "determines build results for builds with branches" do
+      [ [ "build#2", "branch#1" ], ["build#2", "branch#2" ] ].each do |build_name, branch_name|
+        expect(server).to receive(:build_result).with(build_name, branch_name)
+      end
+
+      subject
+    end
+
+    it "determines build results for builds without branches" do
+      %w{ build#1 build#3 }.each { |build_name| expect(server).to receive(:build_result).with(build_name, nil) }
 
       subject
     end

data/spec/lib/build_eval/result/build_result_spec.rb

@@ -3,13 +3,10 @@ describe BuildEval::Result::BuildResult do
   describe "::create" do
 
     let(:build_name)  { "Some build name" }
+    let(:branch_name) { "Some branch name" }
     let(:status_name) { "SUCCESS" }
 
-    subject { described_class.create(build_name: build_name, status_name: status_name) }
-
-    it "returns a result with the provided build name" do
-      expect(subject.build_name).to eql(build_name)
-    end
+    subject { described_class.create(build_name: build_name, branch_name: branch_name, status_name: status_name) }
 
     it "determines the status with the provided status name" do
       expect(BuildEval::Result::Status).to receive(:find).with(status_name)
@@ -29,12 +26,9 @@ describe BuildEval::Result::BuildResult do
   describe "::indeterminate" do
 
     let(:build_name) { "Some build name" }
+    let(:branch_name) { "Some branch name" }
 
-    subject { described_class.indeterminate(build_name) }
-
-    it "returns a result with the provided build name" do
-      expect(subject.build_name).to eql(build_name)
-    end
+    subject { described_class.indeterminate(build_name: build_name, branch_name: branch_name) }
 
     it "returns a result with an indeterminate status" do
       expect(subject.status).to eql(BuildEval::Result::Status::INDETERMINATE)
@@ -45,7 +39,9 @@ describe BuildEval::Result::BuildResult do
   describe "#unsuccessful?" do
 
     let(:status)       { instance_double(BuildEval::Result::Status) }
-    let(:build_result) { described_class.create(build_name: "some build", status_name: "some status") }
+    let(:build_result) do
+      described_class.create(build_name: "some build", branch_name: "some branch", status_name: "some status")
+    end
 
     subject { build_result.unsuccessful? }
 
@@ -62,10 +58,15 @@ describe BuildEval::Result::BuildResult do
   describe "#to_s" do
 
     let(:build_name)                   { "Some build name" }
+    let(:branch_name)                  { "Some branch name" }
     let(:status_string_representation) { "SUCCESS" }
-    let(:status)                       { instance_double(BuildEval::Result::Status, to_s: status_string_representation) }
+    let(:status)                       do
+      instance_double(BuildEval::Result::Status, to_s: status_string_representation)
+    end
 
-    let(:build_result) { described_class.create(build_name: build_name, status_name: "some status") }
+    let(:build_result) do
+      described_class.create(build_name: build_name, branch_name: branch_name, status_name: "some status")
+    end
 
     subject { build_result.to_s }
 
@@ -75,6 +76,34 @@ describe BuildEval::Result::BuildResult do
       expect(subject).to include(build_name)
     end
 
+    context "when a branch name is provided" do
+
+      let(:branch_name) { "Some branch name" }
+
+      it "contains the branch name" do
+        expect(subject).to include(branch_name)
+      end
+
+      it "separates the build and branch names with a colon" do
+        expect(subject).to include("#{build_name}:#{branch_name}")
+      end
+
+    end
+
+    context "when a branch name is not provided" do
+
+      let(:branch_name) { nil }
+
+      it "does not contain a nil" do
+        expect(subject).to_not include("nil")
+      end
+
+      it "does not contain a colon separator" do
+        expect(subject).to_not include(":")
+      end
+
+    end
+
     it "contains the string representation of the status" do
       expect(subject).to include(status_string_representation)
     end

data/spec/lib/build_eval/result/status_spec.rb

@@ -58,6 +58,7 @@ describe BuildEval::Result::Status do
           BuildEval::Result::Status::FAILURE,
           BuildEval::Result::Status::UNKNOWN,
           BuildEval::Result::Status::INDETERMINATE,
+          BuildEval::Result::Status::BUILDING,
           BuildEval::Result::Status::SUCCESS
         ]
       end
@@ -73,6 +74,7 @@ describe BuildEval::Result::Status do
       let(:statuses) do
         [
           BuildEval::Result::Status::SUCCESS,
+          BuildEval::Result::Status::BUILDING,
           BuildEval::Result::Status::UNKNOWN,
           BuildEval::Result::Status::INDETERMINATE,
           BuildEval::Result::Status::FAILURE,
@@ -92,12 +94,21 @@ describe BuildEval::Result::Status do
 
     subject { status.unsuccessful? }
 
-    context "when the status is SUCCESS" do
-      let(:status) { BuildEval::Result::Status::SUCCESS }
+    {
+      "SUCCESS"  => BuildEval::Result::Status::SUCCESS,
+      "BUILDING" => BuildEval::Result::Status::BUILDING
+    }.each do |name, status|
+
+      context "when the status is #{name}" do
+
+        let(:status) { status }
+
+        it "returns false" do
+          expect(subject).to be(false)
+        end
 
-      it "returns false" do
-        expect(subject).to be(false)
       end
+
     end
 
     {
@@ -127,6 +138,7 @@ describe BuildEval::Result::Status do
 
     {
       SUCCESS:       :success!,
+      BUILDING:      :building!,
       UNKNOWN:       :warning!,
       INDETERMINATE: :warning!,
       FAILURE:       :failure!,
@@ -137,7 +149,7 @@ describe BuildEval::Result::Status do
 
         let(:status) { BuildEval::Result::Status.const_get(name) }
 
-        it "returns success!" do
+        it "returns #{expected_symbol}" do
           expect(subject).to eql(expected_symbol)
         end
 
@@ -153,6 +165,7 @@ describe BuildEval::Result::Status do
 
     {
       SUCCESS:       "succeeded",
+      BUILDING:      "building",
       UNKNOWN:       "unknown",
       INDETERMINATE: "indeterminate",
       FAILURE:       "failed",
@@ -163,7 +176,7 @@ describe BuildEval::Result::Status do
 
         let(:status) { BuildEval::Result::Status.const_get(name) }
 
-        it "returns success!" do
+        it "returns #{expected_string}" do
           expect(subject).to eql(expected_string)
         end
 

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

@@ -6,12 +6,13 @@ describe BuildEval::Server::Decorator do
 
   describe "#build_result" do
 
-    let(:build_name) { "some build name" }
+    let(:build_name)  { "some build name" }
+    let(:branch_name) { "some branch name" }
 
-    subject { decorator.build_result(build_name) }
+    subject { decorator.build_result(build_name, branch_name) }
 
     it "delegates to the decorated server" do
-      expect(server).to receive(:build_result).with(build_name)
+      expect(server).to receive(:build_result).with(build_name, branch_name)
 
       subject
     end
@@ -33,7 +34,9 @@ describe BuildEval::Server::Decorator do
       before(:example) { allow(server).to receive(:build_result).and_raise("Forced error") }
 
       it "creates an indeterminate result" do
-        expect(BuildEval::Result::BuildResult).to receive(:indeterminate).with(build_name)
+        expect(BuildEval::Result::BuildResult).to(
+          receive(:indeterminate).with(build_name: build_name, branch_name: branch_name)
+        )
 
         subject
       end
@@ -51,9 +54,9 @@ describe BuildEval::Server::Decorator do
 
   describe "#monitor" do
 
-    let(:build_names) { (1..3).map { |i| "build##{i}" } }
+    let(:build_configurations) { (1..3).map { |i| "monitor##{i}" } }
 
-    subject { decorator.monitor(*build_names) }
+    subject { decorator.monitor(*build_configurations) }
 
     it "creates a server monitor for the decorated server" do
       expect(BuildEval::Monitor::Server).to receive(:new).with(hash_including(server: server))
@@ -68,24 +71,28 @@ describe BuildEval::Server::Decorator do
       expect(subject).to eql(monitor)
     end
 
-    context "when an array of build names is provided" do
+    context "when an array of build configurations is provided" do
 
-      subject { decorator.monitor(build_names) }
+      subject { decorator.monitor(build_configurations) }
 
-      it "creates a server monitor for the provided build names" do
-        expect(BuildEval::Monitor::Server).to receive(:new).with(hash_including(build_names: build_names))
+      it "creates a server monitor for the provided build configurations" do
+        expect(BuildEval::Monitor::Server).to(
+          receive(:new).with(hash_including(build_configurations: build_configurations))
+        )
 
         subject
       end
 
     end
 
-    context "when variable argument list of build names is provided" do
+    context "when variable argument list build configurations is provided" do
 
-      subject { decorator.monitor(*build_names) }
+      subject { decorator.monitor(*build_configurations) }
 
-      it "creates a server monitor for the provided build names" do
-        expect(BuildEval::Monitor::Server).to receive(:new).with(hash_including(build_names: build_names))
+      it "creates a server monitor for the provided build configurations" do
+        expect(BuildEval::Monitor::Server).to(
+          receive(:new).with(hash_including(build_configurations: build_configurations))
+        )
 
         subject
       end

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

@@ -7,10 +7,11 @@ describe BuildEval::Server::Jenkins, "integrating with a response parser", integ
 
   describe "#build_result" do
 
-    let(:build_name) { "some_build_name" }
-    let(:response)   { instance_double(Net::HTTPResponse, body: response_body) }
+    let(:build_name)  { "some_build_name" }
+    let(:branch_name) { nil }
+    let(:response)    { instance_double(Net::HTTPResponse, body: response_body) }
 
-    subject { jenkins.build_result(build_name) }
+    subject { jenkins.build_result(build_name, branch_name) }
 
     before(:example) { allow(http).to receive(:get).and_return(response) }