marty 1.0.53 → 1.0.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e29a8f6100cbc30a7a8207778d67566180324348
-  data.tar.gz: 352aa2c3dfc43f0e59490f37219b8032669647b1
+  metadata.gz: b39a9aaf4fd1b9f90bdff0503ea509ae7b4e4232
+  data.tar.gz: 36f9283c373a1e5e1f0ab1c5e5a00efab731238c
 SHA512:
-  metadata.gz: bf6c38998881fe010b0dc0231d2d12a572f84c7b69203caf573e5aafe986dd75815dd24ba26e70fd5a3c56645fa58d1ccfe12aa45339ca69b026778d3a42df97
-  data.tar.gz: 071174651bea3b1018210e959e963ef4dc9c5ccf7c7a36a3cb9e11cee5a9f8a3f08fc31e7d538fac33249570c5f28edaabff778bf97c0e86f29a0987698cbed0
+  metadata.gz: a0212491f9ac246e2731fc2629d7543f49f0c814b597459cef568be5fc824ce891b56553f083f5de3a831ff8cd6585e118c82379f2512d74f08eff4913f08b40
+  data.tar.gz: abf2e69338e8f90b1f9dac8b15a31896d1ffab3681190adece922db454ac8dada1ecce411cef5c417f3d5d161d0a0e5f250bfa917de03e8ef17fe069163e9b77

data/Gemfile

@@ -28,5 +28,5 @@ group :development, :test do
   gem 'netzke-testing'
 
   gem 'marty_rspec'
-
+  gem 'rspec-instafail', require: false
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (1.0.53)
+    marty (1.0.54)
       axlsx (= 2.1.0pre)
       coderay
       delorean_lang (~> 0.1)
@@ -156,6 +156,10 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.1.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
     rspec-by (0.0.7)
       rspec-core (>= 3)
     rspec-core (3.6.0)
@@ -163,6 +167,8 @@ GEM
     rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.6.0)
+    rspec-instafail (1.0.0)
+      rspec
     rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.6.0)
@@ -220,10 +226,11 @@ DEPENDENCIES
   pg (~> 0.18.4)
   pry-rails
   rails (~> 4.2.1)
+  rspec-instafail
   rspec-rails (~> 3.0)
   selenium-webdriver
   sqlite3
   timecop
 
 BUNDLED WITH
-   1.16.0.pre.2
+   1.16.0

data/app/controllers/marty/diagnostic_controller.rb

@@ -6,8 +6,10 @@ module Marty
     layout false
     def op
       begin
-        # inject request into Base class of all diagnostics
-        Base.request   = request
+        # inject request object into base class of all diagnostics
+        Base.request = request
+
+        # determine if request is aggregate and return result
         params[:scope] = 'nodal' unless params[:scope]
         diag = self.class.get_sub_class(params[:op])
         @result = params[:scope] == 'local' ? diag.generate : diag.aggregate
@@ -32,23 +34,25 @@ module Marty
     #
     ############################################################################
     class Base
-      @@request     = nil
-      @@read_only   = Marty::Util.db_in_recovery?
-
-      def self.request= req
-       @@request = req
-      end
+      @@request   = nil
+      @@read_only = Marty::Util.db_in_recovery?
+      @@template  = ActionController::Base.new.lookup_context.
+                      find_template("marty/diagnostic/diag").identifier
 
       def self.request
         @@request
       end
 
+      def self.request= req
+        @@request = req
+      end
+
       def self.aggregate op_name=name.demodulize
         get_nodal_diags(op_name)
       end
 
       def self.get_nodal_diags op_name, scope='local'
-         self.get_nodes.map do |n|
+        self.get_nodes.map do |n|
           ssl = ENV['HTTPS'] == 'on'
           uri = Addressable::URI.new(host: n, port: ssl ? 443 : @@request.port)
           uri.query_values = {op: op_name.underscore,
@@ -57,7 +61,7 @@ module Marty
           uri.path = '/marty/diag.json'
           opts = {ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE}
           {n => JSON.parse(open(uri, opts).readlines[0])}
-         end.sum
+        end.sum
       end
 
       def self.find_failures data
@@ -85,36 +89,20 @@ module Marty
         "Failure: #{message}"
       end
 
+      # determine "target" (highest) value for tests
+      def self.get_targets data
+        data.each_with_object({}) do |(_, v), h|
+          v.each do |k, r|
+            r = r.to_s
+            h[k] ||= r
+            h[k] = r if h[k] < r
+          end
+        end
+      end
+
       def self.display data, type='nodal'
         data = {'local' => data} if type == 'local'
-        display = <<-ERB
-                <% inconsistent = diff(data) %>
-                <h3><%=name.demodulize%></h3>
-                <%='<h3 class="error">Issues Detected</h3>' if
-                   inconsistent%>
-                <div class="wrapper">
-                <% data.each do |node, result| %>
-                    <table>
-                    <% issues = ('error' if inconsistent) %>
-                    <th colspan="2" class="<%=issues%>">
-                      <small>
-                        <%=inconsistent ? node :
-                           (type == 'local' ? 'local' : 'consistent') %>
-                      </small>
-                    </th>
-                    <% result.each do |name, value| %>
-                      <tr class="<%=is_failure?(value) ? 'failed' :
-                                    'passed' %>">
-                        <td><%=name%></td>
-                        <td class="overflow"><%=simple_format(value.to_s)%></td>
-                      </tr>
-                    <% end %>
-                    </table>
-                  <% break unless inconsistent %>
-                <% end %>
-                </div>
-                ERB
-        ERB.new(display.html_safe).result(binding)
+        ERB.new(File.open(@@template).read).result(binding)
       end
 
       def self.get_pg_connections
@@ -170,7 +158,7 @@ module Marty
 
     class Database < Base
       def self.db_server_name
-        ActiveRecord::Base.connection_config[:host] || 'undefined'
+        ActiveRecord::Base.connection_config[:host] || error('undefined')
       end
 
       def self.db_adapter_name
@@ -206,16 +194,18 @@ module Marty
     class Environment < Database
       def self.generate
         rbv = "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} (#{RUBY_PLATFORM})"
-        infos = {'Environment'             => Rails.env,
-                 'Rails'                   => Rails.version,
-                 'Netzke Core'             => Netzke::Core::VERSION,
-                 'Netzke Basepack'         => Netzke::Basepack::VERSION,
-                 'Ruby'                    => rbv,
-                 'RubyGems'                => Gem::VERSION,
-                 'Database Adapter'        => db_adapter_name,
-                 'Database Server'         => db_server_name,
-                 'Database Version'        => db_version,
-                 'Database Schema Version' => db_schema}
+        {
+          'Environment'             => Rails.env,
+          'Rails'                   => Rails.version,
+          'Netzke Core'             => Netzke::Core::VERSION,
+          'Netzke Basepack'         => Netzke::Basepack::VERSION,
+          'Ruby'                    => rbv,
+          'RubyGems'                => Gem::VERSION,
+          'Database Adapter'        => db_adapter_name,
+          'Database Server'         => db_server_name,
+          'Database Version'        => db_version,
+          'Database Schema Version' => db_schema
+        }
       end
     end
 
@@ -269,15 +259,6 @@ module Marty
           c['name'].include?('delayed_job')}
       end
 
-      def self.pretty hash
-        hash.keys.map{|k| k + " => " + hash[k].to_s}.join("\n")
-      end
-
-      def self.verify_history delayed_versions
-        @@history ||= delayed_versions
-        @@history == delayed_versions
-      end
-
       def self.validate data
         data.each_with_object({}) do
           |(k,v), h|
@@ -288,7 +269,7 @@ module Marty
 
       def self.generate
         count = delayed_job_count
-        return {'Status' => ['No delayed jobs are running.']} if count.zero?
+        return {'Issue' => ['No delayed jobs are running.']} if count.zero?
 
         # we will only iterate by half of the total delayed workers to avoid
         # excess use of delayed job time
@@ -306,17 +287,7 @@ module Marty
       end
 
       def self.aggregate
-        d_vers = validate(generate)
-
-        unless verify_history(d_vers)
-          a = @@history.to_a
-          b = d_vers.to_a
-          @@history = d_vers
-          d_vers += {"WARN" => error(["Result different from "\
-                                      "#{Marty::Helper.my_ip}'s history.",
-                                      "#{pretty(Hash[a - b])}"].join("\n"))}
-        end
-        package(d_vers)
+        package(validate(generate))
       end
 
       def self.diff data

data/app/views/marty/diagnostic/diag.html.erb

@@ -0,0 +1,34 @@
+<% inconsistent = diff(data) %>
+<h3><%=name.demodulize%></h3>
+<%='<h3 class="error">Issues Detected</h3>' if
+                     inconsistent%>
+<div class="wrapper">
+  <table>
+    <%# Create node table headers if applicable %>
+    <tr>
+      <%='<th></th>' if inconsistent %>
+      <% data.keys.each do |node| %>
+        <th <%='colspan="2"' unless inconsistent %> scope="col">
+          <%= inconsistent ? node :
+                          (type == 'local' ? 'local' : 'consistent') %>
+        </th>
+        <% break unless inconsistent %>
+      <% end %>
+    </tr>
+    <%# Create row headers and display node results %>
+    <% data[data.keys.first].each do |key, value| %>
+      <tr>
+        <th scope="row"><%= key %></th>
+        <% targets = get_targets(data) %>
+        <% data.each do |_node, result| %>
+          <td class="overflow <%= (is_failure?(value) ||
+                          (result[key].to_s != targets[key].to_s)) ? 'error' :
+                          'passed' %>">
+            <%= simple_format(result[key].to_s) %>
+          </td>
+          <% break unless inconsistent %>
+        <% end %>
+      </tr>
+    <% end %>
+  </table>
+</div>

data/app/views/marty/diagnostic/op.html.erb

@@ -4,18 +4,18 @@
     <title><%=Rails.application.class.parent_name%> Diagnostic</title>
     <style type="text/css">
       body { margin: auto;
-             margin-bottom: 50px;
-             border: 0;
-             background-color: #fff;
-             color: #333333;
-             font-family: Arial, Helvetica, Verdana, sans-serif;
-             font-weight: normal;
-             font-size: 9pt; }
+       margin-bottom: 50px;
+       border: 0;
+       background-color: #fff;
+       color: #333333;
+       font-family: Arial, Helvetica, Verdana, sans-serif;
+       font-weight: normal;
+       font-size: 9pt; }
       table { border: none;
-              border-collapse: collapse;
-              display: inline-block;
-              margin: 0px 5px 0px 5px;
-              text-align: left;
+        border-collapse: collapse;
+        display: inline-block;
+        margin: 0px 5px 0px 5px;
+        text-align: left;
       }
       th { padding: 9px;
            border: none;
@@ -23,14 +23,12 @@
       td { text-align: left;
            padding: 9px;
          }
-      th.error  { background-color: #ff5555;
-                  color: #ffffff;
-      }
       tr { text-align: center;}
       tr.passed { background-color: #d0e9c6 }
-      tr.failed { background-color: #ff5555;
-                  color: #ffffff
-      }
+      td.passed { background-color: #d0e9c6 }
+      td.error  { background-color: #ff5555;
+            color: #ffffff;}
+      th.error  { background-color: #ff5555;}
       td.desc { font-size: 10pt; }
       p  { white-space: pre-line;}
       h1 { display: block;
@@ -40,22 +38,25 @@
            font-size: 18pt;
            color: #ffffff;
            line-height: 1.5em; }
+      h1.error {background-color: #ff5555;}
       h2 {text-align: center;}
       h3.error {color: red;}
       h3 {text-align: center;}
       td.overflow { max-width: 350px;
-         overflow: auto; }
+              overflow: auto; }
       .wrapper {
-         overflow-x: auto;
-         white-space: nowrap;
-         display: block;}
+          overflow-x: auto;
+          white-space: nowrap;
+          display: block;}
     </style>
   </head>
   <body>
     <div style="text-align:center">
-      <h1><%=Rails.application.class.parent_name%> Diagnostic</h1>
+      <h1 class="<%= 'error' if @result.to_s.include?('error') %>">
+        <%=Rails.application.class.parent_name%> Diagnostic
+      </h1>
       <h3><i><%= DateTime.now %></i></h3>
-    <%== @result %>
-  </div>
-</body>
+      <%== @result %>
+    </div>
+  </body>
 </html>

data/lib/marty/engine.rb

@@ -9,7 +9,5 @@ module Marty
     config.generators do |g|
       g.test_framework :rspec, :view_specs => false
     end
-
-    config.assets.precompile << 'marty/diagnostic.css'
   end
 end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.53"
+  VERSION = "1.0.54"
 end

data/spec/controllers/diagnostic_controller_spec.rb

@@ -39,25 +39,31 @@ module Marty
       <<-ERB
       <h3>Version</h3>
       <div class="wrapper">
-      <table>
-        <th colspan="2" class=""><small>consistent</small></th>
-        <tr class="passed">
-          <td>Marty</td>
-          <td class="overflow"><p>#{Marty::VERSION}</p></td>
-        </tr>
-        <tr class="passed">
-          <td>Delorean</td>
-          <td class="overflow"><p>#{Delorean::VERSION}</p></td>
-        </tr>
-        <tr class="passed">
-          <td>Mcfly</td>
-          <td class="overflow"><p>#{Mcfly::VERSION}</p></td>
-        </tr>
-        <tr class="passed">
-          <td>Git</td>
-          <td class="overflow"><p>#{git}</p></td>
-        </tr>
-      </table>
+        <table>
+          <tr>
+            <th colspan="2" scope="col">consistent</th>
+          </tr>
+          <tr>
+            <th scope="row">Marty</th>
+            <td class="overflow passed"><p>#{Marty::VERSION}</p>
+            </td>
+          </tr>
+          <tr>
+            <th scope="row">Delorean</th>
+            <td class="overflow passed"><p>#{Delorean::VERSION}</p>
+            </td>
+          </tr>
+          <tr>
+            <th scope="row">Mcfly</th>
+            <td class="overflow passed"><p>#{Mcfly::VERSION}</p>
+            </td>
+          </tr>
+          <tr>
+            <th scope="row">Git</th>
+            <td class="overflow passed"><p>#{git}</p>
+            </td>
+          </tr>
+        </table>
       </div>
       ERB
     end
@@ -68,42 +74,31 @@ module Marty
       <h3 class="error">Issues Detected </h3>
       <div class="wrapper">
       <table>
-        <th colspan="2" class="error"><small>node1</small></th>
-        <tr class="passed">
-          <td>Marty</td>
-          <td class="overflow"><p>#{Marty::VERSION}</p></td>
-        </tr>
-        <tr class="passed">
-          <td>Delorean</td>
-          <td class="overflow"><p>#{Delorean::VERSION}</p></td>
-        </tr>
-        <tr class="passed">
-          <td>Mcfly</td>
-          <td class="overflow"><p>#{Mcfly::VERSION}</p></td>
-        </tr>
-        <tr class="passed">
-          <td>Git</td>
-          <td class="overflow"><p>#{git}</p></td>
-        </tr>
-      </table>
-      <table>
-        <th colspan="2" class="error"><small>node2</small></th>
-        <tr class="passed">
-          <td>Marty</td>
-          <td class="overflow"><p>#{val}</p></td>
-        </tr>
-        <tr class="passed">
-          <td>Delorean</td>
-          <td class="overflow"><p>#{Delorean::VERSION}</p></td>
-        </tr>
-        <tr class="passed">
-          <td>Mcfly</td>
-          <td class="overflow"><p>#{Mcfly::VERSION}</p></td>
-        </tr>
-        <tr class="passed">
-          <td>Git</td>
-          <td class="overflow"><p>#{git}</p></td>
-        </tr>
+         <tr>
+            <th></th>
+            <th scope="col">node1</th>
+            <th scope="col">node2</th>
+          </tr>
+          <tr>
+            <th scope="row">Marty</th>
+            <td class="overflow passed"><p>#{Marty::VERSION}</p></td>
+            <td class="overflow error"><p>#{val}</p></td>
+          </tr>
+          <tr>
+            <th scope="row">Delorean</th>
+            <td class="overflow passed"><p>#{Delorean::VERSION}</p></td>
+            <td class="overflow passed"><p>#{Delorean::VERSION}</p></td>
+          </tr>
+          <tr>
+            <th scope="row">Mcfly</th>
+            <td class="overflow passed"><p>#{Mcfly::VERSION}</p></td>
+            <td class="overflow passed"><p>#{Mcfly::VERSION}</p></td>
+          </tr>
+          <tr>
+            <th scope="row">Git</th>
+            <td class="overflow passed"><p>#{git}</p></td>
+            <td class="overflow passed"><p>#{git}</p></td>
+          </tr>
       </table>
       </div>
       ERB
@@ -145,7 +140,7 @@ module Marty
         data      = {'node1' => version, 'node2' => version + {'Marty' => ver}}
         expected  = version_display_fail(ver)
         test      = described_class::Version.display(data)
-        expect(minimize(expected)).to eq(minimize(test))
+        expect(minimize(test)).to eq(minimize(expected))
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.53
+  version: 1.0.54
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2017-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -202,7 +202,6 @@ files:
 - Rakefile
 - app/assets/images/marty/.gitkeep
 - app/assets/stylesheets/marty/application.css
-- app/assets/stylesheets/marty/diagnostic.css
 - app/components/marty/api_auth_view.rb
 - app/components/marty/api_config_view.rb
 - app/components/marty/api_log_view.rb
@@ -439,7 +438,7 @@ files:
 - app/models/marty/user.rb
 - app/models/marty/user_role.rb
 - app/views/layouts/marty/application.html.erb
-- app/views/layouts/marty/diagnostic.html.erb
+- app/views/marty/diagnostic/diag.html.erb
 - app/views/marty/diagnostic/op.html.erb
 - config/database.yml.travis
 - config/locales/en.yml

data/app/assets/stylesheets/marty/diagnostic.css

@@ -1,34 +0,0 @@
-body { margin: 0;
-       padding: 0;
-       border: 0;
-       background-color: #fff;
-       color: #333333;
-       text-align: left;
-       font-family: Arial, Helvetica, Verdana, sans-serif;
-       font-weight: normal;
-       font-size: 11pt; }
-table { border-width: 0px;
-        margin-left: auto;
-        margin-right: auto;
-        border-spacing: 1px;
-        width: 75% }
-th { padding: 9px;
-     background-color: #d6d6d6 }
-td { padding: 9px;
-     -moz-border-radius: 5px;
-     border-radius: 5px;
-     -webkit-border-radius: 5px;
-     border-style: solid;
-     border-width: 1px;
-     border-color: #999999; }
-tr.passed { background-color: #9ed515 }
-tr.warning { background-color: #ffdb58 }
-tr.failed { background-color: #ff5555 }
-td.desc { font-size: 10pt; }
-h1 { display: block;
-     margin: 0px auto 40px auto;
-     padding: 8px;
-     background-color: #3e2155;
-     font-size: 18pt;
-     color: #ffffff;
-     line-height: 1.5em; }

data/app/views/layouts/marty/diagnostic.html.erb

@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <title><%= Rails.application.class.parent %></title>
-  <%= stylesheet_link_tag 'marty/diagnostic' %>
-</head>
-<body>
-  <%= yield %>
-</body>
-</html>