pathtree 0.2.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5618618520c5b3e5d9c7d1094ac3ca0e42805d016d5152d3ee42a0b06e912a36
-  data.tar.gz: 4d1e1bf3729a4393d9d0bd6a9d9dff8a2e9e6490e40a696b7c7ed13f63bcec84
+  metadata.gz: 06e46ecc4b58e4553042302669756be661ac48184b80ed5dd54da22dc8697b5f
+  data.tar.gz: d73d5937c003469eede446f6e700657b594083a09b5d4f9d886df3ecc3369a48
 SHA512:
-  metadata.gz: 1c1491f67f13883d135417a51986777577ca70119796d8db898dd548b19a8c1f6c1e47d866066210564ad6d586c61ce598ffa5e9ef8b734e0ff628d3ff3aaef8
-  data.tar.gz: f553ba89a367f84541ddcfba1dcfbbf13b398fefbc9d652f1de83895af66c2b4b8321144a5b23309c89f11a7aec2dd9c62639937857f2f22e3e308b2c6d1e4f3
+  metadata.gz: 9b2c4e1e4f15378a564e3db49d93b77126d55900a913435b74e71206195153f723785369f800d107a3c3bb3d4966a0a44c47c9d5a18322a48886d9e8413a7294
+  data.tar.gz: d76946784f32750357ab5bbe6145f114b5207c6204fdd3f2663c2d7da5d322aa25d5e3047fc0a514d1749e33164f30323dd4564f3c2a3953366215ab3c31de8f

data/CHANGELOG.md

@@ -7,9 +7,61 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Fixed in 0.4.1
+
+* It is now possible to define identically named paths in different hierarchies.
+  In 0.4.0, duplicate names caused an exception.
+
+```ruby
+directory :aaa do
+  file :xxx
+
+  directory :bbb do
+    file :xxx # OK
+  end
+end
+```
+
+## 0.4.0 - 2022-05-14
+
+### Changed in 0.4.0
+
+* Moved `Pathtree::Dsl.read` and `Pathtree::Dsl.load` to `Pathtree.read` and `Pathree.load`.
+* If root path is not given, `Pathtree::Trunk` is used, rather than `Pathname.pwd`.
+
+### Removed in 0.4.0
+
+* Refinements for `String`, `Pathname`, and `Object`
+
+## 0.3.0 - 2021-12-12
+
+### Added in 0.3.0
+
+* GitLab CI which checks tests with Minitest and lint rules with RuboCop
+* Enable to pass `Proc` object to `path` argument
+  of `Pathtree::Dsl#file` and `Pathtree::Dsl#directory`.
+
+  ```ruby
+  file :main_idr, -> { _1.capitalize } # Main.idr
+  ```
+
+* `Pathtree::StringRefinements#split_extension`
+* `Pathtree::ObjectRefinements#file_path` and `Pathtree::ObjectRefinements#directory_path`
+
+### Removed in 0.3.0
+
+* `Pathtree::SymbolRefinements`
+  * Move to `Pathtree::StringRefinements#split_extension`
+* `dot` option for `Pathtree::Dsl#file` and `Pathtree::Dsl#directory`
+  * Use `Proc` for path instead
+
+### Changed in 0.3.0
+
+* Visibility of `Pathtree::Dsl#read` to private
+
 ## 0.2.0 - 2021-11-20
 
-### Changed
+### Changed in 0.2.0
 
 * `Pathtree` inherits `Pathname`
 
@@ -29,14 +81,14 @@ Pathtree::Dsl.read('paths.rb').aaa.then { path(_1) } # $PWD/aaa
 Pathtree::Dsl.read('paths.rb').aaa # $PWD/aaa
 ```
 
-### Removed
+### Removed in 0.2.0
 
 * `KernelRefinements` since `Pathtree` directory object is now `Pathtree` itself
 * Instance reader attribute `@tree` of `Pathtree::Dsl`
 
 ## 0.1.1 - 2021-11-20
 
-### Added
+### Added in 0.1.1
 
 * `dot` option for `Pathtree::Dsl#file` and `Pathtree::Dsl#directory`.
   If `dot: true`, then path name is prefixed with dot (period) character

data/README.md

@@ -1,6 +1,6 @@
 # Pathtree
 
-Tree structure of Pathname
+Pathname DSL
 
 ## Installation
 
@@ -24,13 +24,40 @@ gem install pathtree
 
 ## Usage
 
-See tests.
+`path.rb`:
+
+```ruby
+file :aaa
+
+directory :public do
+  file :bbb
+end
+```
+
+`Rakefile`:
+
+```ruby
+require 'pathtree'
+
+P = Pathtree.read('path.rb')
+
+file P.public.bbb => P.aaa do |t|
+  cp t.source, t.name
+do
+```
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies.
+Then, run `rake test` to run the tests.
+You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`.
+To release a new version, update the version number in `version.rb`,
+and then run `bundle exec rake release`,
+which will create a git tag for the version,
+push git commits and the created tag,
+and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 
@@ -38,4 +65,6 @@ Bug reports and pull requests are welcome on GitLab at <https://gitlab.com/gemma
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [MIT License][mit].
+
+[mit]: https://opensource.org/licenses/MIT

data/lib/pathtree/dsl.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'pathname'
+
+module Pathtree
+  # DSL for constructing path tree
+  module Dsl
+    attr_reader :names
+
+    # Grows file leaf from the branch;
+    # The path at the point where this method is called
+    # attempts to create an instance method that returns the path with the +name+.
+    #
+    # * If +path+ is +nil+, +name+ is used instead.
+    # * If +path+ is a +Proc+, give +name+ to it.
+    # * Otherwise, +path+ itself is used.
+    def file(name, path = nil)
+      check_name(name)
+      path = normalize(path, name: name).then { nest(_1) }
+      sprout(name: name, path: path)
+    end
+
+    # Grows directory branch from the branch.
+    # See also Pathtree::Dsl#file method.
+    # This method has optional block, which represents nested file structure.
+    def directory(name, path = nil, &block)
+      check_name(name)
+      path = normalize(path, name: name).then { nest(_1) }
+                                        .then { Dsl.extend(_1) }
+                                        .tap { _1.instance_eval(&block) if block }
+      sprout(name: name, path: path)
+    end
+
+    alias dir directory
+
+    def self.extend(path)
+      path.instance_variable_set(:@names, [])
+      path.extend(Dsl)
+      path
+    end
+
+    private
+
+    def check_name(name)
+      raise MethodDuplicationError, name if respond_to?(name)
+    end
+
+    def normalize(path, name:)
+      if path.nil?
+        Pathname(name.to_s)
+      elsif path.is_a?(String)
+        Pathname(path)
+      elsif path.respond_to?(:call)
+        path.call(name).to_s.then { Pathname(_1) }
+      else
+        path
+      end
+    end
+
+    def nest(path) = is_a?(Trunk) ? path : self / path
+
+    def sprout(name:, path:)
+      define_singleton_method(name) { path }
+      @names << name
+    end
+  end
+end

data/lib/pathtree/trunk.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'pathname'
+require_relative 'dsl'
+
+module Pathtree
+  # A trunk of path tree
+  class Trunk
+    include Dsl
+
+    def initialize
+      @names = []
+    end
+  end
+end

data/lib/pathtree/version.rb

@@ -2,6 +2,6 @@
 
 require 'pathname'
 
-class Pathtree < Pathname
-  VERSION = '0.2.0'
+module Pathtree
+  VERSION = '0.4.1'
 end

data/lib/pathtree.rb

@@ -1,81 +1,31 @@
 # frozen_string_literal: true
 
-require 'pathname'
 require_relative 'pathtree/version'
+require_relative 'pathtree/trunk'
 
-class Pathtree < Pathname
-  module SymbolRefinements
-    refine Symbol do
-      # +type+ option can be one of the following:
-      #
-      # +:directory+:: +:directory+ simply converts to +String+.
-      # +:file+:: +:file+ converts to +String+, and turn +aaa_bbb_ccc+ into +aaa_bbb.ccc+ for example.
-      def path(type: :directory)
-        case type
-        in :directory
-          to_s
-        in :file
-          to_s.sub(/\A[a-z0-9_]*\K_(?=[a-z0-9]+\Z)/, '.')
-        end
-      end
-    end
-  end
-
-  module StringRefinements
-    refine String do
-      def prefix_dot
-        return self if start_with?('.')
+# Pathname DSL
+module Pathtree
+  class MethodDuplicationError < NameError; end
 
-        ".#{self}"
-      end
-    end
+  # Read Pathtree DSL from +path+.
+  # +root+ is base directory for tree.
+  def self.read(path, root: nil)
+    dsl = File.read(path)
+    self.load(dsl, root: root)
   end
 
-  class Dsl
-    using SymbolRefinements
-    using StringRefinements
-
-    def self.read(file_path, working_directory: Pathname.pwd)
-      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)
-      @working_directory = Pathtree.new(working_directory)
-    end
-
-    def read(file_path)
-      instance_eval File.read(file_path)
-    end
-
-    def file(name, path = name.path(type: :file), dot: false)
-      # NOTE: Temporal variable is needed
-      # since define_singleton_method's block is evaluated using instance_eval
-      # which is same as define_method.
-      working_directory = @working_directory
-
-      path = path.prefix_dot if dot
-
-      @working_directory.define_singleton_method(name) { working_directory / path }
-    end
-
-    def directory(name, path = name.path, dot: false, &block)
-      path = path.prefix_dot if dot
+  # Load Pathtree DSL source.
+  # +root+ is base directory for tree.
+  def self.load(dsl, root: nil)
+    (root ? to_path(root) : Trunk.new).tap { _1.instance_eval(dsl) }
+  end
 
-      # NOTE: Temporal variable is needed
-      # since define_singleton_method's block is evaluated using instance_eval
-      # which is same as define_method.
-      working_directory = @working_directory / path
+  class << self
+    private
 
-      @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
+    def to_path(value)
+      value = Pathname(value) if value.is_a?(String)
+      Dsl.extend(value)
     end
-
-    alias dir directory
   end
 end

metadata

@@ -1,128 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: pathtree
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.1
 platform: ruby
 authors:
 - gemmaro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: pathname
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.3'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: rubocop-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.15.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.15.2
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: solargraph
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.44.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.44.0
-description: Tree structure of Pathname
+date: 2022-05-17 00:00:00.000000000 Z
+dependencies: []
+description: Pathname DSL
 email:
 - gemmaro.dev@gmail.com
 executables: []
@@ -133,11 +21,14 @@ files:
 - LICENSE.txt
 - README.md
 - lib/pathtree.rb
+- lib/pathtree/dsl.rb
+- lib/pathtree/trunk.rb
 - lib/pathtree/version.rb
 homepage: https://gitlab.com/gemmaro/pathtree
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -153,8 +44,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
-summary: Tree structure of Pathname
+summary: Pathname DSL
 test_files: []