houston-core 0.5.6 → 0.6.0

data/app/adapters/houston/adapters/version_control/git_adapter/github_repo.rb

@@ -6,7 +6,7 @@ module Houston
 
 
           def project_url
-            location.to_s
+            location
               .gsub(/^git@(?:www\.)?github.com:/, "https://github.com/")
               .gsub(/^git:/, "https:")
               .gsub(/\.git$/, "")
@@ -28,7 +28,7 @@ module Houston
           end
 
           def repo_name
-            location.path[0...-4]
+            Addressable::URI.parse(location).path[0...-4].gsub(/^\//, "")
           end
 
 

data/app/adapters/houston/adapters/version_control/git_adapter/remote_repo.rb

@@ -6,9 +6,10 @@ module Houston
           RETRY_COOLDOWN = 4 # seconds
 
 
-          def initialize(connection, location)
-            super(connection)
-            @location = location
+
+          def initialize(git_path, location)
+            super location
+            @git_path = git_path.to_s
             @branch_location = :remote
           end
 
@@ -17,8 +18,6 @@ module Houston
           # Public API for a VersionControl::Adapter Repo
           # ------------------------------------------------------------------------- #
 
-          attr_reader :location
-
           def refresh!(async: false)
             return clone!(async: async) unless exists?
             pull!(async: async)
@@ -26,14 +25,14 @@ module Houston
 
           # ------------------------------------------------------------------------- #
 
-          def to_s
-            location.to_s
-          end
 
 
+          def git_path
+            @git_path
+          end
 
           def clone!(async: false)
-            GitAdapter.clone!(location, connection.path, async: false)
+            async ? Houston.async { _clone!(true) } : _clone!(false)
           end
 
           def pull!(async: false)
@@ -48,6 +47,11 @@ module Houston
 
         protected
 
+          def connect!
+            clone! unless exists?
+            super
+          end
+
           def find_commit(sha)
             pull_and_retry { super(sha) }
           end
@@ -71,8 +75,16 @@ module Houston
             end
           end
 
+          def _clone!(async)
+            Houston.benchmark("[git:clone#{":async" if async}] #{location} => #{git_path}") do
+              Rugged::Repository.clone_at location, git_path,
+                credentials: GitAdapter.credentials,
+                bare: true
+            end
+          end
+
           def _pull!(async)
-            Houston.benchmark("[git:pull#{":async" if async}] #{connection.path}") do
+            Houston.benchmark("[git:pull#{":async" if async}] #{location} => #{git_path}") do
               options = {credentials: GitAdapter.credentials}
 
               # Fetch
@@ -114,7 +126,7 @@ module Houston
             end
           rescue
             $!.additional_information[:repo] = to_s
-            $!.additional_information[:path] = connection.path
+            $!.additional_information[:path] = git_dir
             raise
           ensure
             close

data/app/adapters/houston/adapters/version_control/git_adapter/repo.rb

@@ -5,10 +5,12 @@ module Houston
     module VersionControl
       class GitAdapter
         class Repo
+          attr_reader :location
 
 
-          def initialize(connection)
-            @connection = connection
+
+          def initialize(location)
+            @location = location.to_s
             @branch_location = :local
           end
 
@@ -70,10 +72,6 @@ module Houston
             raise
           end
 
-          def location
-            connection.path
-          end
-
           def native_commit(sha)
             return NullCommit.new if sha == Houston::NULL_GIT_COMMIT
             to_commit find_commit(sha)
@@ -92,7 +90,7 @@ module Houston
           end
 
           def exists?
-            File.exists?(connection.path)
+            File.exists?(git_path)
           end
 
           # ------------------------------------------------------------------------- #
@@ -130,6 +128,10 @@ module Houston
             DiffChanges.new `git --git-dir=#{git_dir} diff --name-status #{old_sha} #{new_sha}`
           end
 
+          def git_path
+            location
+          end
+
           def to_s
             location
           end
@@ -164,7 +166,15 @@ module Houston
 
         protected
 
-          attr_reader :connection, :branch_location
+          attr_reader :branch_location
+
+          def connection
+            @connection ||= connect!
+          end
+
+          def connect!
+            Rugged::Repository.new(git_path)
+          end
 
           def find_commit(sha)
             normalize_sha!(sha)

data/app/adapters/houston/adapters/version_control/null_repo.rb

@@ -31,6 +31,10 @@ module Houston
           []
         end
 
+        def branch(name)
+          nil
+        end
+
         def commits_between(sha1, sha2)
           []
         end
@@ -50,6 +54,10 @@ module Houston
         def refresh!(async: false)
         end
 
+        def exists?
+          false
+        end
+
         # ------------------------------------------------------------------------- #
 
 

data/app/assets/javascripts/core/handlebars_helpers.coffee

@@ -74,17 +74,17 @@ Handlebars.registerHelper 'linkToCommit', (commit)->
 
 Handlebars.registerHelper 'testerAvatar', (email, size, title)->
   tester = window.testers.findByEmail(email)
-  gravatarUrl = "//www.gravatar.com/avatar/#{MD5(email.toLowerCase().trim())}?r=g&d=retro&s=#{size * 2}"
+  gravatarUrl = "https://www.gravatar.com/avatar/#{MD5(email.toLowerCase().trim())}?r=g&d=retro&s=#{size * 2}"
   "<img src=\"#{gravatarUrl}\" width=\"#{size}\" height=\"#{size}\" rel=\"tooltip\" title=\"#{tester.get('name')}\" />"
 
 Handlebars.registerHelper 'userAvatar', (size)->
   user = window.user
-  gravatarUrl = "//www.gravatar.com/avatar/#{MD5(user.get('email').toLowerCase().trim())}?r=g&d=retro&s=#{size * 2}"
+  gravatarUrl = "https://www.gravatar.com/avatar/#{MD5(user.get('email').toLowerCase().trim())}?r=g&d=retro&s=#{size * 2}"
   "<img src=\"#{gravatarUrl}\" width=\"#{size}\" height=\"#{size}\" rel=\"tooltip\" title=\"#{user.get('name')}\" />"
 
 Handlebars.registerHelper 'avatar', (email, size, title)->
   return "<img class=\"avatar avatar-empty\" width=\"#{size}\" height=\"#{size}\" />" unless email
-  gravatarUrl = "//www.gravatar.com/avatar/#{MD5(email.toLowerCase().trim())}?r=g&d=retro&s=#{size * 2}"
+  gravatarUrl = "https://www.gravatar.com/avatar/#{MD5(email.toLowerCase().trim())}?r=g&d=retro&s=#{size * 2}"
   if title
     "<img src=\"#{gravatarUrl}\" class=\"avatar\" width=\"#{size}\" height=\"#{size}\" rel=\"tooltip\" title=\"#{title}\" />"
   else

data/app/assets/stylesheets/application/github_repos.scss

@@ -0,0 +1,77 @@
+#repos {
+  margin: 0;
+  padding: 0;
+}
+
+.repo {
+  display: block;
+  padding: 0 4px;
+  border-radius: 2px;
+
+  &:hover {
+    background: rgba(128, 212, 255, 0.1);
+  }
+
+  &.selected {
+    background: rgba(128, 212, 255, 0.25);
+  }
+
+  &.disabled {
+    background: #f9f9f9;
+  }
+
+  &.retired {
+    .repo-owner { color: #ddd; }
+    .repo-name > .label { opacity: 0.4; }
+    .repo-owner, .repo-name {
+      position: relative;
+
+      &::after {
+        display: block;
+        content: '.';
+        color: transparent;
+        position: absolute;
+        top: 0;
+        left: 0;
+        height: 50%;
+        width: 100%;
+        margin: 0;
+        border-bottom: 2px solid #555;
+      }
+    }
+  }
+
+  input[type="checkbox"] {
+    margin: 8px;
+    float: left;
+
+    &[disabled] + label {
+      color: #bbb;
+    }
+  }
+
+  label {
+    padding: 4px 0;
+    margin: 0;
+  }
+
+  .repo-visibility {
+    display: inline-block;
+    margin: 0 4px;
+
+    .fa { width: 14px; }
+    .fa-unlock { opacity: 0.1; }
+  }
+
+  .repo-owner {
+    &::after {
+      display: inline-block;
+      content: '/';
+      margin: 0 0.33em;
+    }
+  }
+
+  .repo-name b {
+    color: #505050;
+  }
+}

data/app/assets/stylesheets/application/navigation.scss

@@ -22,6 +22,8 @@ $project-navbar-height: 30px;
 
 .navbar .brand {
   padding: 6px 20px 10px;
+  position: relative;
+  z-index: 1;
 }
 
 // Don't let the navbar wrap onto multiple lines

data/app/assets/stylesheets/application/pull_requests.scss

@@ -1,68 +1,54 @@
-h4.github-repo {
-  margin: 1.33em 0 0.66em;
-  font-weight: 500;
+td.pull-request-avatar {
+  width: 32px;
 
-  .pull-requests-count { vertical-align: middle; }
-}
-
-ul.pull-requests { margin: 0; }
-
-.pull-request {
-  list-style-type: none;
-  display: block;
-  margin: 0;
-  line-height: 24px;
-
-  &.back-burner a {
-    color: #c9c9c9;
-
-    .pull-request-author { opacity: 0.16; }
-    .pull-request-number { color: #d6d6d6; }
-    .pull-request-age { color: #d6d6d6; }
-  }
-
-  a {
-    display: block;
-    padding: 0.33em 0;
-
-    &:hover {
-      text-decoration: none;
-      background: #EDF9FF;
-      color: #005580;
-
-      .pull-request-author { opacity: 1.0; }
-      .pull-request-number { color: #6C8592; }
-      .pull-request-age { color: #AABCC5; }
-    }
+  img {
+    width: 32px;
+    height: 32px;
   }
 }
 
-.pull-request-number {
-  display: inline-block;
-  vertical-align: middle;
-  text-align: right;
-  width: 2.5em; // enough room for 4 digits (i.e. 9999 pull requests)
-  font-size: 1.66em;
-  font-weight: 100;
-  color: #777;
-}
-
-.pull-request-author {
-  vertical-align: middle;
-  margin-left: 0.25em;
-  width: 24px;
-  height: 24px;
+td.pull-request-project {
+  white-space: nowrap;
 }
 
-.pull-request-title {
+.pull-request-labels .label {
   display: inline-block;
-  vertical-align: middle;
-  margin-left: 0.25em;
+  padding: 2px 4px 4px;
+  font-size: 11px;
+  font-weight: bold;
+  line-height: 1;
+  color: #fff;
+  border-radius: 2px;
+  box-shadow: inset 0 -1px 0 rgba(0,0,0,0.12);
 }
 
-.pull-request-age {
-  display: inline-block;
-  vertical-align: middle;
-  margin-left: 0.5em;
-  color: #c9c9c9;
+.pull-request-labels-toggle {
+  margin: 0.66em 0 2em;
+
+  input[type="checkbox"] { visibility: hidden; width: 0; height: 0; }
+  label { display: inline-block; }
+
+  // Premailer does not like the selector. It will result in an error
+  // NoMethodError: undefined method `<<' for nil:NilClass
+  //   hpricot-0.8.6/lib/hpricot/elements.rb:307→ filter
+  //   hpricot-0.8.6/lib/hpricot/elements.rb:290→ filter
+  //   hpricot-0.8.6/lib/hpricot/traverse.rb:327→ search
+  //   premailer-1.8.6/lib/premailer/adapter/hpricot.rb:46→ block in to_inline_css
+  //   css_parser-1.3.7/lib/css_parser/parser.rb:192→ block (2 levels) in each_selector
+  //   css_parser-1.3.7/lib/css_parser/rule_set.rb:90→ block in each_selector
+  //   css_parser-1.3.7/lib/css_parser/rule_set.rb:90→ each
+  //   css_parser-1.3.7/lib/css_parser/rule_set.rb:90→ each_selector
+  //   css_parser-1.3.7/lib/css_parser/parser.rb:191→ block in each_selector
+  //   css_parser-1.3.7/lib/css_parser/parser.rb:180→ block in each_rule_set
+  //   css_parser-1.3.7/lib/css_parser/parser.rb:178→ each
+  //   css_parser-1.3.7/lib/css_parser/parser.rb:178→ each_rule_set
+  //   css_parser-1.3.7/lib/css_parser/parser.rb:190→ each_selector
+  //   premailer-1.8.6/lib/premailer/adapter/hpricot.rb:21→ to_inline_css
+  //   houston-core-57242effb689/app/mailers/view_mailer.rb:65→ block (2 levels) in mail
+  input[type="checkbox"]:not(:checked) + label {
+    .label {
+      background: #efefef !important;
+      color: #888 !important;
+    }
+  }
 }

data/app/assets/stylesheets/core/avatars.scss

@@ -2,6 +2,11 @@
   border-radius: 100em;
 }
 
+.avatar.avatar-not-our-user {
+  border: 2px dotted #aaa;
+  margin: -2px;
+}
+
 // just like on the timeline page
 h1.project-banner .avatar {
   float: right;

data/app/assets/stylesheets/core/colors.scss.erb

@@ -1,12 +1,15 @@
+$default: rgb(80,80,80);
 <% Houston.config.project_colors.each do |name, value| %>
   $<%= name %>: <%= value.rgb %>;
 <% end %>
 
+<% project_colors = %w{default} + Houston.config.project_colors.keys %>
+
 .label {
   vertical-align: baseline;
   font-weight: 400;
   
-  <% Houston.config.project_colors.each do |name, value| %>
+  <% project_colors.each do |name| %>
     &.<%= name %> { background-color: $<%= name %>; }
   <% end %>
 
@@ -17,7 +20,7 @@
 }
 
 .dashboard .label {
-  <% Houston.config.project_colors.each do |name, value| %>
+  <% project_colors.each do |name| %>
     &.<%= name %> {
       background-color: $<%= name %>;
       color: rgba(255,255,255,0.9);
@@ -36,13 +39,13 @@
   top: 1px;
   margin-left: 0.25em;
   
-  <% Houston.config.project_colors.each do |name, value| %>
+  <% project_colors.each do |name| %>
     &.<%= name %> { background-color: $<%= name %>; }
   <% end %>
 }
 
 .project-tile {
-  <% Houston.config.project_colors.each do |name, value| %>
+  <% project_colors.each do |name| %>
     &.<%= name %>:hover { background-color: $<%= name %>; }
   <% end %>
 }
@@ -50,12 +53,12 @@
 #email_body h1.project-banner,
 .current-project,
 .project-navbar {
-  <% Houston.config.project_colors.each do |name, value| %>
+  <% project_colors.each do |name| %>
     &.<%= name %> { background-color: $<%= name %>; }
   <% end %>
 }
 
-<% Houston.config.project_colors.each do |name, value| %>
+<% project_colors.each do |name| %>
   .project-navbar.<%= name %> .nav > li.current,
   .project-banner.<%= name %> {
     background-color: lighten($<%= name %>, 32%);
@@ -72,7 +75,7 @@
 
 .modal-header { background-color: #73746F; }
 
-<% Houston.config.project_colors.each do |name, value| %>
+<% project_colors.each do |name| %>
   #new_ticket_modal.<%= name %> {
     .modal-header { background-color: $<%= name %>; }
   }