houston-core 0.6.3 → 0.7.0.beta

data/lib/houston/version.rb

@@ -1,3 +1,3 @@
 module Houston
-  VERSION = "0.6.3"
+  VERSION = "0.7.0.beta"
 end

data/lib/houston_observer.rb

@@ -42,13 +42,8 @@ module Houston
   private
 
     def invoke_callback_async(event, block, *args)
-      Thread.new do
-        begin
-          invoke_callback(event, block, *args)
-        ensure
-          ActiveRecord::Base.clear_active_connections!
-          Rails.logger.flush # http://stackoverflow.com/a/3516003/731300
-        end
+      Houston.async do
+        invoke_callback(event, block, *args)
       end
     end
 

data/lib/parallel_enumerable.rb

@@ -16,14 +16,8 @@ class ParallelEnumerable
 
   def each
     enumerable.map do |item|
-      Thread.new do
-        begin
-          yield item
-        rescue Exception # rescues StandardError by default; but we want to rescue and report all errors
-          Houston.report_exception $!
-        ensure
-          ActiveRecord::Base.clear_active_connections!
-        end
+      Houston.async! do
+        yield item
       end
     end.each(&:join)
   end

data/templates/new-instance/app/assets/javascripts/application.js

@@ -0,0 +1,13 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require_tree .

data/templates/new-instance/app/assets/stylesheets/application.css

@@ -0,0 +1,13 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require_self
+ *= require_tree .
+*/

data/templates/new-instance/config/alerts/errs.rb

@@ -7,7 +7,7 @@ $errbit_since_changes_since = 1.week.ago
 Houston::Alerts.config.sync :changes, "err", every: "45s" do
   app_project_map = Hash[Project
     .where(error_tracker_name: "Errbit")
-    .pluck("(extended_attributes->'errbit_app_id')::integer", :id)]
+    .pluck("(props->>'errbit.appId')::integer", :id)]
   app_ids = app_project_map.keys
 
   Houston::Adapters::ErrorTracker::ErrbitAdapter.changed_problems(app_id: app_ids, since: $errbit_since_changes_since).map { |problem|

data/templates/new-instance/config/jobs/purge_jobs.rb

@@ -0,0 +1,3 @@
+Houston.config.at "10:00pm", "purge:jobs" do
+  Job.started_before(1.week.ago).delete_all
+end

data/templates/new-instance/config/main.rb

@@ -3,6 +3,7 @@
 # Load Houston
 require "houston/application"
 
+require_relative "../lib/houston/engine"
 require_relative "../lib/slack_helpers"
 require_relative "../lib/time_helpers"
 

data/templates/new-instance/config/routes.rb

@@ -0,0 +1,5 @@
+Rails.application.routes.draw do
+
+  # You can add routes to your instance here
+
+end

data/templates/new-instance/config/triggers/github/publish_comments_on_slack.rb

@@ -1,5 +1,5 @@
 Houston.config do
-  on "github:comment:commit" do |comment|
+  on "github:comment:created:commit" do |comment|
     channel = "##{comment["project"].slug}" if comment["project"]
     channel = "developers" unless Houston::Slack.connection.channels.include? channel
     body, url = comment.values_at "body", "html_url"
@@ -10,7 +10,7 @@ Houston.config do
     slack_send_message_to message, channel, as: :github, attachments: [comment], test: true
   end
 
-  on "github:comment:diff" do |comment|
+  on "github:comment:created:diff" do |comment|
     channel = "##{comment["project"].slug}" if comment["project"]
     channel = "developers" unless Houston::Slack.connection.channels.include? channel
     body, url = comment.values_at "body", "html_url"
@@ -22,7 +22,7 @@ Houston.config do
     slack_send_message_to message, channel, as: :github, attachments: [comment], test: true
   end
 
-  on "github:comment:pull" do |comment|
+  on "github:comment:created:pull" do |comment|
     channel = "##{comment["project"].slug}" if comment["project"]
     channel = "developers" unless Houston::Slack.connection.channels.include? channel
     body, url = comment.values_at "body", "html_url"

data/templates/new-instance/lib/houston/engine.rb

@@ -0,0 +1,25 @@
+# This is required so that Houston Instances can define
+# its own routes and models and views.
+
+module Houston
+  class Engine < ::Rails::Engine
+
+    # Precompile assets for the instance
+    initializer :assets do |config|
+      Rails.application.config.assets.precompile += %w(
+        application.js
+        application.css )
+    end
+
+    # Include the Engine's migrations with the Application
+    # http://pivotallabs.com/leave-your-migrations-in-your-rails-engines/
+    initializer :append_migrations do |app|
+      unless app.root.to_s.match root.to_s
+        config.paths["db/migrate"].expanded.each do |expanded_path|
+          app.config.paths["db/migrate"] << expanded_path
+        end
+      end
+    end
+
+  end
+end

data/test/acceptance/creating_a_release_test.rb

@@ -16,7 +16,7 @@ class CreatingAReleaseTest < ActionDispatch::IntegrationTest
       slug: "houston",
       ticket_tracker_name: "Houston",
       version_control_name: "Git",
-      extended_attributes:  {"git_location" => Rails.root.join(".git")})
+      props:  {"git.location" => Rails.root.join(".git").to_s})
     @project.roles.create!(name: "Maintainer", user: user)
     @ticket = @project.tickets.create!(
       number: 116,

data/test/integration/ci_integration_test.rb

@@ -119,7 +119,7 @@ class CIIntegrationTest < ActionDispatch::IntegrationTest
           name: "Test",
           slug: "fixture",
           version_control_name: "Git",
-          extended_attributes: { "git_location" => "git@github.com:houston/fixture.git" })
+          props: {"git.location" => "git@github.com:houston/fixture.git"})
         test_run = TestRun.new(project: project, sha: "bd3e9e2")
 
         expected_url = "https://api.github.com/repos/houston/fixture/statuses/bd3e9e2e4ddf89a640a4f880cbf55bb46cc7e88a?access_token=#{Houston.config.github[:access_token]}"
@@ -140,7 +140,7 @@ class CIIntegrationTest < ActionDispatch::IntegrationTest
           name: "Test",
           slug: "fixture",
           version_control_name: "Git",
-          extended_attributes: { "git_location" => "git@github.com:houston/fixture.git" })
+          props: {"git.location" => "git@github.com:houston/fixture.git"})
         test_run = TestRun.new(project: project, sha: "bd3e9e2", result: :pass, completed_at: Time.now)
 
         expected_url = "https://api.github.com/repos/houston/fixture/statuses/bd3e9e2e4ddf89a640a4f880cbf55bb46cc7e88a?access_token=#{Houston.config.github[:access_token]}"

data/test/integration/commits_api_test.rb

@@ -11,7 +11,7 @@ class CommitsApiTest < ActionDispatch::IntegrationTest
       name: "Test",
       slug: "test",
       version_control_name: "Git",
-      extended_attributes: { "git_location" => Rails.root.join("test", "data", "bare_repo.git") })
+      props: {"git.location" => Rails.root.join("test", "data", "bare_repo.git").to_s})
 
     project.repo.all_commits.each do |sha|
       native_commit = project.repo.native_commit(sha)

data/test/unit/controllers/hooks_controller_test.rb

@@ -26,12 +26,7 @@ class HooksControllerTest < ActionController::TestCase
       assert_response :success
     end
 
-    should "close a GitHub::PullRequest when the action is \"closed\"" do
-      mock(Github::PullRequest).close!(a_pull_request, as: "baxterthehacker")
-      post :github, hook: github_pull_request_event_payload(action: "closed")
-    end
-
-    should "create or update a GitHub::PullRequest when the action is not \"closed\"" do
+    should "create or update a GitHub::PullRequest" do
       mock(Github::PullRequest).upsert!(a_pull_request, as: "baxterthehacker")
       post :github, hook: github_pull_request_event_payload
     end

data/test/unit/controllers/project_options_controller_test.rb

@@ -8,22 +8,22 @@ class ProjectOptionsControllerTest < ActionController::TestCase
   setup do
     sign_in User.first
     @project = create(:project,
-      view_options: {
-        "speed" => "plaid",
-        "helmet" => "dark" })
+      props: {
+        "view.speed" => "plaid",
+        "view.helmet" => "dark" })
   end
 
 
   context "#update" do
     should "merge supplied options with the project's options" do
       expected_options = {
-        "speed" => "light",
-        "helmet" => "dark",
-        "schwartz" => "up side" }
+        "view.speed" => "light",
+        "view.helmet" => "dark",
+        "view.schwartz" => "up side" }
 
-      put :update, slug: "test", options: {speed: "light", schwartz: "up side"}
+      put :update, slug: "test", options: {"view.speed" => "light", "view.schwartz" => "up side"}
       assert_response :ok
-      assert_equal expected_options, project.reload.view_options
+      assert_equal expected_options, project.reload.props.to_h
     end
   end
 
@@ -31,11 +31,11 @@ class ProjectOptionsControllerTest < ActionController::TestCase
   context "#destroy" do
     should "remove the specified key from the project's options" do
       expected_options = {
-        "speed" => "plaid" }
+        "view.speed" => "plaid" }
 
-      delete :destroy, slug: "test", key: "helmet"
+      delete :destroy, slug: "test", key: "view.helmet"
       assert_response :ok
-      assert_equal expected_options, project.reload.view_options
+      assert_equal expected_options, project.reload.props.to_h
     end
   end
 

data/test/unit/controllers/user_options_controller_test.rb

@@ -7,35 +7,35 @@ class UserOptionsControllerTest < ActionController::TestCase
 
   setup do
     @user = create(:user,
-      view_options: {
-        "speed" => "plaid",
-        "helmet" => "dark" })
+      props: {
+        "view.speed" => "plaid",
+        "view.helmet" => "dark" })
     sign_in @user
   end
 
 
   context "#update" do
-    should "merge supplied options with the project's options" do
+    should "merge supplied options with the user's options" do
       expected_options = {
-        "speed" => "light",
-        "helmet" => "dark",
-        "schwartz" => "up side" }
+        "view.speed" => "light",
+        "view.helmet" => "dark",
+        "view.schwartz" => "up side" }
 
-      put :update, options: {speed: "light", schwartz: "up side"}
+      put :update, options: {"view.speed" => "light", "view.schwartz" => "up side"}
       assert_response :ok
-      assert_equal expected_options, user.reload.view_options
+      assert_equal expected_options, user.reload.props.to_h
     end
   end
 
 
   context "#destroy" do
-    should "remove the specified key from the project's options" do
+    should "remove the specified key from the user's options" do
       expected_options = {
-        "speed" => "plaid" }
+        "view.speed" => "plaid" }
 
-      delete :destroy, key: "helmet"
+      delete :destroy, key: "view.helmet"
       assert_response :ok
-      assert_equal expected_options, user.reload.view_options
+      assert_equal expected_options, user.reload.props.to_h
     end
   end
 

data/test/unit/models/code_climate_coverage_report_test.rb

@@ -11,7 +11,7 @@ class CodeClimateCoverageReportTest < ActiveSupport::TestCase
       slug: "test",
       ci_server_name: "Jenkins",
       version_control_name: "Git",
-      extended_attributes: { "git_location" => Rails.root.join("test/data/bare_repo.git").to_s })
+      props: {"git.location" => Rails.root.join("test/data/bare_repo.git").to_s})
     @commit = Commit.new(project: @project, sha: @sha)
     @test_run = TestRun.new(
       project: project,

data/test/unit/models/commit_test.rb

@@ -85,12 +85,14 @@ class CommitTest < ActiveSupport::TestCase
     should "ignore spaces when extracting extra attributes from a commit" do
       commits = [
         "I did some work {{attr: value}}",
-        "I set this one twice {{attr:\tv1}} {{attr: v2}}"
+        "I set this one twice {{attr:\tv1}} {{attr: v2}}",
+        "I set this one three times {{attr:v1, v2,v3}}",
       ]
 
       expectations = [
         {"attr" => ["value"]},
-        {"attr" => ["v1", "v2"]}
+        {"attr" => ["v1", "v2"]},
+        {"attr" => ["v1", "v2", "v3"]}
       ]
 
       commits.zip(expectations) do |commit_message, expectation|

data/test/unit/models/project_test.rb

@@ -10,15 +10,15 @@ class ProjectTest < ActiveSupport::TestCase
 
   context "Validation:" do
     should "validate version control parameters when a version control adapter is specified" do
-      project = Project.new(version_control_name: "Git", extended_attributes: {"git_location" => "/wrong/path"})
+      project = Project.new(version_control_name: "Git", props:  {"git.location" => "/wrong/path"})
       project.valid?
-      assert project.errors[:git_location].any?
+      assert project.errors["git.location"].any?
     end
 
     should "not validate version control parameters if no adapter is specified" do
-      project = Project.new(version_control_name: "None", extended_attributes: {"git_location" => "/wrong/path"})
+      project = Project.new(version_control_name: "None", props:  {"git.location" => "/wrong/path"})
       project.valid?
-      refute project.errors[:git_location].any?
+      refute project.errors["git.location"].any?
     end
   end
 
@@ -64,7 +64,7 @@ class ProjectTest < ActiveSupport::TestCase
         name: "Test",
         slug: "test-01",
         version_control_name: "Git",
-        extended_attributes:  {"git_location" => "git@github.com:houston/fixture.git"})
+        props:  {"git.location" => "git@github.com:houston/fixture.git"})
     end
 
     teardown do

data/test/unit/models/props_test.rb

@@ -0,0 +1,57 @@
+require "test_helper"
+
+class PropsTest < ActiveSupport::TestCase
+  attr_reader :user
+
+  should "raise an exception for an invalid prop name" do
+    assert_raises do
+      user = User.first
+      user.update_prop! "slack_user_name", "slackbot"
+    end
+  end
+
+  context "Given a user with the prop slack.username, it" do
+    setup do
+      @user = create(:user, props: {"slack.username" => "slackbot"})
+    end
+
+    should "be able to look up the user by that prop" do
+      assert_equal user, User.find_by_prop("slack.username", "slackbot")
+    end
+  end
+
+  context "When .find_by_prop is used with a block" do
+    context "and a user exists with the queried prop, the block" do
+      setup do
+        @user = create(:user, props: {"slack.username" => "slackbot"})
+      end
+
+      should "not be invoked" do
+        invoked = false
+        User.find_by_prop("slack.username", "slackbot") { invoked = true }
+        refute invoked, "Expected the block not to be invoked: the user was found"
+      end
+    end
+
+    context "and a user does not exist with the queried prop," do
+      context "the block" do
+        should "be invoked the first time the user is looked up" do
+          invoked = false
+          User.find_by_prop("slack.username", "slackbot") { invoked = true; User.first }
+          assert invoked, "Expected the block to be invoked: the user wasn't found"
+        end
+
+        should "not be invoked the second time the user is looked up" do
+          invoked = false
+          User.find_by_prop("slack.username", "slackbot") { invoked = true; User.first }
+          assert invoked, "Expected the block to be invoked: the user wasn't found"
+
+          invoked = false
+          User.find_by_prop("slack.username", "slackbot") { invoked = true; User.first }
+          refute invoked, "Expected the block not to be invoked: the user should've been mapped the first time"
+        end
+      end
+    end
+  end
+
+end

data/test/unit/models/pull_request_test.rb

@@ -16,7 +16,7 @@ class PullRequestTest < ActiveSupport::TestCase
         name: "Test",
         slug: "test",
         version_control_name: "Git",
-        extended_attributes: { "git_location" => Rails.root.join("test", "data", "bare_repo.git") })
+        props: {"git.location" => Rails.root.join("test", "data", "bare_repo.git").to_s})
 
       @pull_request_payload = {
         "number" => 1,
@@ -160,7 +160,7 @@ class PullRequestTest < ActiveSupport::TestCase
         name: "Test",
         slug: "test",
         version_control_name: "Git",
-        extended_attributes: { "git_location" => Rails.root.join("test", "data", "bare_repo.git") })
+        props: {"git.location" => Rails.root.join("test", "data", "bare_repo.git").to_s})
 
       @pull_request = Github::PullRequest.create!(
         project: @project,