janky 0.9.0 → 0.9.9

data/lib/janky/github/payload_parser.rb

@@ -41,7 +41,7 @@ module Janky
         repository = @payload["repository"]
 
         if repository["private"]
-          "git@github.com:#{URI(repository["url"]).path[1..-1]}"
+          "git@#{GitHub.git_host}:#{URI(repository["url"]).path[1..-1]}"
         else
           uri = URI(repository["url"])
           uri.scheme = "git"

data/lib/janky/hubot.rb

@@ -4,7 +4,7 @@ module Janky
   # builds.
   #
   # The client side implementation is at
-  # <https://github.com/github/hubot/blob/master/scripts/ci.js>
+  # <https://github.com/github/hubot-scripts/blob/master/src/scripts/janky.coffee>
   class Hubot < Sinatra::Base
     register Helpers
 
@@ -15,7 +15,7 @@ module Janky
       repo = Repository.setup(nwo, name)
 
       if repo
-        url  = "#{settings.base_url}/#{repo.name}"
+        url  = "#{settings.base_url}#{repo.name}"
         [201, "Setup #{repo.name} at #{repo.uri} | #{url}"]
       else
         [400, "Couldn't access #{nwo}. Check the permissions."]
@@ -31,11 +31,12 @@ module Janky
     end
 
     # Build a repository's branch.
-    post "/:repo_name/:branch" do |repo_name, branch_name|
+    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)
       build   = branch.current_build
-      room_id = params["room_id"] && Integer(params["room_id"])
+
+      room_id = (params["room_id"] && Integer(params["room_id"]) rescue nil)
 
       if build
         build.rerun(room_id)
@@ -48,7 +49,7 @@ module Janky
 
     # Get a list of available rooms.
     get "/rooms" do
-      Yajl.dump(Campfire.room_names)
+      Yajl.dump(ChatService.room_names)
     end
 
     # Update a repository's notification room.
@@ -56,7 +57,7 @@ module Janky
       repo = find_repo(repo_name)
       room = params["room"]
 
-      if room_id = Campfire.room_id(room)
+      if room_id = ChatService.room_id(room)
         repo.update_attributes!(:room_id => room_id)
         [200, "Room for #{repo.name} updated to #{room}"]
       else
@@ -67,7 +68,7 @@ module Janky
     # Get the status of all projects.
     get "/" do
       content_type "text/plain"
-      repos = Repository.all.map do |repo|
+      repos = Repository.all(:include => [:branches, :commits, :builds]).map do |repo|
         master = repo.branch_for("master")
 
         "%-17s %-13s %-10s %40s" % [
@@ -81,7 +82,7 @@ module Janky
     end
 
     # Get the status of a repository's branch.
-    get "/:repo_name/:branch_name" do |repo_name, branch_name|
+    get %r{\/([-_\.0-9a-zA-Z]+)\/([-_\.a-zA-z0-9\/]+)} do |repo_name, branch_name|
       limit = params["limit"]
 
       repo   = find_repo(repo_name)
@@ -105,12 +106,12 @@ module Janky
     get "/help" do
       content_type "text/plain"
 <<-EOS
-hubot ci build janky
-hubot ci build janky/fix-everything
-hubot ci setup github/janky [name]
-hubot ci toggle janky
-hubot ci rooms
-hubot ci set room janky The Danger Room
+ci build janky
+ci build janky/fix-everything
+ci setup github/janky [name]
+ci toggle janky
+ci rooms
+ci set room janky development
 EOS
     end
   end

data/lib/janky/job_creator.rb

@@ -71,9 +71,13 @@ module Janky
         uri  = server_url
         user = uri.user
         pass = uri.password
+        path = uri.path
         http = Net::HTTP.new(uri.host, uri.port)
+        if uri.scheme == "https"
+          http.use_ssl = true
+        end
 
-        get = Net::HTTP::Get.new("/job/#{name}/")
+        get = Net::HTTP::Get.new("#{path}/job/#{name}/")
         get.basic_auth(user, pass) if user && pass
         response = http.request(get)
 
@@ -92,9 +96,13 @@ module Janky
         uri  = server_url
         user = uri.user
         pass = uri.password
+        path = uri.path
         http = Net::HTTP.new(uri.host, uri.port)
+        if uri.scheme == "https"
+          http.use_ssl = true
+        end
 
-        post = Net::HTTP::Post.new("/createItem?name=#{name}")
+        post = Net::HTTP::Post.new("#{path}/createItem?name=#{name}")
         post.basic_auth(user, pass) if user && pass
         post["Content-Type"] = "application/xml"
         post.body = config

data/lib/janky/notifier/{campfire.rb → chat_service.rb}

@@ -1,8 +1,9 @@
 module Janky
   module Notifier
-    class Campfire
+    class ChatService
       def self.completed(build)
-        status  = build.green? ? "was successful" : "failed"
+        status = build.green? ? "was successful" : "failed"
+        color = build.green? ? "green" : "red"
 
         message = "Build #%s (%s) of %s/%s %s (%ss) %s" % [
           build.number,
@@ -14,7 +15,7 @@ module Janky
           build.compare
         ]
 
-        ::Janky::Campfire.speak(message, build.room_id)
+        ::Janky::ChatService.speak(message, build.room_id, {:color => color})
       end
     end
   end

data/lib/janky/notifier/mock.rb

@@ -24,7 +24,7 @@ module Janky
       end
 
       def success?(repo, branch, room_name)
-        room_name ||= Janky::Campfire.default_room_name
+        room_name ||= Janky::ChatService.default_room_name
 
         builds = @notifications.select do |state, build|
           state == :completed &&
@@ -38,7 +38,7 @@ module Janky
       end
 
       def failure?(repo, branch, room_name)
-        room_name ||= Janky::Campfire.default_room_name
+        room_name ||= Janky::ChatService.default_room_name
 
         builds = @notifications.select do |state, build|
           state == :completed &&

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

@@ -25,6 +25,7 @@ a img{ border:none; }
 * html .clearfix {height: 1%;}
 .clearfix {display:inline-block;}
 .clearfix {display: block;}
+.right {float: right;}
 
 /* @end */
 
@@ -112,14 +113,21 @@ ul.builds li.building:hover{
 }
 
 ul.builds a{
-  display:block;
   text-decoration:none;
-  background:url(../images/disclosure-arrow.png) 100% 10px no-repeat;
 }
-ul.builds li:hover a{
-  background-position:100% -90px;
+
+ul.builds a.console{
+  float: right;
+  display:block;
+  width: 22px;
+  height: 40px;
+  margin-left: 10px;
+  background:url(../images/disclosure-arrow.png) 65% 10px no-repeat;
 }
-ul.builds .building a{
+ul.builds li:hover a.console{
+  background-position:65% -90px;
+}
+ul.builds .building a.console{
   background:none;
   cursor:default;
 }
@@ -144,16 +152,31 @@ ul.builds h2{
   font-size:16px;
   text-shadow:0 1px #fff;
 }
-ul.builds .good a h2{
+ul.builds h2 span{
+  font-weight: normal;
+  color: #666666;
+}
+ul.builds .good a{
+  color:#358c00;
+}
+ul.builds .good h2{
   color:#358c00;
 }
-ul.builds .building a h2{
+ul.builds .building a{
+  color:#e59741;
+}
+ul.builds .building h2{
   color:#e59741;
 }
-ul.builds .janky a h2{
+ul.builds .janky a{
   color:#ae0000;
 }
-
+ul.builds .janky h2{
+  color:#ae0000;
+}
+ul.builds p.sha1{
+  margin-top: 2px;
+}
 ul.builds p{
   margin:-2px 0 0 0;
   font-size:13px;
@@ -201,4 +224,4 @@ pre::-webkit-scrollbar-thumb:horizontal{
   -webkit-border-radius: 4px;
 }
 
-/* @end */
+/* @end */

data/lib/janky/repository.rb

@@ -86,27 +86,27 @@ module Janky
     #
     # Returns the user name as a String.
     def github_owner
-      uri[/github\.com[\/:](\w+)\//] && $1
+      uri[/.*[\/:]([a-zA-Z0-9\-_]+)\//] && $1
     end
 
     # Name of this repository on GitHub.
     #
     # Returns the name as a String.
     def github_name
-      uri[/github\.com[\/:](\w+)\/([a-zA-Z0-9\-_]+)/] && $2
+      uri[/.*[\/:]([a-zA-Z0-9\-_]+)\/([a-zA-Z0-9\-_]+)/] && $2
     end
 
     # Name of the Campfire room receiving build notifications.
     #
     # Returns the name as a String.
     def campfire_room
-      Campfire.room_name(room_id)
+      ChatService.room_name(room_id)
     end
 
     # Ditto but returns the Fixnum room id. Defaults to the one set
     # in Campfire.setup.
     def room_id
-      read_attribute(:room_id) || Campfire.default_room_id
+      read_attribute(:room_id) || ChatService.default_room_id
     end
 
     # Setups GitHub and Jenkins for build this repository.

data/lib/janky/templates/index.mustache

@@ -1,11 +1,16 @@
 <ul class="builds">
   {{# jobs }}
   <li class="{{ status }}">
-    <a href="{{ console_path }}">
-      <span class="status"></span>
-      <h2>{{ name }}</h2>
-      <p>{{{ last_built_text }}}</p>
-    </a>
+    <span class="status"></span>
+    <a class="console" href="{{ console_path }}"></a>
+    <p class="right sha1"><a title="{{message}}" href="{{compare_url}}">{{sha1}}</a></p>
+    <h2>
+      <a href="{{repo_path}}">{{ repo_name }}</a>/<a href="{{branch_path}}">{{ branch_name }}</a>
+    </h2>
+    <p>
+      <span class="right">{{author}}</span>
+      {{{ last_built_text }}}
+    </p>
   </li>
   {{/ jobs }}
 </ul>

data/lib/janky/version.rb

@@ -1,3 +1,3 @@
 module Janky
-  VERSION = "0.9.0"
+  VERSION = "0.9.9"
 end

data/lib/janky/views/index.rb

@@ -6,9 +6,16 @@ module Janky
         @builds.collect do |build|
           {
             :console_path    => "/#{build.number}/output",
-            :name            => "#{build.repo_name}/#{build.branch_name}",
+            :compare_url     => build.compare,
+            :repo_path       => "/#{build.repo_name}",
+            :branch_path     => "/#{build.repo_name}/#{build.branch_name}",
+            :repo_name       => build.repo_name,
+            :branch_name     => build.branch_name,
             :status          => css_status_for(build),
-            :last_built_text => last_built_text_for(build)
+            :last_built_text => last_built_text_for(build),
+            :message         => build.commit_message,
+            :sha1            => build.sha1,
+            :author          => build.commit_author.split("<").first
           }
         end
       end
@@ -25,7 +32,7 @@ module Janky
 
       def last_built_text_for(build)
         if build.building?
-          "Building since <span class='relatize'>#{build.started_at}</span>…"
+          "Build started <span class='relatize'>#{build.started_at}</span>…"
         elsif build.completed?
           "Built in <span>#{build.duration}</span> seconds"
         end

data/lib/janky/views/layout.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Janky
   module Views
     class Layout < Mustache

data/test/janky_test.rb

@@ -8,8 +8,8 @@ class JankyTest < Test::Unit::TestCase
 
     DatabaseCleaner.clean_with(:truncation)
 
-    Janky::Campfire.rooms = {1 => "enterprise", 2 => "builds"}
-    Janky::Campfire.default_room_name = "builds"
+    Janky::ChatService.rooms = {1 => "enterprise", 2 => "builds"}
+    Janky::ChatService.default_room_name = "builds"
 
     hubot_setup("github/github")
   end
@@ -268,4 +268,16 @@ class JankyTest < Test::Unit::TestCase
     assert hubot_build("janky", "master").not_found?
     assert hubot_build("github", "master").not_found?
   end
+
+  test "github owner is parsed correctly" do
+    repo = Janky::Repository.setup("github/janky")
+    assert_equal "github", repo.github_owner
+    assert_equal "janky", repo.github_name
+  end
+
+  test "owner with a dash is parsed correctly" do
+    repo = Janky::Repository.setup("digital-science/central-ftp-manage")
+    assert_equal "digital-science", repo.github_owner
+    assert_equal "central-ftp-manage", repo.github_name
+  end
 end

data/test/test_helper.rb

@@ -17,9 +17,10 @@ class Test::Unit::TestCase
       "JANKY_GITHUB_HOOK_SECRET" => "secret",
       "JANKY_HUBOT_USER" => "hubot",
       "JANKY_HUBOT_PASSWORD" => "password",
-      "JANKY_CAMPFIRE_ACCOUNT" => "github",
-      "JANKY_CAMPFIRE_TOKEN" => "token",
-      "JANKY_CAMPFIRE_DEFAULT_ROOM" => "Builds"
+      "JANKY_CHAT_CAMPFIRE_ACCOUNT" => "github",
+      "JANKY_CHAT_CAMPFIRE_TOKEN" => "token",
+      "JANKY_CHAT_DEFAULT_ROOM" => "Builds",
+      "JANKY_CHAT" => "campfire"
     }
   end
 
@@ -71,7 +72,7 @@ class Test::Unit::TestCase
 
   def hubot_build(repo, branch, room_name = nil)
     params =
-      if room_id = Janky::Campfire.room_id(room_name)
+      if room_id = Janky::ChatService.room_id(room_name)
         {"room_id" => room_id.to_s}
       else
         {}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: janky
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 41
   prerelease: 
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 9
+  version: 0.9.9
 platform: ruby
 authors: 
 - GitHub, Inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-19 00:00:00 +01:00
+date: 2012-02-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,11 +88,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 19
         segments: 
+        - 1
+        - 1
         - 0
-        - 8
-        version: "0.8"
+        version: 1.1.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -230,8 +231,10 @@ files:
 - lib/janky/builder/payload.rb
 - lib/janky/builder/receiver.rb
 - lib/janky/builder/runner.rb
-- lib/janky/campfire.rb
-- lib/janky/campfire/mock.rb
+- lib/janky/chat_service.rb
+- lib/janky/chat_service/campfire.rb
+- lib/janky/chat_service/hipchat.rb
+- lib/janky/chat_service/mock.rb
 - lib/janky/commit.rb
 - lib/janky/database/migrate/1312115512_init.rb
 - lib/janky/database/migrate/1312117285_non_unique_repo_uri.rb
@@ -256,7 +259,7 @@ files:
 - lib/janky/hubot.rb
 - lib/janky/job_creator.rb
 - lib/janky/notifier.rb
-- lib/janky/notifier/campfire.rb
+- lib/janky/notifier/chat_service.rb
 - lib/janky/notifier/mock.rb
 - lib/janky/notifier/multi.rb
 - lib/janky/public/css/base.css