janky 0.10.0 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94b8fea3bd0280aeca3225b03fdbb053cafff29c
-  data.tar.gz: dc463e3a7336dee276c255b4acf3af7ab1e9eb0e
+  metadata.gz: 9d531dd95f17c83f106364fc9bb3b56a83e7c84f
+  data.tar.gz: ea8e851492074c805a207ec0938a0eff692e9e7e
 SHA512:
-  metadata.gz: b620403a1997196d491bcf52d110aacf372a088dba2df09d257e73aef7174083a9dc24273a468b670d7c07b20123aba863200e87b1f8b4dad893f6a6afb48935
-  data.tar.gz: 1221e4ff33cbb85ee619bfc22a573542589f9309dbc2262e10b39b736f6857c431f5129532f6dd78cbe5ccad31bd1a7a65b555cb540ad7fcb67d8605409b5e4b
+  metadata.gz: 1c10a412e74e88045013e915ad1859a481e949a01da50c207d26302fe2651d9d1e748cf9bb81399a0296adde8befcb4e53b062b5f7a5445a00bd52ade2afa60f
+  data.tar.gz: c8ea975e0f9b6527c80b2b91b796b9ca72d4cc3ee82a7503c302839c6476cb9ee43fb688494a23d453b2f5071574e85a7e73d7f59adc1ba29f63a85f81bd87d4

data/CHANGES

@@ -1,3 +1,15 @@
+= 0.10.2 / 2013-10-02
+
+ * Revert AR deprecation warnings
+ * Revert previous configure jobs throwing error change
+
+= 0.10.1 / 2013-09-20
+
+ * Refresh landing page every 5 seconds for updates
+ * Previously configured jobs reconfigure instead of throwing errors
+ * Add an API endpoint to get a json response full of build statuses
+ * Fixup stupid AR deprecation warnings
+
 = 0.10.0 / 2013-09-19
 
  * Upgrade sinatra_auth_github to work with latest octokit

data/README.md

@@ -79,6 +79,9 @@ Janky requires access to a Jenkins server. Version **1.427** is
 recommended. Refer to the Jenkins [documentation][doc] for installation
 instructions and install the [Notification Plugin][np] version 1.4.
 
+Remember to set the Jenkins URL in `http://your-jenkins-server.com/configure`.
+Janky will still trigger builds but will not update the build status without this set.
+
 [doc]: https://wiki.jenkins-ci.org/display/JENKINS/Installing+Jenkins
 [np]: https://wiki.jenkins-ci.org/display/JENKINS/Notification+Plugin
 
@@ -134,6 +137,7 @@ Required settings:
 * `JANKY_BUILDER_DEFAULT`: The Jenkins server URL **with** a trailing slash.
    Example: `http://jenkins.example.com/`. For basic auth, include the
    credentials in the URL: `http://user:pass@jenkins.example.com/`.
+   Using GitHub OAuth with Jenkins is not supported by Janky.
 * `JANKY_CONFIG_DIR`: Directory where build config templates are stored.
   Typically set to `/app/config` on Heroku.
 * `JANKY_HUBOT_USER`: Login used to protect the Hubot API.
@@ -174,6 +178,10 @@ via the GitHub API:
 
 then set `JANKY_GITHUB_STATUS_TOKEN`.
 
+`username` and `password` in the above example should be the same as the
+values provided for `JANKY_GITHUB_USER` and `JANKY_GITHUB_PASSWORD`
+respectively.
+
 ### Chat notifications
 
 #### Campfire

data/lib/janky/build.rb

@@ -11,6 +11,10 @@ module Janky
       select(columns)
     end
 
+    scope :building, -> {
+      where("started_at IS NOT NULL AND completed_at IS NULL")
+    }
+
     # Transition the Build to the started state.
     #
     # id  - the Fixnum ID used to find the build.

data/lib/janky/hubot.rb

@@ -80,6 +80,26 @@ module Janky
       repos.join("\n")
     end
 
+    # Get the lasts builds
+    get "/builds" do
+      limit = params["limit"]
+      building = params["building"]
+
+      builds = Build.unscoped
+      if building.blank? || building == 'false'
+        builds = builds.completed
+      else
+        builds = builds.building
+      end
+      builds = builds.limit(limit) unless limit.blank?
+
+      builds.map! do |build|
+        build_to_hash(build)
+      end
+
+      builds.to_json
+    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"]
@@ -87,18 +107,7 @@ module Janky
       repo   = find_repo(repo_name)
       branch = repo.branch_for(branch_name)
       builds = branch.queued_builds.limit(limit).map do |build|
-        { :sha1     => build.sha1,
-          :repo     => build.repo_name,
-          :branch   => build.branch_name,
-          :user     => build.user,
-          :green    => build.green?,
-          :building => build.building?,
-          :queued   => build.queued?,
-          :pending  => build.pending?,
-          :number   => build.number,
-          :status   => (build.green? ? "was successful" : "failed"),
-          :compare  => build.compare,
-          :duration => build.duration }
+        build_to_hash(build)
       end
 
       builds.to_json
@@ -117,11 +126,30 @@ ci set room janky development
 ci status
 ci status janky
 ci status janky/master
+ci builds limit [building]
 EOS
     end
 
     get "/boomtown" do
       fail "BOOM (janky)"
     end
+
+    private
+
+    def build_to_hash(build)
+      { :sha1     => build.sha1,
+        :repo     => build.repo_name,
+        :branch   => build.branch_name,
+        :user     => build.user,
+        :green    => build.green?,
+        :building => build.building?,
+        :queued   => build.queued?,
+        :pending  => build.pending?,
+        :number   => build.number,
+        :status   => (build.green? ? "was successful" : "failed"),
+        :compare  => build.compare,
+        :duration => build.duration,
+        :web_url  => build.web_url }
+    end
   end
 end

data/lib/janky/public/javascripts/application.js

@@ -1,3 +1,10 @@
 $(function(){
+  function refresh() {
+    $('.builds').load(location.pathname + ' .builds', function() {
+      $('.relatize').relatize()
+    })
+  }
+
+  setInterval(refresh, 5000)
   $('.relatize').relatize()
-})
+})

data/lib/janky/version.rb

@@ -1,3 +1,3 @@
 module Janky
-  VERSION = "0.10.0"
+  VERSION = "0.10.2"
 end

data/test/janky_test.rb

@@ -262,6 +262,30 @@ class JankyTest < Test::Unit::TestCase
     assert_equal 2, payload.size
   end
 
+  test "hubot last 1 builds" do
+    3.times do
+      gh_post_receive("github", "master")
+      Janky::Builder.start!
+      Janky::Builder.complete!
+    end
+
+    assert_equal 1, Yajl.load(hubot_last(limit: 1).body).size
+  end
+
+  test "hubot lasts completed" do
+    gh_post_receive("github", "master")
+    Janky::Builder.start!
+    Janky::Builder.complete!
+
+    assert_equal 1, Yajl.load(hubot_last.body).size
+  end
+
+  test "hubot lasts building" do
+    gh_post_receive("github", "master")
+    Janky::Builder.start!
+    assert_equal 1, Yajl.load(hubot_last(building: true).body).size
+  end
+
   test "hubot build" do
     gh_post_receive("github", "master")
     Janky::Builder.start!

data/test/test_helper.rb

@@ -110,6 +110,11 @@ class Test::Unit::TestCase
     end
   end
 
+  def hubot_last(options = {})
+    hubot_request "GET",
+      "/_hubot/builds?limit=#{options[:limit]}&building=#{options[:building]}"
+  end
+
   def hubot_latest_build_sha(repo, branch)
     response = hubot_status(repo, branch)
     Yajl.load(response.body).first["sha1"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: janky
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.2
 platform: ruby
 authors:
 - Simon Rozet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -306,3 +306,4 @@ test_files:
 - test/default.xml.erb
 - test/janky_test.rb
 - test/test_helper.rb
+has_rdoc: false