houston-core 0.5.6 → 0.6.0

data/app/views/releases/_commits.html.erb

@@ -7,7 +7,7 @@
     <% end %>
   </h5>
   <ul class="commits">
-    <% commits.each do |commit| %>
+    <% commits.each do |commit|; commit.project = @project %>
       <%= content_tag :li, :id => "commit_#{commit.id}" do %>
         <%= link_to_commit(commit) if github_url?(@project) && !for_email? && can?(:read, commit) %>
         <%= format_commit(commit) %>

data/app/views/releases/show.html.erb

@@ -1,3 +1,12 @@
+<% content_for :meta do %>
+  <%= link_to_oembed release_url(@release) %>
+  <%= tag "meta", property: "og:type", content: "website" %>
+  <%= tag "meta", property: "og:site_name", content: "#{@project.slug} / #{@release.environment_name}" %>
+  <%= tag "meta", property: "og:title", content: format_release_subject(@release) %>
+  <%= tag "meta", property: "og:description", content: format_release_description(@release) %>
+  <%= tag "meta", property: "og:url", content: release_url(@release) %>
+<% end %>
+
 <%= render partial: "projects/header", locals: {project: @project, subtitle: "Release of"} %>
 
 <%= render partial: "releases/changelog" %>

data/app/views/users/_form.html.erb

@@ -1,55 +1,55 @@
-<%= form_for @user, :html => { :class => 'form-horizontal' } do |f| %>
+<%= form_for @user, :html => { :class => "form-horizontal" } do |f| %>
   <fieldset>
 
     <div class="control-group">
-      <%= f.label :first_name, :class => 'control-label' %>
+      <%= f.label :first_name, :class => "control-label" %>
       <div class="controls">
-        <%= f.text_field :first_name, :class => 'text_field' %>
+        <%= f.text_field :first_name, :class => "text_field" %>
       </div>
     </div>
 
     <div class="control-group">
-      <%= f.label :last_name, :class => 'control-label' %>
+      <%= f.label :last_name, :class => "control-label" %>
       <div class="controls">
-        <%= f.text_field :last_name, :class => 'text_field' %>
+        <%= f.text_field :last_name, :class => "text_field" %>
       </div>
     </div>
 
     <div class="control-group">
-      <%= f.label :nickname, "Nickname", :class => 'control-label' %>
+      <%= f.label :nickname, "Nickname", :class => "control-label" %>
       <div class="controls">
-        <%= f.text_field :nickname, :class => 'text_field' %>
+        <%= f.text_field :nickname, :class => "text_field" %>
       </div>
     </div>
 
     <div class="control-group">
-      <%= f.label :email, "Primary Email Address", :class => 'control-label' %>
+      <%= f.label :email, "Primary Email Address", :class => "control-label" %>
       <div class="controls">
-        <%= f.text_field :email, :class => 'text_field' %>
+        <%= f.text_field :email, :class => "text_field" %>
       </div>
     </div>
     
     <div class="control-group">
-      <%= f.label :alias_emails, "Other Email Addresses", :class => 'control-label' %>
+      <%= f.label :alias_emails, "Other Email Addresses", :class => "control-label" %>
       <div class="controls">
-        <%= f.text_area :alias_emails, :class => 'text_field', rows: 3, value: @user.alias_emails.join("\n") %>
+        <%= f.text_area :alias_emails, :class => "text_field", rows: 3, value: @user.alias_emails.join("\n") %>
       </div>
     </div>
     
     <% if can?(:manage, @user) %>
       <div class="control-group">
-        <%= f.label :role, :class => 'control-label' %>
+        <%= f.label :role, :class => "control-label" %>
         <div class="controls">
-          <%= f.select :role, Houston.config.roles, :class => 'select_field' %>
+          <%= f.select :role, Houston.config.roles, :class => "select_field" %>
         </div>
       </div>
     <% end %>
     
     <% if can?(:manage, @user) %>
       <div class="control-group">
-        <%= f.label :administrator, :class => 'control-label' %>
+        <%= f.label :administrator, :class => "control-label" %>
         <div class="controls">
-          <%= f.check_box :administrator, :class => 'checkbox' %>
+          <%= f.check_box :administrator, :class => "checkbox" %>
         </div>
       </div>
     <% end %>
@@ -105,11 +105,27 @@
     <% end %>
     
     <div class="form-actions">
-      <%= f.submit nil, :class => 'btn btn-primary' %>
-      <%= link_to 'Invite', invite_user_path(@user), :method => 'post', :class => 'btn btn-primary' if @user.persisted? && @user.encrypted_password.blank? && !@user.invited? && can?(:create, User) %>
-      <%= link_to 'Cancel', users_path, :class => 'btn' %>
-      <%= link_to 'Delete', user_path(@user), :method => 'delete', :confirm => 'Are you sure?', :class => 'btn btn-danger btn-delete' if @user.persisted? && can?(:destroy, @user) %>
+      <%= f.submit nil, :class => "btn btn-primary" %>
+      <%= link_to "Invite", invite_user_path(@user), :method => "post", :class => "btn btn-primary" if @user.persisted? && @user.encrypted_password.blank? && !@user.invited? && can?(:create, User) %>
+      <%= link_to "Cancel", users_path, :class => "btn" %>
+
+      <% if @user.persisted? && can?(:destroy, @user) %>
+        <button class="btn btn-delete btn-danger" id="retire_user_button">Retire</button>
+      <% end %>
     </div>
     
   </fieldset>
 <% end %>
+
+<% content_for :javascripts do %>
+<script type="text/javascript">
+  $(function() {
+    $('#retire_user_button').click(function(e) {
+      e.preventDefault();
+      $.destroy('<%= user_path(@user) %>')
+        .success(function() { window.location = '/users'; })
+        .error(function() { console.log(arguments); });
+    });
+  });
+</script>
+<% end %>

data/config/application.rb

@@ -82,8 +82,20 @@ module Houston
     # Automatically compress responses that accept gzip encoding
     config.middleware.use Rack::Deflater
 
+    # Support the oEmbed protocol
+    require "rack/oembed"
+    config.middleware.use Rack::Oembed, path: "oembed/1.0"
+
     # Respond with a 400 when requests are malformed
     # http://stackoverflow.com/a/24727310/731300
     config.middleware.insert 0, Rack::UTF8Sanitizer
+
+    # DEPRECATION WARNING: Currently, Active Record suppresses errors raised within
+    # `after_rollback`/`after_commit` callbacks and only print them to the logs.
+    # In the next version, these errors will no longer be suppressed. Instead, the
+    # errors will propagate normally just like in other Active Record callbacks.
+    #
+    # You can opt into the new behavior and remove this warning by setting:
+    config.active_record.raise_in_transactional_callbacks = true
   end
 end

data/config/initializers/mime_types.rb

@@ -3,3 +3,4 @@
 # Add new mime types for use in respond_to blocks:
 Mime::Type.register "application/vnd.ms-excel", :xls
 Mime::Type.register "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", :xlsx
+Mime::Type.register "application/json+oembed", :oembed

data/config/routes.rb

@@ -73,6 +73,9 @@ Rails.application.routes.draw do
     post "deploy/:environment", to: "deploys#create"
   end
 
+  get "projects/new/github", to: "projects#new_from_github", as: :add_github_projects
+  post "projects/new/github", to: "projects#create_from_github"
+
 
 
   # Web Hooks
@@ -92,12 +95,21 @@ Rails.application.routes.draw do
   # Releases
 
   scope "projects/:project_id" do
-    get "releases", to: "releases#index"
+    get "releases", to: "releases#index", as: :releases
+
     scope "environments/:environment" do
-      resources :releases
+      get "releases", to: "releases#index"
+      post "releases", to: "releases#create"
+      get "releases/new", to: "releases#new", as: :new_release
+      get "releases/:id", to: "releases#show"
     end
   end
 
+  get "releases/:id", to: "releases#show", as: :release
+  get "releases/:id/edit", to: "releases#edit", as: :edit_release
+  put "releases/:id", to: "releases#update"
+  delete "releases/:id", to: "releases#destroy"
+
 
 
   # Teammates
@@ -173,7 +185,7 @@ Rails.application.routes.draw do
     get "commits", to: "commits#self"
   end
 
-  get "commits/:sha", to: "commits#show"
+  get "commits/:sha", to: "commits#show", as: :commit
 
   namespace "api" do
     namespace "v1" do
@@ -248,6 +260,8 @@ Rails.application.routes.draw do
 
   get "sprint/reports", to: "reports#sprint"
 
+  get "pulls", to: "github/pulls#index"
+
   # Tester Bar
   match "tester_bar/:action", :controller => "tester_bar", via: [:get, :post] if Rails.env.development?
 

data/db/migrate/20151201042126_require_projects_to_have_name_and_slug.rb

@@ -0,0 +1,6 @@
+class RequireProjectsToHaveNameAndSlug < ActiveRecord::Migration
+  def change
+    change_column_null :projects, :name, false
+    change_column_null :projects, :slug, false
+  end
+end

data/db/migrate/20151202005557_add_head_sha_to_projects.rb

@@ -0,0 +1,24 @@
+require "progressbar"
+
+class AddHeadShaToProjects < ActiveRecord::Migration
+  def up
+    add_column :projects, :head_sha, :string
+
+    projects = Project.unretired
+    pbar = ProgressBar.new "projects", projects.count
+
+    projects.find_each do |project|
+      pbar.inc
+      next unless project.repo.exists?
+
+      sha = project.repo.branch("master")
+      project.update_column :head_sha, sha
+    end
+
+    pbar.finish
+  end
+
+  def down
+    remove_column :projects, :head_sha
+  end
+end

data/db/migrate/20151202011812_require_projects_to_have_color.rb

@@ -0,0 +1,13 @@
+class RequireProjectsToHaveColor < ActiveRecord::Migration
+  def up
+    execute "UPDATE projects SET color='default' WHERE color IS NULL"
+    change_column_default :projects, :color, "default"
+    change_column_null  :projects, :color, false
+  end
+
+  def down
+    change_column_null  :projects, :color, true
+    change_column_default :projects, :color, nil
+    execute "UPDATE projects SET color=NULL WHERE color='default'"
+  end
+end

data/db/migrate/20151205204922_require_project_slugs_to_be_unique.rb

@@ -0,0 +1,5 @@
+class RequireProjectSlugsToBeUnique < ActiveRecord::Migration
+  def change
+    add_index :projects, :slug, unique: true
+  end
+end

data/db/migrate/20151205214647_add_avatar_url_to_pull_requests.rb

@@ -0,0 +1,5 @@
+class AddAvatarUrlToPullRequests < ActiveRecord::Migration
+  def change
+    add_column :pull_requests, :avatar_url, :string
+  end
+end

data/db/migrate/20151209004458_add_json_labels_to_pull_requests.rb

@@ -0,0 +1,5 @@
+class AddJsonLabelsToPullRequests < ActiveRecord::Migration
+  def change
+    add_column :pull_requests, :json_labels, :jsonb, default: "[]"
+  end
+end

data/db/migrate/20151209030113_add_timestamps_to_pull_requests.rb

@@ -0,0 +1,6 @@
+class AddTimestampsToPullRequests < ActiveRecord::Migration
+  def change
+    add_column :pull_requests, :created_at, :timestamp
+    add_column :pull_requests, :updated_at, :timestamp
+  end
+end

data/db/structure.sql

@@ -365,11 +365,11 @@ ALTER SEQUENCE project_quotas_id_seq OWNED BY project_quotas.id;
 
 CREATE TABLE projects (
     id integer NOT NULL,
-    name character varying(255),
-    slug character varying(255),
+    name character varying(255) NOT NULL,
+    slug character varying(255) NOT NULL,
     created_at timestamp without time zone,
     updated_at timestamp without time zone,
-    color character varying(255),
+    color character varying(255) DEFAULT 'default'::character varying NOT NULL,
     retired_at timestamp without time zone,
     category character varying(255),
     version_control_name character varying(255) DEFAULT 'None'::character varying NOT NULL,
@@ -384,7 +384,8 @@ CREATE TABLE projects (
     view_options hstore DEFAULT ''::hstore NOT NULL,
     gemnasium_slug character varying(255),
     feature_states hstore DEFAULT ''::hstore NOT NULL,
-    selected_features text[]
+    selected_features text[],
+    head_sha character varying(255)
 );
 
 
@@ -427,7 +428,11 @@ CREATE TABLE pull_requests (
     old_labels text DEFAULT ''::text NOT NULL,
     labels text[] DEFAULT '{}'::text[],
     body text,
-    props jsonb DEFAULT '{}'::jsonb
+    props jsonb DEFAULT '{}'::jsonb,
+    avatar_url character varying(255),
+    json_labels jsonb DEFAULT '[]'::jsonb,
+    created_at timestamp without time zone,
+    updated_at timestamp without time zone
 );
 
 
@@ -1631,6 +1636,13 @@ CREATE UNIQUE INDEX index_project_quotas_on_project_id_and_week ON project_quota
 CREATE INDEX index_project_quotas_on_week ON project_quotas USING btree (week);
 
 
+--
+-- Name: index_projects_on_slug; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE UNIQUE INDEX index_projects_on_slug ON projects USING btree (slug);
+
+
 --
 -- Name: index_pull_requests_on_project_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
@@ -2289,3 +2301,17 @@ INSERT INTO schema_migrations (version) VALUES ('20151108223154');
 
 INSERT INTO schema_migrations (version) VALUES ('20151108233510');
 
+INSERT INTO schema_migrations (version) VALUES ('20151201042126');
+
+INSERT INTO schema_migrations (version) VALUES ('20151202005557');
+
+INSERT INTO schema_migrations (version) VALUES ('20151202011812');
+
+INSERT INTO schema_migrations (version) VALUES ('20151205204922');
+
+INSERT INTO schema_migrations (version) VALUES ('20151205214647');
+
+INSERT INTO schema_migrations (version) VALUES ('20151209004458');
+
+INSERT INTO schema_migrations (version) VALUES ('20151209030113');
+

data/houston.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
 
   # For Houston as a Web Application
-  spec.add_dependency "rails", "~> 4.1.13"
+  spec.add_dependency "rails", "~> 4.2.5"
   spec.add_dependency "sprockets", "~> 2.8" # update this when updating Rails
   spec.add_dependency "pg", "~> 0.18.3"
   # --------------------------------
@@ -29,9 +29,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable"
   spec.add_dependency "browser"
   spec.add_dependency "cancan", "~> 1.6.10"
-  spec.add_dependency "default_value_for", "3.0.0.1"
-  spec.add_dependency "devise", "~> 3.0.0"
-  spec.add_dependency "devise_invitable", "~> 1.2.1"
+  spec.add_dependency "default_value_for", "3.0.1"
+  spec.add_dependency "devise", "~> 3.5.0"
+  spec.add_dependency "devise_invitable", "~> 1.5.3"
   spec.add_dependency "houston-devise_ldap_authenticatable"
   spec.add_dependency "faraday", "~> 0.8.10"
   spec.add_dependency "faraday-http-cache", "~> 1.2.2"
@@ -55,9 +55,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "houston-vestal_versions"
 
   # The Asset Pipeline
-  spec.add_dependency "sass-rails", "~> 4.0.0"
-  spec.add_dependency "uglifier", ">= 1.3.0"
-  spec.add_dependency "coffee-rails", "~> 4.0.0"
+  spec.add_dependency "sass-rails", "~> 5.0"
+  spec.add_dependency "uglifier", ">= 2.7.2"
+  spec.add_dependency "coffee-rails", "~> 4.1.0"
 
   # Houston's background jobs daemon
   spec.add_dependency "rufus-scheduler", "~> 3.1.7"

data/lib/configuration.rb

@@ -187,7 +187,7 @@ module Houston
 
     def project_colors(*args)
       @project_colors = args.first.each_with_object({}) { |(key, hex), hash| hash[key] = ColorValue.new(hex) } if args.any?
-      @project_colors ||= []
+      @project_colors ||= {}
     end
 
     def environments(*args)
@@ -264,7 +264,7 @@ module Houston
       #      :timeoutable,
       #      :omniauthable
 
-      configuration = [:database_authenticatable, :token_authenticatable]
+      configuration = [:database_authenticatable]
       unless Rails.env.test? # <-- !todo: control when custom strategies are employed in the test suite
         configuration << :ldap_authenticatable if authentication_strategy == :ldap
       end
@@ -655,6 +655,7 @@ module Houston
            Faraday::HTTP::ServerError,
            Rugged::NetworkError,
            Unfuddle::ConnectionError,
+           Octokit::BadGateway,
            exceptions_wrapping(PG::ConnectionBad)
       Rails.logger.error "\e[31m[#{tag}] #{$!.class}: #{$!.message} [ignored]\e[0m"
     rescue Exception # rescues StandardError by default; but we want to rescue and report all errors

data/lib/houston/version.rb

@@ -1,3 +1,3 @@
 module Houston
-  VERSION = "0.5.6"
+  VERSION = "0.6.0"
 end

data/lib/rack/oembed.rb

@@ -0,0 +1,23 @@
+module Rack
+  class Oembed
+    attr_reader :app, :oembed_path
+
+    def initialize(app, options={})
+      @app = app
+      @oembed_path = options.fetch :path
+      @oembed_path = "/#{oembed_path}" unless oembed_path.starts_with? "/"
+    end
+
+    def call(env)
+      if env["REQUEST_METHOD"] == "GET" && env["PATH_INFO"] == oembed_path
+        url = Rack::Request.new(env).params.fetch("url")
+        path = Addressable::URI.parse(url).path
+        env["PATH_INFO"] = path
+        env["HTTP_ACCEPT"] = "application/json+oembed"
+      end
+
+      app.call(env)
+    end
+
+  end
+end

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

@@ -0,0 +1,3 @@
+Houston.config.every "3h", "cache:key-dependencies" do
+  CacheKeyDependencies.for Project.unretired
+end

data/templates/new-instance/config/triggers/tests/slack_when_analyzed.rb

@@ -17,10 +17,7 @@ Houston.config do
 
     project_channel = "##{test_run.project.slug}"
     channels = [project_channel] if Houston::Slack.connection.channels.include? project_channel
-    channels ||= test_run.commit.committers
-      .pluck(:email)
-      .map { |email| SLACK_USERNAME_FOR_USER[email] }
-      .reject(&:nil?)
+    channels ||= test_run.commit.committers.map(&:slack_username)
     channels = %w{general} if Array(channel).empty?
 
     channels.each do |channel|