update_status 0.1.2 → 0.1.3

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
   gem "multi_json", ">= 1.0.3"
-  gem "rest-client", ">= 1.6.7"
+  gem "rest-client", ">= 1.6.2"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -35,5 +35,5 @@ DEPENDENCIES
   multi_json (>= 1.0.3)
   rcov
   rdoc (~> 3.12)
-  rest-client (>= 1.6.7)
+  rest-client (>= 1.6.2)
   rspec (>= 2.11.0)

data/README.rdoc

@@ -15,7 +15,7 @@ eg
 
 :repo => "status",
 
-:ci_url => "http://jenkins-ci.org/",
+:ci_url => "http://jenkins-ci.org",
 
 :token => "your github token http://developer.github.com/v3/oauth/",
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/status/github/statuses.rb

@@ -30,7 +30,11 @@ module Status
       end
 
       def state
-        (Jenkins.pass? && @qa_status == "pass") ? states[3] : states[2]
+        (Jenkins.pass? && @qa_status == "pass") ? states[3] : git_state
+      end
+
+      def git_state
+        states.include?(Jenkins.state) ? states[states.index(Jenkins.state)] : "error"
       end
 
       def states

data/lib/status/jenkins.rb

@@ -5,24 +5,28 @@ module Status
     extend self
 
     def state
-      return "Green" if pass?
-      "building"
+      return "success" if pass?
+      @status
     end
 
     def pass?
       @status ||= get_ci_status
-      return false if @status == "building" || @status == "not found"
+      return false unless @status == "success"
       true
     end
 
     def get_ci_status
       response = Request.new(:ci).get(path)
-      return response if response == "not found"
-      response["building"] == true ? "building" : response["result"]
+      return "pending" if response == "not found"
+      return "pending" if response["building"] == true
+      return "failure" unless response["result"].downcase == "success"
+       "success"
     end
 
     def path
       "/job/#{Status.branch}/lastBuild/api/json"
     end
   end
-end
+end
+
+

data/spec/status/github/statuses_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Status::Github::Statuses do
   before do
-    stub_const("Jenkins", stub)
+    stub_const("Status::Jenkins", stub)
   end
 
   subject { Status::Github::Statuses }
@@ -12,20 +12,25 @@ describe Status::Github::Statuses do
   end
 
   it "has a payload description of the ci state and qa status" do
-    Jenkins.stub(:state => "Green")
-    subject.new.send(:description).should == "Build status: Green, QA pending"
+    Status::Jenkins.stub(:state => "success")
+    subject.new.send(:description).should == "Build status: success, QA pending"
   end
 
   it "has a payload pending state when ci is passing but qa hasn't passed" do
-    Jenkins.stub(:pass? => true)
+    Status::Jenkins.stub(:pass? => true, :state => "pending")
     subject.new.send(:state).should == "pending"
   end
 
   it "has a payload success state when ci is passing and qa has passed" do
-    Jenkins.stub(:pass? => true)
+    Status::Jenkins.stub(:pass? => true, :state => "success")
     subject.new("pass").send(:state).should == "success"
   end
 
+  it "has a payload error state when ci has an error" do
+    Status::Jenkins.stub(:pass? => false, :state => "nothing")
+    subject.new("pass").send(:state).should == "error"
+  end
+
   it "goes to the correct status api" do
     Status.stub(:owner => "owner", :repo => "status", :sha => "99efgd", :token => "123")
     subject.new.send(:status_api).should == "/repos/owner/status/statuses/99efgd?access_token=123"

data/spec/status/jenkins_spec.rb

@@ -15,19 +15,24 @@ describe Status::Jenkins do
   end
 
   context "#state" do
-    it "is Green when ci result is success" do
+    it "is success when ci result is success" do
       Status::Request.stub(:new => stub(:get => {"building" => false, "result" => "success"}))
-      subject.state.should == "Green"
+      subject.state.should == "success"
     end
 
     it "is Building when ci result is building" do
       Status::Request.stub(:new => stub(:get => {"building" => true, "result" => "success"}))
-      subject.state.should == "building"
+      subject.state.should == "pending"
+    end
+
+    it "is Building when ci result is in any other state" do
+      Status::Request.stub(:new => stub(:get => {"building" => true, "result" => "failed"}))
+      subject.state.should == "pending"
     end
 
     it "is Building when ci result is not found" do
       Status::Request.stub(:new => stub(:get => "not found"))
-      subject.state.should == "building"
+      subject.state.should == "pending"
     end
   end
 end

data/update_status.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "update_status"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Douglas Roper"]
-  s.date = "2012-10-26"
+  s.date = "2012-12-11"
   s.description = "Updates pull requests on github, with latest build from Jenkins and QA status"
   s.email = "douglasroper@notonthehighstreet.com"
   s.executables = ["status"]
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<multi_json>, [">= 1.0.3"])
-      s.add_runtime_dependency(%q<rest-client>, [">= 1.6.7"])
+      s.add_runtime_dependency(%q<rest-client>, [">= 1.6.2"])
       s.add_development_dependency(%q<rspec>, [">= 2.11.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.2.1"])
@@ -59,7 +59,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<multi_json>, [">= 1.0.3"])
-      s.add_dependency(%q<rest-client>, [">= 1.6.7"])
+      s.add_dependency(%q<rest-client>, [">= 1.6.2"])
       s.add_dependency(%q<rspec>, [">= 2.11.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.2.1"])
@@ -68,7 +68,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<multi_json>, [">= 1.0.3"])
-    s.add_dependency(%q<rest-client>, [">= 1.6.7"])
+    s.add_dependency(%q<rest-client>, [">= 1.6.2"])
     s.add_dependency(%q<rspec>, [">= 2.11.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.2.1"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: update_status
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Douglas Roper
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-26 00:00:00 Z
+date: 2012-12-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multi_json
@@ -40,12 +40,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 11
         segments: 
         - 1
         - 6
-        - 7
-        version: 1.6.7
+        - 2
+        version: 1.6.2
   type: :runtime
   requirement: *id002
   prerelease: false