oxidized-web 0.2.0 → 0.3.0

data/lib/oxidized/web/public/scripts/script-migration.js

@@ -0,0 +1,15 @@
+var number = 1;
+
+function add_file_upload(){
+	number++;
+	document.getElementById('number').value = number;
+	var table = document.getElementById("files");
+	var row = table.insertRow(-1);
+	var group = row.insertCell(0);
+	group.id = "file";
+	var file = row.insertCell(1);
+	file.id = "file";
+	group.innerHTML = '<input type="text" name="group' + number +'" value="default">';
+	file.innerHTML = '<input type="file" name="file' + number +'" required >';
+	
+}

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

@@ -0,0 +1,69 @@
+!=haml :head
+%body
+  %h4
+    - node_full = ''
+    - if @info[:group] != ''
+      - node_full = "#{@info[:group] + '/' + @info[:node]}"
+    - else
+      - node_full = "#{@info[:node]}"
+    %a{:href=>url_for("/node/version?node_full=#{node_full}")} versions
+    \/ Diff version #{@info[:num]} - #{@info[:num2]} for Node 
+    %span{:class=>'node_title'} #{@info[:node]}
+  - date_version = Time.parse @info[:date]
+  Date of version: #{date_version.strftime("%d-%m-%y at %r")}
+  %br
+  Number of lines changed: 
+  %span{:class=>'added'}added #{@stat[0]} 
+  %span{:class=>'deleted'}removed #{@stat[1]}
+  %br
+  %br
+  %form{ :action => "/node/version/diffs?node=#{@info[:node]}&group=#{@info[:group]}&oid=#{@info[:oid]}&date=#{@info[:date]}&num=#{@info[:num]}", :method => "post"}
+    %select{:name => "oid2", :id => "oid2"}
+      - diff2 = {}
+      - num = @oids_dates.count + 1
+      - next_id = false
+      - @oids_dates.each do |x|
+        %option{:value => x[:oid]} Version #{num -= 1} (#{time_from_now x[:date]})
+        - if (x[:oid].to_s == @info[:oid2]) || (next_id)
+          - diff2 = {:num => num, :date => x[:date]}
+          - next_id = false
+        - elsif (x[:oid].to_s == @info[:oid]) && !(@info[:oid2])
+          - next_id = true
+        
+          
+    %input{:type => "submit", :value => "Get diffs !"}
+  %br
+  %div{:class=>'old_version_title'} Version #{diff2[:num]} (#{time_from_now diff2[:date]})
+
+  %div{:class=>'new_version_title'} Version #{@info[:num]} (#{time_from_now @info[:date]})
+  %br
+  %div{:class=>'diffs_old', :id=>'Test'}
+    - @diff[:old_diff].each do |line|
+      - if /^\+.*/.match(line)
+        %div{:class=>'added',:id=>'Test'} #{line}
+        
+      - elsif /^\-.*/.match(line)
+        %div{:class=>'deleted'} #{line}
+        
+      - elsif /^@@\s.*@@.*$/.match(line)
+        %div{:class=>'diff-index', :id=>'Test'} #{line}
+      - elsif /^empty_line /.match(line)
+        - line.slice! "empty_line"
+        %div{:class=>'diff-empty'} #{line}
+      - else
+        %div #{line}
+  %div{:class=>'diffs_new'}
+    -  @diff[:new_diff].each do |line|
+      - if /^\+.*/.match(line)
+        %div{:class=>'added'} #{line}
+      
+      - elsif /^\-.*/.match(line)
+        %div{:class=>'deleted'} #{line}
+      
+      - elsif /^@@\s.*@@.*$/.match(line)
+        %div{:class=>'diff-index'} #{line}
+      - elsif /^empty_line /.match(line)
+        - line.slice! "empty_line"
+        %div{:class=>'diff-empty'} #{line}
+      - else
+        %div #{line}

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

@@ -0,0 +1,41 @@
+!=haml :head
+%script{:src=>url_for('/scripts/script-migration.js')}
+%body
+  
+  %span{:id=>"migration_span"}
+    Here you can migrate from your Rancid to Oxidized.
+    %br
+    To do it, just execute te following actions :
+  %br
+  %br
+  %form(method="post" enctype="multipart/form-data")
+    %label{:for=>"path_new_file"} Set the path for your future equipement file in .db format
+    %br
+    %input{:type=>"text", :name=>"path_new_file", :value=>"Path/to_file/here.db"}
+    %br
+    %br
+    %label{:for=>"cloginrc"} Select your .cloginrc file, must be readeable
+    %input{:type=>"file", :name=>"cloginrc"}
+    %br
+    %label{:for=>"files"} Select all your router.db fies of rancid, and add their group (Click "Add file" if you have multiple files)
+    %table{:id=>"files", :name=>"files"}
+      %th{:id=>"file"} Group
+      %th{:id=>"file"} File
+      %tbody
+        %tr
+          %td{:id=>"file"}
+            %input{:type=>"text", :name=>"group1", :value=>"default"}
+          %td{:id=>"file"}
+            %input{:type=>"file", :name=>"file1", :required=>""}
+    %br
+    %input(type='button' value ='Add file' onclick="add_file_upload();")
+    %br
+    %br
+    %label{:for=>"upload_button"}Then Click "Migrate" to do your migration
+    %br
+    %input(type='submit' value='Migrate !' id="upload_button")
+    /
+      used to know the numbers of files router.db
+    %input(type='hidden' value='1' id='number' name='number')
+    
+  

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

@@ -1,22 +1,34 @@
 %script{:src=>url_for('/scripts/jquery-2.1.1.min.js')}
 %script{:src=>url_for('/scripts/jquery.dataTables.min.js')}
 %script{:src=>url_for('/scripts/dataTables.bootstrap.js')}
+%script{:src=>url_for('/scripts/dataTables.colVis.js')}
 %link{:rel=>'stylesheet', :href=>url_for('/css/dataTables.bootstrap.css')}
+%link{:rel=>'stylesheet', :href=>url_for('/css/dataTables.colVis.css')}
 :javascript
   $(function() {
     $('#nodesTable').dataTable({
-      "dom": '<"H"flr>tip',
-      "lengthMenu": [[50, 250, 500, -1], [50, 250, 500, "All"]]
+      dom: 'C<"clear">lfrtip',
+      "lengthMenu": [[50, 250, 500, -1], [50, 250, 500, "All"]],
+      columnDefs: [
+        { visible: false, targets: 1 },
+        {type: "string", targets: 3}
+      ],
+      colVis: {
+            exclude: [ 0, 5 ]
+        }
     });
   });
 %div{:class=>'row tbl-header'}
   %div{:class=>'col-xs-12 col-md-2'}
     %h4 nodes /
-  %div{:class=>'col-xs-12 col-md-10'}
-    %a{:class=>"btn btn-default tbl-action col-xs-12 col-md-2 col-md-offset-10", :id=>"reload", :href=>url_for("/nodes")}
-      %span{:class=>"glyphicon glyphicon-repeat"}
-      Refresh
+%button{:onclick => "location.href='/migration'" }
+  %span migration
 %div{:class=>'row'}
+  %div{:class=>'refresh-div'}
+    %form
+      %button{:class => "ColVis_Button", :type => "button", :onclick => "history.go();"}
+        %span{:class=>"glyphicon glyphicon-repeat"}
+        Refresh
   %table{:id=>'nodesTable', :class=>'table table-responsive tablesorter'}
     %thead
       %tr
@@ -25,8 +37,8 @@
         %th Group
         %th Last Status
         %th Last Update
-        %th Config
-        %th Update
+        %th Actions
+
     %tbody
       -trclass = %w(even odd)
       -@data.sort_by{|e|e[:name]}.each do |node|
@@ -36,11 +48,15 @@
             %a{:href => url_for("/node/show/#{node[:name]}") } #{node[:name]}
           %td= node[:ip]
           %td= node[:group]
-          %td= node[:status]
+          %td
+            %div{:title=>node[:status], :class=>node[:status]}
           %td= node[:time]
           %td
-            %a{:href => url_for("/node/fetch/#{node[:full_name]}") }
+            %a{:title => "configuration", :href => url_for("/node/fetch/#{node[:full_name]}") }
               %span{:class=>'glyphicon glyphicon-cloud-download'}
-          %td
-            %a{:href => url_for("/node/next/#{node[:full_name]}") }
-              %span{:class=>'glyphicon glyphicon-repeat'}
+            &nbsp;&nbsp;
+            %a{:title => "versions", :href => url_for("/node/version?node_full=#{node[:full_name]}") }
+              %img{:src=>url_for('/images/versioning_18px.png')}
+            &nbsp;&nbsp;
+            %a{:title => "update", :href => url_for("/node/next/#{node[:full_name]}") }
+              %span{:class=>'glyphicon glyphicon-repeat'}

data/lib/oxidized/web/views/sass/oxidized.sass

@@ -43,3 +43,91 @@ input#search
 
 input#search .focused
     border-bottom: 1px dotted #FFA600 !important
+    
+.added
+    background-color: #DBFFDB
+
+.deleted
+    background-color: #FFDDDD
+
+.diff-index
+    background-color: #FFFF99
+    
+.diff-empty
+    background-color: #F0F0F0 
+    
+.diffs
+    background-color: FAFAFA
+    border: 2px solid #ccc
+    border-radius: 5px
+    padding: 3px
+    
+.diffs_old
+    @extend .diffs
+    float: left
+    width: 49%
+    white-space: nowrap
+    overflow: auto
+
+.diffs_new
+    @extend .diffs
+    margin-left: 51%
+    width: 49%
+    white-space: nowrap
+    overflow: auto
+
+.node_title
+    @extend .diffs
+    border-radius: 0px
+
+.old_version_title
+    float: left
+    width: 49%
+    font-weight: bold
+.new_version_title
+    margin-left: 51%
+    font-weight: bold
+
+.refresh-div
+    float: right
+    padding-left: 5px
+
+
+.status
+    float: right
+    width: 15px
+    height: 15px
+    border: 1px solid
+    margin-right: 70%
+    margin-bottom: 0px
+    border-radius: 2px
+.success
+    @extend .status
+    background-color: #64FE2E
+ 
+.no_connection
+    @extend .status
+    background-color: #FF0000
+.never
+    @extend .status
+    background-color: #58ACFA
+
+a:hover
+    text-decoration: none 
+
+#migration_span
+    font-size: 20px
+    font-weight: bold
+    
+table#files
+    width: 70%
+    border: 1px solid
+    
+th#file
+    width: 50%
+    height: 30px
+    text-align: center
+
+td#file
+    @extend th#file
+    padding: 15px

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

@@ -0,0 +1,19 @@
+!=haml :head
+%body
+  %h4
+    - if @info[:group] != ''
+      %a{:href=>url_for("/node/version?node_full=#{@info[:group] + '/' + @info[:node]}")} versions
+    - else    
+      %a{:href=>url_for("/node/version?node_full=#{@info[:node]}")} versions
+    \/ version #{@info[:num]}  for Node 
+    %span{:class=>'node_title'} #{@info[:node]}
+    
+  - date_version = Time.parse @info[:date]
+  Date of version: #{date_version.strftime("%d-%m-%y at %r")}
+  %br
+  %br
+  %div{:class=>'diffs'}
+    - @data.each_line do |line|
+      %div #{line}
+
+  

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

@@ -0,0 +1,54 @@
+%script{:src=>url_for('/scripts/jquery-2.1.1.min.js')}
+%script{:src=>url_for('/scripts/jquery.dataTables.min.js')}
+%script{:src=>url_for('/scripts/dataTables.bootstrap.js')}
+%script{:src=>url_for('/scripts/dataTables.colVis.js')}
+%link{:rel=>'stylesheet', :href=>url_for('/css/dataTables.bootstrap.css')}
+%link{:rel=>'stylesheet', :href=>url_for('/css/dataTables.colVis.css')}
+:javascript
+  $(function() {
+    $('#versionsTable').dataTable({
+      dom: 'C<"clear">lfrtip',
+      "order": [[ 0, "desc" ]],
+      colVis: {
+            exclude: [ 2 ]
+        }
+    });
+  });
+%div{:class=>'row tbl-header'}
+  %div{:class=>'col-xs-12 '}
+    %h4
+      %a{:href=>url_for('/nodes')} nodes
+      \/ Versions for Node 
+      %span{:class=>'node_title'} #{@node}
+  
+%div{:class=>'row'}
+  %div{:class=>'refresh-div'}
+    %form
+      %button{:class => "ColVis_Button", :type => "button", :onclick => "history.go();"}
+        %span{:class=>"glyphicon glyphicon-repeat"}
+        Refresh
+  %table{:id=>'versionsTable', :class=>'table table-responsive tablesorter'}
+    %thead
+      %tr
+        %th Version
+        %th Dates
+        %th Actions
+
+    %tbody
+      -trclass = %w(even odd)
+      - nb = @data.count + 1
+      - @data.each do |x|
+        %tr
+          %td
+            #{nb -= 1}
+          %td
+            #{time_from_now x[:date]}
+          %td
+            %a{:title => "configuration", :href => url_for("/node/version/view?node=#{@node}&group=#{@group}&oid=#{x[:oid]}&date=#{x[:date]}&num=#{nb}") }
+              %span{:class=>'glyphicon glyphicon-cloud-download'} 
+            &nbsp;&nbsp;
+            %a{:title => "diff", :href => url_for("/node/version/diffs?node=#{@node}&group=#{@group}&oid=#{x[:oid]}&date=#{x[:date]}&num=#{nb}") }
+              %img{:src=>url_for('/images/diff_15x17.png')}
+          
+
+    

data/lib/oxidized/web/webapp.rb

@@ -4,6 +4,8 @@ require 'sinatra/url_for'
 require 'haml'
 require 'sass'
 require 'pp'
+require 'pp'
+require 'oxidized/web/mig'
 module Oxidized
   module API
     class WebApp < Sinatra::Base
@@ -84,11 +86,104 @@ 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
+        cloginrc_file = params['cloginrc'][:tempfile]
+        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]})
+          i = i+1
+        end
 
+        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' do
+        @data = nil
+        @group = nil
+        @node = nil
+        node_full = params[:node_full]
+        if node_full.include? "/"
+          node_full = node_full.split('/')
+          @group = node_full[0]
+          @node = node_full[1]
+          @data = nodes.version @node, @group
+        else
+          @node = node_full
+          @data = nodes.version @node, nil
+        end
+        out :versions
+      end
+      
+      #show the blob of a version
+      get '/node/version/view' do
+        node, @json = route_parse :node
+        @info = {:node => node, :group => params[:group],:oid => params[:oid],:date => params[:date],:num => params[:num]}
+        @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
+        @data = nil
+        @info = {:node => node, :group => params[:group],:oid => params[:oid],:date => params[:date],:num => params[:num], :num2 => (params[:num].to_i - 1)}
+        group = nil
+        if @info[:group] != ''
+          group = @info[:group]
+        end
+        @oids_dates = nodes.version node, group
+        if params[:oid2]
+          @info[:oid2] = params[:oid2]
+          oid2 = nil
+          num = @oids_dates.count + 1
+          @oids_dates.each do |x|
+            num -= 1
+            if x[:oid].to_s == params[:oid2]
+              oid2 = x[:oid]
+              @info[:num2] = num
+              break
+            end
+          end
+          @data = nodes.get_diff node, @info[:group], @info[:oid], oid2
+        else
+          @data = nodes.get_diff node, @info[:group], @info[:oid], nil
+        end
+        @stat = ["null","null"]
+        if @data != 'no diffs' && @data != nil
+          @stat = @data[:stat]
+          @data = @data[:patch]
+        else
+          @data = "no available"
+        end
+        @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
@@ -115,6 +210,69 @@ module Oxidized
         end
         [e.join('.'), json]
       end
+      
+      #give the time enlapsed between now and a date
+      def time_from_now date
+        if date
+          #if the + is missing
+          unless date.include? "+"
+            date.insert(21, "+")
+          end
+          date = DateTime.parse date
+          now = DateTime.now
+          t = ((now - date) * 24 * 60 * 60).to_i
+          mm, ss = t.divmod(60)
+          hh, mm = mm.divmod(60)
+          dd, hh = hh.divmod(24)
+          if dd > 0
+           date = "#{dd} days #{hh} hours ago"
+          elsif hh > 0
+            date = "#{hh} hours #{mm} min ago"
+          else
+            date = "#{mm} min #{ss} sec ago"
+          end
+        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)
+          elsif /^\-/.match(line)
+            old_diff.push(line)
+          else
+            new_diff.push(line)
+            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
+          if i > [length_o, length_n].min
+            break
+          end
+          if (/^\-.*/.match(old_diff[i])) && !(/^\+.*/.match(new_diff[i]))
+            #tag removed latter to add color syntax
+            insert = 'empty_line'
+            #ugly way to avoid asymmetry if at display the line takes 2 line on the screen
+            insert = "&nbsp;\n"
+            new_diff.insert(i,insert)
+            length_n += 1
+          elsif !(/^\-.*/.match(old_diff[i])) && (/^\+.*/.match(new_diff[i]))
+            insert = 'empty_line'
+            insert = "&nbsp;\n"
+            old_diff.insert(i,insert)
+            length_o += 1
+          end
+        end
+        both_diff = {:old_diff => old_diff, :new_diff => new_diff}
+      end
     end
   end
 end