pathtree 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13b52803c5a409fd368d095edb856e29a3a54c6c7e177df66e4410473ee3f776
-  data.tar.gz: 4ee4258ce192ae3d6ff2f8b943f1d76bc886ce7a2fdbaf851aa549c74d6050ac
+  metadata.gz: 5618618520c5b3e5d9c7d1094ac3ca0e42805d016d5152d3ee42a0b06e912a36
+  data.tar.gz: 4d1e1bf3729a4393d9d0bd6a9d9dff8a2e9e6490e40a696b7c7ed13f63bcec84
 SHA512:
-  metadata.gz: f615213773979b011228246740045d274021ca3c453466403cb3c90a44795d0f589f2f4ac5fad0dc1938ee19fb72d089217739fea2061ee7b9d81dc583cc8a64
-  data.tar.gz: 476c327f6704ec2a80ef6abc2eb98f079b6f82aba2cf40f5299e7a7a37163e44dec6baa6046824dc71623f0dab9dd30f8a88b58f7817003e3ed4a9105bbc6c09
+  metadata.gz: 1c1491f67f13883d135417a51986777577ca70119796d8db898dd548b19a8c1f6c1e47d866066210564ad6d586c61ce598ffa5e9ef8b734e0ff628d3ff3aaef8
+  data.tar.gz: f553ba89a367f84541ddcfba1dcfbbf13b398fefbc9d652f1de83895af66c2b4b8321144a5b23309c89f11a7aec2dd9c62639937857f2f22e3e308b2c6d1e4f3

data/CHANGELOG.md

@@ -7,6 +7,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 0.2.0 - 2021-11-20
+
+### Changed
+
+* `Pathtree` inherits `Pathname`
+
+`paths.rb`:
+
+```ruby
+dir :aaa
+```
+
+`main.rb`:
+
+```ruby
+# old (not works for now, see removed section)
+Pathtree::Dsl.read('paths.rb').aaa.then { path(_1) } # $PWD/aaa
+
+# new
+Pathtree::Dsl.read('paths.rb').aaa # $PWD/aaa
+```
+
+### Removed
+
+* `KernelRefinements` since `Pathtree` directory object is now `Pathtree` itself
+* Instance reader attribute `@tree` of `Pathtree::Dsl`
+
 ## 0.1.1 - 2021-11-20
 
 ### Added
@@ -27,4 +54,4 @@ file :rubocop_yml, dot: true # .rubocop.yml
 
 ## 0.1.0 - 2021-11-13
 
-- Initial release
+* Initial release

data/lib/pathtree/version.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
-class Pathtree
-  VERSION = '0.1.1'
+require 'pathname'
+
+class Pathtree < Pathname
+  VERSION = '0.2.0'
 end

data/lib/pathtree.rb

@@ -3,7 +3,7 @@
 require 'pathname'
 require_relative 'pathtree/version'
 
-class Pathtree
+class Pathtree < Pathname
   module SymbolRefinements
     refine Symbol do
       # +type+ option can be one of the following:
@@ -35,20 +35,19 @@ class Pathtree
     using SymbolRefinements
     using StringRefinements
 
-    attr_reader :tree
-
     def self.read(file_path, working_directory: Pathname.pwd)
-      new(working_directory: working_directory).tap { _1.read(file_path) }.tree
+      new(working_directory: working_directory)
+        .tap { _1.read(file_path) }
+        .instance_variable_get(:@working_directory)
     end
 
     # See also Pathtree::Dsl.read.
     def initialize(working_directory: Pathname.pwd)
-      @tree = Pathtree.new
-      @working_directory = Pathname(working_directory)
+      @working_directory = Pathtree.new(working_directory)
     end
 
     def read(file_path)
-      File.read(file_path).then { instance_eval(_1) }
+      instance_eval File.read(file_path)
     end
 
     def file(name, path = name.path(type: :file), dot: false)
@@ -59,7 +58,7 @@ class Pathtree
 
       path = path.prefix_dot if dot
 
-      @tree.define_singleton_method(name) { working_directory / path }
+      @working_directory.define_singleton_method(name) { working_directory / path }
     end
 
     def directory(name, path = name.path, dot: false, &block)
@@ -70,22 +69,13 @@ class Pathtree
       # which is same as define_method.
       working_directory = @working_directory / path
 
-      @tree.define_singleton_method(name) do
-        Dsl.new(working_directory: working_directory).tap do |d|
-          d.tree.instance_variable_set('@path', working_directory)
-          d.instance_eval(&block) if block_given?
-        end.tree
+      @working_directory.define_singleton_method(name) do
+        Dsl.new(working_directory: working_directory)
+           .tap { _1.instance_eval(&block) if block_given? }
+           .instance_variable_get(:@working_directory)
       end
     end
 
     alias dir directory
   end
-
-  module KernelRefinements
-    refine Kernel do
-      def path(tree)
-        tree.instance_variable_get('@path')
-      end
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pathtree
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - gemmaro