oxidized-web 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a6c99156a4f1b11e6191cebbc45930a1a9b08c3
-  data.tar.gz: b1b53cd9ad617946022cdc76c7a434dea13dbbf8
+  metadata.gz: c961dc5e881fa1ff198d051155548ce78c83aa28
+  data.tar.gz: 96c4683669a7be4399b5861b5c71ef6dc71ec474
 SHA512:
-  metadata.gz: eece9ad88b2bae1ce741199d3402da38c1fc2aaf2a38b0f8b1bc076b2c134f8f6f49670ac4a3c2fd1ac92ed2c05cb493fe0d8f8dbf153a2ef9d99a5bdc9e544e
-  data.tar.gz: 283a0bb900bd859e92ee320ae792b9250bd55d75f2181d0b5c3bbb98ecabe304601863ac78bdf4551c8ae34b9cfec5173f05e777d6fc3da40317fc9a2c3f22a8
+  metadata.gz: e1d2f501cb2325ceb4cd30d601d11ee395a80d8f06ea5f0ff2b38a977c9ad09718cc772b2ed1a35ec07aff624ce7ae8894e6c35303a3199937eedea8e4319924
+  data.tar.gz: ae93b452c2d73f24c86b4e1d696e6f48c01bb981d41f8f31d556ee80ff9c9ad76a7dc3dd01aa25a050ce2b983bab40bdd631a311b511e53d8300f8759ce4a268

data/.gitignore

@@ -1,2 +1,50 @@
-Gemfile.lock
-gems
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+# Used by dotenv library to load environment variables.
+# .env
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+*.bridgesupport
+build-iPhoneOS/
+build-iPhoneSimulator/
+
+## Specific to RubyMotion (use of CocoaPods):
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# vendor/Pods/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalization:
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+
+# 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
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc

data/Rakefile

@@ -1,10 +1,5 @@
-begin
-  require 'rake/testtask'
-  require 'bundler'
-  # Bundler.setup
-rescue LoadError
-  warn 'bundler missing'
-end
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 gemspec = eval(File.read(Dir['*.gemspec'].first))
 file    = [gemspec.name, gemspec.version].join('-') + '.gem'
@@ -17,27 +12,21 @@ end
 desc 'Run minitest'
 task :test do
   Rake::TestTask.new do |t|
-    t.libs.push 'lib'
-    t.test_files = FileList['spec/*_spec.rb']
+    t.libs << 'spec'
+    t.test_files = FileList['spec/**/*_spec.rb']
+    t.warning = true
     t.verbose = true
   end
 end
 
-desc 'Build gem'
-task :build do
-  system "gem build #{gemspec.name}.gemspec"
-  FileUtils.mkdir_p 'gems'
-  FileUtils.mv file, 'gems'
-end
-
-desc 'Install gem'
-task install: :build do
-  system "sudo -Es sh -c \'umask 022; gem install gems/#{file}\'"
-end
+## desc 'Install gem'
+## task :install => :build do
+##   system "sudo -Es sh -c \'umask 022; gem install gems/#{file}\'"
+## end
 
 desc 'Remove gems'
 task :clean do
-  FileUtils.rm_rf 'gems'
+  FileUtils.rm_rf 'pkg'
 end
 
 desc 'Tag the release'
@@ -46,6 +35,8 @@ task :tag do
 end
 
 desc 'Push to rubygems'
-task push: :tag do
-  system "gem push gems/#{file}"
+task :push => :tag do
+  system "gem push pkg/#{file}"
 end
+
+task default: :test

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') { return; }
+    if(content === 'never' || 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/head.haml

@@ -2,6 +2,7 @@
   %meta{charset: 'utf-8'}
   %meta{:'meta-equiv' => 'X-UA-Compatible', content: 'IE=edge'}
   %meta{name: 'viewport', content: 'width=device-width, initial-scale=1'}
+  %meta{name: 'google', content: 'notranslate'}
   %title oxidized
   %link{rel: 'stylesheet', href: url_for('/css/bootstrap.min.css')}
   %link{rel: 'stylesheet', href: url_for('/css/oxidized.css')}

data/lib/oxidized/web/webapp.rb

@@ -45,7 +45,7 @@ module Oxidized
         out :nodes
       end
 
-      post '/nodes/conf_search' do
+      post '/nodes/conf_search.?:format?' do
         @to_research = Regexp.new params[:search_in_conf_textbox]
         nodes_list = nodes.list.map
         @nodes_match = []
@@ -56,6 +56,7 @@ module Oxidized
             @nodes_match.push({ node: n[:name], full_name: n[:full_name] })
           end
         end
+        @data = @nodes_match
         out :conf_search
       end
 
@@ -262,7 +263,7 @@ module Oxidized
             date.insert(21, '+')
           end
           date = DateTime.parse date
-          now = DateTime.now
+          now = DateTime.now.new_offset(0)
           t = ((now - date) * 24 * 60 * 60).to_i
           mm, ss = t.divmod(60)
           hh, mm = mm.divmod(60)

data/oxidized-web.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'oxidized-web'
-  s.version           = '0.7.1'
+  s.version           = '0.8.0'
   s.licenses          = %w( Apache-2.0 )
   s.platform          = Gem::Platform::RUBY
   s.authors           = ['Saku Ytti', 'Samer Abdel-Hafez']
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.require_path      = 'lib'
 
   s.required_ruby_version =                       '>= 1.9.3'
-  s.add_runtime_dependency 'oxidized',            '~> 0.13'
+  s.add_runtime_dependency 'oxidized',            '~> 0.19'
   s.add_runtime_dependency 'puma',                '~> 2.8'
   s.add_runtime_dependency 'sinatra',             '~> 1.4', '>= 1.4.6'
   s.add_runtime_dependency 'sinatra-contrib',     '~> 1.4', '>= 1.4.6'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized-web
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oxidized
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oxidized-web
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: sinatra API + webUI for oxidized