update_status 0.1.7 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.2.0

data/bin/status

@@ -4,5 +4,13 @@
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'status'
+require 'optparse'
 
-Status::Base.new(*ARGV).update
+OptionParser.new do |o|
+  o.on("-s STATE", "--state", "Status of QA (default pending) [pending/pass]") {|s| $state = s }
+  o.on("-b BRANCH", "--branch BRANCH", "Branch name") {|b| $branch = b }
+  o.on("-h", "--help", "Display this screen") {puts o; exit }
+  o.parse!
+end
+
+Status::Base.new({:state => $state, :branch => $branch}).update

data/lib/status/base.rb

@@ -6,14 +6,19 @@ module Status
   class Base
     attr_reader :qa_status
 
-    def initialize(qa_status="pending")
-      @qa_status = qa_status
-      @statuses = Status::Github::Statuses.new(qa_status)
+    def initialize(options)
+      @qa_status = options[:state] || "pending"
+      @branch = options[:branch] || branch
+      @statuses = Status::Github::Statuses.new(@qa_status, @branch)
+    end
+
+    def branch
+      `git rev-parse --abbrev-ref HEAD`.chomp
     end
 
     def update
       puts "Updating..."
-      pull = Status::Github::PullRequest.new
+      pull = Status::Github::PullRequest.new(@branch)
       pull.create_pull_request unless pull.pull_request_found?
       @statuses.request
       puts "Done."

data/lib/status/config.rb

@@ -1,21 +1,16 @@
 # coding: utf-8
+require "yaml"
 
 module Status
   class Config
-    FILE = "#{ENV['HOME']}/.status.conf"
-
-    attr_reader :attrs
+    FILE = ".status.yml"
 
+    attr_reader :parsed
     def initialize
-      bootstrap unless File.exist?(file)
-      load_config
+      bootstrap
       validate
     end
 
-    def file
-      FILE
-    end
-
     def validate
       validate_presence_of :owner
       validate_presence_of :repo
@@ -25,37 +20,40 @@ module Status
       validate_presence_of :password, "ci"
     end
 
-    def validate_presence_of(sym, type="github")
-      unless attrs.include?(sym.to_s)
-        puts "You have not entered a #{sym} for #{type}"
-        attribute = gets
-        self.attrs = ({sym => attribute.chomp})
-      end
-    end
-
     def bootstrap
-      @attrs = {
-        # eg:
-        # :owner => "dougdroper",
-        # :repo => "status",
-        # :ci_url => "http://jenkins-ci.org/"
-      }
-      save
-      abort("Config setup: Run status")
+      @parsed = begin
+        YAML.load(File.open(FILE))
+      rescue Exception => e
+        create_file
+        puts "Could not parse YAML file #{FILE}: #{e.message}"
+        abort("exit")
+      end
     end
 
-    def attrs=(attribute={})
-      @attrs.merge!(attribute)
-      save
-    end
+    private
 
-    def load_config
-      @attrs = MultiJson.decode(File.new(file, 'r').read)
+    def validate_presence_of(sym, type="github")
+      unless parsed.include?(sym)
+        puts "Please update #{FILE} with a #{sym} for #{type}"
+        abort("exit")
+      end
     end
 
-    def save
-      json = MultiJson.encode(attrs)
-      File.open(file, 'w') {|f| f.write(json) }
+    def create_file
+      puts "No #{FILE} found, create one? (y/n)"
+      answer = gets
+      if answer.chomp.downcase == "y"
+        data = {
+          :username => "Jenkins username",
+          :password => "Jenkins password",
+          :ci_url => "eg. http://ci.jenkins.com",
+          :owner => "eg. dougdroper",
+          :repo => "eg. status",
+          :token => "Githubs API token (http://developer.github.com/v3/oauth/)"}
+        File.open(FILE, 'w') {|f| f.write(data.to_yaml)}
+        puts "Please update #{FILE} and then run status"
+        abort("exit")
+      end
     end
   end
 end

data/lib/status/github/pull_request.rb

@@ -3,12 +3,16 @@
 module Status
   module Github
     class PullRequest
+      def initialize(branch)
+        @branch = branch
+      end
+
       def pull_request_found?
-        !get_pull_request.select {|pull| pull["head"]["ref"] == Status.branch}.empty?
+        !get_pull_request.select {|pull| pull["head"]["ref"] == @branch}.empty?
       end
 
       def create_pull_request
-        puts "no pull request found create one? (y/n)"
+        puts "No pull request found, create one? (y/n)"
         answer = gets
         answer.chomp.downcase == "y" ? new_pull_request : abort("exit")
       end
@@ -22,7 +26,11 @@ module Status
         puts "enter a description"
         body = gets
 
-        {:title => Status.title, :body => body, :base => "master", :head => Status.branch }
+        {:title => title, :body => body, :base => "master", :head => @branch }
+      end
+
+      def title
+        `git log #{@branch} -1 --pretty=format:'%s'`
       end
 
       def get_pull_request

data/lib/status/github/statuses.rb

@@ -3,8 +3,10 @@
 module Status
   module Github
     class Statuses
-      def initialize(qa_status="pending")
+      def initialize(qa_status, branch)
         @qa_status = qa_status
+        @branch = branch
+        @jenkins = Jenkins.new(branch)
       end
 
       def request
@@ -14,11 +16,11 @@ module Status
       private
 
       def status_api
-        "/repos/#{Status.owner}/#{Status.repo}/statuses/" + Status.sha + "?access_token=" + Status.token
+        "/repos/#{Status.owner}/#{Status.repo}/statuses/" + sha + "?access_token=" + Status.token
       end
 
       def description
-        "Build status: #{Jenkins.state}, QA #{@qa_status}"
+        "Build status: #{@jenkins.state}, QA #{@qa_status}"
       end
 
       def payload
@@ -26,19 +28,25 @@ module Status
       end
 
       def target_url
-        "#{Status.ci_url}/job/#{Status.branch}"
+        "#{Status.ci_url}/job/#{@branch}"
       end
 
       def state
-        (Jenkins.pass? && @qa_status == "pass") ? states[3] : git_state
+        return "success" if @jenkins.pass? && @qa_status == "pass"
+        return "pending" if @jenkins.pass? && @qa_status != "pass"
+        git_state
       end
 
       def git_state
-        states.include?(Jenkins.state) ? states[states.index(Jenkins.state)] : "error"
+        states.include?(@jenkins.state) ? states[states.index(@jenkins.state)] : "error"
       end
 
       def states
-        %w(error failure pending success)
+        %w(error failure)
+      end
+
+      def sha
+        `git log #{@branch} -1 --pretty=format:'%H'`
       end
     end
   end

data/lib/status/jenkins.rb

@@ -1,8 +1,10 @@
 # coding: utf-8
 
 module Status
-  module Jenkins
-    extend self
+  class Jenkins
+    def initialize(branch)
+      @branch = branch
+    end
 
     def state
       return "success" if pass?
@@ -24,7 +26,7 @@ module Status
     end
 
     def path
-      "/job/#{Status.branch}/lastBuild/api/json"
+      "/job/#{@branch}/lastBuild/api/json"
     end
   end
 end

data/lib/status.rb

@@ -26,40 +26,28 @@ module Status
     @config ||= Status::Config.new
   end
 
-  def sha
-    `git log -1 --pretty=format:'%H'`
-  end
-
-  def title
-     `git log -1 --pretty=format:'%s'`
-  end
-
-  def branch
-    `git rev-parse --abbrev-ref HEAD`.chomp
-  end
-
   def token
-    Status.config.attrs["token"]
+    Status.config.parsed[:token]
   end
 
   def repo
-    Status.config.attrs["repo"]
+    Status.config.parsed[:repo]
   end
 
   def owner
-    Status.config.attrs["owner"]
+    Status.config.parsed[:owner]
   end
 
   def ci_url
-    Status.config.attrs["ci_url"]
+    Status.config.parsed[:ci_url]
   end
 
   def ci_user
-    Status.config.attrs["username"]
+    Status.config.parsed[:username]
   end
 
   def ci_password
-    Status.config.attrs["password"]
+    Status.config.parsed[:password]
   end
 
 end

data/spec/status/github/pull_request_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe Status::Github::PullRequest do
-  subject { Status::Github::PullRequest.new }
+  subject { Status::Github::PullRequest.new("") }
 
   before do
-    Status.stub(:config => stub(:attrs => {}))
+    Status.stub(:config => stub(:parsed => {}))
   end
 
   context "#pull_request_found?" do
@@ -14,12 +14,12 @@ describe Status::Github::PullRequest do
 
     it "is not found if a pull request does not exists" do
       Status.stub(:branch => "new_branch")
-      subject.pull_request_found?.should be_false
+      Status::Github::PullRequest.new("new_branch").pull_request_found?.should be_false
     end
 
     it "is found if a pull request does exists" do
       Status.stub(:branch => "branch_name")
-      subject.pull_request_found?.should be_true
+      Status::Github::PullRequest.new("branch_name").pull_request_found?.should be_true
     end
   end
 

data/spec/status/github/statuses_spec.rb

@@ -2,37 +2,42 @@ require 'spec_helper'
 
 describe Status::Github::Statuses do
   before do
-    stub_const("Status::Jenkins", stub)
+    @jenkins = stub
+    stub_const("Status::Jenkins", @jenkins)
   end
 
   subject { Status::Github::Statuses }
   it "has a payload target URL of the ci server URL and the branch name" do
+    @jenkins.stub(:new => stub(:state => "success", :pass? => true))
     Status.stub(:ci_url => "http://jenkins-ci.org", :branch => "feature_branch")
-    subject.new.send(:target_url).should == "http://jenkins-ci.org/job/feature_branch"
+    subject.new("pending", "feature_branch").send(:target_url).should == "http://jenkins-ci.org/job/feature_branch"
   end
 
   it "has a payload description of the ci state and qa status" do
-    Status::Jenkins.stub(:state => "success")
-    subject.new.send(:description).should == "Build status: success, QA pending"
+    @jenkins.stub(:new => stub(:state => "success"))
+    subject.new("pending", "feature_branch").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
-    Status::Jenkins.stub(:pass? => true, :state => "pending")
-    subject.new.send(:state).should == "pending"
+    @jenkins.stub(:new => stub(:state => "pending", :pass? => true))
+    subject.new("pending", "feature_branch").send(:state).should == "pending"
   end
 
   it "has a payload success state when ci is passing and qa has passed" do
-    Status::Jenkins.stub(:pass? => true, :state => "success")
-    subject.new("pass").send(:state).should == "success"
+    @jenkins.stub(:new => stub(:state => "success", :pass? => true))
+    subject.new("pass", "feature_branch").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"
+    @jenkins.stub(:new => stub(:state => "nothing", :pass? => false))
+    subject.new("pass", "feature_branch").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"
+    @jenkins.stub(:new => stub)
+    Status.stub(:owner => "owner", :repo => "status", :token => "123", :ci_url => "")
+    status = subject.new("pending", "feature_branch")
+    status.stub(:sha => "99efgd")
+    status.send(:status_api).should == "/repos/owner/status/statuses/99efgd?access_token=123"
   end
 end

data/spec/status/jenkins_spec.rb

@@ -1,15 +1,11 @@
 require 'spec_helper'
 
 describe Status::Jenkins do
-  class Test
-    include Status::Jenkins
-  end
 
-  subject {Test.new}
+  subject {Status::Jenkins.new("")}
 
   before do
     Status.stub(:config => stub(:attrs => {}))
-    Status.stub(:branch => "")
 
     stub(Status::Request)
   end

data/update_status.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "update_status"
-  s.version = "0.1.7"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Douglas Roper"]
-  s.date = "2012-12-11"
+  s.date = "2012-12-12"
   s.description = "Updates pull requests on github, with latest build from Jenkins and QA status"
   s.email = "douglasroper@notonthehighstreet.com"
   s.executables = ["status"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: update_status
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -170,7 +170,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2510346470153262609
+      hash: 3307849087401865744
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: