#10 file paths

yegor256 · Feb 26, 2024 · 22170a7 · 22170a7
1 parent 755ebec
commit 22170a7
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 23 deletions.
diff --git a/bin/xembly b/bin/xembly
@@ -24,9 +24,9 @@
 
 $stdout.sync = true
 
-require 'xembly'
-require 'xembly/version'
 require 'slop'
+require_relative '../lib/xembly'
+require_relative '../lib/xembly/version'
 
 opts = Slop.parse(ARGV, strict: true, help: true) do |o|
   o.banner = "Usage (#{Xembly::VERSION}): xembly [options] [directives]"

diff --git a/lib/xembly.rb b/lib/xembly.rb
@@ -21,12 +21,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'xembly/version'
-require 'xembly/xembler'
-require 'xembly/directives'
 require 'nokogiri'
 require 'logger'
 require 'time'
+require_relative 'xembly/version'
+require_relative 'xembly/xembler'
+require_relative 'xembly/directives'
 
 # Xembly main module.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)

diff --git a/lib/xembly/add.rb b/lib/xembly/add.rb
@@ -21,8 +21,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'xembly'
 require 'nokogiri'
+require_relative '../xembly'
 
 module Xembly
   # ADD directive

diff --git a/lib/xembly/addif.rb b/lib/xembly/addif.rb
@@ -21,8 +21,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'xembly'
 require 'nokogiri'
+require_relative '../xembly'
 
 module Xembly
   # ADDIF directive

diff --git a/lib/xembly/attr.rb b/lib/xembly/attr.rb
@@ -21,7 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'xembly'
+require_relative '../xembly'
 
 module Xembly
   # ATTR directive

diff --git a/lib/xembly/directives.rb b/lib/xembly/directives.rb
@@ -21,14 +21,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'xembly/add'
-require 'xembly/addif'
-require 'xembly/attr'
-require 'xembly/remove'
-require 'xembly/set'
-require 'xembly/strict'
-require 'xembly/up'
-require 'xembly/xpath'
+require_relative 'add'
+require_relative 'addif'
+require_relative 'attr'
+require_relative 'remove'
+require_relative 'set'
+require_relative 'strict'
+require_relative 'up'
+require_relative 'xpath'
 
 module Xembly
   # Directives

diff --git a/lib/xembly/remove.rb b/lib/xembly/remove.rb
@@ -21,7 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'xembly'
+require_relative '../xembly'
 
 module Xembly
   # REMOVE directive

diff --git a/lib/xembly/set.rb b/lib/xembly/set.rb
@@ -22,7 +22,7 @@
 # SOFTWARE.
 
 require 'nokogiri'
-require 'xembly'
+require_relative '../xembly'
 
 module Xembly
   # SET directive

diff --git a/lib/xembly/strict.rb b/lib/xembly/strict.rb
@@ -22,6 +22,7 @@
 # SOFTWARE.
 
 require 'nokogiri'
+require_relative '../xembly'
 
 module Xembly
   # STRICT directive

diff --git a/lib/xembly/up.rb b/lib/xembly/up.rb
@@ -22,6 +22,7 @@
 # SOFTWARE.
 
 require 'nokogiri'
+require_relative '../xembly'
 
 module Xembly
   # UP directive

diff --git a/lib/xembly/xembler.rb b/lib/xembly/xembler.rb
@@ -21,7 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'xembly'
+require_relative '../xembly'
 
 module Xembly
   # Xembler

diff --git a/lib/xembly/xpath.rb b/lib/xembly/xpath.rb
@@ -22,6 +22,7 @@
 # SOFTWARE.
 
 require 'nokogiri'
+require_relative '../xembly'
 
 module Xembly
   # XPATH directive

diff --git a/test/test_xembler.rb b/test/test_xembler.rb
@@ -25,7 +25,7 @@
 require 'nokogiri'
 require 'xembly/xembler'
 require 'xembly/directives'
-require 'test__helper'
+require_relative 'test__helper'
 
 # Xembly::Xembler module tests.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)

diff --git a/test/test_xembly.rb b/test/test_xembly.rb
@@ -23,10 +23,10 @@
 
 require 'minitest/autorun'
 require 'nokogiri'
-require 'xembly'
 require 'tmpdir'
 require 'slop'
-require 'test__helper'
+require_relative '../lib/xembly'
+require_relative 'test__helper'
 
 # Xembly main module test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -69,7 +69,7 @@ def test_reading_from_file
   private
 
   def opts(args)
-    Slop.parse args do |o|
+    Slop.parse(args, help: true) do |o|
       o.on '-v', '--verbose'
       o.string '-x', '--xml', argument: :required
       o.string '-d', '--dirs', argument: :required