startor 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1664fc2c72796a1421de0cd3a2ef46c770d5eb51f1027cc77b723492c8d76bd
-  data.tar.gz: 0471f2f135dd8d55bd510c9b0316d846471f583208ac46c4ff2531696133d376
+  metadata.gz: dc53f3a56d1a16ab625bc40c3ac78f227a70ae2e211ccff7e362d0c93b9e5184
+  data.tar.gz: b3e9b991bad3c524fa8ab4bdec2cf4669f4df0f5773a9253f9fc6e4c6c1f6faf
 SHA512:
-  metadata.gz: d20f0881fc5e5a4394a2c65e90dac099c2223f88bfb02d579633416b6da304ff071c3a598db7fc9f10566ca74709b5939c024c703cd94ebb31efc00e6094eac3
-  data.tar.gz: d0c6f0ac45641c0cc81f9bbeed6dfe98c716046008871761e5c5060354ee6db4fec7c62367c152bc45f9480a04d6b72dd673c0c13a0f3226cf92d0a49a67ffb9
+  metadata.gz: 14ae6ecc7567c1c35f3f64c6eb1e02154d33d809ffe0bf7c9f093349f8beca6ba1c7b6f833585b4f05f9f65fb80ad81d3febc44ff2aecfb188eb42b937290ed1
+  data.tar.gz: d48241ae5e093866046f7319f0d161b96ada6a3e5bb82eedbbf62346a645bdfd77ac0322bca9172952fc061aac2a3f74dd9e0c81306faaac154f7cdfc8a83168

data/bin/startor

@@ -1,14 +1,12 @@
 #!/usr/bin/env ruby
 # startor
 
-# 20181107
-# 0.6.2
+# 20190802
+# 0.6.3
 
 # History: Derived from https://kremalicious.com/simple-tor-setup-on-mac-os-x/...
 
-# Prerequisites:
-# 1. tor binary is installed.
-# 2. Ruby is installed, which it should be already!
+# Prerequisite: Ruby is installed, which it should be already!
 
 # Installation:
 # 1. Press the <cmd> and <space> keys on the keyboard simultaneously.
@@ -21,7 +19,7 @@
 # 3. Type: "startor setup" and press the <return> key.
 # 4. Type: "startor" and press the <return> key.
 # 5. If prompted, enter the password you use to login to your computer.
-# 6. When wanting stop tor, go to the same window as the commands immediately above were entered and press the <ctrl> and <c> keys on the keyboard simultaneously.
+# 6. When wanting to stop tor, go to the same window as the commands immediately above were entered and press the <ctrl> and <c> keys on the keyboard simultaneously.
 # 7. If prompted, enter the password you use to login to your computer.
 
 # Notes:

data/lib/Array/all_but_last.rb

@@ -1,24 +1,7 @@
-# Array#all_but_last
-
-# 20080831
-# 0.1.0
-
-# Description: This returns a copy of the receiving array with the last element removed.  
-
-# Changes since 0.0: 
-# 1. I've added require 'Array/lastX', since I think it is reasonable that each file should load its own dependencies.  
-
-# Todo: 
-# 1. Conditionally do the require depending on whether the method already exists on Array and/or on whether rubylib has been defined elsewhere, since the require will fail in either case; and if rubylib is available, but this method isn't.  
-
-require 'Array/lastX'
-
-class Array
-  
-  def all_but_last
-    d = self.dup
-    d.last!
-    d
-  end
-  
-end
+# Array/all_but_last.rb
+# Array#all_but_last
+
+# 20180804
+# 0.1.0 (The same version number as the current version of Thoran/Array/AllButLast.)
+
+require 'Thoran/Array/AllButLast/all_but_last'

data/lib/Array/extract_optionsX.rb

@@ -1,21 +1,7 @@
 # Array/extract_optionsX.rb
 # Array#extract_options!
 
-# 20140402
-# 0.1.1
+# 20180804
+# 0.2.0 (The same version number as the current version of Thoran/Array/ExtractOptions.)
 
-# History: Stolen wholesale from ActiveSupport.
-
-# Changes:
-# 1. + #extract_options (no exclamation).  Whereas I had previously had #extract_options mean the same as what I now call #peek_options, I decided that Array has some precedents for method names which do not have a bang method, but which do modify the receiver in place; #shift, #unshift, #push, and #pop come to mind...
-# 0/1
-# 2. Some minor tidying.
-
-class Array
-
-  def extract_options!
-    last.is_a?(::Hash) ? pop : {}
-  end
-  alias_method :extract_options, :extract_options!
-
-end
+require 'Thoran/Array/ExtractOptionsX/extract_optionsX'

data/lib/Array/lastX.rb

@@ -1,10 +1,7 @@
+# Array/lastX.rb
 # Array#last!
-# 20060630
-#
-# Description: Sometimes it makes more sense to treat arrays this way.  
-#
-# Discussion: This and first! were taken from Skink2Quick from a few months ago.  
 
-class Array
-  alias_method :last!, :pop
-end
+# 20180804
+# 0.2.3 (The same version number as the current version of Thoran/Array/LastX.)
+
+require 'Thoran/Array/LastX/lastX'

data/lib/Files.rb

@@ -1,8 +1,8 @@
 # Files.rb
 # Files
 
-# 20140508
-# 0.8.3
+# 20181112
+# 0.8.7
 
 # Changes since 0.7: (Switched from using Files to OpenStructs for @files instance variable because Ruby can't open more than some hundreds of files and nil was being returned after that limit had been reached.)
 # 1. - Files.files_for().
@@ -36,15 +36,25 @@
 # 26. ~ Files#sort_method_macro, #sorter_macro, and #reverse_sort_method_macro, so as to make use of instance_eval rather than eval.
 # 27. Added Kernel/require_relative.rb back, since I should be able to run the specs with MacRuby as well.
 # 28. Updated the gemspec with latest version number.
+# 3/4
+# 29. /return_ostruct_object/return_files_object/.
+# 30. Updated the tests to pass again.  Not sure what has caused the re-ordering.  Has Ruby changed the way it handles files somehow?  Would like to not have to sort the results prior to comparison and have it be exact at some point...
+# 4/5
+# 31. Switched from using the assertion style of testing to the spec style of testing, except for assert File.exist? and assert ... include_all_patterns?, because there is no satisfactory alternative (insofar as readability is concerned) in the spec world.
+# 5/6
+# 32. Using Thoran namespaced extensions to the standard library and updated those to the lastest versions.
+# 6/7
+# 33. Reintroduced a change made in the earlier version 0.8.4: "~ Files.gsub!, so as it calls the instance version for easier debugging."
 
 # Todo:
 # 1. Ensure that the interface is sufficiently usable that it will be reading for a 1.0 release after some more tinkering through the remainder of 0.8 and 0.9.
+# 2. Remove the need for sorting in the tests, which is due to ordering differences which were introduced at some point.
 
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless
   $LOAD_PATH.include?(File.dirname(__FILE__)) || $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
 
 require 'Array/extract_optionsX'
-require 'File/self.gsubX'
+require 'File/gsubX'
 require 'fileutils'
 require 'Module/alias_methods'
 require 'ostruct'
@@ -54,23 +64,23 @@ class Files
   class << self
 
     def find(options = {})
-      path, pattern, return_ostruct_object = options[:path], options[:pattern], options[:return_ostruct_object]
+      path, pattern, return_files_object = options[:path], options[:pattern], options[:return_files_object]
       case
       when path && pattern
-        in_path___with_pattern___(path, pattern, return_ostruct_object)
+        in_path___with_pattern___(path, pattern, return_files_object)
       when path && !pattern
-        in_path___(path, return_ostruct_object)
+        in_path___(path, return_files_object)
       when !path && pattern
-        with_pattern___(pattern, return_ostruct_object)
+        with_pattern___(pattern, return_files_object)
       when !path && !pattern
-        here(return_ostruct_object)
+        here(return_files_object)
       end
     end
     alias_methods :all, :find
 
-    def in_path___with_pattern___(path, pattern, return_ostruct_object = true)
+    def in_path___with_pattern___(path, pattern, return_files_object = true)
       files = with_attributes(Dir["#{path}/#{pattern}"])
-      if return_ostruct_object
+      if return_files_object
         files_object = Files.new
         files_object.files = files
         files_object
@@ -81,18 +91,18 @@ class Files
     alias_methods :in_path_matching, :in_path___matching___,
       :in_path_with_pattern, :in_path___with_pattern___
 
-    def in_path___(path, return_ostruct_object = true)
-      in_path___matching___(path, '*', return_ostruct_object)
+    def in_path___(path, return_files_object = true)
+      in_path___matching___(path, '*', return_files_object)
     end
     alias_methods :in, :in_path, :in_path___
 
-    def with_pattern___(pattern, return_ostruct_object = true)
-      in_path___matching___('./', pattern, return_ostruct_object)
+    def with_pattern___(pattern, return_files_object = true)
+      in_path___matching___('./', pattern, return_files_object)
     end
     alias_methods :with_pattern, :with_pattern___
 
-    def here(return_ostruct_object = true)
-      in_path___matching___('./', '*', return_ostruct_object)
+    def here(return_files_object = true)
+      in_path___matching___('./', '*', return_files_object)
     end
 
     def with_attributes(paths)
@@ -116,7 +126,9 @@ class Files
 
     def gsub!(filenames, replacement_pattern, replacement_text, selection_pattern = nil)
       filenames.each do |filename|
-        File.gsub!(filename, replacement_pattern, replacement_text, selection_pattern)
+        File.open(filename, 'r+') do |f|
+          f.gsub!(replacement_pattern, replacement_text, selection_pattern)
+        end
       end
     end
 
@@ -147,11 +159,11 @@ class Files
       if !@args.empty?
         Files.with_attributes(@args.flatten)
       elsif path && pattern
-        Files.find(path: path, pattern: pattern, return_ostruct_object: false)
+        Files.find(path: path, pattern: pattern, return_files_object: false)
       elsif path
-        Files.find(path: path, return_ostruct_object: false)
+        Files.find(path: path, return_files_object: false)
       elsif pattern
-        Files.find(pattern: pattern, return_ostruct_object: false)
+        Files.find(pattern: pattern, return_files_object: false)
       else
         []
       end

data/lib/Module/alias_methods.rb

@@ -1,16 +1,7 @@
+# Module/alias_methods.rb
 # Module#alias_methods
 
-# 20080831
-# 0.0.0
+# 20190802
+# 0.1.0 (The same version number as the current version of Thoran/Module/AliasMethods.)
 
-# Description: I have a penchance for having multiple method names and having line after line of alias_method calls is kinda ugly.  
-
-require 'Array/all_but_last'
-
-class Module
-  
-  def alias_methods(*args)
-    args.all_but_last.each{|e| alias_method e.to_sym, args.last.to_sym}
-  end
-  
-end
+require 'Thoran/Module/AliasMethods/alias_methods'

data/lib/Thoran/Array/AllButLast/all_but_last.rb

@@ -0,0 +1,28 @@
+# Thoran/Array/AllButLast/all_but_last.rb
+# Thoran::Array::AllButLast#all_but_last
+
+# 20180804
+# 0.1.0
+
+# Description: This returns a copy of the receiving array with the last element removed.  
+
+# Changes:
+# 1. + Thoran namespace.
+
+require 'Thoran/Array/LastX/lastX'
+
+module Thoran
+  module Array
+    module AllButLast
+
+      def all_but_last
+        d = self.dup
+        d.last!
+        d
+      end
+
+    end
+  end
+end
+
+Array.send(:include, Thoran::Array::AllButLast)

data/lib/Thoran/Array/ExtractOptionsX/extract_optionsX.rb

@@ -0,0 +1,25 @@
+# Thoran/Array/ExtractOptions/extract_optionsX.rb
+# Thoran::Array::ExtractOptions#extract_options!
+
+# 20180804
+# 0.2.0
+
+# History: Stolen wholesale from ActiveSupport.
+
+# Changes:
+# 1. + Thoran namespace.
+
+module Thoran
+  module Array
+    module ExtractOptionsX
+
+      def extract_options!
+        last.is_a?(::Hash) ? pop : {}
+      end
+      alias_method :extract_options, :extract_options!
+
+   end
+ end
+end
+
+Array.send(:include, Thoran::Array::ExtractOptionsX)

data/lib/Thoran/Array/LastX/lastX.rb

@@ -0,0 +1,33 @@
+# Thoran/Array/LastX/lastX.rb
+# Thoran::Array::LastX#last!
+
+# 20180804
+# 0.2.3
+
+# Description: Sometimes it makes more sense to treat arrays this way.
+
+# Changes since 0.1:
+# 1. Added the complement of the extended version of Array#first!.
+# 0/1
+# 2. Switched the tests to spec-style.
+# 1/2
+# 3. Added a test for the state of the array afterward, since this is meant to be an in place change.
+# 2/3
+# 4. Added tests for the extended functionality introduced in the first version 0.1.0.
+# 5. Fixed the implementation, so that the order is retained by unshifting the popped values rather than appending the shifted values as is the case with Array#first!.
+
+module Thoran
+  module Array
+    module LastX
+
+      def last!(n = 1)
+        return_value = []
+        n.times{return_value.unshift(self.pop)}
+        return_value.size == 1 ? return_value[0] : return_value
+      end
+
+    end
+  end
+end
+
+Array.send(:include, Thoran::Array::LastX)

data/lib/Thoran/Module/AliasMethods/alias_methods.rb

@@ -0,0 +1,23 @@
+# Thoran/Module/AliasMethods/alias_methods.rb
+# Thoran::Module::AliasMethods#alias_methods
+
+# 20180806
+# 0.1.0
+
+# Description: I have a penchance for having multiple method names and having line after line of alias_method calls is kinda ugly.  
+
+require 'Array/all_but_last'
+
+module Thoran
+  module Module
+    module AliasMethods
+
+      def alias_methods(*args)
+        args.all_but_last.each{|e| alias_method e.to_sym, args.last.to_sym}
+      end
+
+    end
+  end
+end
+
+Module.send(:include, Thoran::Module::AliasMethods)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: startor
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - thoran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2019-08-02 00:00:00.000000000 Z
 dependencies: []
 description: Easily install, start, and stop tor.
 email: code@thoran.com
@@ -44,6 +44,10 @@ files:
 - lib/String/each_char.rb
 - lib/String/each_line.rb
 - lib/String/grep.rb
+- lib/Thoran/Array/AllButLast/all_but_last.rb
+- lib/Thoran/Array/ExtractOptionsX/extract_optionsX.rb
+- lib/Thoran/Array/LastX/lastX.rb
+- lib/Thoran/Module/AliasMethods/alias_methods.rb
 - lib/Thoran/String/Capture/capture.rb
 - lib/Thoran/String/Captures/captures.rb
 - lib/Version.rb
@@ -68,8 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: tor management made easy.