ip_in_range 1.0 → 1.05

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f78cc554313b637067339aa2d806c605b6b7c585281fda8b8cdea2cc8362b7cc
-  data.tar.gz: 69f993155150a984ff2adb49690d6e4da65bc5d550ce28c754a6a9142450da8c
+  metadata.gz: 353a2d86f7e263a1905e030d0c5e8006c1ee4d5bcbd140a23f74c3e8d02acecb
+  data.tar.gz: 1b4ef7718d85e4536515e763e7d858adaa4d083945dfe3df2b65a61729f0705d
 SHA512:
-  metadata.gz: 6181974367f0bed559cd03efad8795f06476e610f847d72fa8b9896f70d70d2c7937d5b6010d3c3e343ea966281b9cbbe1aa8d8cf7e44f937ce0d444c8f8da11
-  data.tar.gz: 5ec959d9ce03441472a4a9da6f67a61c8ecfdc6f3e7d452d88292fdf48a284b0f024c8e2f404bd5f906029de234b08f849af569b5e7949c6e7e6983b0d104055
+  metadata.gz: 21c1e2a1395bd9df2b520beda3a1420666ef7a3d612a887258221262da80b9e0c139f85c80a0e6849909709ca53e1649eaf99c432c7c60d16acf07d260ffc833
+  data.tar.gz: 4c30b698d81a4dc459d7366f3c46ef33a528fe74163e8baa0ca3f662eb479b48315f76da9f39f9e5d72a185624e9708f45deadd2bb5c1898befd0f194eb78034

data/README.md

@@ -5,7 +5,7 @@ To test on address:
 > **ip_in_range first_in_range last_in_range ip_to_check**  
 
 To verify Received-headers:  
-> **ip_in_range < [email] first_in_range last_in_range
+> **ip_in_range < [email] first_in_range last_in_range**
 
 or  
 > **ip_in_range < [email] [range_list.txt]**  

data/bin/ip_in_range

@@ -100,7 +100,7 @@ elsif ARGV.length == 1
             isso = ip_range.in_range?(ip)
             msg = 'ip ' << ip << (isso ? ' is ' : ' is not ' ) << 'in range: ' << l
             if isso
-              info("\n" + msg)
+              info("\nidentified IP: " + msg)
             else
               debug(msg)
             end

data/ip_in_range.gemspec

@@ -14,4 +14,7 @@ Gem::Specification.new do |s|
   s.executables = 'ip_in_range'
   s.license     = 'Nonstandard'
   s.required_ruby_version = '>= 3.0'
+  s.requirements = 'mail'
+  s.add_runtime_dependency 'mail', '~> 2.8', '>= 2.8.1'
+
 end

data/lib/basic_logging.rb

@@ -2,8 +2,7 @@
 #encoding: UTF-8
 =begin
 /***************************************************************************
- *   ©2013-2023, Michael Uplawski <michael.uplawski@uplawski.eu>           *
- *                                                                         *
+ *   2023-2024, Michael Uplawski <michael.uplawski@uplawski.eu>            *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the WTFPL 2.0 or later, see                     * 
  *   http://www.wtfpl.net/about/                                           *
@@ -19,10 +18,6 @@
 # Simplified logging. 
 # See example code at the bottom of this file.
 # Execute this file to see the output.
-#
-
-#require 'time'
-
 module BasicLogging
 
   DEBUG = 0
@@ -53,14 +48,19 @@ module BasicLogging
 
   # set the log level 
   def set_level(lv)
-    if lv.respond_to?(:to_str)
+    if lv.respond_to?(:to_str) && Levels.keys.include?(lv.strip.to_sym)
       lv = Levels[lv.to_sym]
+    elsif lv.respond_to?(:to_sym) && Levels.keys.include?(lv)
+      lv = Levels[lv]
     end
+
     if(!lv || (lv.respond_to?(:to_int) && lv >= DEBUG && lv <= FATAL) )
       @@log_level = lv
     else
-      STDERR.puts __FILE__.dup << ": ERROR : invalid log level \"" << lv.to_s << "\""
-      STDERR.puts "Keepinng old log level " << Levels.keys.detect {| k| Levels[k] == @@log_level}.to_s
+      msg = __FILE__.dup << ": ERROR : invalid log level \"" << lv.to_s << "\""
+      msg << "\n" << "Keepinng old log level " << Levels.keys.detect {| k| Levels[k] == @@log_level}.to_s
+      STDERR.puts msg
+      puts msg
     end
   end
 
@@ -70,6 +70,8 @@ module BasicLogging
       @@target = tg
     elsif(!File::exist?(tg) || ( File.file?(tg) && File.writable?(tg) ) )
       @@target = File.open(tg, 'w+')  
+    elsif !tg || tg.respond_to?(:to_str) && tg.strip.empty?
+      @@target = nil
     else
       STDERR.puts __FILE__.dup << ': ERROR : target ' << tg << ' cannot be set'
       STDERR.puts "Keeping old target " << @@target.inspect
@@ -93,21 +95,52 @@ module BasicLogging
     end
   end
 
+  def target
+    @@target.path if @@target
+  end
+
+  def level
+    @@log_level.to_s if @@log_level
+  end
+
+  # Clear the log (-file)
+  def clear_log
+    if @@target && @@target.respond_to?(:truncate)
+      lock_target{ @@target.truncate(0) }
+    end
+  end
+
   alias :debug :log
   alias :info :log
   alias :warn :log
   alias :error :log
   alias :fatal :log
 
-  attr_reader :target, :log_level
 
   private 
 
+  def lock_target(&block)
+    begin
+      if @@target.respond_to?(:flock) 
+        @@target.flock(File::LOCK_EX)
+        block.call
+        @@target.flock(File::LOCK_UN)
+      elsif @@target.respond_to?(:to_io)
+        block.call
+      end
+    rescue => ex
+      STDERR.puts __FILE__.dup  << ": ERROR : cannot lock target (" << ex.message << ")"
+    end
+  end
+
   # 1 format_log for all loggers.
   def format_log(message, mlevel)
-    # indicate if a registered class or the registered object of a class is calling.
-    name = self.class == Class ? self.name.dup << ' [class]' : self.class.name
-    @@target.puts '' << name << ' ' << mlevel.to_s << ' ' << Time.now.strftime("%H:%M:%S:%6N")  << ': ' << message
+    if @@target
+      clname = self.class.name
+      # indicate if a registered class or the registered object of a class is calling.
+      name = self.class == Class ? self.name.dup << ' [class]' : (clname != 'Object' ? clname : 'Top-Level')
+      lock_target{@@target.puts '' << name << ' ' << mlevel.to_s << ' ' << Time.now.strftime("%H:%M:%S:%6N")  << ': ' << message.gsub("\n", "\n |")}
+    end
   end
 end
 #---------test: execute file----------

data/lib/file_checking.rb

@@ -14,7 +14,7 @@
  ***************************************************************************/
 =end
 
-require 'filemagic'
+# require 'filemagic'
 
 =begin
 A module to facilitate frequently occuring checks on
@@ -86,7 +86,7 @@ module File_Checking
     end
     return nil
   end
-
+=begin
   def self.magic_check(file, magic)
     fm = FileMagic.fm
     fd = fm.fd(File.new(file) ).split(';')[0]
@@ -95,7 +95,7 @@ module File_Checking
     end
     return nil
   end
-
+=end
 end # module
 
 =begin
@@ -107,7 +107,6 @@ msg = file_check('some_file.txt', [:exist?, :readable?, 'writable'])
 # msg = file_check('some_file.txt', [:exist, :readable, 'writable?'])
 
 msg ||= magic_check('some_file.txt', [:type?], 'OpenDocument Text'
-msg ||= mime_check('some_file.txt', [:mime?], 'application/vnd.oasis.opendocument.text'
 puts msg if msg
 =end
 # E O F

data/lib/ip_range.rb

@@ -18,7 +18,7 @@
 
 require_relative 'basic_logging'
 class IPRange 
-  extend BasicLogging  
+  include BasicLogging  
 
   private
   
@@ -54,7 +54,8 @@ class IPRange
       #last IP
       @last = ip_to_number args[1]
       if @last && @first && ( @last < @first )
-        error('ERROR! Last IP is smaller than first. Aborting!') 
+        error('ERROR! Last IP is smaller than the first (' << @first.to_s << ' - ' << @last.to_s << ')')
+        error('Aborting!') 
         exit false
       end
       @vrange = args[0,2] 
@@ -66,6 +67,8 @@ end
 ######### TEST #############
 if __FILE__ == $0
   rg = IPRange.new(['192.168.2.33', '192.168.255.150'])
+  #### ERROR :
+  # rg = IPRange.new(['23.122.9.11', '23.122.8.11'])
   puts rg.first
   puts rg.last
   puts rg.in_range? '192.168.1.35' 

data/lib/version.rb

@@ -13,8 +13,8 @@
  ***************************************************************************/
 =end
 
-VERSION = 1.0
-SUMMARY="New Logging module, new license, Readme for rubygems.org"
+VERSION = 1.05
+SUMMARY="list of dependencies corrected in the gemfile"
 AUTHORS=["Michael Uplawski@uplawski.eu"]
 EMAIL="michael.uplawski@uplawski.eu"
 AUTHORS_MAIL=["<michael.uplawski@uplawski.eu>"]

metadata

@@ -1,15 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: ip_in_range
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.05'
 platform: ruby
 authors:
 - Michael Uplawski@uplawski.eu
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-08 00:00:00.000000000 Z
-dependencies: []
+date: 2025-02-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.1
 description: Verify that an IP is in a range
 email: "<michael.uplawski@uplawski.eu>"
 executables:
@@ -30,7 +49,6 @@ homepage: ''
 licenses:
 - Nonstandard
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -44,9 +62,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
-rubygems_version: 3.4.20
-signing_key:
+requirements:
+- mail
+rubygems_version: 3.6.3
 specification_version: 4
-summary: New Logging module, new license, Readme for rubygems.org
+summary: list of dependencies corrected in the gemfile
 test_files: []