sw2at-ui 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3612cda6f489c48a3170bd5bb707fe0ca831f8b
-  data.tar.gz: c6d5a8639b2c725d93fbe8f0978755f770587ca8
+  metadata.gz: 1cffde9d161f0600912286898a90e66714af2b7c
+  data.tar.gz: 3949594b3e4c1ca123f016d2592009fd1f5aae18
 SHA512:
-  metadata.gz: bab12debf2d4514d6bc6a4637c23bfc34574c4626c43ea8dd9f50b15fe2beed7ce1fdc5deed111d724564ca3ee5e0a94816994fcc036beecd0588ffff94577c9
-  data.tar.gz: 2a5b81b6a3c0c541a4211bbef0ba6ef76cd74fc7bbe828837227722ace098219f0bb7ab836c60e44bae954bedfda50055a48fc503e3f16d184ae3f21ca48a68c
+  metadata.gz: 300ea82224d56e73969ab919a5f1434fe7c5fc19eb5225c752465cad44cffc74afe0a52c15fe1af6568d079afce3c015cc41b1f9f5266e292f87a9fd7286b6c0
+  data.tar.gz: 80d5b68a71caacf1b5b9cd8f83bdda7ab9ba330dc28aec54481506f8da3978bdff9ef78228930c4edf8573478575d88c9cf717e23ce852519f8dbe5f895254e1

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.12

data/app/assets/javascripts/swat/app/app.coffee

@@ -18,6 +18,7 @@ App = angular.module 'SWAT', [
   'ui.bootstrap'
   'ngClipboard'
   'highcharts-ng'
+  'ngtimeago'
 ]
 
 App.config ($urlRouterProvider, $stateProvider) ->

data/app/assets/javascripts/swat/app/controllers/revisions.coffee

@@ -8,6 +8,14 @@ angular.module("SWAT").controller "RevisionsCtrl", ($rootScope, $scope, $state,
     $scope.revisions = RevisionService.query()
 
   $scope.testsProgress = (revision)->
-    _.sum(revision.threads, (t)->t )
+
+    startedThreads = revision.data.threads.length
+    totalThreads = revision.data.threads_count
+
+    completedThreads = _.select(revision.data.threads, (t)->t.status && t.status.completed)
+    completedTests = _.sum( completedThreads, (t)-> t.total_examples)
+    totalTests = _.sum( revision.data.threads, (t)-> t.total_examples)
+
+    completedThreads.length + " threads completed of " + totalThreads + ". (" + totalTests + " tests in total)"
 
   $scope.init()

data/app/assets/javascripts/swat/app/controllers/root.coffee

@@ -1,6 +1,7 @@
-angular.module("SWAT").controller "RootCtrl", ($rootScope, $scope, $state) ->
+angular.module("SWAT").controller "RootCtrl", ($rootScope, $scope, $state, SwatHelpers) ->
 
   $scope.init = ->
+    $scope.helpers = SwatHelpers
     window.Swat.log 'Swat Root initialized.'
 
   $scope.init()

data/app/assets/javascripts/swat/app/controllers/summary.coffee

@@ -65,9 +65,6 @@ angular.module("SWAT").controller "SummaryCtrl", ($rootScope, $scope, $state, $s
 
     $scope.summary.metrics = result
 
-  $scope.isSpecTraceLine = (line)->
-    _.include(line, 'spec')
-
   $scope.init()
 
 

data/app/assets/javascripts/swat/app/directives/revision_name.coffee

@@ -10,13 +10,9 @@ angular.module("SWAT").directive "revisionName", ($document, RevisionService)->
       $scope.id = ('revision-name-'+$scope.revision.data.time+Math.floor(Math.random()*1000))
       $scope.name = ($scope.revision.data.name || $scope.revision.data.time)
 
-    $scope.delayedSave = ->
-      $timeout($scope.save, 0)
-
     $scope.save = ->
       value = angular.element('#'+$scope.id).text()
       window.Swat.log(value)
-
       return if value == $scope.name
       params = { branch: $scope.revision.data.branch, user: $scope.revision.data.user, time: $scope.revision.data.time, name: value }
       RevisionService.setName(params).$promise.then((resp)->

data/app/assets/javascripts/swat/app/factories/helpers.coffee

@@ -5,3 +5,7 @@ angular.module("SWAT").factory "SwatHelpers", ->
       mm = Math.floor(seconds / 60) % 60
       ss = Math.floor(seconds) % 60
       (if hh then (if hh < 10 then '0' else '') + hh + ':' else '') + (if mm < 10 and hh then '0' else '') + mm + ':' + (if ss < 10 then '0' else '') + ss
+
+    isSpecTraceLine: (line)->
+      _.include(line, 'spec')
+

data/app/assets/javascripts/swat/bower_components.coffee

@@ -16,3 +16,4 @@
 
 #= require swat/lib/highcharts.src.js
 #= require swat/lib/highcharts-ng.js
+#= require swat/lib/ngtimeago.js

data/app/assets/javascripts/swat/lib/ngtimeago.js

@@ -0,0 +1,75 @@
+'use strict';
+
+var catalyst = angular.module('ngtimeago', []);
+
+
+catalyst.filter('timeago', function() {
+        return function(input, p_allowFuture) {
+		
+            var substitute = function (stringOrFunction, number, strings) {
+                    var string = angular.isFunction(stringOrFunction) ? stringOrFunction(number, dateDifference) : stringOrFunction;
+                    var value = (strings.numbers && strings.numbers[number]) || number;
+                    return string.replace(/%d/i, value);
+                },
+                nowTime = (new Date()).getTime(),
+                date = (new Date(input)).getTime(),
+                //refreshMillis= 6e4, //A minute
+                allowFuture = p_allowFuture || false,
+                strings= {
+                    prefixAgo: '',
+                    prefixFromNow: '',
+                    suffixAgo: "ago",
+                    suffixFromNow: "from now",
+                    seconds: "less than a minute",
+                    minute: "about a minute",
+                    minutes: "%d minutes",
+                    hour: "about an hour",
+                    hours: "about %d hours",
+                    day: "a day",
+                    days: "%d days",
+                    month: "about a month",
+                    months: "%d months",
+                    year: "about a year",
+                    years: "%d years"
+                },
+                dateDifference = nowTime - date,
+                words,
+                seconds = Math.abs(dateDifference) / 1000,
+                minutes = seconds / 60,
+                hours = minutes / 60,
+                days = hours / 24,
+                years = days / 365,
+                separator = strings.wordSeparator === undefined ?  " " : strings.wordSeparator,
+            
+               
+                prefix = strings.prefixAgo,
+                suffix = strings.suffixAgo;
+                
+            if (allowFuture) {
+                if (dateDifference < 0) {
+                    prefix = strings.prefixFromNow;
+                    suffix = strings.suffixFromNow;
+                }
+            }
+
+            words = seconds < 45 && substitute(strings.seconds, Math.round(seconds), strings) ||
+            seconds < 90 && substitute(strings.minute, 1, strings) ||
+            minutes < 45 && substitute(strings.minutes, Math.round(minutes), strings) ||
+            minutes < 90 && substitute(strings.hour, 1, strings) ||
+            hours < 24 && substitute(strings.hours, Math.round(hours), strings) ||
+            hours < 42 && substitute(strings.day, 1, strings) ||
+            days < 30 && substitute(strings.days, Math.round(days), strings) ||
+            days < 45 && substitute(strings.month, 1, strings) ||
+            days < 365 && substitute(strings.months, Math.round(days / 30), strings) ||
+            years < 1.5 && substitute(strings.year, 1, strings) ||
+            substitute(strings.years, Math.round(years), strings);
+			console.log(prefix+words+suffix+separator);
+			prefix.replace(/ /g, '')
+			words.replace(/ /g, '')
+			suffix.replace(/ /g, '')
+			return (prefix+' '+words+' '+suffix+' '+separator);
+            
+        };
+    });
+
+    

data/app/assets/stylesheets/swat/swat_theme.scss

@@ -45,6 +45,19 @@ html, body {
 
     }
 
+    .backtrace {
+      background-color: #400e30;
+      padding: 10px;
+      margin-bottom: 5px;
+      color: #f8f8f8;
+      border-radius: 3px;
+      p {
+        margin-bottom: 0;
+        &.spec {
+          color: #ff5860;
+        }
+      }
+    }
 
     min-height: 100%;
     .invisible {
@@ -140,11 +153,12 @@ html, body {
     }
 
     #revisions-container {
+      min-height: 50px;
+
       .revisions-header {
         margin: 0;
         padding-right: 50px;
         padding-top: 8px;
-        min-height: 45px;
       }
       .list {
         padding: 13px;
@@ -194,20 +208,6 @@ html, body {
           }
           .detailed-info {
             padding: 0 8px;
-            .backtrace {
-              background-color: #400e30;
-              padding: 10px;
-              margin-bottom: 5px;
-              color: #f8f8f8;
-              border-radius: 3px;
-              p {
-                margin-bottom: 0;
-                &.spec {
-                  color: #ff5860;
-                }
-              }
-
-            }
           }
         }
         td.status {

data/app/models/revision_status_calculator.rb

@@ -79,13 +79,13 @@ class RevisionStatusCalulator
   STATUSES = {
       in_progress_success: {
           name: 'in_progress_success',
-          label: 'In Progress',
+          label: 'Started',
           completed: false,
           failed: false,
       },
       in_progress_failed: {
           name: 'in_progress_failed',
-          label: 'In Progress',
+          label: 'Started',
           completed: false,
           failed: true,
       },

data/app/views/swat/pages/revisions/index.slim

@@ -9,6 +9,7 @@
         th Branch
         th User
         th Time
+        th Progress
         th Status
       tr.has-status ng-class="revision.data.status.name" ng-repeat="revision in revisions | orderBy: '-data.time'" ui-sref="revision(revision.data)"
         td
@@ -20,6 +21,10 @@
           | {{ revision.data.user }}
         td
           | {{ revision.data.time * 1000 | date: "yyyy/MM/dd h:mm:ss a" }}
+          strong style="float:right;"
+            | {{ revision.data.time * 1000 | date: "yyyy/MM/dd h:mm:ss a" | timeago }}
+        td
+          | {{ testsProgress(revision) }}
         td.revision-status ng-class="revision.data.status.name" title="{{ revision.data.status.name }}"
           | {{ revision.data.status.label }}
 

data/app/views/swat/pages/revisions/partials/_exceptions.slim

@@ -29,7 +29,7 @@
                 strong
                   | {{ test.exception.message }}
               .backtrace
-                p.trace-line class="{{ isSpecTraceLine(line) ? 'spec' : '' }}" ng-repeat="line in test.exception.backtrace track by $index"
+                p.trace-line class="{{ helpers.isSpecTraceLine(line) ? 'spec' : '' }}" ng-repeat="line in test.exception.backtrace track by $index"
                   | {{ line }}
 
       th.count

data/app/views/swat/pages/revisions/partials/_test_cases.slim

@@ -10,7 +10,7 @@ table#test-cases.table.table-bordered.table-hover
   tr ng-if="(#{object} && #{object}.length == 0)"
     td colspan="#{ thread ? 5 : 4 }"
       .cell
-        | No Failed Examples
+        | No Examples
   tr ng-class="test.status" ng-repeat="test in #{ object }"
     td title="{{ test.full_description }}"
       .main-info.cell data-toggle="collapse" data-target="##{test_id}"
@@ -22,7 +22,7 @@ table#test-cases.table.table-bordered.table-hover
           strong
             | {{ test.exception.message }}
         .backtrace
-          p.trace-line ng-repeat="line in test.exception.backtrace track by $index"
+          p.trace-line class="{{ helpers.isSpecTraceLine(line) ? 'spec' : '' }}" ng-repeat="line in test.exception.backtrace track by $index"
             | {{ line }}
     - if thread
       td.thread title="{{ test.thread_name }}"

data/spec/models/calculator_spec.rb

@@ -33,7 +33,7 @@ describe FullRevision do
                             :completed=>true,
                             :failed=>true},
                            {:name=>"in_progress_success",
-                            :label=>"In Progress",
+                            :label=>"Started",
                             :completed=>false,
                             :failed=>false}]
                       )
@@ -125,12 +125,12 @@ describe FullRevision do
               :completed=>true,
               :failed=>true},
              {:name=>"in_progress_success",
-              :label=>"In Progress",
+              :label=>"Started",
               :completed=>false,
               :failed=>false}]
         )
         status = RevisionStatusCalulator.new(rev).set_status
-        expect(status).to include({name: "in_progress_failed", label: "In Progress", completed: false, failed: true})
+        expect(status).to include({name: "in_progress_failed", label: "Started", completed: false, failed: true})
       end
 
 
@@ -153,13 +153,13 @@ describe FullRevision do
               :completed=>true,
               :failed=>false},
              {:name=>"in_progress_success",
-              :label=>"In Progress",
+              :label=>"Started",
               :completed=>false,
               :failed=>false}
             ]
         )
         status = RevisionStatusCalulator.new(rev).set_status
-        expect(status).to include({name: "in_progress_success", label: "In Progress", completed: false, failed: false})
+        expect(status).to include({name: "in_progress_success", label: "Started", completed: false, failed: false})
       end
 
     end

data/sw2at-ui.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: sw2at-ui 0.0.11 ruby lib
+# stub: sw2at-ui 0.0.12 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "sw2at-ui"
-  s.version = "0.0.11"
+  s.version = "0.0.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Vitaly Tarasenko"]
-  s.date = "2015-07-01"
+  s.date = "2015-07-03"
   s.description = " Control your tests, run them parallel. Check statuses of your revisions online. Share results to all team members. "
   s.email = "vetal.tarasenko@gmail.com"
   s.executables = ["rails"]
@@ -361,6 +361,7 @@ Gem::Specification.new do |s|
     "app/assets/javascripts/swat/bower_components/zeroclipboard/dist/ZeroClipboard.swf",
     "app/assets/javascripts/swat/lib/highcharts-ng.js",
     "app/assets/javascripts/swat/lib/highcharts.src.js",
+    "app/assets/javascripts/swat/lib/ngtimeago.js",
     "app/assets/stylesheets/swat/application.scss",
     "app/assets/stylesheets/swat/default-theme.css",
     "app/assets/stylesheets/swat/font-awesome.css",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sw2at-ui
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Vitaly Tarasenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -571,6 +571,7 @@ files:
 - app/assets/javascripts/swat/bower_components/zeroclipboard/dist/ZeroClipboard.swf
 - app/assets/javascripts/swat/lib/highcharts-ng.js
 - app/assets/javascripts/swat/lib/highcharts.src.js
+- app/assets/javascripts/swat/lib/ngtimeago.js
 - app/assets/stylesheets/swat/application.scss
 - app/assets/stylesheets/swat/default-theme.css
 - app/assets/stylesheets/swat/font-awesome.css