startor 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc53f3a56d1a16ab625bc40c3ac78f227a70ae2e211ccff7e362d0c93b9e5184
-  data.tar.gz: b3e9b991bad3c524fa8ab4bdec2cf4669f4df0f5773a9253f9fc6e4c6c1f6faf
+  metadata.gz: 75a30a450379b0c64fbb337d72447828e9f7b7c7c7dd66c040794682ce488480
+  data.tar.gz: 5965c6e542207e6af325d3c305eeda9e4f30beea1068f77df39543a114a7cf07
 SHA512:
-  metadata.gz: 14ae6ecc7567c1c35f3f64c6eb1e02154d33d809ffe0bf7c9f093349f8beca6ba1c7b6f833585b4f05f9f65fb80ad81d3febc44ff2aecfb188eb42b937290ed1
-  data.tar.gz: d48241ae5e093866046f7319f0d161b96ada6a3e5bb82eedbbf62346a645bdfd77ac0322bca9172952fc061aac2a3f74dd9e0c81306faaac154f7cdfc8a83168
+  metadata.gz: 4d3d3901d349fa82d2cb8efea423814f40d8617e56d9288fb7ee1807a53c170e975c368ed08513f9ba909134f4cae2b37290d9ae493c8c66116391482137af56
+  data.tar.gz: 16efcce7c462dcfc34a066ddb6ee799f0b7d1b79c0bf0c22c944ee5ea924d1a73f715f5eedb302f3c62acaa82eae0374e3ed1c4085c118069f57eafde8e6a5d3

data/bin/startor

@@ -2,7 +2,7 @@
 # startor
 
 # 20190802
-# 0.6.3
+# 0.6.4
 
 # History: Derived from https://kremalicious.com/simple-tor-setup-on-mac-os-x/...
 
@@ -52,11 +52,13 @@
 # 11. ~ install_homebrew() to make use of homebrew_installed?().
 # 12. ~ install_tor() to make use of tor_installed?(), though this is a bit redundant, since setup() should control whether install_tor() is run anyway.
 # 13. ~ setup(), so that it doesn't needlessly install brew, because tor is already installed.
+# 3/4
+# 14. /lib\/OSX/lib\/MacOS/
 
 require 'FileUtils/which'
 require 'Kernel/run'
-require 'OSX/HardwarePort'
-require 'OSX/IfConfig'
+require 'MacOS/HardwarePort'
+require 'MacOS/IfConfig'
 
 def install_homebrew
   if homebrew_installed?
@@ -102,12 +104,12 @@ def enter_admin_password
 end
 
 def active_network_interfaces
-  OSX::IfConfig.new.active_interfaces
+  MacOS::IfConfig.active_interfaces
 end
 
 def active_network_ports
   active_network_interfaces.collect do |active_network_interface|
-    if hardware_port = OSX::HardwarePort.find_by_device(active_network_interface)
+    if hardware_port = MacOS::HardwarePort.find_by_device(active_network_interface)
       hardware_port.name
     end
   end.compact

data/lib/MacOS/HardwarePort.rb

@@ -0,0 +1,109 @@
+# MacOS/HardwarePort.rb
+# MacOS::HardwarePort
+
+# 20190829
+# 0.3.1
+
+# Changes since 0.2:
+# 1. /Hardware/HardwarePort at the top of the file.
+# 2. /new()/initialize()/ (Really!? I did that!? Twice!)
+# 3. ~ MacOS::HardwarePort.parse, so that it only puts in one entry per hardware port.
+# 4. - all()
+# 5. + alias_method :all, :parse
+# 6. + alias_method :hardware_ports, :parse
+# 7. + alias_method :ports, :parse
+# 8. + MacOS::HardwarePort.find_by_name
+# 9. + MacOS::HardwarePort.find_by_ethernet_address
+# 10. + MacOS::HardwarePort#mac_address
+# 0/1
+# 11. /MacOS::HardwarePort.find_by_device/MacOS::HardwarePort.find_by_interface/
+# 11. + alias_method :find_by_device, :find_by_interface
+# 12. + MacOS::HardwarePort#interface
+# 13. + alias_method :find_by_hardware_port, :find_by_name
+
+require 'Thoran/String/Captures/captures'
+
+module MacOS
+  class HardwarePort
+
+    class << self
+
+      def parse(output = nil)
+        output ||= self.output
+        hardware_ports = []
+        hardware_port = nil
+        output.each_line do |line|
+          # p line
+          if line == "\n" || line == ""
+            hardware_ports << hardware_port if hardware_port
+            hardware_port = new
+          else
+            label, value = line.captures(/^(.+): (.+)/)
+            case label
+            when 'Hardware Port'; hardware_port.hardware_port = value
+            when 'Device'; hardware_port.device = value
+            when 'Ethernet Address'; hardware_port.ethernet_address = value
+            end
+          end
+        end
+        hardware_ports
+      end
+      alias_method :all, :parse
+      alias_method :hardware_ports, :parse
+      alias_method :ports, :parse
+
+      def find_by_interface(interface)
+        all.detect{|hardware_port| hardware_port.interface == interface}
+      end
+      alias_method :find_by_device, :find_by_interface
+
+      def find_by_name(name)
+        all.detect{|hardware_port| hardware_port.name == name}
+      end
+      alias_method :find_by_hardware_port, :find_by_name
+
+      def find_by_mac_address(mac_address)
+        all.detect{|hardware_port| hardware_port.ethernet_address == mac_address}
+      end
+      alias_method :find_by_ethernet_address, :find_by_mac_address
+
+      private
+
+      def output
+        `networksetup -listallhardwareports`
+      end
+
+    end # class << self
+
+    attr_accessor :hardware_port
+    attr_accessor :device
+    attr_accessor :ethernet_address
+
+    def initialize(hardware_port: nil, device: nil, ethernet_address: nil)
+      @hardware_port = hardware_port
+      @device = device
+      @ethernet_address = ethernet_address
+    end
+
+    def name
+      @hardware_port
+    end
+
+    def mac_address
+      @ethernet_address
+    end
+
+    def interface
+      @device
+    end
+
+  end
+end
+
+if __FILE__ == $0
+  require 'pp'
+  pp MacOS::HardwarePort.all
+  p MacOS::HardwarePort.find_by_device('en4')
+  p MacOS::HardwarePort.find_by_name('Wi-Fi')
+  p MacOS::HardwarePort.find_by_interface('en4')
+end

data/lib/MacOS/IfConfig.rb

@@ -0,0 +1,161 @@
+# MacOS/IfConfig.rb
+# MacOS::IfConfig
+
+# 20200429
+# 0.6.0
+
+# Changes since 0.5:
+# 1. + MacOS::Ifconfig.find_by_interface
+# 2. + MacOS::Ifconfig.find_by_mac_address
+# 3. + MacOS::Ifconfig.find_by_ipv4_address
+
+require 'Thoran/String/Capture/capture'
+require 'Thoran/String/Captures/captures'
+
+module MacOS
+  class IfConfig
+
+    class << self
+
+      def parse(output = nil)
+        output ||= self.output
+        @ifconfigs = []
+        interface = nil
+        output.each_line do |line|
+          if line =~ /^\t/
+            case line
+            when /ether/
+              @ifconfig.mac_address = line.capture(/ *ether (.+) $/)
+            when /inet /
+              if line.match(/broadcast/)
+                @ifconfig.ipv4_address, @ifconfig.netmask, @ifconfig.broadcast_address = line.captures(/ *inet (\d+(?:\.\d+){3}) netmask (.+) broadcast (.+)$/)
+              elsif line.match(/-->/)
+                ipv4_addresses, @ifconfig.netmask = line.captures(/ *inet (.+) netmask (.+) $/)
+                @ifconfig.ipv4_address = ipv4_addresses.split(' --> ').first
+              else
+                @ifconfig.ipv4_address, @ifconfig.netmask = line.captures(/ *inet (\d+(?:\.\d+){3}) netmask (.+) $/)
+              end
+            when /status\:/
+              @ifconfig.status = line.capture(/ *status: (.+)$/)
+            end
+          else
+            @ifconfigs << @ifconfig if @ifconfig
+            @ifconfig = new
+            @ifconfig.interface, _rest_of_line = line.captures(/^(.+?): (.+)$/)
+          end
+        end
+        @ifconfigs << @ifconfig
+      end
+      alias_method :all, :parse
+      alias_method :interfaces, :parse
+
+      def interface_names
+        all.collect(&:interface_name)
+      end
+
+      def active_interfaces
+        all.select(&:active?)
+      end
+      alias_method :active, :active_interfaces
+
+      def active_interfaces_names
+        all.select(&:active?).collect(&:interface_name)
+      end
+
+      def inactive_interfaces
+        all.select(&:inactive?)
+      end
+      alias_method :inactive, :inactive_interfaces
+
+      def inactive_interfaces_names
+        all.select(&:inactive?).collect(&:interface_name)
+      end
+
+      def up_interfaces
+        all.select(&:up?)
+      end
+      alias_method :up, :up_interfaces
+
+      def up_interfaces_names
+        all.select(&:up?).collect(&:interface_name)
+      end
+
+      def mac_addresses
+        all.collect(&:mac_address).compact
+      end
+      alias_method :ethernet_addresses, :mac_addresses
+
+      def ipv4_addresses
+        all.collect(&:ipv4_address).compact
+      end
+
+      def find_by_interface(interface)
+        all.find{|ifconfig| ifconfig.interface == interface}
+      end
+
+      def find_by_mac_address(mac_address)
+        all.find{|ifconfig| ifconfig.mac_address == mac_address}
+      end
+
+      def find_by_ipv4_address(ipv4_address)
+        all.find{|ifconfig| ifconfig.ipv4_address == ipv4_address}
+      end
+
+      private
+
+      def output
+        `ifconfig -a`
+      end
+
+    end # class << self
+
+    attr_accessor :interface
+    attr_accessor :mac_address
+    attr_accessor :ipv4_address, :netmask, :broadcast_address
+    attr_accessor :status
+
+    def initialize(interface: nil, mac_address: nil, ipv4_address: nil, netmask: nil, broadcast_address:nil, status: nil)
+      @interface = interface
+      @mac_address = mac_address
+      @ipv4_address, @netmask, @broadcast_address = ipv4_address, netmask, broadcast_address
+      @status = status
+    end
+
+    def interface_name
+      @interface
+    end
+    alias_method :name, :interface_name
+
+    def ethernet_address
+      @mac_address
+    end
+
+    def active?
+      @status == 'active'
+    end
+
+    def inactive?
+      @status == 'inactive'
+    end
+
+    def up?
+      active? || @ipv4_address
+    end
+
+  end
+end
+
+if __FILE__ == $0
+  require 'pp'
+  pp MacOS::IfConfig.interfaces
+  p MacOS::IfConfig.interface_names
+  p MacOS::IfConfig.active_interfaces
+  p MacOS::IfConfig.active_interfaces_names
+  p MacOS::IfConfig.inactive_interfaces
+  p MacOS::IfConfig.inactive_interfaces_names
+  p MacOS::IfConfig.up_interfaces
+  p MacOS::IfConfig.up_interfaces_names
+  p MacOS::IfConfig.mac_addresses
+  p MacOS::IfConfig.ipv4_addresses
+  p MacOS::IfConfig.find_by_interface('en0')
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: startor
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - thoran
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-02 00:00:00.000000000 Z
+date: 2020-12-30 00:00:00.000000000 Z
 dependencies: []
 description: Easily install, start, and stop tor.
 email: code@thoran.com
@@ -28,9 +28,9 @@ files:
 - lib/FileUtils/which.rb
 - lib/Files.rb
 - lib/Kernel/run.rb
+- lib/MacOS/HardwarePort.rb
+- lib/MacOS/IfConfig.rb
 - lib/Module/alias_methods.rb
-- lib/OSX/HardwarePort.rb
-- lib/OSX/IfConfig.rb
 - lib/Ordinal.rb
 - lib/Ordinal/Array.rb
 - lib/Platform/OS.rb
@@ -57,7 +57,7 @@ licenses:
 metadata:
   tor_website: https://www.torproject.org
   tor_check_page: https://check.torproject.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -72,8 +72,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.0.rc.1
+signing_key:
 specification_version: 4
 summary: tor management made easy.
 test_files: []

data/lib/OSX/HardwarePort.rb

@@ -1,69 +0,0 @@
-# OSX/Hardware.rb
-# OSX::Hardware
-
-# 20180209
-# 0.1.1
-
-require 'Thoran/String/Captures/captures'
-
-module OSX
-  class HardwarePort
-
-    class << self
-
-      def parse(output)
-        hardware_ports = []
-        hardware_port = nil
-        output.each_line do |line|
-          if line == "\n" || line == ""
-            hardware_port = new
-          else
-            label, value = line.captures(/^(.+): (.+)/)
-            case label
-            when 'Hardware Port'; hardware_port.hardware_port = value
-            when 'Device'; hardware_port.device = value
-            when 'Ethernet Address'; hardware_port.ethernet_address = value
-            end
-          end
-          hardware_ports << hardware_port
-        end
-        hardware_ports
-      end
-
-      def all
-        parse(output)
-      end
-
-      def find_by_device(device)
-        all.detect{|hardware_port| hardware_port.device == device}
-      end
-
-      private
-
-      def output
-        `networksetup -listallhardwareports`
-      end
-
-    end # class << self
-
-    attr_accessor :hardware_port
-    attr_accessor :device
-    attr_accessor :ethernet_address
-
-    def new(hardware_port:, device:, ethernet_address:)
-      @hardware_port = hardware_port
-      @device = device
-      @ethernet_address = ethernet_address
-    end
-
-    def name
-      @hardware_port
-    end
-
-  end
-end
-
-if __FILE__ == $0
-  p hardware_ports = OSX::HardwarePort.all
-  p en4 = OSX::HardwarePort.find_by_device('en4')
-end

data/lib/OSX/IfConfig.rb

@@ -1,57 +0,0 @@
-# OSX/IfConfig.rb
-# OSX::IfConfig
-
-# 20180209
-# 0.2.0
-
-# Changes since 0.1:
-# 1. + OSX namespace, under the assumption that the output of ifconfig on OSX is different from other operating systems.
-require 'Thoran/String/Captures/captures'
-
-module OSX
-  class IfConfig
-
-    def new(output = nil)
-      @output = output
-    end
-
-    def interfaces
-      parse.keys
-    end
-
-    def active_interfaces
-      parse.select do |interface, details|
-        details.any?{|detail| detail =~ /status: active/}
-      end.keys
-    end
-
-    private
-
-    def output
-      @output || `ifconfig -a`
-    end
-
-    def parse
-      interfaces = {}
-      interface = nil
-      output.each_line do |line|
-        if line =~ /^\t/
-          interfaces[interface] << line.sub(/^\t/, '')
-        else
-          interface, rest_of_line = line.captures(/^(.+?): (.+)$/)
-          interfaces[interface] = [rest_of_line]
-        end
-      end
-      interfaces
-    end
-
-  end
-end
-
-if __FILE__ == $0
-  require 'pp'
-  ic = OSX::IfConfig.new
-  pp ic.send(:parse)
-  ic.interfaces
-  ic.active_interfaces
-end