oxidized-web 0.9.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 082d314e3b82281ec62f6e845e12809801920cfc
-  data.tar.gz: 5c27d5bdca70bde5ed9cf8a1e26552634ae9978b
+SHA256:
+  metadata.gz: 67c5f5f7e9122fd6fba70a0f50e4b822386c8ac209114cf21f987895057c727c
+  data.tar.gz: 8eb2e53fc0e064cbe59610540d1914eccd795e93897f998aad3e53b6375824ed
 SHA512:
-  metadata.gz: 6722e3424583a8944f70ab7b943f033633d241cc28cccfabd78e44397d6f402055442fe3d8891975d21d9e333ac0b0221a317d24090888ddd5b428a90e305702
-  data.tar.gz: faa997ec6a000993abaf5a9803f10797459e43878978852862f91f39c4009b05f36edacf2fec73ed6fc884e9802e0d80b48df622ed2ae2c3d8ec76eee9b77352
+  metadata.gz: a8f5b6788432058f260019cd3cbb956fe33e06f9063fc849ac712018b81d24b24ebbff907e3bceffa5611b73e7210a46617a1ecbea530cc02040f7844cc9977a
+  data.tar.gz: fd4c7132b2e76bb044d0dc3f987b78ca9b392cef81bed6d5a33b9feae1072315fe39813575371d0909a70088e1996b441ebd4fdbbe36b45db0c87a812ac278df

data/.gitignore

@@ -9,6 +9,7 @@
 /test/tmp/
 /test/version_tmp/
 /tmp/
+.idea/
 
 # Used by dotenv library to load environment variables.
 # .env
@@ -42,9 +43,9 @@ build-iPhoneSimulator/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
+Gemfile.lock
+.ruby-version
+.ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc

data/.rubocop.yml

@@ -1,5 +1,36 @@
----
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  Include:
+    - Rakefile
+
+StringLiterals:
+  Enabled: false
 
 LineLength:
-  # Default line length is silly.  100 is more realistic.
-  Max: 100
+  Enabled: false
+
+# Stick to verbose until https://bugs.ruby-lang.org/issues/10177 is closed.
+Style/PreferredHashMethods:
+  EnforcedStyle: verbose
+
+Style/Not:
+  Enabled: false
+
+# comply with @ytti's exacting specifications
+Style/CommandLiteral:
+  EnforcedStyle: percent_x
+
+Style/FormatString:
+  EnforcedStyle: percent
+
+Style/FormatStringToken:
+  EnforcedStyle: unannotated
+
+Style/RescueModifier:
+  Enabled: false
+
+# Do not attempt to police vendored code, and exclude special cases
+AllCops:
+  Exclude:
+    - 'vendor/**/*'

data/.rubocop_todo.yml

@@ -0,0 +1,264 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-05-03 20:40:31 +0200 using RuboCop version 0.55.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: Include, TreatCommentsAsGroupSeparators.
+# Include: **/*.gemspec
+Gemspec/OrderedDependencies:
+  Exclude:
+    - 'oxidized-web.gemspec'
+
+# Offense count: 1
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - 'oxidized-web.gemspec'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
+# SupportedStyles: space, no_space, compact
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceInsideHashLiteralBraces:
+  Exclude:
+    - 'lib/oxidized/web/webapp.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowInHeredoc.
+Layout/TrailingWhitespace:
+  Exclude:
+    - 'lib/oxidized/web/mig.rb'
+
+# Offense count: 1
+Lint/AmbiguousBlockAssociation:
+  Exclude:
+    - 'lib/oxidized/web/webapp.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowSafeAssignment.
+Lint/AssignmentInCondition:
+  Exclude:
+    - 'lib/oxidized/web/mig.rb'
+
+# Offense count: 1
+Lint/HandleExceptions:
+  Exclude:
+    - 'lib/oxidized/web/webapp.rb'
+
+# Offense count: 7
+Metrics/AbcSize:
+  Max: 47
+
+# Offense count: 2
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 33
+
+# Offense count: 1
+# Configuration parameters: CountBlocks.
+Metrics/BlockNesting:
+  Max: 5
+
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 282
+
+# Offense count: 2
+Metrics/CyclomaticComplexity:
+  Max: 9
+
+# Offense count: 9
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 36
+
+# Offense count: 3
+Metrics/PerceivedComplexity:
+  Max: 11
+
+# Offense count: 5
+# Cop supports --auto-correct.
+Performance/RedundantMatch:
+  Exclude:
+    - 'lib/oxidized/web/mig.rb'
+    - 'lib/oxidized/web/webapp.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Performance/StringReplacement:
+  Exclude:
+    - 'lib/oxidized/web/mig.rb'
+
+# Offense count: 1
+Security/Eval:
+  Exclude:
+    - 'Rakefile'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect.
+Security/JSONLoad:
+  Exclude:
+    - 'lib/oxidized/web/webapp.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, conditionals
+Style/AndOr:
+  Exclude:
+    - 'lib/oxidized/web/webapp.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: braces, no_braces, context_dependent
+Style/BracesAroundHashParameters:
+  Exclude:
+    - 'lib/oxidized/web/webapp.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
+# SupportedStyles: assign_to_condition, assign_inside_condition
+Style/ConditionalAssignment:
+  Exclude:
+    - 'lib/oxidized/web/webapp.rb'
+
+# Offense count: 2
+Style/DateTime:
+  Exclude:
+    - 'lib/oxidized/web/webapp.rb'
+
+# Offense count: 3
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/oxidized/web.rb'
+    - 'lib/oxidized/web/mig.rb'
+    - 'lib/oxidized/web/webapp.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/EmptyLiteral:
+  Exclude:
+    - 'lib/oxidized/web/webapp.rb'
+
+# Offense count: 2
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: each, for
+Style/For:
+  Exclude:
+    - 'lib/oxidized/web/mig.rb'
+    - 'lib/oxidized/web/webapp.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+Style/HashSyntax:
+  Exclude:
+    - 'Rakefile'
+
+# Offense count: 9
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'lib/oxidized/web/mig.rb'
+    - 'lib/oxidized/web/webapp.rb'
+
+# Offense count: 10
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline
+Style/MethodDefParentheses:
+  Exclude:
+    - 'lib/oxidized/web.rb'
+    - 'lib/oxidized/web/mig.rb'
+    - 'lib/oxidized/web/webapp.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: both, prefix, postfix
+Style/NegatedIf:
+  Exclude:
+    - 'lib/oxidized/web.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, MinBodyLength.
+# SupportedStyles: skip_modifier_ifs, always
+Style/Next:
+  Exclude:
+    - 'lib/oxidized/web/mig.rb'
+    - 'lib/oxidized/web/webapp.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: IncludeSemanticChanges.
+Style/NonNilCheck:
+  Exclude:
+    - 'lib/oxidized/web/webapp.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/ParallelAssignment:
+  Exclude:
+    - 'lib/oxidized/web.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/Proc:
+  Exclude:
+    - 'lib/oxidized/web/webapp.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+Style/RedundantParentheses:
+  Exclude:
+    - 'lib/oxidized/web/webapp.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/SelfAssignment:
+  Exclude:
+    - 'lib/oxidized/web/webapp.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleForMultiline.
+# SupportedStylesForMultiline: comma, consistent_comma, no_comma
+Style/TrailingCommaInHashLiteral:
+  Exclude:
+    - 'lib/oxidized/web.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/WhileUntilDo:
+  Exclude:
+    - 'lib/oxidized/web/webapp.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: WordRegex.
+# SupportedStyles: percent, brackets
+Style/WordArray:
+  EnforcedStyle: percent
+  MinSize: 3
+
+# Offense count: 10
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 177

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+sudo: false
+cache: bundler
+before_install:
+  - gem install bundler
+rvm:
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5

data/README.md

@@ -1,4 +1,4 @@
-# Oxidized Web
+# Oxidized Web [![Build Status](https://travis-ci.com/ytti/oxidized-web.svg)](https://travis-ci.com/ytti/oxidized-web) [![Gem Version](https://badge.fury.io/rb/oxidized-web.svg)](http://badge.fury.io/rb/oxidized-web)
 
 Web userinterface and RESTful API for Oxidized.
 

data/Rakefile

@@ -4,6 +4,18 @@ require 'rake/testtask'
 gemspec = eval(File.read(Dir['*.gemspec'].first))
 file    = [gemspec.name, gemspec.version].join('-') + '.gem'
 
+# Integrate Rubocop if available
+begin
+  require 'rubocop/rake_task'
+
+  RuboCop::RakeTask.new
+  task(:default).prerequisites << task(:rubocop)
+rescue LoadError
+  task :rubocop do
+    puts 'Install rubocop to run its rake tasks'
+  end
+end
+
 desc 'Validate gemspec'
 task :gemspec do
   gemspec.validate

data/lib/oxidized/web.rb

@@ -25,7 +25,10 @@ module Oxidized
       end
 
       def run
-        @thread = Thread.new { Rack::Handler::Puma.run @app, @opts }
+        @thread = Thread.new do
+          Rack::Handler::Puma.run @app, @opts
+          exit!
+        end
       end
     end
   end

data/lib/oxidized/web/public/scripts/oxidized.js

@@ -44,7 +44,7 @@ var convertTime = function() {
   */
   $('.time').each(function() {
     var content = $(this).text();
-    if(content === 'never' || content === '') { return; }
+    if(content === 'never' || content === 'unknown' || content === '') { return; }
     var utcTime = content.split(' ');
     var date = new Date(utcTime[0] + 'T' + utcTime[1] + 'Z');
     var year = date.getFullYear();

data/lib/oxidized/web/views/conf_search.haml

@@ -30,6 +30,7 @@
   $(function() {
     $('#versionsTable').dataTable({
       dom: 'C<"clear">lfrtip',
+      bAutoWidth: false,
       "order": [[0, "desc"]]
     });
   });

data/lib/oxidized/web/views/diffs.haml

@@ -50,54 +50,44 @@
       - @diff[:old_diff].each do |line|
         - if /^\+.*/.match(line)
           .added><
-            :escaped
-              #{line}
+            != escape_once("#{line}")
 
         - elsif /^\-.*/.match(line)
           .deleted><
-            :escaped
-              #{line}
+            != escape_once("#{line}")
 
         - elsif /^@@\s.*@@.*$/.match(line)
           .diff-index><
-            :escaped
-              #{line}
+            != escape_once("#{line}")
 
         - elsif /^empty_line&nbsp;/.match(line)
           - line.slice! "empty_line"
           .diff-empty><
-            :escaped
-              #{line}
+            != escape_once("#{line}")
 
         - else
           %div><
-            :escaped
-              #{line}
+            != escape_once("#{line}")
 
     .diffs_new
       - @diff[:new_diff].each do |line|
         - if /^\+.*/.match(line)
           .added><
-            :escaped
-              #{line}
+            != escape_once("#{line}")
 
         - elsif /^\-.*/.match(line)
           .deleted><
-            :escaped
-              #{line}
+            != escape_once("#{line}")
 
         - elsif /^@@\s.*@@.*$/.match(line)
           .diff-index><
-            :escaped
-              #{line}
+            != escape_once("#{line}")
 
         - elsif /^empty_line&nbsp;/.match(line)
           - line.slice! "empty_line"
           .diff-empty><
-            :escaped
-              #{line}
+            != escape_once("#{line}")
 
         - else
           %div><
-            :escaped
-              #{line}
+            != escape_once("#{line}")

data/lib/oxidized/web/views/footer.haml

@@ -0,0 +1,4 @@
+%footer
+  %hr
+  %span
+    %p Oxidized v.#{Oxidized::VERSION}

data/lib/oxidized/web/views/layout.haml

@@ -36,6 +36,7 @@
 
     .container-fluid
       =yield
+    !=haml :footer
     %script{src: url_for('/scripts/bootstrap.min.js')}
     %script{src: url_for('/scripts/jquery.dataTables.min.js')}
     %script{src: url_for('/scripts/dataTables.bootstrap.js')}

data/lib/oxidized/web/views/nodes.haml

@@ -22,6 +22,7 @@
           %th Group
           %th Last Status
           %th Last Update
+          %th Last Changed
           %th Actions
 
       %tbody
@@ -40,6 +41,7 @@
               %div{title: node[:status], class: node[:status]}
                 %span{style: 'visibility: hidden'}#{node[:status]}
             %td.time= node[:time]
+            %td.time= node[:mtime]
             %td
               %a{title: 'configuration',
                  href: url_for("/node/fetch/#{node[:full_name]}")}
@@ -56,6 +58,7 @@
   $(function() {
     $('#nodesTable').dataTable({
       dom: 'C<"clear">lfrtip',
+      bAutoWidth: false,
       "lengthMenu": [[50, 250, 500, -1], [50, 250, 500, "All"]],
       columnDefs: [{
         visible: false,
@@ -65,7 +68,7 @@
         targets: 3
       }],
       colVis: {
-        exclude: [0, 5]
+        exclude: [0, 7]
       }
     });
   });

data/lib/oxidized/web/views/stats.haml

@@ -28,8 +28,8 @@
       %tbody
         - @data.map do |node, stats|
           - status = 'no_connection'
-          - successes = 0
-          - failures = 0
+          - successes = stats.successes
+          - failures = stats.failures
           - avg_success_time = 0
           - avg_failure_time = 0
           - avg_time = 0
@@ -37,14 +37,12 @@
 
           - if stats[:success]
             - last_success = stats[:success].last[:end]
-            - successes = stats[:success].length
             - avg_success_time = stats[:success].collect {|x| x[:time]}
             - avg_success_time = avg_success_time.inject {|sum, x| sum + x}
             - avg_success_time /= successes
 
           - if stats[:no_connection]
             - last_failure = stats[:no_connection].last[:end]
-            - failures = stats[:no_connection].length
             - avg_failure_time = stats[:no_connection].collect {|x| x[:time]}
             - avg_failure_time = avg_failure_time.inject {|sum, x| sum + x}
             - avg_failure_time /= failures
@@ -86,6 +84,7 @@
     $('#statsTable').dataTable({
       dom: 'C<"clear">lfrtip',
       "lengthMenu": [[50, 250, 500, -1], [50, 250, 500, "All"]],
+      bAutoWidth: false,
       columnDefs: [{
         visible: false,
         targets: 1

data/lib/oxidized/web/views/version.haml

@@ -19,5 +19,4 @@
     .diffs
       - @data.each_line do |line|
         %div><
-          :escaped
-            #{line}
+          != escape_once("#{line}")

data/lib/oxidized/web/views/versions.haml

@@ -43,6 +43,7 @@
     $('#versionsTable').dataTable({
       dom: 'C<"clear">lfrtip',
       "order": [[0, "desc"]],
+      bAutoWidth: false,
       columnDefs: [{
         visible: false,
         targets: [2, 3]

data/lib/oxidized/web/webapp.rb

@@ -6,6 +6,7 @@ require 'sass'
 require 'pp'
 require 'oxidized/web/mig'
 require 'htmlentities'
+require 'charlock_holmes'
 module Oxidized
   module API
     class WebApp < Sinatra::Base
@@ -19,13 +20,18 @@ module Oxidized
       get '/nodes/:filter/:value.?:format?' do
         @data = nodes.list.select do |node|
           if node[params[:filter].to_sym] == params[:value]
+            versions = nodes.version node[:name], node[:group]
             node[:status]    = 'never'
             node[:time]      = 'never'
-            node[:group]     = 'default' unless node[:group]
+            node[:mtime] = 'unknown'
+            node[:group] = 'default' unless node[:group]
             if node[:last]
               node[:status] = node[:last][:status]
               node[:time]   = node[:last][:end]
             end
+            if versions.is_a? Array
+              node[:mtime] = versions.first[:date]
+            end
             node
           end
         end
@@ -34,13 +40,18 @@ module Oxidized
 
       get '/nodes.?:format?' do
         @data = nodes.list.map do |node|
+          versions = nodes.version node[:name], node[:group]
           node[:status]    = 'never'
           node[:time]      = 'never'
-          node[:group]     = 'default' unless node[:group]
+          node[:mtime] = 'unknown'
+          node[:group] = 'default' unless node[:group]
           if node[:last]
             node[:status] = node[:last][:status]
             node[:time]   = node[:last][:end]
           end
+          if versions.is_a? Array and (not versions.empty?)
+            node[:mtime] = versions.first[:date]
+          end
           node
         end
         out :nodes
@@ -175,7 +186,10 @@ module Oxidized
           num: params[:num]
         }
 
-        @data = HTMLEntities.new.encode(nodes.get_version node, @info[:group], @info[:oid])
+        the_data = nodes.get_version node, @info[:group], @info[:oid]
+        detection = ::CharlockHolmes::EncodingDetector.detect(the_data)
+        utf8_encoded_content = ::CharlockHolmes::Converter.convert the_data, detection[:encoding], 'UTF-8'
+        @data = HTMLEntities.new.encode(utf8_encoded_content)
         out :version
       end
 
@@ -285,7 +299,9 @@ module Oxidized
         old_diff = []
         new_diff = []
 
-        HTMLEntities.new.encode(diff).each_line do |line|
+        detection = ::CharlockHolmes::EncodingDetector.detect(diff)
+        utf8_encoded_content = ::CharlockHolmes::Converter.convert diff, detection[:encoding], 'UTF-8'
+        HTMLEntities.new.encode(utf8_encoded_content).each_line do |line|
           if /^\+/.match(line)
             new_diff.push(line)
           elsif /^\-/.match(line)

data/oxidized-web.gemspec

@@ -1,25 +1,32 @@
 Gem::Specification.new do |s|
   s.name              = 'oxidized-web'
-  s.version           = '0.9.3'
-  s.licenses          = %w( Apache-2.0 )
+  s.version           = '0.10.0'
+  s.licenses          = %w[Apache-2.0]
   s.platform          = Gem::Platform::RUBY
   s.authors           = ['Saku Ytti', 'Samer Abdel-Hafez']
-  s.email             = %w(saku@ytti.fi sam@arahant.net)
+  s.email             = %w[saku@ytti.fi sam@arahant.net]
   s.homepage          = 'http://github.com/ytti/oxidized-web'
   s.summary           = 'sinatra API + webUI for oxidized'
   s.description       = 'puma+sinatra+haml webUI + REST API for oxidized'
   s.rubyforge_project = s.name
-  s.files             = `git ls-files`.split("\n")
-  s.executables       = %w( )
+  s.files             = %x(git ls-files).split("\n")
+  s.executables       = %w[]
   s.require_path      = 'lib'
 
-  s.required_ruby_version =                       '>= 1.9.3'
+  s.required_ruby_version =                       '>= 2.0.0'
+  s.add_runtime_dependency 'charlock_holmes',     '~> 0.7.5'
+  s.add_runtime_dependency 'emk-sinatra-url-for', '~> 0.2'
+  s.add_runtime_dependency 'haml',                '~> 5.0'
+  s.add_runtime_dependency 'htmlentities',        '~> 4.3'
   s.add_runtime_dependency 'oxidized',            '~> 0.21.0'
   s.add_runtime_dependency 'puma',                '~> 3'
+  s.add_runtime_dependency 'sass',                '~> 3.3'
   s.add_runtime_dependency 'sinatra',             '~> 1.4', '>= 1.4.6'
   s.add_runtime_dependency 'sinatra-contrib',     '~> 1.4', '>= 1.4.6'
-  s.add_runtime_dependency 'haml',                '~> 4.0'
-  s.add_runtime_dependency 'sass',                '~> 3.3'
-  s.add_runtime_dependency 'emk-sinatra-url-for', '~> 0.2'
-  s.add_runtime_dependency 'htmlentities',        '~> 4.3'
+  s.add_runtime_dependency 'json',                '>= 1.7.0'
+  s.add_runtime_dependency 'rack-test',           '~> 0.7.0'
+
+  s.add_development_dependency 'rails_best_practices', '~> 1.19'
+  s.add_development_dependency 'rake', '~> 10.0'
+  s.add_development_dependency 'rubocop', '~> 0.55.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized-web
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -9,132 +9,216 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2018-06-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: charlock_holmes
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.5
+- !ruby/object:Gem::Dependency
+  name: emk-sinatra-url-for
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: oxidized
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.6
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.6
 - !ruby/object:Gem::Dependency
-  name: haml
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: emk-sinatra-url-for
+  name: rails_best_practices
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
+        version: '1.19'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.19'
 - !ruby/object:Gem::Dependency
-  name: htmlentities
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
-  type: :runtime
+        version: '10.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.55.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.55.0
 description: puma+sinatra+haml webUI + REST API for oxidized
 email:
 - saku@ytti.fi
@@ -143,9 +227,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .codeclimate.yml
-- .gitignore
-- .rubocop.yml
+- ".codeclimate.yml"
+- ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -180,6 +266,7 @@ files:
 - lib/oxidized/web/public/scripts/script-migration.js
 - lib/oxidized/web/views/conf_search.haml
 - lib/oxidized/web/views/diffs.haml
+- lib/oxidized/web/views/footer.haml
 - lib/oxidized/web/views/head.haml
 - lib/oxidized/web/views/layout.haml
 - lib/oxidized/web/views/migration.haml
@@ -201,17 +288,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: oxidized-web
-rubygems_version: 2.0.14.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: sinatra API + webUI for oxidized