spior 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecae8f75479fb87d8b09a28ea74c86728923802feb7b6c495af0c6e455dfc986
-  data.tar.gz: 442c8fbf6ea54e45b6b48abc4ba5de582ae09ae73bd71c1fce497ea082c929c1
+  metadata.gz: 07b4daf3d6c06b689e2d584b43e419eb4e9e9ea8e19c4bf71c3116428955f957
+  data.tar.gz: '08699ad87b9abc01147df75938c744268e33d313955bb046b736ad674f93820e'
 SHA512:
-  metadata.gz: fe92411f967699b8cd29129f174030bb44a0d6ea2616fa5ff579e0879da63dfce83ce7bfeadfbed7e536141a882ff118315f730d3a26e45d8756bf9aed416130
-  data.tar.gz: 2195a94c764fcdecc221d2cea1688ca241901ac948cb02fb285b2c4c234b2f73335b2c44bd227014e795e32621b8221616dcaaecada2e95e779fad543d21ffff
+  metadata.gz: 92014306180514cf8b3f9bea57544054fc961127161a6ca8e067a7baeaec256fc365ca8c6e58fe4f88bfeb7f01c24b85350d7ac031dd44e4532b7c8c5ddbc497
+  data.tar.gz: 2971e056165009f5ef1dda7dcbc5e282ba1769076ffc99d439e3b8741a44d1aeb01197087b628e3f6103b1d23cfbb1861bfa27d1c843c52a5bb0e84caeba03f2

data/lib/auth.rb

@@ -10,7 +10,7 @@ class Auth
   end
 
   def mkdir(path)
-    return unless File.exist?(path)
+    return if File.exist?(path)
 
     x("mkdir -p #{path}")
   end

data/lib/spior/iptables/rules.rb

@@ -43,6 +43,8 @@ module Spior
       end
 
       def search_for_comment(filename)
+        return unless File.exist? filename
+
         File.open(filename) do |f|
           f.each do |line|
             return true if line.match(/saved by Spior/)
@@ -88,7 +90,9 @@ module Spior
 
       def search_iptables_config
         case Nomansland.distro?
-        when :archlinux || :void
+        when :archlinux
+          '/etc/iptables/iptables.rules'
+        when :void
           '/etc/iptables/iptables.rules'
         when :debian
           '/etc/iptables.up.rules'

data/lib/spior/tor/config.rb

@@ -106,7 +106,7 @@ module Spior
       end
 
       def digest_match?(src, dest)
-        return unless File.exist?(dest)
+        return unless File.exist?(dest) && File.readable?(dest)
 
         md5_src = Digest::MD5.file src
         md5_dest = Digest::MD5.file dest

data/lib/spior/tor/data.rb

@@ -34,7 +34,8 @@ module Spior
       def search(option_name)
         File.open('/etc/tor/torrc') do |f|
           f.each do |line|
-            return Regexp.last_match(1) if line.match(%r{#{option_name} ([a-z0-9./]*)}i)
+            line.match(%r{^#{option_name} ([a-z0-9./]*)}i) and
+              return Regexp.last_match(1)
           end
         end
         false

data/lib/spior/tor/stop.rb

@@ -7,13 +7,6 @@ module Spior
     # It also kill previous instance run by Spior
     class Stop
       def initialize
-        old_pid = `pgrep -f "tor -f /tmp/torrc*"`.chomp
-
-        if old_pid != ''
-          Msg.p "Found old pid > #{old_pid}, killing it..."
-          Helpers::Exec.new('kill').run("-9 #{old_pid}")
-        end
-
         nomansland
       end
 

data/lib/spior/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spior
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spior
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - szorfein