oxidized-web 0.14.0 → 0.15.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized-web
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-28 00:00:00.000000000 Z
+date: 2025-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
@@ -81,20 +81,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: oxidized
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.26'
+        version: '0.31'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.26'
+        version: '0.31'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -102,9 +116,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.11.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 6.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -112,9 +123,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.11.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 6.5.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -122,9 +130,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -132,9 +137,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -142,9 +144,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -152,9 +151,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -245,56 +241,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.64.1
+        version: 1.72.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.64.1
+        version: 1.72.1
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: 0.37.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: 0.37.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.25.0
+        version: 2.30.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.25.0
+        version: 2.30.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -329,14 +325,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: 0.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: 0.13.1
 description: puma+sinatra+haml webUI + REST API for oxidized
 email:
 - saku@ytti.fi
@@ -361,13 +357,11 @@ files:
 - Rakefile
 - docs/development.md
 - lib/oxidized/web.rb
-- lib/oxidized/web/mig.rb
 - lib/oxidized/web/public/css/oxidized.css
 - lib/oxidized/web/public/images/favicon.ico
 - lib/oxidized/web/public/images/oxidizing.png
 - lib/oxidized/web/public/images/oxidizing_40px.png
 - lib/oxidized/web/public/scripts/oxidized.js
-- lib/oxidized/web/public/scripts/script-migration.js
 - lib/oxidized/web/public/weblibs/bootstrap-icons.css
 - lib/oxidized/web/public/weblibs/bootstrap.bundle.js
 - lib/oxidized/web/public/weblibs/bootstrap.bundle.js.map
@@ -391,7 +385,6 @@ files:
 - lib/oxidized/web/views/footer.haml
 - lib/oxidized/web/views/head.haml
 - lib/oxidized/web/views/layout.haml
-- lib/oxidized/web/views/migration.haml
 - lib/oxidized/web/views/node.haml
 - lib/oxidized/web/views/nodes.haml
 - lib/oxidized/web/views/stats.haml
@@ -402,6 +395,8 @@ files:
 - package-lock.json
 - package.json
 - spec/node_spec.rb
+- spec/node_version_spec.rb
+- spec/nodes_spec.rb
 - spec/root_spec.rb
 - spec/spec_helper.rb
 - spec/webapp_spec.rb

data/lib/oxidized/web/mig.rb

@@ -1,140 +0,0 @@
-module Oxidized
-  module API
-    class Mig
-      def initialize(hash_router_db, cloginrc, path_new_router)
-        @hash_router_db = hash_router_db
-        @cloginrc = cloginrc
-        @path_new_router = path_new_router
-      end
-
-      # read cloginrc and return a hash with node name, which a hash value which contains user,
-      # password, eventually enable
-      def cloginrc(clogin_file)
-        close_file = clogin_file
-        file = close_file.read
-        file = file.gsub('add', '')
-
-        hash = {}
-        file.each_line do |line|
-          # stock all device name, and password and enable if there is one
-          line = line.split
-          (0..line.length).each do |i|
-            if line[i] == 'user'
-              # add the equipment and user if not exist
-              hash[line[i + 1]] = { user: line[i + 2] } unless hash[line[i + 1]]
-            # if the equipment exist, add password and enable password
-            elsif line[i] == 'password'
-              if hash[line[i + 1]]
-                if line.length > i + 2
-                  h = hash[line[i + 1]]
-                  h[:password] = line[i + 2]
-                  h[:enable] = line[i + 3] if /\s*/.match(line[i + 3])
-                  hash[line[i + 1]] = h
-                elsif line.length == i + 2
-                  h = hash[line[i + 1]]
-                  h[:password] = line[i + 2]
-                  hash[line[i + 1]] = h
-                end
-              end
-            end
-          end
-        end
-        close_file.close
-        hash
-      end
-
-      def model_dico(model)
-        dico = { 'cisco' => 'ios', 'foundry' => 'ironware' }
-        model = model.gsub("\n", '')
-        model = dico[model] if dico[model]
-        model
-      end
-
-      # add node and group for an equipment (take a list of router.db)
-      def rancid_group(router_db_list)
-        model = {}
-        hash = cloginrc @cloginrc
-        router_db_list.each do |router_db|
-          group = router_db[:group]
-          file_close = router_db[:file]
-          file = file_close.read
-          file = file.gsub(':up', '')
-          file.gsub(' ', '')
-
-          file.each_line do |line|
-            line = line.split(':')
-            node = line[0]
-            next unless hash[node]
-
-            h = hash[node]
-            model = model_dico line[1].to_s
-            h[:model] = model
-            h[:group] = group
-          end
-          file_close.close
-        end
-        hash
-      end
-
-      # write a router.db conf, need the hash and the path of the file we whish create
-      def write_router_db(hash)
-        router_db = File.new(@path_new_router, 'w')
-        hash.each do |key, value|
-          line = key.to_s
-          line += ":#{value[:model]}"
-          line += ":#{value[:user]}"
-          line += ":#{value[:password]}"
-          line += ":#{value[:group]}"
-          line += ":#{value[:enable]}" if value[:enable]
-          router_db.puts(line)
-        end
-        router_db.close
-      end
-
-      def edit_conf_file(path_conf, router_db_path)
-        file_close = File.open(path_conf, 'r')
-        file = file_close
-        file = file.read
-        source_reached = false
-        new_file = []
-        file.each_line do |line|
-          if source_reached
-            next unless /^\w/.match(line)
-
-            source_reached = false
-          end
-          new_file.push(line)
-          next unless /source:/.match(line)
-
-          source_reached = true
-          new_file.push("  default: csv\n")
-          new_file.push("  csv:\n")
-          new_file.push("    file: #{router_db_path}\n")
-          new_file.push("    delimiter: !ruby/regexp /:/\n")
-          new_file.push("    map:\n")
-          new_file.push("      name: 0\n")
-          new_file.push("      model: 1\n")
-          new_file.push("      username: 2\n")
-          new_file.push("      password: 3\n")
-          new_file.push("      group: 4\n")
-          new_file.push("    vars_map:\n")
-          new_file.push("      enable: 5\n")
-          next
-        end
-        file_close.close
-
-        new_conf = File.new(path_conf, "w")
-        new_file.each do |line|
-          new_conf.puts(line)
-        end
-        new_conf.close
-      end
-
-      def go_rancid_migration
-        hash = rancid_group @hash_router_db
-        write_router_db hash
-        edit_conf_file "#{Dir.home}/.config/oxidized/config", @path_new_router
-      end
-    end
-  end
-end

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

@@ -1,15 +0,0 @@
-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/migration.haml

@@ -1,53 +0,0 @@
-.alert.alert-warning
-  The RANCID migration tool is deprecated and will be removed in a future
-  release. If you still need it
-  %b and
-  are willing to maintain it, open an issue at
-  %a{href: 'https://github.com/ytti/oxidized-web/issues'}oxidized-web issues (github)
-
-%h2
-  RANCID to Oxidized
-  %small router.db and Group Migration
-%form.form-horizontal{method: 'post', enctype: 'multipart/form-data',
-                      role: 'form'}
-  .form-group
-    %label.col-sm-3{for: 'path_new_file'}
-      Oxidized router.db Path
-    .col-sm-3
-      %input.form-control{type: 'text', name: 'path_new_file',
-                          placeholder: 'Path/to_file/here.db'}
-  .form-group
-    %label.col-sm-3{for: 'clogrinc'} .cloginrc File
-    .col-sm-3
-      .input-group
-        %input.form-control{type: 'text'}
-        %span.input-group-btn
-          %span.btn.btn-default.btn-file
-            %input{type: 'file', name: 'cloginrc'}
-            Browse
-
-  .form-group
-    .col-sm-12
-      .row
-        %label.col-sm-3.label-control RANCID router.db File
-        %label.col-sm-3.label-control Device Group
-    .col-sm-12#rancid_routerdbs
-      .row#rancidDb1
-        .col-sm-3
-          .input-group
-            %input.form-control{type: 'text'}
-            %span.input-group-btn
-              %span.btn.btn-default.btn-file
-                %input#file1{type: 'file', name: 'file1', required: ''}
-                Browse
-        .col-sm-3
-          %input.form-control#group1{type: 'text', name: 'group1',
-                                     value: 'default'}
-      .row
-        .col-sm-3
-          %button.btn.btn-default#add{type: 'button'} Add More
-
-  .form-group
-    .col-sm-12
-      %button.btn.btn-primary#upload_button{type: 'submit'} Migrate!
-