free-range 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0252edadec09077b1c95f148f2e5dec18a0faf393f7c9b225fc0ca0962b06af
-  data.tar.gz: f45851705405c80dd7ec484c439711716146317e0b19efdba3e4d756f5fce2fa
+  metadata.gz: ce3d41efcb7e6ee1906179227559f6d004b2d07816b3aa230756f4b64f6f0327
+  data.tar.gz: f61a1feddd95066226602b0540c54efeada8a2846c6eb8ba297655a76240454d
 SHA512:
-  metadata.gz: 76e14e7c6e5a94c2f4a88fe987477e8ca960aab236fb2d63b24e7655a694d5e0da57a0b08aee141c4f6b4ecd4e1ec2caf64d671703033ab626a725de30c4a9a5
-  data.tar.gz: 879632d0abb8539b61b99e49af8bf427b786163be9e669e0a5542f2286234666d9c183a360fe21cac97bc9debb1ad97e816b15f18bd1cb494adfb205252c43ad
+  metadata.gz: 2bb942063fff21ce9e3a80e1b6223986da7c2a6ff632d01eb05c2e9c2c1a00faaf6655cc544d5b74fcfe14e5dd64c933d581a016e78078c53d8308f98a1af488
+  data.tar.gz: ce98a667f77b4ee2cf0dccca0cba7655b18ae2251e4e5284051bb366f725f58fc55c47ccaeb01522e056e2d68658804ffb6aee6d5a19d28d4bd23d235c8e56c3

data/lib/free-range.rb

@@ -515,6 +515,47 @@ module FreeRange
     end
   end
 
+  # Обробляє VLAN для інтерфейсу та виводить результати
+  # @param config [Config] Configuration object with commands
+  # @param interface [String, nil] Interface name or nil for all interfaces
+  # @param subscribers_result [String] Result of subscribers command
+  # @param target [String] Target device hostname
+  # @param use_color [Boolean] Enable colored output
+  # @param debug [Boolean] Enable debug output
+  # @param table_mode [Boolean] Display VLAN distribution table
+  # @param table_png_mode [String, nil] Path to save PNG or nil
+  # @return [void]
+  def self.process_and_output(config, interface, subscribers_result, target, use_color, debug, table_mode, table_png_mode)
+    ranges = Ranges.new
+    vlans = Vlans.new
+    subscribers_result.each_line do |line|
+      if line.split.first =~ /dhcp(?:_[0-9a-fA-F.]+)?_([^:]+):(\d+)@#{Regexp.escape(target)}$/
+        subscriber_interface, vlan = $1, $2.to_i
+        if interface
+          vlans.add_vlan(vlan) if subscriber_interface == interface && vlan > 0
+        else
+          vlans.add_vlan(vlan) if vlan > 0
+        end
+      end
+    end
+
+    process_interface(config, interface, ranges, debug)
+    if debug
+      puts "\nІнтерфейс: #{interface}" if interface
+      Print.ranged(ranges)
+      Print.vlans(vlans)
+      Print.vlan_ranges(vlans)
+      puts
+    end
+    if table_png_mode
+      Print.table_png(ranges, vlans, table_png_mode, target, interface)
+    elsif table_mode
+      Print.table(ranges, vlans, use_color, target, interface)
+    else
+      Print.combined_ranges(ranges, vlans, use_color, target, interface)
+    end
+  end
+
   # Основна логіка виконання
   # @return [void]
   def self.run
@@ -562,7 +603,7 @@ module FreeRange
         puts "Помилка: неможливо завантажити конфігураційний файл '#{config_file}'."
         exit 1
       rescue ArgumentError => e
-        puts "Помилка в конфігураційному файлі '#{config_file}': #{e.message}"
+        puts "Помилка в аргументах конфігураційного файлу '#{config_file}': #{e.message}"
         exit 1
       rescue StandardError => e
         puts "Помилка в конфігураційному файлі '#{config_file}': #{e.message}"
@@ -590,6 +631,23 @@ module FreeRange
       c.password = config.password if config.password
     }
 
+    if debug
+      puts "[DEBUG] Values:"
+      puts "[DEBUG] use_color: #{use_color}"
+      puts "[DEBUG] table_mode: #{table_mode}"
+      puts "[DEBUG] table_png_mode: #{table_png_mode}"
+      puts "[DEBUG] interface: #{interface}"
+      puts "[DEBUG] ARGV[0]: #{ARGV[0]}"
+      puts "[DEBUG] target: #{target}"
+      puts "[DEBUG] login: #{login}"
+      puts "[DEBUG] config_file: #{config_file}"
+      puts "[DEBUG] config.username: #{config.username}"
+      puts "[DEBUG] config.password: #{config.password}"
+      puts "[DEBUG] config.ssh_command: #{config.ssh_command}"
+      puts "[DEBUG] config.subscribers_command: #{config.subscribers_command}"
+      puts "[DEBUG] config.command_interfaces: #{config.command_interfaces}"
+    end
+
     subscribers_result = `#{config.subscribers_command}`.strip
     if subscribers_result.empty?
       puts "Помилка: результат subscribers_command порожній. Перевір шлях або доступ."
@@ -612,60 +670,10 @@ module FreeRange
       end
 
       interfaces.each do |intf|
-        ranges = Ranges.new
-        vlans = Vlans.new
-        subscribers_result.each_line do |line|
-          if line.split.first =~ /dhcp(?:_[0-9a-fA-F.]+)?_([^:]+):(\d+)@#{Regexp.escape(target)}$/
-            subscriber_interface, vlan = $1, $2.to_i
-            vlans.add_vlan(vlan) if subscriber_interface == intf && vlan > 0
-          end
-        end
-
-        process_interface(config, intf, ranges, debug)
-        if debug
-          puts "\nІнтерфейс: #{intf}"
-          Print.ranged(ranges)
-          Print.vlans(vlans)
-          Print.vlan_ranges(vlans)
-          puts
-        end
-        if table_png_mode
-          Print.table_png(ranges, vlans, table_png_mode, target, intf)
-        elsif table_mode
-          Print.table(ranges, vlans, use_color, target, intf)
-        else
-          Print.combined_ranges(ranges, vlans, use_color, target, intf)
-        end
+        process_and_output(config, intf, subscribers_result, target, use_color, debug, table_mode, table_png_mode)
       end
     else
-      ranges = Ranges.new
-      vlans = Vlans.new
-      subscribers_result.each_line do |line|
-        if line.split.first =~ /dhcp(?:_[0-9a-fA-F.]+)?_([^:]+):(\d+)@#{Regexp.escape(target)}$/
-          subscriber_interface, vlan = $1, $2.to_i
-          if interface
-            vlans.add_vlan(vlan) if subscriber_interface == interface && vlan > 0
-          else
-            vlans.add_vlan(vlan) if vlan > 0
-          end
-        end
-      end
-
-      process_interface(config, interface, ranges, debug)
-      if debug
-        puts "\nІнтерфейс: #{interface}" if interface
-        Print.ranged(ranges)
-        Print.vlans(vlans)
-        Print.vlan_ranges(vlans)
-        puts
-      end
-      if table_png_mode
-        Print.table_png(ranges, vlans, table_png_mode, target, interface)
-      elsif table_mode
-        Print.table(ranges, vlans, use_color, target, interface)
-      else
-        Print.combined_ranges(ranges, vlans, use_color, target, interface)
-      end
+      process_and_output(config, interface, subscribers_result, target, use_color, debug, table_mode, table_png_mode)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: free-range
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Oleksandr Russkikh //aka Olden Gremlin