janky 0.9.14 → 0.9.15

data/CHANGES

@@ -1,3 +1,9 @@
+= 0.9.15 / 2013-07-25
+
+* Upgrade sinatra_auth_github to make this work better with latest GitHub.com requirements
+
+* Truncate MD5 digests in job names to 12 characters
+
 = 0.9.14 / 2013-02-26
 
  * Many doc changes and improvements

data/README.md

@@ -90,7 +90,7 @@ Grab all the necessary files from [the gist][gist]:
 
     $ git clone git://gist.github.com/1497335 janky
 
-Then push up it to a new Heroku app:
+Then push it up to a new Heroku app:
 
     $ cd janky
     $ heroku create --stack cedar
@@ -193,6 +193,7 @@ Required settings:
 * `JANKY_CHAT_HIPCHAT_FROM`: name that messages will appear be sent from.
   Defaults to `CI`.
 * `JANKY_HUBOT_USER` should be XMPP/Jabber username in format xxxxx_xxxxxx rather than email
+* `JANKY_CHAT_DEFAULT_ROOM` should be the name of the room instead of the XMPP format, for example: `Engineers` instead of xxxx_xxxxxx.
 
 Installation:
 
@@ -215,6 +216,7 @@ a few extra settings:
 * `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".
+* `JANKY_AUTH_TEAM_ID`: An optional team ID to give auth to. Example: "1234".
 
 ### Hubot
 

data/janky.gemspec

@@ -17,7 +17,7 @@ EOL
   # runtime
   s.add_dependency "rake", "~>0.9.2"
   s.add_dependency "sinatra", "~>1.3"
-  s.add_dependency "sinatra_auth_github", "~>0.7.0"
+  s.add_dependency "sinatra_auth_github", "~>0.13.3"
   s.add_dependency "mustache", "~>0.11"
   s.add_dependency "yajl-ruby", "~>1.1.0"
   s.add_dependency "activerecord", "~>3.2.0"

data/lib/janky.rb

@@ -93,6 +93,7 @@ module Janky
 
     database = URI(settings["DATABASE_URL"])
     adapter  = database.scheme == "postgres" ? "postgresql" : database.scheme
+    encoding = database.scheme == "postgres" ? "unicode" : "utf8"
     if settings["JANKY_BASE_URL"][-1] != ?/
       warn "JANKY_BASE_URL must have a trailing slash"
       settings["JANKY_BASE_URL"] = settings["JANKY_BASE_URL"] + "/"
@@ -102,11 +103,13 @@ module Janky
 
     connection = {
       :adapter   => adapter,
-      :host      => database.host,
+      :encoding  => encoding,
+      :pool      => 5,
       :database  => database.path[1..-1],
       :username  => database.user,
       :password  => database.password,
-      :reconnect => true,
+      :host      => database.host,
+      :port      => database.port
     }
     if socket = settings["JANKY_DATABASE_SOCKET"]
       connection[:socket] = socket

data/lib/janky/builder/http.rb

@@ -20,7 +20,7 @@ module Janky
 
         response = http.request(request)
 
-        if response.code != "302"
+        if !%w[302 201].include?(response.code)
           Exception.push_http_response(response)
           raise Error, "Failed to create build"
         end

data/lib/janky/repository.rb

@@ -189,7 +189,7 @@ module Janky
       md5 << uri
       md5 << job_config_path.read
       md5 << builder.callback_url.to_s
-      "#{github_owner}-#{github_name}-#{md5.hexdigest}"
+      "#{name}-#{md5.hexdigest[0,12]}"
     end
   end
 end

data/lib/janky/version.rb

@@ -1,3 +1,3 @@
 module Janky
-  VERSION = "0.9.14"
+  VERSION = "0.9.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: janky
 version: !ruby/object:Gem::Version
-  version: 0.9.14
+  version: 0.9.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement