ci_in_a_can 0.0.20 → 0.0.21

data/ci_in_a_can.gemspec

@@ -32,4 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "octokit"
   spec.add_runtime_dependency "daemons"
   spec.add_runtime_dependency "subtle"
+  spec.add_runtime_dependency "systemu"
 end

data/lib/ci_in_a_can/app.rb

@@ -27,6 +27,22 @@ module CiInACan
           #{test_result.id}
         </td>
       </tr>
+      <tr>
+        <td>
+          Repo
+        </td>
+        <td>
+          #{test_result.repo}
+        </td>
+      </tr>
+      <tr>
+        <td>
+          Branch
+        </td>
+        <td>
+          #{test_result.branch}
+        </td>
+      </tr>
       <tr>
         <td>
           Created At
@@ -67,6 +83,9 @@ EOF
                       <td>
                         #{run.repo}
                       </td>
+                      <td>
+                        #{run.branch}
+                      </td>
                       <td>
                         #{run.passed ? 'Yes' : 'No'}
                       </td>

data/lib/ci_in_a_can/build.rb

@@ -7,7 +7,7 @@ module CiInACan
     end
 
     attr_accessor :id, :git_ssh, :sha,
-                  :local_location, :repo,
+                  :local_location, :repo, :branch,
                   :created_at
 
     def self.parse content

data/lib/ci_in_a_can/github_build_parser.rb

@@ -8,7 +8,9 @@ module CiInACan
 
       CiInACan::Build.new(git_ssh: "git@github.com:#{project}.git",
                           repo:    project,
+                          branch:  extract_branch_from(payload),
                           sha:     extract_sha_from(payload))
+
     end
 
     private
@@ -32,5 +34,9 @@ module CiInACan
       payload['head_commit']['id']
     end
 
+    def extract_branch_from payload
+      payload['ref'].sub('refs/heads/', '')
+    end
+
   end
 end

data/lib/ci_in_a_can/last_run_list.rb

@@ -18,7 +18,8 @@ module CiInACan
                passed:         test_result.passed,
                build_id:       build.id,
                sha:            build.sha,
-               repo:           build.repo 
+               repo:           build.repo,
+               branch:         build.branch
              }
       CiInACan::Persistence.save("test_run_list", test_result.created_at, data)
     end

data/lib/ci_in_a_can/test_result.rb

@@ -12,6 +12,9 @@ module CiInACan
     attr_accessor :id
     attr_accessor :passed, :output
     attr_accessor :created_at
+    attr_accessor :build_id
+    attr_accessor :branch
+    attr_accessor :repo
 
     def self.create values
       test_result = create_the_test_result_from values

data/lib/ci_in_a_can/test_runner.rb

@@ -4,14 +4,16 @@ module CiInACan
 
     def self.run_tests_for build
       bash_result = run get_commands_for(build)
-      build_test_result_from bash_result
+      build_test_result_from bash_result, build
     end
 
     private
 
-    def self.build_test_result_from bash_result
+    def self.build_test_result_from bash_result, build
       CiInACan::TestResult.create( { passed: bash_result.successful,
-                                     output: bash_result.output } )
+                                     output: bash_result.output,
+                                     build_id: build.id,
+                                     branch: build.branch } )
     end
 
     def self.run commands

data/lib/ci_in_a_can/version.rb

@@ -1,3 +1,3 @@
 module CiInACan
-  VERSION = "0.0.20"
+  VERSION = "0.0.21"
 end

data/spec/ci_in_a_can/github_build_parser_spec.rb

@@ -2,18 +2,24 @@ require_relative '../spec_helper'
 
 describe CiInACan::GithubBuildParser do
 
-  [:compare, :sha, :git_ssh, :repo].to_objects {[
-    ["https://github.com/darrencauthon/ci_in_a_can/commit/b1c5f9c9588f", "qwe", "git@github.com:darrencauthon/ci_in_a_can.git", "darrencauthon/ci_in_a_can"],
-    ["https://github.com/abc/123/commit/b1c5f9c9588f",                   "uio", "git@github.com:abc/123.git",                   "abc/123"]
+  [:branch, :compare, :sha, :git_ssh, :repo].to_objects {[
+    ["blah",          "https://github.com/darrencauthon/ci_in_a_can/commit/b1c5f9c9588f", "qwe", "git@github.com:darrencauthon/ci_in_a_can.git", "darrencauthon/ci_in_a_can"],
+    ["bloo",          "https://github.com/abc/123/commit/b1c5f9c9588f",                   "uio", "git@github.com:abc/123.git",                   "abc/123"],
+    ["issues/5/blop", "https://github.com/abc/123/commit/b1c5f9c9588f",                   "uio", "git@github.com:abc/123.git",                   "abc/123"]
   ]}.each do |test|
 
     describe "parse" do
 
+      let(:ref) { "refs/heads/#{test.branch}" }
+
+      # content is a representation of the web request
+      # that github will send on every push
       let(:content) do
         {
           payload: {
                      compare:     test.compare,
-                     head_commit: { id: test.sha }
+                     head_commit: { id: test.sha },
+                     ref:         ref
                    }.to_json
         }.to_json
       end
@@ -33,6 +39,11 @@ describe CiInACan::GithubBuildParser do
         build.sha.must_equal test.sha
       end
 
+      it "should stamp the branch" do
+        build = CiInACan::GithubBuildParser.new.parse content
+        build.branch.must_equal test.branch
+      end
+
     end
 
   end

data/spec/ci_in_a_can/last_run_list_spec.rb

@@ -17,8 +17,7 @@ describe CiInACan::LastRunList do
       results = CiInACan::LastRunList.all
       results.count.must_equal 1
 
-      expected = { created_at: test_result.created_at }
-      results.first.contrast_with! expected
+      results.first.created_at.must_equal test_result.created_at 
     end
 
     it "should track the test_result_id" do
@@ -29,32 +28,38 @@ describe CiInACan::LastRunList do
 
       results = CiInACan::LastRunList.all
 
-      results.first[:test_result_id].must_equal test_result.id
+      results.first.test_result_id.must_equal test_result.id
         
     end
 
     it "should track the build id" do
       build.id = UUID.new.generate
       CiInACan::LastRunList.add build, test_result
-      CiInACan::LastRunList.all.first[:build_id].must_equal build.id
+      CiInACan::LastRunList.all.first.build_id.must_equal build.id
     end
 
     it "should track the build id" do
       build.id = UUID.new.generate
       CiInACan::LastRunList.add build, test_result
-      CiInACan::LastRunList.all.first[:build_id].must_equal build.id
+      CiInACan::LastRunList.all.first.build_id.must_equal build.id
     end
 
     it "should track the build sha" do
       build.sha = UUID.new.generate
       CiInACan::LastRunList.add build, test_result
-      CiInACan::LastRunList.all.first[:sha].must_equal build.sha
+      CiInACan::LastRunList.all.first.sha.must_equal build.sha
     end
 
     it "should track the build repo" do
       build.repo = UUID.new.generate
       CiInACan::LastRunList.add build, test_result
-      CiInACan::LastRunList.all.first[:repo].must_equal build.repo
+      CiInACan::LastRunList.all.first.repo.must_equal build.repo
+    end
+
+    it "should track the branch" do
+      build.branch = UUID.new.generate
+      CiInACan::LastRunList.add build, test_result
+      CiInACan::LastRunList.all.first.branch.must_equal build.branch
     end
 
     [true, false].each do |passed|
@@ -70,7 +75,7 @@ describe CiInACan::LastRunList do
 
           results = CiInACan::LastRunList.all
 
-          results.first[:passed].must_equal passed
+          results.first.passed.must_equal passed
         end
 
       end
@@ -92,9 +97,9 @@ describe CiInACan::LastRunList do
         test_results.each { |t| CiInACan::LastRunList.add build, t }
 
         results = CiInACan::LastRunList.all
-        results[0][:test_result_id].must_equal 'c'
-        results[1][:test_result_id].must_equal 'b'
-        results[2][:test_result_id].must_equal 'a'
+        results[0].test_result_id.must_equal 'c'
+        results[1].test_result_id.must_equal 'b'
+        results[2].test_result_id.must_equal 'a'
       end
 
     end

data/spec/ci_in_a_can/test_runner_spec.rb

@@ -50,6 +50,24 @@ describe CiInACan::TestRunner do
           result.output.must_be_same_as output
         end
 
+        it "should pass the id from the build" do
+          build.id = Object.new
+          result = CiInACan::TestRunner.run_tests_for build
+          result.build_id.must_be_same_as build.id
+        end
+
+        it "should pass the branch from the build" do
+          build.branch = Object.new
+          result = CiInACan::TestRunner.run_tests_for build
+          result.branch.must_be_same_as build.branch
+        end
+
+        it "should pass the repo from the build" do
+          build.repo = Object.new
+          result = CiInACan::TestRunner.run_tests_for build
+          result.repo.must_be_same_as build.repo
+        end
+
         it "should return a passed test result if the command returns true" do
           bash_result.stubs(:successful).returns true
           result = CiInACan::TestRunner.run_tests_for build

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: ci_in_a_can
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
+  prerelease: 
 platform: ruby
 authors:
 - Darren Cauthon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-15 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,169 +30,209 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: subtle
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: contrast
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: subtle
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: systemu
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Fast CI. Still a WIP.
@@ -243,26 +286,33 @@ files:
 homepage: ''
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2963165488835053675
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2963165488835053675
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Fast CI. Still a WIP.
 test_files:
 - spec/ci_in_a_can/bash_result_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 64e2e19dd3ef7054409c88c4ce760c3a3b27ed00
-  data.tar.gz: 81fefe7f8183713589a0b4790516cbcf1c83de03
-SHA512:
-  metadata.gz: 89ac33194ab44d9ebd23c6fbb8a9c2d51ef99cae39263f2024281fb3ad1e93ef76f66114fde990c2746f0426a1993e56dee514d395c0a2ad5d7f70b2f4ab2b5f
-  data.tar.gz: 1e2da649f0f2872d30fae3809a28ffc5661870c26832627855d0a389ec81eb93c7247cdbd94c8292960867f37cbaa972d86ce5b89e1681682ca2061121c59cf4