evesync 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89f74020a22ae230f9ff9d31d26a7983acde3cc073a4ef9e70e6f053d028e91f
-  data.tar.gz: 593bfa7b50fd6a2f17818cb00a9e1394c3409808c724469bc3bad706ead0e4ff
+  metadata.gz: 2dfabc12dbd6228ae7855ffd195a96ebc4b2c9c2164e477d41eed688f9b4bac2
+  data.tar.gz: 2888ea5a7979af4fe27b519c864e57867d08f74bf5a1f44704eb90b9b49c6f1a
 SHA512:
-  metadata.gz: 596d803d35d866764391284a1c65eead4e73d7ab7a73304d5d7f4b6275943988b829b340f87b676f3fc8aef99b589df2a5bbbd42297a22e577edaf4839a0f4c7
-  data.tar.gz: 5520247054b67b98b9753c07bf50ef099ea01e3f9777beaf23cbf0a2cf9947022e50e274ebb6c5bdebccde17c779361797d31b3d8acdb8f00c0afcbb90109f2d
+  metadata.gz: 221f04a0720876831f2da1f0c70cdcb97dca47f74f0fa50ccd6d8f92ac8efce5c4301d4d3c77601f1baf463faf3a8217e3a642a69cb9a7f35fd7f7ba0ef59c0a
+  data.tar.gz: 96720c0c6380d98df1f32e1466612aebb33365eff865749133545a31215896560b221297b72b3b3f8fe1138f5c435c48320c9c7b7c246e9ac21e6d6e1459b3a4

data/Rakefile

@@ -9,7 +9,7 @@ GEMFILE = "evesync-#{VERSION}.gem".freeze
 task default: %i[lint build]
 
 task :lint do
-  sh 'rubocop -l lib' if find_executable 'rubocop'
+  sh 'rubocop -l lib bin' if find_executable 'rubocop'
 end
 
 task :rdoc do
@@ -37,8 +37,7 @@ task :clean, [:remove_rpm] do |_t, args|
   rm_rf('mkmf.log')
   rm_rf(Dir['*.zip'])
   rm_rf('RPM') if args[:remove_rpm] == 1
-  rm_rf("evesync-#{VERSION}")
-  rm_rf(GEMFILE)
+  rm_rf(Dir['evesync-*.gem'])
 end
 
 task todos: :todo

data/bin/evesync

@@ -22,6 +22,22 @@ $program = File.basename($0)
 #Evesync::Log.level = :warn
 Evesync::Log.simple = true
 
+def kill_by_pid(daemon)
+  begin
+    Process.kill('TERM', File.read("/var/run/evesync/#{daemon}.pid").to_i)
+  rescue Errno::ESRCH
+    puts("#{daemon} already killed")
+  end
+end
+
+def spawn_daemon(daemon)
+  pid = spawn(daemon,
+        :err => "/var/log/evesync/#{daemon}.log",
+        :out=>:err)
+  File.write("/var/run/evesync/#{daemon}.pid", pid)
+  pid
+end
+
 OptionParser.new do |parser|
   parser.banner = "#{$program} [OPTIONS...]
 
@@ -68,26 +84,20 @@ OptionParser.new do |parser|
 
   # TODO: refactor
   parser.on('-r', '--run', 'Start daemons') do
-    r, w = IO.pipe
-    data_pid = spawn('evedatad', :err => '/var/log/evesync/evedatad.log', :out=>:err)
-    mon_pid = spawn('evemond', :err => '/var/log/evesync/evemond.log', :out=>:err)
-    hand_pid = spawn('evehand', :err => '/var/log/evesync/evehand.log', :out=>:err)
-    sync_pid = spawn('evesyncd', :err => '/var/log/evesync/evesyncd.log', :out=>:err)
-    FileUtils.mkdir_p('/var/run/evesync')
-    File.write('/var/run/evesync/evedatad.pid', data_pid)
-    File.write('/var/run/evesync/evemond.pid', mon_pid)
-    File.write('/var/run/evesync/evehand.pid', hand_pid)
-    File.write('/var/run/evesync/evesyncd.pid', sync_pid)
+    FileUtils.mkdir_p '/var/log/evesync'
+    FileUtils.mkdir_p '/var/run/evesync'
+    spawn_daemon 'evedatad'
+    spawn_daemon 'evemond'
+    spawn_daemon 'evehand'
+    spawn_daemon 'evesyncd'
   end
 
   parser.on('-k', '--kill', 'Stop daemons') do
     begin
-    Process.kill('TERM', File.read('/var/run/evesync/evemond.pid').to_i)
-    Process.kill('TERM', File.read('/var/run/evesync/evehand.pid').to_i)
-    Process.kill('TERM', File.read('/var/run/evesync/evesyncd.pid').to_i)
-    Process.kill('TERM', File.read('/var/run/evesync/evedatad.pid').to_i)
-    rescue Errno::ESRCH => e
-      puts('Some process already killed')
+      kill_by_pid 'evemond'
+      kill_by_pid 'evehand'
+      kill_by_pid 'evesyncd'
+      kill_by_pid 'evedatad'
     rescue StandardError => e
       puts("Error: #{e}")
       puts('Something went wrong while killing processes. Do it yourself!')
@@ -192,4 +202,5 @@ def evesync(opts)
   end
 end
 
+
 evesync opts

data/lib/evesync/config.rb

@@ -8,6 +8,7 @@ module Evesync
     class << self
 
       DEFAULTS = {
+        'loglevel' => Constants::DEFAULT_LOGLEVEL,
         'ntp' => '',
         'evemond' => {
           'port'           => Constants::MOOND_PORT,
@@ -30,10 +31,8 @@ module Evesync
       }
 
 
-      def [](daemon)
-        read_config if needs_reading
-
-        @@config[daemon.to_s]
+      def [](param)
+        config[param.to_s]
       end
 
       def reread
@@ -55,8 +54,9 @@ module Evesync
         Log.info("Config initialized!")
       end
 
-      def needs_reading
-        ! defined? @@config
+      def config
+        read_config if ! defined? @@config
+        @@config
       end
     end
   end

data/lib/evesync/constants.rb

@@ -9,7 +9,7 @@ module Evesync
     DB_PATH       = '/var/lib/evesync/db/'.freeze
     DB_FILES_PATH = '/var/lib/evesync/files/'.freeze
 
-    DEFAULT_LOGLEVEL = 'debug'.freeze
+    DEFAULT_LOGLEVEL = 'info'.freeze
 
     DISCOVER_TIMEOUT = 3600
     WATCH_INTERVAL   = 2

data/lib/evesync/err.rb

@@ -1,5 +1,8 @@
-# TODO: move to a err directory
+
 module Evesync
+  # TODO: move to a err directory
+
+
   module Err
 
     # Base Evesync error class.

data/lib/evesync/ipc/data.rb

@@ -1,8 +1,12 @@
 require 'drb/drb'
 
-# TODO: add custom exceptions for IPCData
 module Evesync
+
+
   module IPCData
+    # TODO: add custom exceptions for IPCData
+
+
     def self.pack(message)
       unless message.respond_to? :to_hash
         err_msg = "IPC ERROR Instance #{message} must implement `to_hash'"

data/lib/evesync/ipc/ipc.rb

@@ -1,9 +1,9 @@
 require 'evesync/config'
 
 module Evesync
-  #
+  ##
   # Constants and helpful functions for Evesync::IPC module.
-  #
+
   module IPC
     $SAFE = 1 # 'no eval' rule
 

data/lib/evesync/log.rb

@@ -2,8 +2,10 @@ require 'logger'
 require 'evesync/config'
 require 'evesync/constants'
 
-# This module is responsible for logging
+
 module Evesync
+
+  # This module is responsible for logging
   module Log
     # Supported levels for logging
     LEVELS = %i[debug info warn error fatal].freeze

data/lib/evesync/ntp.rb

@@ -1,11 +1,22 @@
 require 'net/ntp'
+require 'evesync/log'
 require 'evesync/config'
 
 module Evesync
   module NTP
 
     def self.time
-      Net::NTP.get(Config['ntp']).time
+      begin
+        Timeout.timeout(5) do
+          Net::NTP.get(Config['ntp']).time
+        end
+      rescue Errno::ECONNREFUSED
+        Log.warn('NTP not configured. Using local time for timestamps')
+        Time.now
+      rescue Timeout::Error
+        Log.warn('NTP timeout. Using local time')
+        Time.now
+      end
     end
 
     def self.timestamp

data/lib/evesync/os/linux/arch/package_manager.rb

@@ -1,6 +1,8 @@
 module Evesync
   module OS
     # FIXME: pacman downgrading requires full url path
+
+
     module PackageManager
       class << self
         def install(*args)

data/lib/evesync/os/linux/rhel/package_manager.rb

@@ -1,9 +1,12 @@
 require 'evesync/log'
 
-# Manages package manager things
-# TODO: trigger package_watcher event to update database
 module Evesync
   module OS
+
+    ##
+    # Manages package manager things
+    # TODO: trigger package_watcher event to update database
+
     module PackageManager
       class << self
         def install(*args)

data/lib/evesync/trigger.rb

@@ -22,6 +22,7 @@ module Evesync
         db: evedatad,
         remotes: @remote_handlers
       )
+
       file_trigger = Trigger::File.new(
         db: evedatad,
         remotes: @remote_handlers

data/lib/evesync/watcher.rb

@@ -1,6 +1,5 @@
 require 'timeout'
 require 'evesync/log'
-require 'evesync/config'
 require 'evesync/ipc/client'
 require 'evesync/watcher/file'
 require 'evesync/watcher/package'

data/lib/evesync.rb

@@ -1,3 +1,3 @@
 module Evesync
-  VERSION = '1.0.4'.freeze
+  VERSION = '1.0.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evesync
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Kiselev Valentine
@@ -108,7 +108,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.3
-description: Daemons and utility for package and file changes synchronization.
+description: Daemons and utility for package and file changes synchronization. Installation
+  requires ruby headers and build tools (make, gcc).'
 email: mrexox@yahoo.com
 executables:
 - evemond
@@ -194,5 +195,6 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Daemons and utility for package and file changes synchronization
+summary: Daemons and utility for package and file changes synchronization. Installation
+  requires ruby headers and build tools (make, gcc).
 test_files: []