flgen 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73f400f84753663384d40487070b0cc511740b0084aa9e7ecfea84e845304fcf
-  data.tar.gz: '091045c56dc31bd9f11768c0c94a6451e0dd9872f052c5e199470fa9b5e4e2e7'
+  metadata.gz: 9ffab1952f67689d9675b1a5f0ee47b4905b7ea098b5013b2467cfa54360e311
+  data.tar.gz: bd33d9997f06c4b6a00ab54a2df2fefe9ff86d9eb766d098ed787e500f289db6
 SHA512:
-  metadata.gz: '066887c84c2348296e9692a620e893f1b0e97087a48f50b4c938baf9e66da27f8206f9ab7012e6ceb4d7c790cc71abfd2d34c0a7b95c7c301e500942ca6f0b43'
-  data.tar.gz: 051a76f99641f3673b777ee7702200b1ea4c11b5512952bd72bbb81c8a54fe440f7ac5a7c11be1c2d4b1b36639c6fee54ee6618e9b92cca5d44bf8e28376b2df
+  metadata.gz: d698fd487524fd93687db00ff03b73351579fd8499092960f6b077f42afc3fdbc2910926e95bd8a00e9d08cc47c60baa1478cf17309c008bc131371af1cd977f
+  data.tar.gz: 66c01f900315edc6d7355281112be92ef2e28eccfc174049c611959a5385b56b9ba1a9ee73f2102e34e250ead4a1a3805440c3e6c07a109d2c367312d279b1f1

data/lib/flgen/context.rb

@@ -78,17 +78,15 @@ module FLGen
     end
 
     def source_file_already_added?(file)
-      checksum = file.checksum
-      path = file.path
+      return true if source_files.include?(file.path)
+      return true if checksums.include?(file.checksum)
 
-      return true if checksums[path].include?(checksum)
-
-      checksums[path] << checksum
+      checksums << file.checksum
       false
     end
 
     def checksums
-      @checksums ||= Hash.new { |h, k| h[k] = [] }
+      @checksums ||= []
     end
 
     def add_macro_definition(name, value)

data/lib/flgen/formatter.rb

@@ -109,7 +109,7 @@ module FLGen
 
       pre_source_files(io)
       @context.source_files.each do |file|
-        io.puts(format_file_path(file.full_path))
+        io.puts(format_file_path(file.path))
       end
       post_source_files(io)
     end

data/lib/flgen/source_file.rb

@@ -3,35 +3,27 @@
 module FLGen
   class SourceFile
     def initialize(root, path)
-      @root = root
-      @path = path
+      @path = File.join(root, path)
     end
 
-    attr_reader :root
     attr_reader :path
 
-    def full_path
-      File.join(@root, @path)
-    end
-
     def match_ext?(ext_list)
       return false if ext_list.nil? || ext_list.empty?
 
-      file_ext = File.extname(@path)
-      ext_list.any? do |ext|
-        (ext[0] == '.' && ext || ".#{ext}") == file_ext
-      end
+      file_ext = File.extname(@path)[1..]
+      ext_list.any? { |ext| (ext[0] == '.' && ext[1..] || ext) == file_ext }
     end
 
     def remove_ext(ext_list)
       return self unless match_ext?(ext_list)
 
       path = Pathname.new(@path).sub_ext('').to_s
-      self.class.new(@root, path)
+      self.class.new('', path)
     end
 
     def checksum
-      @checksum ||= Digest::MD5.digest(File.read(full_path))
+      @checksum ||= Digest::MD5.digest(File.read(@path))
     end
   end
 end

data/lib/flgen/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FLGen
-  VERSION = '0.16.0'
+  VERSION = '0.16.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flgen
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Taichi Ishitani
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.2
+rubygems_version: 3.4.5
 signing_key: 
 specification_version: 4
 summary: Filelist generator