janky 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58d52422d4f7c22902eeeff06e8b63671fa21594
-  data.tar.gz: a65162a5e523477f2c0ecd29d2db9d97c6318295
+  metadata.gz: f039c609da4b8b8d5caa60c860aa4140adf8a8a1
+  data.tar.gz: 17f08463778bd8cf3ffc17d2d2e90a59421b9116
 SHA512:
-  metadata.gz: 3416367277f1c30ab0609b74f99f9a667b4385be56f611bce7fa26698866d6f4aa6d9bf79db0db2ddda752160774d0b839bc210db4f84943550e562ef1558fd1
-  data.tar.gz: 62e67c8e6719ccd9082dc2bcac8eee5edd0af591097f8fae1da50f5696123e16598a9bd9fc601b319beba2c2f00d65724244dcc2fe177f44a6d6236ebf2deb26
+  metadata.gz: cd76f405decebd3f22357f43d2761121ffd35cd132e602f6c39aa2f9cb16b07f8870f5042a349244c7d6037c5ffcf41bf90666711b7cc9837010e5b73477a125
+  data.tar.gz: 73df879a5376b721b045f0c54555ab736c7077b794ecfa7aa2c4caee2e34c71e29c8f78d982913e274c25dd3013a53765698c9eb1ff3edaa5a9ee35698c40aaa

data/CHANGES

@@ -1,3 +1,9 @@
+= 0.12.0 / 2017-06-05
+ * Update yajl-ruby to work with Ruby 2.4
+ * Add the ability to use MySQL 5.7
+ * Update mocha to a more recent version
+ * Allow DATABASE_URL to be specified for tests
+
 = 0.11.1 / 2015-02-20
  * Update gemspec to include the  hubot chat service files
  * Update recommended Jenkins version in the README

data/README.md

@@ -1,6 +1,8 @@
 Janky
 =====
 
+[![Gem Version](https://badge.fury.io/rb/janky.svg)](https://badge.fury.io/rb/janky)
+
 This is Janky, a continuous integration server built on top of
 [Jenkins][], controlled by [Hubot][], and designed for [GitHub][].
 
@@ -246,10 +248,16 @@ Sends notifications to Hubot via [janky script](http://git.io/hubot-janky).
 
 Required settings:
 
+* `JANKY_CHAT=hubot`
 * `JANKY_CHAT_HUBOT_URL`: URL to your Hubot instance.
 * `JANKY_CHAT_HUBOT_ROOMS`: List of rooms which can be set via `ci set room`.
   * For IRC: Comma-separated list of channels `"#room, #another-room"`
   * For Campfire/HipChat: List with room id and name `"34343:room, 23223:another-room"`
+  * For Slack: List with room names `"room, another-room"`
+
+Installation:
+* Add `require "janky/chat_service/hubot"` to the `config/environment.rb`
+  file **before** the `Janky.setup(ENV)` line.
 
 ### Authentication
 

data/Rakefile

@@ -2,6 +2,10 @@ $LOAD_PATH.unshift(File.expand_path("../lib", __FILE__))
 ENV["RACK_ENV"] ||= "development"
 
 require "janky"
+
+class ActiveRecord::ConnectionAdapters::Mysql2Adapter
+  NATIVE_DATABASE_TYPES[:primary_key] = "int(11) auto_increment PRIMARY KEY"
+end
 Janky.setup(ENV)
 require "janky/tasks"
 

data/janky.gemspec

@@ -20,7 +20,7 @@ EOL
   s.add_dependency "sinatra", "~>1.3"
   s.add_dependency "sinatra_auth_github", "~>1.0.0"
   s.add_dependency "mustache", "~>0.11"
-  s.add_dependency "yajl-ruby", "~>1.1.0"
+  s.add_dependency "yajl-ruby", "~>1.3.0"
   s.add_dependency "activerecord", "~>3.2.0"
   s.add_dependency "broach", "~>0.2"
   s.add_dependency "replicate", "~>1.4"
@@ -32,7 +32,7 @@ EOL
 
   # test
   s.add_development_dependency "database_cleaner", "~>0.6"
-  s.add_development_dependency "mocha", "~>0.10.4"
+  s.add_development_dependency "mocha", "~>0.14.0"
 
   s.files = %w[
 CHANGES

data/lib/janky.rb

@@ -53,6 +53,12 @@ require "janky/views/layout"
 require "janky/views/index"
 require "janky/views/console"
 
+# TODO Remove after upgrading to activerecord 4.x
+require "active_record/connection_adapters/mysql2_adapter"
+class ActiveRecord::ConnectionAdapters::Mysql2Adapter
+  NATIVE_DATABASE_TYPES[:primary_key] = "int(11) auto_increment PRIMARY KEY"
+end
+
 # This is Janky, a continuous integration server. Checkout the 'app'
 # method on this module for an overview of the different components
 # involved.
@@ -95,10 +101,6 @@ 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"] + "/"
-    end
     base_url = URI(settings["JANKY_BASE_URL"]).to_s
     Build.base_url = base_url
 

data/lib/janky/builder/runner.rb

@@ -30,7 +30,7 @@ module Janky
       end
 
       def create_url
-        URI("#{@base_url}job/#{@build.repo_job_name}/build")
+        URI.join(@base_url, "job/#{@build.repo_job_name}/build")
       end
 
       def context_push

data/lib/janky/chat_service/hubot.rb

@@ -28,14 +28,14 @@ module Janky
         uri  = @url
         user = uri.user
         pass = uri.password
-        path = uri.path
+        path = File.join(uri.path, "janky")
 
         http = Net::HTTP.new(uri.host, uri.port)
         if uri.scheme == "https"
           http.use_ssl = true
         end
 
-        post = Net::HTTP::Post.new("#{path}/janky")
+        post = Net::HTTP::Post.new(path)
         post.basic_auth(user, pass) if user && pass
         post["Content-Type"] = "application/json"
         post.body = {:message => message, :room => room}.to_json

data/lib/janky/github/receiver.rb

@@ -46,7 +46,7 @@ module Janky
       end
 
       def valid_signature?
-        digest    = OpenSSL::Digest::Digest.new("sha1")
+        digest    = OpenSSL::Digest::SHA1.new
         signature = @request.env["HTTP_X_HUB_SIGNATURE"].split("=").last
 
         signature == OpenSSL::HMAC.hexdigest(digest, @secret, data)

data/lib/janky/version.rb

@@ -1,3 +1,3 @@
 module Janky
-  VERSION = "0.11.1"
+  VERSION = "0.12.0"
 end

data/test/test_helper.rb

@@ -2,7 +2,7 @@ $LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
 
 require "janky"
 require "test/unit"
-require "mocha"
+require "mocha/setup"
 require "database_cleaner"
 
 class Test::Unit::TestCase
@@ -28,7 +28,7 @@ class Test::Unit::TestCase
   def environment
     env = default_environment
     ENV.each do |key, value|
-      if key =~ /^JANKY_/
+      if key =~ /^JANKY_/ || key == "DATABASE_URL"
         env[key] = value
       end
     end
@@ -67,7 +67,7 @@ class Test::Unit::TestCase
 
     repo    = Janky::Repository.find_by_name!(repo_name)
     payload = gh_payload(repo, branch, pusher, [gh_commit(commit)])
-    digest  = OpenSSL::Digest::Digest.new("sha1")
+    digest  = OpenSSL::Digest::SHA1.new
     sig     = OpenSSL::HMAC.hexdigest(digest, Janky::GitHub.secret,
                 payload.to_json)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: janky
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Simon Rozet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-21 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.14.0
 description: Janky is a Continuous Integration server
 email: 
 executables: []
@@ -303,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Continuous Integration server built on top of Jenkins and designed for GitHub