oxidized-web 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d6d01a9cc5ccc9c98d97a28166667c205f32286
-  data.tar.gz: 4a87180d8b75f7c94a1d5135296e31e60bd2ab97
+  metadata.gz: b110dab12b4cab01fcf16a030447b672d7e9f1b0
+  data.tar.gz: 4527869b82a903d1f466ae012488923d3368fdd1
 SHA512:
-  metadata.gz: 56238ef9618517581efbdb29d9309ab02cf6d41210f1511c147bf6d33224a019fe2508b08cd35cf9eea31bcae203f47a3a59232e2d4fa8cd2c707d7e26b85002
-  data.tar.gz: 9cd62137cd2ce3b23302de68d3ae750829abca616bc469df3c18db14c8c3d8e68e22d110ba6ef104502e9790459e75b3c6f5533d39ec4b89c178ec3f2dd9c330
+  metadata.gz: dbad3adcb6828d522f0a2d3898dc0e7f63469f414ae9bad8c8836518deff71c3870880672022afc3245b91d5532d1622cc4e7810e96f109cb1ce9bdfd0cef397
+  data.tar.gz: da4959a59533f5e22d84cc7a7d3e702e27aff6760f182c12cce8e67e50184dbee48c6a145d8113f4bd712e0bbb6019a0eeafdbb3e1c7452d02e381ce77f15d9f

data/lib/oxidized/web/webapp.rb

@@ -1,8 +1,8 @@
 require 'sinatra/base'
 require 'sinatra/json'
 require 'sinatra/url_for'
-require 'haml'
-require 'sass'
+require 'tilt/haml'
+require 'tilt/sass'
 require 'pp'
 require 'oxidized/web/mig'
 module Oxidized
@@ -10,7 +10,7 @@ module Oxidized
     class WebApp < Sinatra::Base
       helpers Sinatra::UrlForHelper
       set :public_folder, Proc.new { File.join(root, "public") }
-      
+
       get '/' do
         redirect url_for('/nodes')
       end
@@ -28,8 +28,8 @@ module Oxidized
         end
         out :nodes
       end
-      
-      post '/nodes/conf_search' do 
+
+      post '/nodes/conf_search' do
         @to_research = params[:search_in_conf_textbox]
         nodes_list = nodes.list.map
         @nodes_match = []
@@ -99,12 +99,12 @@ module Oxidized
         @data = nodes.show node
         out :node
       end
-      
+
       #redirect to the web page for rancid - oxidized migration
       get '/migration' do
         out :migration
       end
-      
+
       #get the files send
       post '/migration' do
         number = params[:number].to_i
@@ -112,7 +112,7 @@ module Oxidized
         path_new_file = params['path_new_file']
 
         router_db_files = Array.new
-        
+
         i = 1
         while i <= number do
           router_db_files.push({:file=>(params["file"+i.to_s][:tempfile]), :group=>params["group"+i.to_s]})
@@ -122,13 +122,13 @@ module Oxidized
         migration = Mig.new(router_db_files, cloginrc_file, path_new_file)
         migration.go_rancid_migration
         redirect url_for("//nodes")
-     
+
       end
-      
+
       get '/css/*.css' do
         sass "sass/#{params[:splat].first}".to_sym
       end
-      
+
       #show the lists of versions for a node
       get '/node/version.?:format?' do
         @data = nil
@@ -146,7 +146,7 @@ module Oxidized
         end
         out :versions
       end
-      
+
       #show the blob of a version
       get '/node/version/view.?:format?' do
         node, @json = route_parse :node
@@ -154,7 +154,7 @@ module Oxidized
         @data = nodes.get_version node, @info[:group], @info[:oid]
         out :version
       end
-      
+
       #show diffs between 2 version
       get '/node/version/diffs' do
         node, @json = route_parse :node
@@ -191,12 +191,12 @@ module Oxidized
         @diff = diff_view @data
         out :diffs
       end
-      
+
       #used for diff between 2 distant commit
       post '/node/version/diffs' do
         redirect url_for("/node/version/diffs?node=#{params[:node]}&group=#{params[:group]}&oid=#{params[:oid]}&date=#{params[:date]}&num=#{params[:num]}&oid2=#{params[:oid2]}")
       end
-      
+
       private
 
       def out template=:default
@@ -231,7 +231,7 @@ module Oxidized
         end
         [e.join('.'), json]
       end
-      
+
       #give the time enlapsed between now and a date
       def time_from_now date
         if date
@@ -255,12 +255,12 @@ module Oxidized
         end
         date
       end
-      
+
       #method the give diffs in separate view (the old and the new) as in github
       def diff_view diff
         old_diff = []
         new_diff = []
-        
+
         diff.each_line do |line|
           if /^\+/.match(line)
             new_diff.push(line)
@@ -271,7 +271,7 @@ module Oxidized
             old_diff.push(line)
           end
         end
-        
+
         length_o = old_diff.count
         length_n = new_diff.count
         for i in 0..[length_o, length_n].max
@@ -292,7 +292,7 @@ module Oxidized
             length_o += 1
           end
         end
-        both_diff = {:old_diff => old_diff, :new_diff => new_diff}
+        {:old_diff => old_diff, :new_diff => new_diff}
       end
     end
   end

data/oxidized-web.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'oxidized-web'
-  s.version           = '0.5.0'
+  s.version           = '0.5.1'
   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.2'
+  s.add_runtime_dependency 'oxidized',            '~> 0.8'
   s.add_runtime_dependency 'puma',                '~> 2.8'
   s.add_runtime_dependency 'sinatra',             '~> 1.4'
   s.add_runtime_dependency 'sinatra-contrib',     '~> 1.4'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized-web
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Saku Ytti
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oxidized
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement