janky 0.9.11 → 0.9.12

data/CHANGES

@@ -1,3 +1,24 @@
+= 0.9.12 / 2012-06-23
+
+ * Upgrade OAuth authentication gem to use GitHub API v3. [Corey Donohoe]
+
+ * Upgrade to ActiveRecord 3.2.X. [Simon Rozet]
+
+ * Allow configuring the path to the database socket with JANKY_DATABASE_SOCKET
+   setting. [Simon Rozet]
+
+ * Add a few indexes on the builds table to improve performance. [Simon Rozet].
+
+ * Eager load the builds.output column to improve performance. [Simon Rozet,
+   Jesse Dearing, Rafael Mendonça França]
+
+ * Fix deprecation logic for Campfire settings. [Piet Jaspers]
+
+ * Destroy all associated records after destroying a repository record. [Eric
+   Holmes]
+
+ * Handle commit messages longer than 255 characters. [Shay Frendt]
+
 = 0.9.11 / 2011-03-01
 
  * Fix HipChat setup instructions. [Andre Sachs]

data/README.md

@@ -115,7 +115,7 @@ command:
 Required settings:
 
 * `JANKY_BASE_URL`: The application URL **with** a trailing slash. Example:
-  `http://mf-doom-42.heroku.com/`.
+  `http://mf-doom-42.herokuapp.com/`.
 * `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/`.
@@ -124,12 +124,19 @@ Required settings:
 * `JANKY_HUBOT_USER`: Login used to protect the Hubot API.
 * `JANKY_HUBOT_PASSWORD`: Password for the Hubot API.
 * `JANKY_GITHUB_USER`: The login of the GitHub user used to access the
-  API. Requires Push and Pull privileges.
+  API. Requires Administrative privileges to set up service hooks.
 * `JANKY_GITHUB_PASSWORD`: The password for the GitHub user.
 * `JANKY_GITHUB_HOOK_SECRET`: Secret used to sign hook requests from
   GitHub.
 * `JANKY_CHAT_DEFAULT_ROOM`: Chat room where notifications are sent by default.
 
+Optional database settings:
+
+* `DATABASE_URL`: Database connection URL. Example:
+  `postgres://user:password@host:port/db_name`.
+* `JANKY_DATABASE_SOCKET`: Path to the database socket. Example:
+  `/var/run/mysql5/mysqld.sock`.
+
 #### GitHub Enterprise
 
 Using Janky with [GitHub Enterprise][ghe] requires one extra setting:
@@ -155,7 +162,8 @@ Janky notifies [Campfire][] chat rooms by default. Required settings:
 Required settings:
 
 * `JANKY_CHAT=hipchat`
-* `JANKY_CHAT_HIPCHAT_TOKEN`: authentication token
+* `JANKY_CHAT_HIPCHAT_TOKEN`: authentication token (This token needs to be an
+  admin token, not a notification token.)
 * `JANKY_CHAT_HIPCHAT_FROM`: name that messages will appear be sent from.
   Defaults to `CI`.
 
@@ -170,12 +178,12 @@ Installation:
 ### Authentication
 
 To restrict access to members of a GitHub organization, [register a new
-OAuth application on GitHub](https://github.com/account/applications)
+OAuth application on GitHub](https://github.com/settings/applications)
 with the callback set to `$JANKY_BASE_URL/auth/github/callback` then set
 a few extra settings:
 
 * `JANKY_SESSION_SECRET`: Random session cookie secret. Typically
-  generated by a tool like `pgwen`.
+  generated by a tool like `pwgen`.
 * `JANKY_AUTH_CLIENT_ID`: The client ID of the OAuth application.
 * `JANKY_AUTH_CLIENT_SECRET`: The client secret of the OAuth application.
 * `JANKY_AUTH_ORGANIZATION`: The organization name. Example: "github".

data/janky.gemspec

@@ -11,10 +11,10 @@ Gem::Specification.new "janky", Janky::VERSION do |s|
   # runtime
   s.add_dependency "rake", "~>0.9.2"
   s.add_dependency "sinatra", "~>1.3"
-  s.add_dependency "sinatra_auth_github", "~>0.3.1"
+  s.add_dependency "sinatra_auth_github", "~>0.7.0"
   s.add_dependency "mustache", "~>0.11"
   s.add_dependency "yajl-ruby", "~>1.1.0"
-  s.add_dependency "activerecord", "~>3.1.0"
+  s.add_dependency "activerecord", "~>3.2.0"
   s.add_dependency "broach", "~>0.2"
   s.add_dependency "replicate", "~>1.4"
 

data/lib/janky.rb

@@ -93,14 +93,18 @@ module Janky
     end
     base_url = URI(settings["JANKY_BASE_URL"]).to_s
 
-    ActiveRecord::Base.establish_connection(
+    connection = {
       :adapter   => adapter,
       :host      => database.host,
       :database  => database.path[1..-1],
       :username  => database.user,
       :password  => database.password,
-      :reconnect => true
-    )
+      :reconnect => true,
+    }
+    if socket = settings["JANKY_DATABASE_SOCKET"]
+      connection[:socket] = socket
+    end
+    ActiveRecord::Base.establish_connection(connection)
 
     self.jobs_config_dir = config_dir = Pathname(settings["JANKY_CONFIG_DIR"])
     if !config_dir.directory?
@@ -170,7 +174,7 @@ module Janky
       warn "JANKY_CAMPFIRE_TOKEN is deprecated. Please use " \
         "JANKY_CHAT_CAMPFIRE_TOKEN instead."
       settings["JANKY_CHAT_CAMPFIRE_TOKEN"] ||=
-        settings["JANKY_CAMPFIRE_ACCOUNT"]
+        settings["JANKY_CAMPFIRE_TOKEN"]
     end
 
     chat_name = settings["JANKY_CHAT"] || "campfire"

data/lib/janky/app.rb

@@ -45,7 +45,7 @@ module Janky
     end
 
     get "/:build_id/output" do |build_id|
-      @build = Build.find(build_id)
+      @build = Build.select(:output).find(build_id)
       authorize_repo(@build.repo)
       mustache :console, :layout => false
     end

data/lib/janky/branch.rb

@@ -1,7 +1,7 @@
 module Janky
   class Branch < ActiveRecord::Base
     belongs_to :repository
-    has_many :builds
+    has_many :builds, :dependent => :destroy
 
     # Is this branch green?
     #

data/lib/janky/build.rb

@@ -3,6 +3,14 @@ module Janky
     belongs_to :branch
     belongs_to :commit
 
+    default_scope do
+      columns = (column_names - ["output"]).map do |column_name|
+        arel_table[column_name]
+      end
+
+      select(columns)
+    end
+
     # Transition the Build to the started state.
     #
     # id  - the Fixnum ID used to find the build.

data/lib/janky/database/schema.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -10,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 1317384649) do
+ActiveRecord::Schema.define(:version => 1317384652) do
 
   create_table "branches", :force => true do |t|
     t.string   "name",          :null => false
@@ -22,24 +23,29 @@ ActiveRecord::Schema.define(:version => 1317384649) do
   add_index "branches", ["name", "repository_id"], :name => "index_branches_on_name_and_repository_id", :unique => true
 
   create_table "builds", :force => true do |t|
-    t.boolean  "green",                              :default => false
+    t.boolean  "green",                            :default => false
     t.string   "url"
-    t.string   "compare",                                               :null => false
+    t.string   "compare",                                             :null => false
     t.datetime "started_at"
     t.datetime "completed_at"
-    t.integer  "commit_id",                                             :null => false
-    t.integer  "branch_id",                                             :null => false
+    t.integer  "commit_id",                                           :null => false
+    t.integer  "branch_id",                                           :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.text     "output",       :limit => 2147483647
+    t.text     "output"
     t.integer  "room_id"
   end
 
+  add_index "builds", ["branch_id"], :name => "index_builds_on_branch_id"
+  add_index "builds", ["commit_id"], :name => "index_builds_on_commit_id"
+  add_index "builds", ["completed_at"], :name => "index_builds_on_completed_at"
+  add_index "builds", ["green"], :name => "index_builds_on_green"
+  add_index "builds", ["started_at"], :name => "index_builds_on_started_at"
   add_index "builds", ["url"], :name => "index_builds_on_url", :unique => true
 
   create_table "commits", :force => true do |t|
     t.string   "sha1",          :null => false
-    t.string   "message",       :null => false
+    t.text     "message",       :null => false
     t.string   "author",        :null => false
     t.datetime "committed_at"
     t.integer  "repository_id", :null => false

data/lib/janky/repository.rb

@@ -1,7 +1,7 @@
 module Janky
   class Repository < ActiveRecord::Base
-    has_many :branches
-    has_many :commits
+    has_many :branches, :dependent => :destroy
+    has_many :commits, :dependent => :destroy
     has_many :builds, :through => :branches
 
     replicate_associations :builds, :commits, :branches
@@ -148,7 +148,7 @@ module Janky
       elsif default.readable?
         default
       else
-        raise Error, "no config.xml template for repo #{id.inspect}"
+        raise Error, "no config.xml.erb template for repo #{id.inspect}"
       end
     end
 

data/lib/janky/templates/layout.mustache

@@ -10,7 +10,7 @@
 </head>
 <body class="{{page_class}}">
   <div id="wrapper">
-    <h2 id="logo"><a href="{{root}}/">Janky Hubot</a></h2>
+    <h2 id="logo"><a href="{{root}}/">{{title}}</a></h2>
 
     <div class="content">
       <div class="inside">
@@ -19,4 +19,4 @@
     </div>
   </div>
 </body>
-</html>
+</html>

data/lib/janky/version.rb

@@ -1,3 +1,3 @@
 module Janky
-  VERSION = "0.9.11"
+  VERSION = "0.9.12"
 end

data/lib/janky/views/layout.rb

@@ -2,9 +2,8 @@
 module Janky
   module Views
     class Layout < Mustache
-
       def title
-        "Janky Hubot"
+        ENV["JANKY_PAGE_TITLE"] || "Janky Hubot"
       end
 
       def page_class
@@ -14,7 +13,6 @@ module Janky
       def root
         @request.env['SCRIPT_NAME']
       end
-
     end
   end
 end

data/test/test_helper.rb

@@ -9,7 +9,7 @@ class Test::Unit::TestCase
     define_method("test_#{name.gsub(/\s+/,'_')}".to_sym, block)
   end
 
-  def environment
+  def default_environment
     { "RACK_ENV" => "test",
       "JANKY_CONFIG_DIR" => File.dirname(__FILE__),
       "JANKY_GITHUB_USER" => "hubot",
@@ -24,6 +24,16 @@ class Test::Unit::TestCase
     }
   end
 
+  def environment
+    env = default_environment
+    ENV.each do |key, value|
+      if key =~ /^JANKY_/
+        env[key] = value
+      end
+    end
+    env
+  end
+
   def gh_commit(sha1 = "HEAD")
     Janky::GitHub::Commit.new(
       sha1,

metadata

@@ -1,217 +1,214 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: janky
-version: !ruby/object:Gem::Version 
-  hash: 45
+version: !ruby/object:Gem::Version
+  version: 0.9.12
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 11
-  version: 0.9.11
 platform: ruby
-authors: 
+authors:
 - GitHub, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-01 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sinatra_auth_github
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 3
-        - 1
-        version: 0.3.1
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: sinatra_auth_github
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mustache
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: mustache
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 11
-        version: "0.11"
+      - !ruby/object:Gem::Version
+        version: '0.11'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
+        version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
-        version: 3.1.0
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: broach
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 2
-        version: "0.2"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: broach
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: replicate
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: replicate
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: shotgun
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: shotgun
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: thin
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: mysql2
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.3.0
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: database_cleaner
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        version: "0.6"
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :development
-  version_requirements: *id012
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
 description: Janky is a Continuous Integration server
 email: 
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - CHANGES
 - COPYING
 - Gemfile
@@ -282,41 +279,32 @@ files:
 - test/default.xml.erb
 - test/janky_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: https://github.com/github/janky
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Continuous Integration server built on top of Jenkins and designed for GitHub and Hubot
-test_files: 
+summary: Continuous Integration server built on top of Jenkins and designed for GitHub
+  and Hubot
+test_files:
 - test/default.xml.erb
 - test/janky_test.rb
 - test/test_helper.rb