houston-core 0.7.0 → 0.8.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7313503e6891a81d74ee02d5c9b06315dce2df20
-  data.tar.gz: aa75366ce3181bebdb91e6f883a1c8879adbcdf9
+  metadata.gz: 5c421314112e267c1d8fb60f812aadf4eb5e49ed
+  data.tar.gz: a596952d1eb956ceccc4a2f39117de8ab42e0b3c
 SHA512:
-  metadata.gz: db72d7a2dcc0808d565cd6a2262e63d1ab0ffb8b144b4a701086126d92c6f1f9ceb944352209ed35bbf5d8a5777ecf80c6186ac9e986ae1ebbf319a6f89bf537
-  data.tar.gz: 4a99188cdd551613eac66106a3b0a86e79df16a64dc6f019e74137fb9bccd562ebc0fde7c4a78e575283aeaeb7ee3f00619a74fd9c1cc5b0f6c167ee41ce24a4
+  metadata.gz: caa4d1e8db286c8cf6e539f98313933e97cad69404049afe4d8be66ee99c10f6e080a8a8dc07ddeed762e2c4ea9392fd2b2a0bb7e3ccd7ec61a89282f201ad3c
+  data.tar.gz: 1bdf41fa186a2aaa2ab564f6b5961d7e673a367d4d62aac84089afaf1cd92e6748e201102bcd93d37f4d12f7c6082ddf1817b44dc1e9acc6423caea5213fbb71

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    houston-core (0.7.0)
+    houston-core (0.8.0.pre)
       activerecord-import
       activerecord-pluck_in_batches
       addressable (~> 2.3.8)
@@ -51,40 +51,40 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.7)
-      actionpack (= 4.2.7)
-      actionview (= 4.2.7)
-      activejob (= 4.2.7)
+    actionmailer (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.7)
-      actionview (= 4.2.7)
-      activesupport (= 4.2.7)
+    actionpack (4.2.7.1)
+      actionview (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.7)
-      activesupport (= 4.2.7)
+    actionview (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.7)
-      activesupport (= 4.2.7)
+    activejob (4.2.7.1)
+      activesupport (= 4.2.7.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.7)
-      activesupport (= 4.2.7)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
-    activerecord (4.2.7)
-      activemodel (= 4.2.7)
-      activesupport (= 4.2.7)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       arel (~> 6.0)
     activerecord-import (0.15.0)
       activerecord (>= 3.2)
     activerecord-pluck_in_batches (0.1.1)
       activerecord
-    activesupport (4.2.7)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -101,7 +101,7 @@ GEM
     browser (1.1.0)
     builder (3.2.2)
     cancan (1.6.10)
-    capybara (2.7.0)
+    capybara (2.7.1)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -167,10 +167,10 @@ GEM
     faraday-raise-errors (0.2.0)
       faraday
     gemoji (2.1.0)
-    globalid (0.3.6)
+    globalid (0.3.7)
       activesupport (>= 4.1.0)
     googlecharts (1.6.12)
-    handlebars_assets (0.23.0)
+    handlebars_assets (0.23.1)
       execjs (~> 2.0)
       multi_json (~> 1.0)
       sprockets (>= 2.0.0)
@@ -200,18 +200,18 @@ GEM
     mime-types (2.99.2)
     mini_portile2 (2.1.0)
     minitest (5.9.0)
-    minitest-reporters (1.1.8)
+    minitest-reporters (1.1.11)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     minitest-reporters-turn_reporter (0.1.0)
       minitest-reporters
-    multi_json (1.11.2)
+    multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     neat-rails (0.5.0)
-    nested_editor_for (0.1.0)
+    nested_editor_for (0.1.1)
     net-ldap (0.12.1)
     net-ssh (2.9.4)
     netrc (0.11.0)
@@ -235,7 +235,7 @@ GEM
       nokogiri
       openxml-package (>= 0.2.0)
     orm_adapter (0.5.0)
-    ox (2.4.3)
+    ox (2.4.4)
     pg (0.18.4)
     pg_search (1.0.6)
       activerecord (>= 3.1)
@@ -246,7 +246,7 @@ GEM
       css_parser (>= 1.4.5)
       htmlentities (>= 4.0.0)
     progressbar (0.21.0)
-    pry (0.10.3)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -255,16 +255,16 @@ GEM
       rack (>= 1.0)
     rack-utf8_sanitizer (1.3.2)
       rack (>= 1.0, < 3.0)
-    rails (4.2.7)
-      actionmailer (= 4.2.7)
-      actionpack (= 4.2.7)
-      actionview (= 4.2.7)
-      activejob (= 4.2.7)
-      activemodel (= 4.2.7)
-      activerecord (= 4.2.7)
-      activesupport (= 4.2.7)
+    rails (4.2.7.1)
+      actionmailer (= 4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activerecord (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.7)
+      railties (= 4.2.7.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -274,9 +274,9 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.7)
-      actionpack (= 4.2.7)
-      activesupport (= 4.2.7)
+    railties (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (11.2.2)
@@ -287,14 +287,14 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rr (1.1.2)
-    ruby-progressbar (1.7.5)
+    rr (1.2.0)
+    ruby-progressbar (1.8.1)
     rubyzip (1.1.7)
     rufus-scheduler (3.2.1)
     rugged (0.24.0)
     safe_yaml (1.0.4)
     sass (3.4.22)
-    sass-rails (5.0.5)
+    sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
@@ -313,7 +313,7 @@ GEM
       json
       simplecov
     slop (3.6.0)
-    sprockets (3.6.3)
+    sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.1.1)
@@ -322,7 +322,7 @@ GEM
       sprockets (>= 3.0.0)
     strongbox (0.7.2)
       activerecord
-    test_after_commit (1.0.0)
+    test_after_commit (1.1.0)
       activerecord (>= 3.2)
     thor (0.19.1)
     thread_safe (0.3.5)
@@ -330,14 +330,14 @@ GEM
     timecop (0.8.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (3.0.0)
+    uglifier (3.0.1)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
     warden (1.2.6)
       rack (>= 1.0)
-    webmock (1.24.3)
+    webmock (2.1.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff

data/app/assets/javascripts/houston/app/models/ticket.coffee

@@ -1,3 +1,9 @@
+# copied from sugar.js
+escapeRegExp = (str)->
+  str = String(str) unless _.isString(str)
+  str.replace /([\\\/\'*+?|()\[\]{}.^$-])/g, '\\$1'
+
+
 class window.Ticket extends Backbone.Model
   urlRoot: '/tickets'
 
@@ -53,11 +59,10 @@ class window.Tickets extends Backbone.Collection
 
   search: (summary)->
     words = @getWords(summary)
-    # console.log(summary, '->', words)
 
     return [] if words.length == 0
 
-    regexes = (new RegExp("\\b#{RegExp.escape(word)}", 'i') for word in words)
+    regexes = (new RegExp("\\b#{escapeRegExp(word)}", 'i') for word in words)
 
     results = []
     for ticket in @models
@@ -116,8 +121,5 @@ class window.Tickets extends Backbone.Collection
       when 'summary'      then (ticket)-> ticket.get('summary').toLowerCase().replace(/^\W/, '')
       when 'openedAt'     then (ticket)-> ticket.get('openedAt')
       when 'number'       then (ticket)-> ticket.get('number')
-      when 'antecedents'  then (ticket)->
-        len = ticket.get('antecedents').length
-        if len is 0 then null else len
       when 'closedAt'     then (ticket)-> ticket.get('closedAt')
       else throw "Tickets#sorterFor doesn't know how to sort #{attribute}!"

data/app/assets/javascripts/houston/app/views/new_ticket_view.coffee

@@ -28,7 +28,6 @@ class window.NewTicketView extends Backbone.View
     @$el.html HandlebarsTemplates['new_ticket/form']()
     @project = @options.project
     @tickets = new Tickets(@options.tickets)
-    @LABELS = @options.labels
     @TAGS = @TYPES.map (type)-> "[#{type}]"
     @TAG_MATCHER = "\\[(#{@TYPES.join('|')})\\]"
     @renderSuggestion = HandlebarsTemplates['new_ticket/suggestion']
@@ -37,11 +36,6 @@ class window.NewTicketView extends Backbone.View
     @$summary.val "[#{@options.type}] " if @options.type
     @lastSearch = ''
 
-    if @options.antecedents
-      description = '### Antecedents\n' + (" - #{antecedent}" for antecedent in @options.antecedents).join("\n")
-      $('#ticket_description').val(description)
-      @showNewTicket(animate: false)
-
     Mousetrap.bindScoped '#ticket_summary, #ticket_description', 'mod+enter', (e)=>
       @$el.find('#create_ticket').click() if @$el.find(':focus').length > 0
 
@@ -73,20 +67,13 @@ class window.NewTicketView extends Backbone.View
         source: (query)->
           pos = @$element.getCursorPosition()
           a = query.indexOf(']')
-          b = query.indexOf(':')
 
           if a is -1 or pos <= a
             @tquery = query.match(z)[1].toLowerCase()
             @mode = 'type'
             return view.TAGS
 
-          else if a > 0 and (b is -1 or pos <= b)
-            @lquery = query.match(y)[1]
-            @lquery = new RegExp "\\b#{@lquery}", "i"
-            @mode = 'label'
-            return view.LABELS
-
-          else if a > 0 and b > 0
+          else if a > 0
             @mode = 'summary'
             return []
 
@@ -98,14 +85,10 @@ class window.NewTicketView extends Backbone.View
           if @mode == 'type'
             view.autocompleteDescriptionFor(item)
             @$element.val().replace(/^[^\]]*(\] ?|$)?/, item + ' ')
-          else if @mode == 'label'
-            @$element.val().replace(/\] ?[^:]*(: ?|$)/, '] ' + item + ': ')
 
         matcher: (item)->
           if @mode == 'type'
             ~item.toLowerCase().indexOf(@tquery)
-          else if @mode == 'label'
-            @lquery.test(item)
           else
             false
 
@@ -119,9 +102,6 @@ class window.NewTicketView extends Backbone.View
     if !///#{@TAG_MATCHER} ///.test(summary)
       @$el.attr('data-mode', 'type')
       @$suggestions.empty()
-    else if !///#{@TAG_MATCHER} (.*):///.test(summary)
-      @$el.attr('data-mode', 'label')
-      @$suggestions.empty()
     else
       @$el.attr('data-mode', 'summary')
       md = summary.match(///#{@TAG_MATCHER} (.*)///)

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

@@ -91,12 +91,6 @@ Handlebars.registerHelper 'ifEq', (v1, v2, block)->
   else
     block.inverse(@)
 
-Handlebars.registerHelper 'summarizeAntecedents', (antecedents)->
-  html = ''
-  for kind, antecedents of _.groupBy(antecedents, (antecedent)-> antecedent.kind)
-    html += "#{kind} <span class=\"badge\">#{antecedents.length}</span>"
-  html
-
 Handlebars.registerPartial 'sprintTask', (task)->
   HandlebarsTemplates['sprints/task'](task)
 

data/app/assets/stylesheets/houston/application/commit.scss

@@ -4,3 +4,19 @@
   h2 { font-weight: 100; margin-left: 110px; }
   h4 { font-weight: 400; }
 }
+
+.commit-extra-attribute {
+  color: #666;
+  font-size: 10px;
+  line-height: normal;
+  background: #f4f4f4;
+  display: inline-block;
+  padding: 2px;
+
+  &::before { content: '{{'; }
+  &::after { content: '}}'; }
+}
+
+.commit-extra-attribute-key::after {
+  content: ':';
+}

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

@@ -136,6 +136,7 @@ $current-project-active-bg: #222;
   }
 
   &:hover { color: white; }
+  &:focus { color: white; }
 }
 
 .navbar .nav li.current-project.dropdown.open > .dropdown-toggle,

data/app/assets/stylesheets/houston/application/new_ticket_view.scss

@@ -16,10 +16,6 @@
     content: 'What kind of ticket is this? [bug]? [feature]?';
   }
 
-  &[data-mode="label"]::after {
-    content: 'What view or feature does it have to do with? Profile? Enter Attendance?';
-  }
-
   &[data-mode="summary"]::after {
     content: 'Hit return to finish making your ticket  ⏎';
   }

data/app/assets/stylesheets/houston/application/projects.css.scss

@@ -65,20 +65,6 @@ td.project-participants .hidden-text { display: inline-block; }
   input[type="image"], input[type="checkbox"], input[type="radio"] { margin: 0; }
 }
 
-th, td {
-  &.project-unfuddle-link {
-    padding-right: 2px !important;
-  }
-  &.project-errbit-link {
-    padding-left: 2px !important;
-    padding-right: 2px !important;
-  }
-  &.project-github-link {
-    padding-left: 2px !important;
-    padding-right: 2px !important;
-  }
-}
-
 td.project-title { white-space: nowrap; }
 
 td.project-feature-error {

data/app/assets/stylesheets/houston/application/release_form.scss

@@ -43,7 +43,7 @@
     color: #777;
   }
 
-  .release-antecedents ul, .release-commits ul {
+  .release-commits ul {
     max-width: 680px;
     margin: 5px 0;
   }

data/app/assets/stylesheets/houston/application/teams.scss

@@ -0,0 +1,68 @@
+.teams {
+  column-width: 320px;
+  column-gap: 1em;
+  columns: 3;
+}
+@media (max-width: 1024px) { .teams { columns: 2; } }
+@media (max-width: 720px) { .teams { columns: 1; } }
+
+.team-wrapper {
+  -webkit-column-break-inside: avoid;
+            page-break-inside: avoid;
+                 break-inside: avoid;
+  padding-bottom: 1em;
+}
+
+.team {
+  box-shadow: 0 1px 2px rgba(34, 25, 25, 0.1);
+  border: 1px solid #ccc;
+  padding: 2em;
+  border-radius: 4px;
+
+  h3 {
+    line-height: normal;
+    margin: 0 0 1em 0;
+  }
+
+  h6 {
+    text-transform: uppercase;
+    font-weight: 500;
+    color: #ccc;
+    margin: 2em 0 0.5em 0;
+  }
+
+  ol {
+    overflow: auto;
+    margin: 0;
+    padding: 0;
+  }
+
+  ol.team-members {
+    column-width: 320px;
+    column-gap: 1em;
+    columns: 2;
+  }
+
+  li.team-member {
+    -webkit-column-break-inside: avoid;
+              page-break-inside: avoid;
+                   break-inside: avoid;
+    display: block;
+    position: relative;
+    line-height: normal;
+    padding: 0 0 0.5em 40px;
+    min-height: 32px;
+
+    .user-avatar {
+      position: absolute;
+      left: 0;
+    }
+
+    .user-name { display: block; }
+    .user-roles { display: block; }
+  }
+
+  .team-projects-add {
+    margin: 1em 0 0 0;
+  }
+}