janky 0.10.2 → 0.11.0

data/lib/janky/github.rb

@@ -67,16 +67,10 @@ module Janky
     #
     # Returns the SHA1 as a String or nil when the branch doesn't exists.
     def self.branch_head_sha(nwo, branch)
-      response = api.branches(nwo)
+      response = api.branch(nwo, branch)
 
-      if response.code != "200"
-        Exception.push_http_response(response)
-        raise Error, "Failed to get branches"
-      end
-
-      branches = Yajl.load(response.body)
-      branch   = branches.detect { |b| b["name"] == branch }
-      branch && branch["commit"]["sha"]
+      branch = Yajl.load(response.body)
+      branch && branch["sha"]
     end
 
     # Fetch commit details for the given SHA1.
@@ -134,6 +128,22 @@ module Janky
       api.get(url).code == "200"
     end
 
+    # Delete a post-receive hook for the given repository.
+    #
+    # hook_url - The repository's hook_url
+    #
+    # Returns true or raises an exception.
+    def self.hook_delete(url)
+      response = api.delete(url)
+
+      if response.code == "204"
+        true
+      else
+        Exception.push_http_response(response)
+        raise Error, "Failed to delete hook"
+      end
+    end
+
     # Default API implementation that goes over the wire (HTTP).
     #
     # Returns nothing.

data/lib/janky/github/api.rb

@@ -16,6 +16,14 @@ module Janky
         http.request(request)
       end
 
+      def delete(hook_url)
+        path    = build_path(URI(hook_url).path)
+        request = Net::HTTP::Delete.new(path)
+        request.basic_auth(@user, @password)
+
+        http.request(request)
+      end
+
       def trigger(hook_url)
         path    = build_path(URI(hook_url).path + "/test")
         request = Net::HTTP::Post.new(path)
@@ -40,8 +48,8 @@ module Janky
         http.request(request)
       end
 
-      def branches(nwo)
-        path    = build_path("repos/#{nwo}/branches")
+      def branch(nwo, branch)
+        path    = build_path("repos/#{nwo}/commits/#{branch}")
         request = Net::HTTP::Get.new(path)
         request.basic_auth(@user, @password)
 

data/lib/janky/github/mock.rb

@@ -33,6 +33,10 @@ module Janky
         Response.new("200")
       end
 
+      def delete(url)
+        Response.new("204")
+      end
+
       def repo_get(nwo)
         repo = {
           "name"    => nwo.split("/").last,
@@ -48,19 +52,9 @@ module Janky
         end
       end
 
-      def branches(nwo)
-        data = []
+      def branch(nwo, branch)
 
-        @branch_shas.each do |(name_with_owner, branch), sha|
-          if nwo == name_with_owner
-            data << {
-              "name"   => branch,
-              "commit" => {
-                "sha" => sha
-              }
-            }
-          end
-        end
+        data = { "sha" => @branch_shas[[nwo, branch]] }
 
         Response.new("200", Yajl.dump(data))
       end

data/lib/janky/hubot.rb

@@ -12,11 +12,12 @@ module Janky
     post "/setup" do
       nwo  = params["nwo"]
       name = params["name"]
-      repo = Repository.setup(nwo, name)
+      tmpl = params["template"]
+      repo = Repository.setup(nwo, name, tmpl)
 
       if repo
         url  = "#{settings.base_url}#{repo.name}"
-        [201, "Setup #{repo.name} at #{repo.uri} | #{url}"]
+        [201, "Setup #{repo.name} at #{repo.uri} with #{repo.job_config_path.basename} | #{url}"]
       else
         [400, "Couldn't access #{nwo}. Check the permissions."]
       end
@@ -34,9 +35,10 @@ module Janky
     post %r{\/([-_\.0-9a-zA-Z]+)\/([-_\.a-zA-z0-9\/]+)} do |repo_name, branch_name|
       repo    = find_repo(repo_name)
       branch  = repo.branch_for(branch_name)
-      room_id = (params["room_id"] && Integer(params["room_id"]) rescue nil)
+      room_id = (params["room_id"] rescue nil)
       user    = params["user"]
       build   = branch.head_build_for(room_id, user)
+      build ||= repo.build_sha(branch_name, user, room_id)
 
       if build
         build.run
@@ -64,6 +66,20 @@ module Janky
       end
     end
 
+    # Update a repository's context
+    put %r{\/([-_\.0-9a-zA-Z]+)\/context} do |repo_name|
+      context = params["context"]
+      repo = find_repo(repo_name)
+
+      if repo
+        repo.context = context
+        repo.save
+        [200, "Context #{context} set for #{repo_name}"]
+      else
+        [404, "Unknown Repository #{repo_name}"]
+      end
+    end
+
     # Get the status of all projects.
     get "/" do
       content_type "text/plain"
@@ -100,6 +116,41 @@ module Janky
       builds.to_json
     end
 
+    # Get information about how a project is configured
+    get %r{\/show\/([-_\.0-9a-zA-Z]+)} do |repo_name|
+      repo   = find_repo(repo_name)
+      res = {
+        :name => repo.name,
+        :configured_job_template => repo.job_template,
+        :used_job_template => repo.job_config_path.basename.to_s,
+        :repo => repo.uri,
+        :room_id => repo.room_id,
+        :enabled => repo.enabled,
+        :hook_url => repo.hook_url,
+        :context => repo.context
+      }
+      res.to_json
+    end
+
+    delete %r{\/([-_\.0-9a-zA-Z]+)} do |repo_name|
+      repo   = find_repo(repo_name)
+      repo.destroy
+      "Janky project #{repo_name} deleted"
+    end
+
+    # Delete a repository's context
+    delete %r{\/([-_\.0-9a-zA-Z]+)\/context} do |repo_name|
+      repo = find_repo(repo_name)
+
+      if repo
+        repo.context = nil
+        repo.save
+        [200, "Context removed for #{repo_name}"]
+      else
+        [404, "Unknown Repository #{repo_name}"]
+      end
+    end
+
     # Get the status of a repository's branch.
     get %r{\/([-_\.0-9a-zA-Z]+)\/([-_\+\.a-zA-z0-9\/]+)} do |repo_name, branch_name|
       limit = params["limit"]
@@ -120,13 +171,18 @@ module Janky
 ci build janky
 ci build janky/fix-everything
 ci setup github/janky [name]
+ci setup github/janky name template
 ci toggle janky
 ci rooms
 ci set room janky development
+ci set context janky ci/janky
+ci unset context janky
 ci status
 ci status janky
 ci status janky/master
 ci builds limit [building]
+ci show janky
+ci delete janky
 EOS
     end
 

data/lib/janky/notifier.rb

@@ -9,6 +9,15 @@ module Janky
       @adapter = Multi.new(Array(notifiers))
     end
 
+    # Called whenever a build is queued
+    #
+    # build - the Build record.
+    #
+    # Returns nothing
+    def self.queued(build)
+      adapter.queued(build)
+    end
+
     # Called whenever a build starts.
     #
     # build - the Build record.

data/lib/janky/notifier/chat_service.rb

@@ -15,7 +15,7 @@ module Janky
           build.web_url
         ]
 
-        ::Janky::ChatService.speak(message, build.room_id, {:color => color})
+        ::Janky::ChatService.speak(message, build.room_id, {:color => color, :build => build})
       end
     end
   end

data/lib/janky/notifier/failure_service.rb

@@ -0,0 +1,18 @@
+module Janky
+  module Notifier
+    class FailureService < ChatService
+      def self.completed(build)
+        return unless need_failure_notification?(build)
+        ::Janky::ChatService.speak(message(build), failure_room, {:color => color(build)})
+      end
+
+      def self.failure_room
+        ENV["JANKY_CHAT_FAILURE_ROOM"]
+      end
+
+      def self.need_failure_notification?(build)
+        build.red? && failure_room != build.room_id
+      end
+    end
+  end
+end

data/lib/janky/notifier/github_status.rb

@@ -7,9 +7,26 @@ module Janky
     # "success" or "failure" when the build is complete.
     class GithubStatus
       # Initialize with an OAuth token to POST Statuses with
-      def initialize(token, api_url)
+      def initialize(token, api_url, context = nil)
         @token = token
         @api_url = URI(api_url)
+        @default_context = context
+      end
+
+      def context(build)
+        repository_context(build.repository) || @default_context
+      end
+
+      def repository_context(repository)
+        repository && repository.context
+      end
+
+      # Create a Pending Status for the Commit when it is queued.
+      def queued(build)
+        repo   = build.repo_nwo
+        path  = "repos/#{repo}/statuses/#{build.sha1}"
+
+        post(path, "pending", build.web_url, "Build ##{build.number} queued", context(build))
       end
 
       # Create a Pending Status for the Commit when it starts.
@@ -17,7 +34,7 @@ module Janky
         repo   = build.repo_nwo
         path  = "repos/#{repo}/statuses/#{build.sha1}"
 
-        post(path, "pending", build.web_url, "Build ##{build.number} started")
+        post(path, "pending", build.web_url, "Build ##{build.number} started", context(build))
       end
 
       # Create a Success or Failure Status for the Commit.
@@ -31,11 +48,11 @@ module Janky
           when "failure" then "Build ##{build.number} failed in #{build.duration}s"
         end
 
-        post(path, status, build.web_url, desc)
+        post(path, status, build.web_url, desc, context(build))
       end
 
       # Internal: POST the new status to the API
-      def post(path, status, url, desc)
+      def post(path, status, url, desc, context = nil)
         http = Net::HTTP.new(@api_url.host, @api_url.port)
         post = Net::HTTP::Post.new("#{@api_url.path}#{path}")
 
@@ -44,11 +61,18 @@ module Janky
         post["Content-Type"] = "application/json"
         post["Authorization"] = "token #{@token}"
 
-        post.body = {
+        body = {
           :state => status,
           :target_url => url,
           :description => desc,
-        }.to_json
+        }
+
+        unless context.nil?
+          post["Accept"] = "application/vnd.github.she-hulk-preview+json"
+          body[:context] = context
+        end
+
+        post.body = body.to_json
 
         http.request(post)
       end

data/lib/janky/notifier/mock.rb

@@ -8,6 +8,9 @@ module Janky
 
       attr_reader :notifications
 
+      def queued(build)
+      end
+
       def reset!
         @notifications.clear
       end

data/lib/janky/notifier/multi.rb

@@ -6,6 +6,12 @@ module Janky
         @notifiers = notifiers
       end
 
+      def queued(build)
+        @notifiers.each do |notifier|
+          notifier.queued(build) if notifier.respond_to?(:queued)
+        end
+      end
+
       def started(build)
         @notifiers.each do |notifier|
           notifier.started(build) if notifier.respond_to?(:started)

data/lib/janky/public/css/base.css

@@ -127,10 +127,6 @@ ul.builds a.console{
 ul.builds li:hover a.console{
   background-position:65% -90px;
 }
-ul.builds .building a.console{
-  background:none;
-  cursor:default;
-}
 
 ul.builds .status{
   float:left;

data/lib/janky/repository.rb

@@ -4,16 +4,19 @@ module Janky
     has_many :commits, :dependent => :destroy
     has_many :builds, :through => :branches
 
+    after_commit :delete_hook, :on => :destroy
+
     replicate_associations :builds, :commits, :branches
 
     default_scope(order("name"))
 
-    def self.setup(nwo, name = nil)
+    def self.setup(nwo, name = nil, template = nil)
       if nwo.nil?
         raise ArgumentError, "nwo can't be nil"
       end
 
       if repo = Repository.find_by_name(nwo)
+        repo.update_attributes!(:job_template => template)
         repo.setup
         return repo
       end
@@ -27,10 +30,10 @@ module Janky
 
       repo =
         if repo = Repository.find_by_name(name)
-          repo.update_attributes!(:uri => uri)
+          repo.update_attributes!(:uri => uri, :job_template => template)
           repo
         else
-          Repository.create!(:name => name, :uri => uri)
+          Repository.create!(:name => name, :uri => uri, :job_template => template)
         end
 
       repo.setup
@@ -67,12 +70,47 @@ module Janky
 
     # Create or retrieve the given commit.
     #
-    # name - The Hash representation of the Commit.
+    # commit - The Hash representation of the Commit.
     #
     # Returns a Commit record.
     def commit_for(commit)
       commits.find_by_sha1(commit[:sha1]) ||
-        commits.create(commit)
+        commits.create!(commit)
+    end
+
+    def commit_for_sha(sha1)
+      commit_data = GitHub.commit(nwo, sha1)
+      commit_message = commit_data["commit"]["message"]
+      commit_url = github_url("commit/#{sha1}")
+      author_data = commit_data["commit"]["author"]
+      commit_author =
+        if email = author_data["email"]
+          "#{author_data["name"]} <#{email}>"
+        else
+          author_data["name"]
+        end
+
+      commit = commit_for({
+        :repository => self,
+        :sha1 => sha1,
+        :author => commit_author,
+        :message => commit_message,
+        :url => commit_url,
+      })
+    end
+
+    # Create a Janky::Build object given a sha
+    #
+    # sha1    - a string of the target sha to build
+    # user    - The login of the GitHub user who pushed.
+    # room_id - optional Fixnum Campfire room ID. Defaults to the room set on
+    # compare - optional String GitHub Compare View URL. Defaults to the
+    #
+    # Returns the newly created Janky::Build
+    def build_sha(sha1, user, room_id = nil, compare = nil)
+      return nil unless sha1 =~ /^[0-9a-fA-F]{7,40}$/
+      commit = commit_for_sha(sha1)
+      commit.build!(user, room_id, compare)
     end
 
     # Jenkins host executing this repo's builds.
@@ -124,7 +162,7 @@ module Janky
       ChatService.room_name(room_id)
     end
 
-    # Ditto but returns the Fixnum room id. Defaults to the one set
+    # Ditto but returns the String room id. Defaults to the one set
     # in Campfire.setup.
     def room_id
       read_attribute(:room_id) || ChatService.default_room_id
@@ -142,9 +180,15 @@ module Janky
     #
     # Returns nothing.
     def setup_hook
-      if !hook_url || !GitHub.hook_exists?(hook_url)
-        url = GitHub.hook_create("#{github_owner}/#{github_name}")
-        update_attributes!(:hook_url => url)
+      delete_hook
+
+      url = GitHub.hook_create("#{github_owner}/#{github_name}")
+      update_attributes!(:hook_url => url)
+    end
+
+    def delete_hook
+      if self.hook_url? && GitHub.hook_exists?(self.hook_url)
+        GitHub.hook_delete(self.hook_url)
       end
     end
 
@@ -156,15 +200,19 @@ module Janky
       builder.setup(job_name, uri, job_config_path)
     end
 
-    # The path of the Jenkins configuration template. Try "<repo-name>.xml.erb"
-    # first then fallback to "default.xml.erb" under the root config directory.
+    # The path of the Jenkins configuration template. Try
+    # "<job_template>.xml.erb" first, "<repo-name>.xml.erb" second, and then
+    # fallback to "default.xml.erb" under the root config directory.
     #
     # Returns the template path as a Pathname.
     def job_config_path
+      user_override = Janky.jobs_config_dir.join("#{job_template.downcase}.xml.erb") if job_template
       custom = Janky.jobs_config_dir.join("#{name.downcase}.xml.erb")
       default = Janky.jobs_config_dir.join("default.xml.erb")
 
-      if custom.readable?
+      if user_override && user_override.readable?
+        user_override
+      elsif custom.readable?
         custom
       elsif default.readable?
         default