spior 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e99a81242d64a4764fe159a89b0da69b2920e6a23669289e47c929c30aa9fb05
-  data.tar.gz: 2b747268e80b4fe1925cd951943bf062f09ac17707ff97f6ae536ad4585af44d
+  metadata.gz: 9f1f4458f99b3d0d4f7aba4c35efab6dff475f11577b3b046b566321c584ea33
+  data.tar.gz: c66a056ab44299ec68cbb1878d5d3036281bf43f94aaa149ebc7c9e7b4490951
 SHA512:
-  metadata.gz: e2db8f8b6f8af9627c74857a306e7b2bad22b95791b2cc6bcdf35e4d91be9b430aebc110bfc2372b3dbebd954c1429e2470995cff806d452aa92cf2fc5838f33
-  data.tar.gz: 1547dadc53b9bb3ee702a39a6c801a2b5591a08324da4936c7b7debba1bc8a7f8619f107c24826a6294fdb3f4f97cf5a665bc70370cb5286a2e10ee57e0720c4
+  metadata.gz: ac80151ddbf3922be49e5c5d710aee4724c8730d781f00bd8c5fe550135d00389a2a92f04af89f32f102ac06c508f52631fa237206a4b1cff618f03e10f55791
+  data.tar.gz: 17137326682492dbdb896718ad78fe75cd99d65d97fc7ffd1baf4dd0c2ddb3ccdb67bc7cf6530c7b69175770ebd3faed70d94942993f4080ce2ca21d5df0fd9a

data/.gitignore

@@ -10,7 +10,6 @@
 /test/tmp/
 /test/version_tmp/
 /tmp/
-Makefile
 
 # Used by dotenv library to load environment variables.
 # .env

data/README.md

@@ -2,14 +2,6 @@
 (Spider|Tor). A tool to make TOR your default gateway and randomize your hardware (MAC).  
 **Still under development !**
 
-## Prerequisite
-Just a little tool for change the mac address in POSIX shell.
-
-    $ curl -s -L -o deceitmac.tar.gz https://github.com/szorfein/deceitmac/archive/master.tar.gz
-    $ tar xvf deceitmac-master
-    $ cd deceitmac-master
-    $ sudo make install
-
 ## Install
 Spior is cryptographically signed, so add my public key (if you haven’t already) as a trusted certificate.
 
@@ -19,10 +11,21 @@ And install the gem
 
     $ gem install spior -P MediumSecurity
 
+## Dependencies
+You can install all the dependencies with:
+
+    $ spior --install
+
+Please, post an issue if your linux distribution fail.
+
 ## Usage
 
     $ spior -h
-    $ spior --install
+
+## Left Over
+
+### Issues
+For any questions, comments, feedback or issues, submit a [new issue](https://github.com/szorfein/spior/issues/new).
 
 ### links
 + https://rubyreferences.github.io/rubyref

data/lib/spior/copy.rb

@@ -0,0 +1,57 @@
+#!/usr/bin/env ruby
+
+require 'pathname'
+require 'date'
+require 'digest'
+require_relative 'msg'
+
+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")
+    end
+
+    private
+
+    def self.copy_file(conf, target)
+      @config_file = "conf/#{conf}"
+      return if check_hash(target)
+      if File.exist? target then
+        print "Target #{target} exist, backup and replace? [N/y] "
+        choice = gets.chomp
+        if choice =~ /y|Y/ then
+          backup_file(target)
+          add_file target
+        end
+      else
+        add_file target
+      end
+    end
+
+    def self.check_hash(target)
+      return unless File.exist? target
+      sha256conf = Digest::SHA256.file @config_file
+      sha256target = Digest::SHA256.file target
+      if sha256conf === sha256target then
+        Msg.p "File #{target} alrealy exist, skip"
+        return true
+      end
+      return false
+    end
+
+    def self.backup_file(target)
+      d = DateTime.now
+      backup = target + ".backup-" + d.strftime('%b-%d_%I-%M')
+      system("sudo cp -a #{target} #{backup}")
+      puts "Renamed file #{backup}"
+    end
+
+    def self.add_file(target)
+      system("sudo cp -a #{@config_file} #{target}")
+      Msg.p "File #{@config_file} has been successfully copied at #{target}"
+    end
+  end
+end

data/lib/spior/install.rb

@@ -1,14 +1,19 @@
 #!/usr/bin/env ruby
 
 require 'pathname'
-require 'date'
-require 'digest'
 require_relative 'msg'
 
 module Spior
   class Install
 
     def self.dependencies
+      base_packages
+      pkg_mac
+    end
+
+    private
+
+    def self.base_packages
       if Pathname.new("/usr/bin/emerge")
         puts "Install with emerge..."
         system('sudo emerge -av --changed-use tor iptables')
@@ -23,50 +28,32 @@ module Spior
       end
     end
 
-    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")
-    end
-
-    private
-
-    def self.copy_file(conf, target)
-      @config_file = "conf/#{conf}"
-      return if check_hash(target)
-      if File.exist? target then
-        print "Target #{target} exist, backup and replace? [N/y] "
+    def self.pkg_mac
+      pkg_name="deceitmac"
+      if File.exist?("/usr/local/bin/#{pkg_name}")
+        print "Target #{pkg_name} exist, update? [N/y] "
         choice = gets.chomp
         if choice =~ /y|Y/ then
-          backup_file(target)
-          add_file target
+          puts "Update #{pkg_name}..."
+          build_pkg(pkg_name)
         end
       else
-        add_file target
-      end
-    end
-
-    def self.check_hash(target)
-      return unless File.exist? target
-      sha256conf = Digest::SHA256.file @config_file
-      sha256target = Digest::SHA256.file target
-      if sha256conf === sha256target then
-        Msg.p "File #{target} alrealy exist, skip"
-        return true
+        puts "Install #{pkg_name}..."
+        build_pkg(pkg_name)
       end
-      return false
     end
 
-    def self.backup_file(target)
-      d = DateTime.now
-      backup = target + ".backup-" + d.strftime('%b-%d_%I-%M')
-      system("sudo cp -a #{target} #{backup}")
-      puts "Renamed file #{backup}"
+    def self.build_pkg(name)
+      system("rm -rf /tmp/#{name}*")
+      system("curl -L -o /tmp/#{name}.tar.gz https://github.com/szorfein/#{name}/archive/master.tar.gz")
+      Dir.chdir("/tmp")
+      system("tar xvf #{name}.tar.gz")
+      Dir.chdir("#{name}-master")
+      system("sudo make install")
+      Msg.p "pkg #{name} installed"
+    rescue => e
+      Msg.err e
     end
 
-    def self.add_file(target)
-      system("sudo cp -a #{@config_file} #{target}")
-      Msg.p "File #{@config_file} has been successfully copied at #{target}"
-    end
   end
 end

data/lib/spior/runner.rb

@@ -1,5 +1,6 @@
 require_relative 'options'
 require_relative 'install'
+require_relative 'copy'
 require_relative 'msg'
 
 module Spior
@@ -15,7 +16,7 @@ module Spior
       end
       if @options.copy then
         Msg.head
-        Spior::Install::config_files
+        Spior::Copy::config_files
       end
     end
   end

data/spior.gemspec

@@ -1,11 +1,14 @@
 Gem::Specification.new do |s|
   s.name = "spior"
-  s.summary = "A tool to make TOR your default gateway"
-  s.description = File.read(File.join(File.dirname(__FILE__), "README.md"))
-  s.version = "0.0.2"
+
+  s.summary = "A tool to make TOR your default gateway and randomize your hardware"
+  s.description = "Status: not yet functionnal, please wait for the next releases !"
+
+  s.version = "0.0.3"
   s.requirements << 'tor'
   s.requirements << 'sudo'
   s.requirements << 'iptables'
+  s.requirements << 'deceitmac'
   s.platform = Gem::Platform::RUBY
   s.author = ['szorfein']
   s.homepage = 'https://github.com/szorfein/spior'
@@ -13,6 +16,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>=2.4'
   s.files = `git ls-files`.split(" ")
   s.files.reject! { |fn| fn.include? "certs" }
+  s.files.reject! { |fn| fn.include? "Makefile" }
   s.executables = [ 'spior' ]
   s.test_files = Dir["test/test_*.rb"]
   s.licenses = ['MIT']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spior
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - szorfein
@@ -35,7 +35,7 @@ cert_chain:
   J/zT/q2Ac7BWpSLbv6p9lChBiEnD9j24x463LR5QQjDNS5SsjzRQfFuprsa9Nqf2
   Tw==
   -----END CERTIFICATE-----
-date: 2020-05-02 00:00:00.000000000 Z
+date: 2020-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -51,16 +51,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.0.0
-description: "# spior\n(Spider|Tor). A tool to make TOR your default gateway and randomize
-  your hardware (MAC).  \n**Still under development !**\n\n## Prerequisite\nJust a
-  little tool for change the mac address in POSIX shell.\n\n    $ curl -s -L -o deceitmac.tar.gz
-  https://github.com/szorfein/deceitmac/archive/master.tar.gz\n    $ tar xvf deceitmac-master\n
-  \   $ cd deceitmac-master\n    $ sudo make install\n\n## Install\nSpior is cryptographically
-  signed, so add my public key (if you haven’t already) as a trusted certificate.\n\n
-  \   $ gem cert --add <(curl -Ls https://raw.githubusercontent.com/szorfein/spior/master/certs/szorfein.pem)\n\nAnd
-  install the gem\n\n    $ gem install spior -P MediumSecurity\n\n## Usage\n\n    $
-  spior -h\n    $ spior --install\n\n### links\n+ https://rubyreferences.github.io/rubyref\n+
-  https://rubystyle.guide/"
+description: 'Status: not yet functionnal, please wait for the next releases !'
 email: szorfein@protonmail.com
 executables:
 - spior
@@ -78,6 +69,7 @@ files:
 - conf/sshd.conf
 - conf/sshuttle.service
 - conf/torrc
+- lib/spior/copy.rb
 - lib/spior/install.rb
 - lib/spior/msg.rb
 - lib/spior/options.rb
@@ -108,10 +100,11 @@ requirements:
 - tor
 - sudo
 - iptables
+- deceitmac
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: A tool to make TOR your default gateway
+summary: A tool to make TOR your default gateway and randomize your hardware
 test_files:
 - test/test_options.rb
 - test/test_install.rb