rrrspec-web 0.2.0 → 0.2.1

data/tasks/assets.rake

@@ -1,6 +1,3 @@
-APP_FILE  = File.expand_path('../../lib/rrrspec/web/app.rb', __FILE__)
-APP_CLASS = 'RRRSpec::Web::App'
-require 'sinatra/assetpack/rake'
-
-desc 'Build assets'
-task 'assets:precompile' => 'assetpack:build'
+require 'sinatra/asset_pipeline/task'
+require 'rrrspec/web'
+Sinatra::AssetPipeline::Task.define! RRRSpec::Web::App

data/views/index.haml

@@ -3,8 +3,8 @@
   %head
     %meta{charset: 'utf-8', 'http-equiv' => 'Content-Type', content: 'text/html'}
     %title RRRSpec
-    != css :application
-    != js :index
+    != stylesheet_tag 'application'
+    != javascript_tag 'index'
   %body
     .index.container
       .panel.panel-default.active-tasksets
@@ -20,17 +20,7 @@
         %ul.pager
           %li.previous
             %a{href: "#"} ← Newer
-          %li.next
-            %a{href: "#"}Older →
-
-    .index.container
-      .panel.panel-default.slave-failed-tasksets
-        .panel-heading
-          .panel-title Slave Failed Tasksets
-        %ul.list-group.tasksets
-        %ul.pager
-          %li.previous
-            %a{href: "#"} ← Newer
+          %li.pagenum
           %li.next
             %a{href: "#"}Older →
 
@@ -41,6 +31,6 @@
         %li
           %a{href: "/tasksets/{{key}}"} {{key}}
         %li.pull-right
-          {{#created_at}}{{created_at}} ({{created_at_humanized}}){{/created_at}}
+          {{dateWithHumanized created_at}}
         %li.username.pull-right
           {{rsync_name}}

data/views/taskset.haml

@@ -3,8 +3,8 @@
   %head
     %meta{charset: 'utf-8', 'http-equiv' => 'Content-Type', content: 'text/html'}
     %title Taskset - RRRSpec
-    != css :application
-    != js :tasksets
+    != stylesheet_tag 'application'
+    != javascript_tag 'tasksets'
   %body
     #notfound-modal.modal.fade
       .modal-dialog
@@ -12,67 +12,62 @@
           .modal-body
             Not found
 
-    .taskset.container.hidden
-      .head.panel.panel-default
-
+    .taskset.hidden
+      .head
       .progressbars
         %h5 FILES
-        .progress.spec-progress
-          .progress-bar.spec-progress-bar
-          .progress-bar.progress-bar-success.passed-spec-bar
-          .progress-bar.progress-bar-warning.pending-spec-bar
-          .progress-bar.progress-bar-danger.failed-spec-bar
+        .spec-progress
+          .spec-progress-bar
+          .passed-spec-bar
+          .pending-spec-bar
+          .failed-spec-bar
 
         %h5 EXAMPLES
-        .progress.example-progress
-          .progress-bar.progress-bar-success.passed-example-bar
-          .progress-bar.progress-bar-warning.pending-example-bar
-          .progress-bar.progress-bar-danger.failed-example-bar
-
-      .panel.panel-default.tasklist
-        .panel-heading FAILED TASKS
-        %ul.list-group.tasklist-list
+        .example-progress
+          .passed-example-bar
+          .pending-example-bar
+          .failed-example-bar
+
+      .tasks
+        .tasks-heading FAILED TASKS
+        %ul.tasks-list
           %li.list-group-item
-            %ul.tasklist-header
+            %ul.tasks-list-header
               %li.taskstatus Status
               %li.file File
-              %li.pull-right.trial-count Trials
-              %li.pull-right.estimate-sec Avg.
+              %li.trial-count Trials
+              %li.estimate-sec Avg.
 
-      .panel.panel-default.worker-logs
-        .panel-heading WORKERS
-        %ul.list-group.worker-logs-list
+      .worker-logs
+        .worker-logs-heading WORKERS
+        %ul.worker-logs-list
 
-      .panel.panel-default.slaves
-        .panel-heading SLAVES
-        %ul.list-group.slaves-list
+      .slaves
+        .slaves-heading SLAVES
+        %ul.slaves-list
 
       %script#head-template{type: 'text/template'}
         .panel-heading.clearfix
           %h4.panel-title
             %a.name{data: {toggle: 'collapse'}, href: '#taskset-info'} {{key}}
           %span.label.status {{status}}
-        #taskset-info.panel-collapse.collapse
+        .taskset-info.panel-collapse.collapse
           .panel-body
-            %dl.dl-horizontal
+            %dl
               %dt Name
               %dd.name {{key}}
               %dt Status
               %dd.status {{status}}
               %dt Created
-              %dd.created-at {{created_at}}
+              %dd.created-at {{date created_at}}
               %dt Finished
-              %dd.finished-at {{finished_at}} ({{duration}})
+              %dd.finished-at {{dateWithDuration finished_at created_at}}
               %dt RSync Name
               %dd.rsync-name {{rsync_name}}
               %dt Max Trials
               %dd.max-trials {{max_trials}}
               %dt Max Workers
               %dd.max-workers {{max_workers}}
-              %dt Unknown spec timeout sec
-              %dd.unknown-spec-timeout-sec {{unknown_spec_timeout_sec}}
-              %dt Least timeout sec
-              %dd.least-timeout-sec {{least_timeout_sec}}
               %dt Taskset class
               %dd.taskset-class {{taskset_class}}
               %dt Worker type
@@ -85,29 +80,30 @@
             %pre.slave-command {{slave_command}}
 
             %h5 LOG
-            %pre.log.pre-scrollable {{log}}
+            %pre.log
 
-      %script#tasklist-template{type: 'text/template'}
-        %ul.tasklist-item.header
+      %script#tasks-list-template{type: 'text/template'}
+        %ul.tasks-list-item-header
           %li.taskstatus {{status}}
-          %li.file {{spec_file}}
-          %li.pull-right.trial-count {{trials.length}}
-          %li.pull-right.estimate-sec {{estimate_sec}}
+          %li.file {{spec_path}}
+          %li.trial-count {{trials.length}}
+          %li.estimate-sec {{estimate_sec}}
         .body.collapse.trials
 
       %script#trial-template{type: 'text/template'}
-        .panel-heading
-          .panel-title {{key}}
-        %dl.dl-horizontal
+        %dl
+          %dt Name
+          %dd
+            %a{href: "#trials/{{id}}"} trials/{{key}}
           %dt Status
           %dd {{status}}
           %dt Started
-          %dd {{#started_at}}{{started_at}}{{/started_at}}
+          %dd {{date started_at}}
           %dt Finished
-          %dd {{#finished_at}}{{finished_at}} ({{duration}}){{/finished_at}}
+          %dd {{dateWithDuration finished_at started_at}}
           %dt Slave
           %dd
-            %a{href: "#slave/{{slave.key}}"} {{slave.key}}
+            %a{href: "#slaves/{{slave_id}}"} slaves/{{slave_id}}
           %dt Passed
           %dd {{passed}}
           %dt Pending
@@ -116,46 +112,43 @@
           %dd {{failed}}
 
         %h5 STDOUT
-        %pre.log.pre-scrollable
-          {{stdout}}
+        %pre.log.stdout
 
         %h5 STDERR
-        %pre.log.pre-scrollable
-          {{stderr}}
+        %pre.log.stderr
 
 
       %script#worker-log-template{type: 'text/template'}
-        .header {{ key }}
+        .worker-logs-list-item-header
+          %a{href: "#worker_logs/{{id}}"} {{worker_name}}
         .body.collapse
-          %dl.dl-horizontal
-            %dt Name
-            %dd {{key}}
+          %dl
             %dt Started
-            %dd {{started_at}}
+            %dd {{date started_at}}
             %dt RSync Finished
-            %dd {{#rsync_finished_at}}{{rsync_finished_at}} ({{rsync_duration}}){{/rsync_finished_at}}
+            %dd {{dateWithDuration rsync_finished_at started_at}}
             %dt Setup Finished
-            %dd {{#setup_finished_at}}{{setup_finished_at}} ({{setup_duration}}){{/setup_finished_at}}
-            %dt Finished
-            %dd {{#finished_at}}{{finished_at}} ({{test_duration}}){{/finished_at}}
+            %dd {{dateWithDuration setup_finished_at rsync_finished_at}}
+            %dt RSpec Finished
+            %dd {{dateWithDuration rspec_finished_at setup_finished_at}}
 
           %h5 LOG
-          %pre.log.pre-scrollable
-            {{log}}
+          %pre.log
+            {{log_text}}
 
       %script#slave-template{type: 'text/template'}
-        .header
-          {{key}}
-          .exit-status.pull-right
+        .slaves-list-item-header
+          %a{href: "#slaves/{{id}}"} {{name}}
+          .exit-status
             {{status}}
         .body.collapse
           %h5 TRIALS
           %ol
             {{#trials}}
             %li
-              %a{href: "#trial/{{encoded_key}}"} {{key}}
+              %a{href: "#trials/{{id}}"} {{key}}
             {{/trials}}
 
           %h5 LOG
-          %pre.log.pre-scrollable
-            {{log}}
+          %pre.log
+            {{log_text}}

data/views/user.haml

@@ -4,8 +4,8 @@
     %meta{charset: 'utf-8', 'http-equiv' => 'Content-Type', content: 'text/html'}
     %title User - RRRSpec
     %script{src: '//ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js', type: 'text/javascript'}
-    != css :application, :media => 'screen'
-    != js :user
+    != stylesheet_tag 'application'
+    != javascript_tag 'user'
   %body
     :javascript
       SERVER_ADDR = "#{webdis_addr}"

metadata

@@ -1,307 +1,335 @@
 --- !ruby/object:Gem::Specification
 name: rrrspec-web
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Masaya Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: guard-livereload
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rack-livereload
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-livereload
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-livereload
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: api-pagination
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bootstrap-sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.0
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rrrspec-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rrrspec-server
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.3
 - !ruby/object:Gem::Dependency
-  name: sinatra-assetpack
+  name: sinatra-asset-pipeline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Execute RSpec in a distributed manner
@@ -311,31 +339,27 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - Guardfile
 - Rakefile
-- app/css/application.sass
-- app/css/vendor/bootstrap-theme.css
-- app/css/vendor/bootstrap-theme.min.css
-- app/css/vendor/bootstrap.css
-- app/css/vendor/bootstrap.min.css
-- app/js/index.coffee
-- app/js/models.coffee
-- app/js/tasksets.coffee
-- app/js/vendor/backbone-min.js
-- app/js/vendor/backbone-min.map
-- app/js/vendor/backbone.js
-- app/js/vendor/bootstrap.js
-- app/js/vendor/bootstrap.min.js
-- app/js/vendor/jquery-1.10.2.js
-- app/js/vendor/jquery-1.10.2.min.js
-- app/js/vendor/jquery-1.10.2.min.map
-- app/js/vendor/moment.min.js
-- app/js/vendor/mustache.js
-- app/js/vendor/underscore-min.js
-- app/js/vendor/underscore-min.map
-- app/js/vendor/underscore.js
+- assets/javascripts/helpers.coffee
+- assets/javascripts/index.coffee
+- assets/javascripts/models.coffee
+- assets/javascripts/tasksets.coffee
+- assets/javascripts/vendor/backbone-min.js
+- assets/javascripts/vendor/backbone-min.map
+- assets/javascripts/vendor/backbone.js
+- assets/javascripts/vendor/handlebars-v1.3.0.js
+- assets/javascripts/vendor/jquery-1.10.2.js
+- assets/javascripts/vendor/jquery-1.10.2.min.js
+- assets/javascripts/vendor/jquery-1.10.2.min.map
+- assets/javascripts/vendor/moment.min.js
+- assets/javascripts/vendor/underscore-min.js
+- assets/javascripts/vendor/underscore-min.map
+- assets/javascripts/vendor/underscore.js
+- assets/stylesheets/application.sass
 - compass.config
 - lib/rrrspec/web.rb
 - lib/rrrspec/web/api.rb
@@ -360,17 +384,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Execute RSpec in a distributed manner