dry-files 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9b554d01289fcefe3eb4159a0d832a55544de168d9df3d68db65d017526debd
-  data.tar.gz: cfe09c1716f6046421111bd848a81c9a0785b195f4a612c348c2054cdf6aa805
+  metadata.gz: 3b415a307ce621ab6601397d6cf2a772ef390210e1591b99f5ab40ccedac6108
+  data.tar.gz: c63b4c80401dccba0c095fa5a26d1b25c4e50d00f71978037e22b481a384c7db
 SHA512:
-  metadata.gz: 2e6142b107d2deafc6bb1b98412fee75be75e05934e940fd8227abd8079cff9b4078d064a5e8ae90339b95a9852a189bab199d3ec5f4de5e6001e13b22be7cde
-  data.tar.gz: 53abdcbd822a4dbc78dac59308454fe46738e21448d3faeca7eae8e80d6a0725b06f7d614c4e736bba0107719c45229765a16ea84b529aad3a4445d882859500
+  metadata.gz: c4b93220b78ec92f7224d9d033d5055b0be5f5f34fc9e187227e3d5c8198f9b9f1e02316295525d04a47709dc3614c40d30e9d43d68f6bbaaaf69f27f442f47c
+  data.tar.gz: 7cf2972a9be4e35dfc2babaa8bfd3ad8f0ee5646c69b397eb6a334baba97c906d17e7a28177229814eacb99b84839062bdda0a2f5972778f8f498f911ede3d61

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 1.0.2 2023-10-03
+
+
+### Fixed
+
+- Ensure Dry::Files#inject_line_at_block_bottom to not match false positive closing blocks (@jodosha in #17)
+
+
+[Compare v1.0.1...v1.0.2](https://github.com/dry-rb/dry-files/compare/v1.0.1...v1.0.2)
+
+## 1.0.1 2022-11-21
+
+
+### Fixed
+
+- Do not introduce multiple newlines in `Dry::Files#append` (@timriley in #14)
+
+
+[Compare v1.0.0...v1.0.1](https://github.com/dry-rb/dry-files/compare/v1.0.0...v1.0.1)
+
 ## 1.0.0 2022-11-04
 
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2022 dry-rb team
+Copyright (c) 2015-2023 dry-rb team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -1,29 +1,21 @@
 <!--- this file is synced from dry-rb/template-gem project -->
 [gem]: https://rubygems.org/gems/dry-files
 [actions]: https://github.com/dry-rb/dry-files/actions
-[codacy]: https://www.codacy.com/gh/dry-rb/dry-files
-[chat]: https://dry-rb.zulipchat.com
-[inchpages]: http://inch-ci.org/github/dry-rb/dry-files
 
-# dry-files [![Join the chat at https://dry-rb.zulipchat.com](https://img.shields.io/badge/dry--rb-join%20chat-%23346b7a.svg)][chat]
-
-[![Gem Version](https://badge.fury.io/rb/dry-files.svg)][gem]
-[![CI Status](https://github.com/dry-rb/dry-files/workflows/ci/badge.svg)][actions]
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/71200ee8d70b412c9e21c20b8b3b3688)][codacy]
-[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/71200ee8d70b412c9e21c20b8b3b3688)][codacy]
-[![Inline docs](http://inch-ci.org/github/dry-rb/dry-files.svg?branch=main)][inchpages]
+# dry-files [![Gem Version](https://badge.fury.io/rb/dry-files.svg)][gem] [![CI Status](https://github.com/dry-rb/dry-files/workflows/ci/badge.svg)][actions]
 
 ## Links
 
 * [User documentation](https://dry-rb.org/gems/dry-files)
 * [API documentation](http://rubydoc.info/gems/dry-files)
+* [Forum](https://discourse.dry-rb.org)
 
 ## Supported Ruby versions
 
 This library officially supports the following Ruby versions:
 
-* MRI `>= 2.7.0`
-* jruby `>= 9.3` (postponed until 2.7 is supported)
+* MRI `>= 3.0.0`
+* jruby `>= 9.4` (not tested on CI)
 
 ## License
 

data/lib/dry/files/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   class Files
-    VERSION = "1.0.0"
+    VERSION = "1.0.2"
   end
 end

data/lib/dry/files.rb

@@ -841,6 +841,11 @@ module Dry
     # @since 0.3.0
     # @api private
     class Delimiter
+      # @since 1.0.2
+      # @api private
+      SPACE_MATCHER_GENERAL = /[[:space:]]*/
+      private_constant :SPACE_MATCHER_GENERAL
+
       # @since 0.3.0
       # @api private
       attr_reader :opening, :closing
@@ -853,6 +858,26 @@ module Dry
         @closing = closing
         freeze
       end
+
+      # @since 1.0.2
+      # @api private
+      def opening_matcher
+        matcher(opening)
+      end
+
+      # @since 1.0.2
+      # @api private
+      def closing_matcher
+        matcher(closing)
+      end
+
+      private
+
+      # @since 1.0.2
+      # @api private
+      def matcher(delimiter)
+        /#{SPACE_MATCHER_GENERAL}\b#{delimiter}\b(?:#{SPACE_MATCHER_GENERAL}|#{NEW_LINE_MATCHER})/
+      end
     end
 
     # @since 0.1.0
@@ -862,12 +887,12 @@ module Dry
 
     # @since 0.3.0
     # @api private
-    NEW_LINE_MATCHER = /#{NEW_LINE}\z/.freeze
+    NEW_LINE_MATCHER = /#{NEW_LINE}\z/
     private_constant :NEW_LINE_MATCHER
 
     # @since 0.3.0
     # @api private
-    EMPTY_LINE = /\A\z/.freeze
+    EMPTY_LINE = /\A\z/
     private_constant :EMPTY_LINE
 
     # @since 0.1.0
@@ -887,7 +912,7 @@ module Dry
 
     # @since 0.1.0
     # @api private
-    SPACE_MATCHER = /\A[[:space:]]*/.freeze
+    SPACE_MATCHER = /\A[[:space:]]*/
     private_constant :SPACE_MATCHER
 
     # @since 0.3.0
@@ -933,6 +958,8 @@ module Dry
     # @since 0.1.0
     # @api private
     def newline(line = nil)
+      return line if line.to_s.end_with?(NEW_LINE)
+
       "#{line}#{NEW_LINE}"
     end
 
@@ -965,9 +992,9 @@ module Dry
     # @since 0.3.0
     # @api private
     def closing_block_index(content, starting, path, target, delimiter, count_offset = 0) # rubocop:disable Metrics/ParameterLists
-      blocks_count = content.count { |line| line.match?(delimiter.opening) } + count_offset
+      blocks_count = content.count { |line| line.match?(delimiter.opening_matcher) } + count_offset
       matching_line = content.find do |line|
-        blocks_count -= 1 if line.match?(delimiter.closing)
+        blocks_count -= 1 if line.match?(delimiter.closing_matcher)
         line if blocks_count.zero?
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-files
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-04 00:00:00.000000000 Z
+date: 2023-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: file utilities