janky 0.12.0 → 0.13.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f039c609da4b8b8d5caa60c860aa4140adf8a8a1
-  data.tar.gz: 17f08463778bd8cf3ffc17d2d2e90a59421b9116
+  metadata.gz: ae900c42b7672a66ca555375abf8e8b20c59ac55
+  data.tar.gz: 8db3f22f4255fa94e8cf73859db9a28ddae14d4a
 SHA512:
-  metadata.gz: cd76f405decebd3f22357f43d2761121ffd35cd132e602f6c39aa2f9cb16b07f8870f5042a349244c7d6037c5ffcf41bf90666711b7cc9837010e5b73477a125
-  data.tar.gz: 73df879a5376b721b045f0c54555ab736c7077b794ecfa7aa2c4caee2e34c71e29c8f78d982913e274c25dd3013a53765698c9eb1ff3edaa5a9ee35698c40aaa
+  metadata.gz: 182d740c5bc5677926fb860a6187407552373ae91943ebfe7d4b5a08d66cbc7552ee9452a33543348bdb70dd752780fd33f612f398c1e3a588cd78338c07af8d
+  data.tar.gz: 46117ffac656995fad07049a4efd8298d144ad50b548ac911f53c56591cae5fc9b565ed7ea047feb8ed151c78fa88bf1a7fa56bcb1998f9ba333beda5e1a4d55

data/README.md

@@ -24,29 +24,37 @@ Hubot usage
 -----------
 
 Start by setting up a new Jenkins job and GitHub web hook for a
-repository:
+repository: `[ORG]/[REPO]`
 
     hubot ci setup github/janky
 
 The `setup` command can safely be run over and over again. It won't do
-anything unless it needs to. It takes an optional name argument:
+anything unless it needs to. It takes an optional `name` argument: `[ORG]/[REPO] [NAME]`
 
     hubot ci setup github/janky janky-ruby1.9.2
 
-It also takes an optional template name argument:
+It also takes an optional `template` argument: `[ORG]/[REPO] [NAME] [TEMPLATE]`
 
     hubot ci setup github/janky janky-ruby1.9.2 ruby-build
 
 All branches are built automatically on push. Disable auto build with:
 
-    hubot ci toggle janky
+    hubot ci toggle [REPO]
+    
+**NOTE**: If `name` was set you'll need to use it intested.
+
+    hubot ci toggle [NAME]
 
 Run the command again to re-enable it. Force a build of the master
 branch:
 
-    hubot ci build janky
+    hubot ci build [REPO]
+    
+**NOTE**: If `name` was set you'll need to use it intested.
+
+    hubot ci build [NAME]
 
-Of a specific branch:
+Of a specific branch: `[REPO]/[BRANCH]`
 
     hubot ci build janky/libgit2
 
@@ -55,7 +63,7 @@ lets you choose where notifications are sent to. First get a list of
 available rooms:
 
     hubot ci rooms
-
+    
 Then pick one:
 
     hubot ci set room janky The Serious Room
@@ -64,7 +72,7 @@ Get the status of a build:
 
     hubot ci status janky
 
-Specific branch:
+Specific branch: `[REPO]/[BRANCH]`
 
     hubot ci status janky/libgit2
 
@@ -192,15 +200,6 @@ respectively.
 
 ### Chat notifications
 
-#### Campfire
-Janky notifies [Campfire][] chat rooms by default. Required settings:
-
-* `JANKY_CHAT_CAMPFIRE_ACCOUNT`: account name.
-* `JANKY_CHAT_CAMPFIRE_TOKEN`: authentication token for the user sending
-  build notifications.
-
-[Campfire]: http://campfirenow.com/
-
 #### HipChat
 
 Required settings:

data/janky.gemspec

@@ -1,10 +1,13 @@
 require File.expand_path("../lib/janky/version", __FILE__)
 
-Gem::Specification.new "janky", Janky::VERSION do |s|
+Gem::Specification.new do |s|
+  s.name = "janky"
+  s.version = Janky::VERSION
   s.description = "Janky is a Continuous Integration server"
   s.summary = "Continuous Integration server built on top of Jenkins and " \
     "designed for GitHub and Hubot"
-  s.authors = ["Simon Rozet"]
+  s.authors = ["Simon Rozet", "Matt Rogers"]
+  s.email = 'codemattr@gmail.com'
   s.homepage = "https://github.com/github/janky"
   s.has_rdoc = false
   s.license  = "MIT"
@@ -16,12 +19,13 @@ https://github.com/github/janky/commit/0fc6214e3a75cc138aed46a2493980440e848aa3#
 EOL
 
   # runtime
-  s.add_dependency "rake", "~>10.0"
+  s.add_dependency "rake", "~>12.0"
   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.3.0"
-  s.add_dependency "activerecord", "~>3.2.0"
+  s.add_dependency "yajl-ruby", "~>1.3.1"
+  s.add_dependency "activerecord", "~>4.2.0"
+  s.add_dependency "activerecord-deprecated_finders", "~>1.0.4"
   s.add_dependency "broach", "~>0.2"
   s.add_dependency "replicate", "~>1.4"
 
@@ -29,10 +33,11 @@ EOL
   s.add_development_dependency "shotgun", "~>0.9"
   s.add_development_dependency "thin", "~>1.2"
   s.add_development_dependency "mysql2", "~>0.3.0"
+  s.add_development_dependency "test-unit", "~>3.2.0"
 
   # test
-  s.add_development_dependency "database_cleaner", "~>0.6"
-  s.add_development_dependency "mocha", "~>0.14.0"
+  s.add_development_dependency "database_cleaner", "1.6.2"
+  s.add_development_dependency "mocha", "~>1.5.0"
 
   s.files = %w[
 CHANGES

data/lib/janky/build_request.rb

@@ -1,7 +1,7 @@
 module Janky
   class BuildRequest
     def self.handle(repo_uri, branch_name, pusher, commit, compare, room_id)
-      repos = Repository.find_all_by_uri(repo_uri)
+      repos = Repository.where(uri: repo_uri)
       repos.each do |repo|
         begin
           new(repo, branch_name, pusher, commit, compare, room_id).handle

data/lib/janky/database/schema.rb

@@ -9,70 +9,70 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 1400144784) do
+ActiveRecord::Schema.define(version: 1400144784) do
 
-  create_table "branches", :force => true do |t|
-    t.string   "name",          :null => false
-    t.integer  "repository_id", :null => false
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
+  create_table "branches", force: :cascade do |t|
+    t.string   "name",          limit: 255, null: false
+    t.integer  "repository_id", limit: 4,   null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "branches", ["name", "repository_id"], :name => "index_branches_on_name_and_repository_id", :unique => true
+  add_index "branches", ["name", "repository_id"], name: "index_branches_on_name_and_repository_id", unique: true, using: :btree
 
-  create_table "builds", :force => true do |t|
-    t.boolean  "green",        :default => false
-    t.string   "url"
-    t.string   "compare",                         :null => false
+  create_table "builds", force: :cascade do |t|
+    t.boolean  "green",                      default: false
+    t.string   "url",          limit: 255
+    t.string   "compare",      limit: 255,                   null: false
     t.datetime "started_at"
     t.datetime "completed_at"
-    t.integer  "commit_id",                       :null => false
-    t.integer  "branch_id",                       :null => false
-    t.datetime "created_at",                      :null => false
-    t.datetime "updated_at",                      :null => false
-    t.text     "output"
-    t.string   "room_id"
-    t.string   "user"
+    t.integer  "commit_id",    limit: 4,                     null: false
+    t.integer  "branch_id",    limit: 4,                     null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.text     "output",       limit: 65535
+    t.string   "room_id",      limit: 255
+    t.string   "user",         limit: 255
     t.datetime "queued_at"
   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
+  add_index "builds", ["branch_id"], name: "index_builds_on_branch_id", using: :btree
+  add_index "builds", ["commit_id"], name: "index_builds_on_commit_id", using: :btree
+  add_index "builds", ["completed_at"], name: "index_builds_on_completed_at", using: :btree
+  add_index "builds", ["green"], name: "index_builds_on_green", using: :btree
+  add_index "builds", ["started_at"], name: "index_builds_on_started_at", using: :btree
+  add_index "builds", ["url"], name: "index_builds_on_url", unique: true, using: :btree
 
-  create_table "commits", :force => true do |t|
-    t.string   "sha1",          :null => false
-    t.text     "message",       :null => false
-    t.string   "author",        :null => false
+  create_table "commits", force: :cascade do |t|
+    t.string   "sha1",          limit: 255,   null: false
+    t.text     "message",       limit: 65535, null: false
+    t.string   "author",        limit: 255,   null: false
     t.datetime "committed_at"
-    t.integer  "repository_id", :null => false
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
-    t.string   "url",           :null => false
+    t.integer  "repository_id", limit: 4,     null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "url",           limit: 255,   null: false
   end
 
-  add_index "commits", ["sha1", "repository_id"], :name => "index_commits_on_sha1_and_repository_id", :unique => true
+  add_index "commits", ["sha1", "repository_id"], name: "index_commits_on_sha1_and_repository_id", unique: true, using: :btree
 
-  create_table "repositories", :force => true do |t|
-    t.string   "name",                             :null => false
-    t.string   "uri",                              :null => false
-    t.string   "room_id"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
-    t.boolean  "enabled",        :default => true, :null => false
-    t.string   "hook_url"
-    t.integer  "github_team_id"
-    t.string   "job_template"
-    t.string   "context"
+  create_table "repositories", force: :cascade do |t|
+    t.string   "name",           limit: 255,                null: false
+    t.string   "uri",            limit: 255,                null: false
+    t.string   "room_id",        limit: 255
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "enabled",                    default: true, null: false
+    t.string   "hook_url",       limit: 255
+    t.integer  "github_team_id", limit: 4
+    t.string   "job_template",   limit: 255
+    t.string   "context",        limit: 255
   end
 
-  add_index "repositories", ["enabled"], :name => "index_repositories_on_enabled"
-  add_index "repositories", ["name"], :name => "index_repositories_on_name", :unique => true
-  add_index "repositories", ["uri"], :name => "index_repositories_on_uri"
+  add_index "repositories", ["enabled"], name: "index_repositories_on_enabled", using: :btree
+  add_index "repositories", ["name"], name: "index_repositories_on_name", unique: true, using: :btree
+  add_index "repositories", ["uri"], name: "index_repositories_on_uri", using: :btree
 
 end

data/lib/janky/hubot.rb

@@ -83,7 +83,7 @@ module Janky
     # Get the status of all projects.
     get "/" do
       content_type "text/plain"
-      repos = Repository.all(:include => [:branches, :commits, :builds]).map do |repo|
+      repos = Repository.includes(:branches, :commits, :builds).all.map do |repo|
         master = repo.branch_for("master")
 
         "%-17s %-13s %-10s %40s" % [
@@ -109,7 +109,7 @@ module Janky
       end
       builds = builds.limit(limit) unless limit.blank?
 
-      builds.map! do |build|
+      builds.map do |build|
         build_to_hash(build)
       end
 

data/lib/janky/repository.rb

@@ -8,7 +8,7 @@ module Janky
 
     replicate_associations :builds, :commits, :branches
 
-    default_scope(order("name"))
+    default_scope { order("name") }
 
     def self.setup(nwo, name = nil, template = nil)
       if nwo.nil?
@@ -65,7 +65,7 @@ module Janky
     #
     # Returns a Branch record.
     def branch_for(name)
-      branches.find_or_create_by_name(name)
+      branches.find_or_create_by(name: name)
     end
 
     # Create or retrieve the given commit.

data/lib/janky/version.rb

@@ -1,3 +1,3 @@
 module Janky
-  VERSION = "0.12.0"
+  VERSION = "0.13.0.pre1"
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: janky
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0.pre1
 platform: ruby
 authors:
 - Simon Rozet
+- Matt Rogers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2018-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +73,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
+- !ruby/object:Gem::Dependency
+  name: activerecord-deprecated_finders
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: broach
   requirement: !ruby/object:Gem::Requirement
@@ -165,35 +180,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 1.5.0
 description: Janky is a Continuous Integration server
-email: 
+email: codemattr@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -298,12 +327,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Continuous Integration server built on top of Jenkins and designed for GitHub