spior 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9da29ea66a46968397265faf097f4fcdb111849af6563ca1157b7a1ca0606da
-  data.tar.gz: 8406d29cdd50d1bbe4c0048f1c6030f8159c7156a0f63066465a6b0624a19c76
+  metadata.gz: 99feec0241976ee0c1fb2113f6b4ac1c72d8593e5d5901e559e642408c37f0ef
+  data.tar.gz: b74ce8165d4fc6538651769fac0ce6b7c79a1d05ab5ddcb68763f548569b2925
 SHA512:
-  metadata.gz: 47ce8c96a9aab4f5c3f156445cd114f522e4b66c5d7b614b6fb19c0697a41670dd4b6cbba905558d2ca27d509cbfd0160dceb8ad3ddb48d5d9c9ebff16ff0d99
-  data.tar.gz: d4c5cf050ad3cb485a9e9f09c80d634ea837b6bd0d8b5a648c29a3518126b56da0c0ddbc9a85e66f6e9c4d00219b2f95116e38300e95969cd4a8b3d1c2b53744
+  metadata.gz: d98ee9554cc7218957d7d3ff00240af12e5fb7e373ce2f080903182354f2cbb09d2fb7e2caa3b45a4a5065dd55b698d2c62d267007ca0d4ef03899529643e3cc
+  data.tar.gz: eb7ab480de17e9ab34ccae56c6da96408ce2206492f7071083702f8cbc8df0ad2cb183ba42bf9bf98173e3cca69d14293dc7caa06c6d98a01a93d5f00412eab6

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.0.9
+* Add an option to reload TOR -r|--reload
+* Cleanup few characters from -s|--status
+* Correct path for search config files
+
 ## 0.0.8, release 2020-05-06
 * Always make a copy and replace original file, do not ask, the program is dependent of his config file for now.
 * Correct install where Dir.chdir don't back to the previous location.

data/lib/spior/copy.rb

@@ -7,9 +7,10 @@ module Spior
   class Copy
 
     def self.config_files
-      copy_file("torrc", "/etc/tor/torrc")
-      copy_file("resolv.conf", "/etc/resolv.conf")
-      copy_file("ipt_mod.conf", "/etc/modules-load.d/ipt_mod.conf")
+      @conf_dir = File.expand_path('../..' + '/conf', __dir__)
+      copy_file(@conf_dir + "/torrc", "/etc/tor/torrc")
+      copy_file(@conf_dir + "/resolv.conf", "/etc/resolv.conf")
+      copy_file(@conf_dir + "/ipt_mod.conf", "/etc/modules-load.d/ipt_mod.conf")
     end
 
     def self.restore_files
@@ -20,7 +21,7 @@ module Spior
     private
 
     def self.copy_file(conf, target)
-      @config_file = "conf/#{conf}"
+      @config_file = conf
       return if check_hash(@config_file, target)
       if File.exist? target then
         if ! previous_copy target
@@ -40,6 +41,7 @@ module Spior
     end
 
     def self.check_hash(src, target)
+      return if not File.exist?(target)
       sha256conf = Digest::SHA256.file src
       sha256target = Digest::SHA256.file target
       sha256conf === sha256target

data/lib/spior/options.rb

@@ -1,4 +1,5 @@
 require 'optparse'
+require_relative 'reload'
 require_relative 'status'
 require_relative 'clear'
 
@@ -17,7 +18,7 @@ module Spior
 
     def parse(argv)
       OptionParser.new do |opts|
-        opts.on("-i", "--install", "Install dependencies") do
+        opts.on("-i", "--install", "Install and update dependencies") do
           @install = true
         end
 
@@ -33,6 +34,10 @@ module Spior
           @tor = true
         end
 
+        opts.on("-r", "--reload", "Reload TOR to change your ip") do
+          Spior::Reload::tor
+        end
+
         opts.on("-c", "--clear", "Clear iptables rules and restore files") do
           Spior::Clear::all
         end

data/lib/spior/reload.rb

@@ -0,0 +1,13 @@
+require 'tty-which'
+require_relative 'msg'
+
+module Spior
+  module Reload
+    def self.tor
+      if TTY::Which.exist?('systemctl')
+        system('sudo systemctl restart tor')
+        Msg.p "ip changed"
+      end
+    end
+  end
+end

data/lib/spior/status.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'open-uri'
-require 'json'
 
 module Spior
   class Status
@@ -12,7 +11,7 @@ module Spior
       uri = URI.parse("https://ipleak.net/json")
       uri.open {|f|
         f.each_line {|line|
-          p line
+          p line.chomp.delete("/\",{}")
         }
       }
     end

data/spior.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
     "wiki_uri" => "https://github.com/szorfein/spior"
   }
 
-  s.version = "0.0.8"
+  s.version = "0.0.9"
   s.requirements << 'tor'
   s.requirements << 'sudo'
   s.requirements << 'iptables'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spior
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - szorfein
@@ -35,7 +35,7 @@ cert_chain:
   J/zT/q2Ac7BWpSLbv6p9lChBiEnD9j24x463LR5QQjDNS5SsjzRQfFuprsa9Nqf2
   Tw==
   -----END CERTIFICATE-----
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -120,6 +120,7 @@ files:
 - lib/spior/msg.rb
 - lib/spior/network.rb
 - lib/spior/options.rb
+- lib/spior/reload.rb
 - lib/spior/runner.rb
 - lib/spior/status.rb
 - lib/spior/tor.rb