canoe 0.3.3.4 → 0.3.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28de761c23336af9df9ed1117d47f85c22f77abd3030195462d0e43ccba5091c
-  data.tar.gz: f0734ecf77c58d6d86a72835fff2e56e1ff49504be3f2ad7cc3e182e550b5623
+  metadata.gz: 31786230f3242408570eab8fa5c5c7a51fa1e3ca7fe5b0edabe6789a4a1b311a
+  data.tar.gz: 68ef217e2f6ac77d17ebe14ef3658c2002b8a6f5d0fed5090292cdb21b16b21c
 SHA512:
-  metadata.gz: ff0167eca4be655a4cc33258b5dddfa07e7cbad53d6745b38d75eb301c032403d5338e6249f7704dee460dbaa87a3a4141b8f1ca023abcff5af4a660691b4f2c
-  data.tar.gz: f5c494d7cefeefca5e2fd14353f9645479c29f4bb338330ebb9075d103fce73ea678bbb62823053bafdbe3bad497d7b5ecc8a3ca369ff078b937d1e7296e5fbd
+  metadata.gz: c089ec6a65599754ef177bbe8f14e71195d0d019ee9df3aa4a8414c1204055058f5b7a7e542a9dc43917b85c84e55907da60c8a2aeccb1d3271f02bead5d6c68
+  data.tar.gz: ca6a203ad8bed8382cb8b3ee5d5ba567de8462bcc611d4a603c43159c98352cec40a9eec1f35d67369f5d33da696a2a46ca15627ffe34a50b1cc8cc07fa91340

data/lib/coloring.rb

@@ -10,7 +10,7 @@ class String
       34 => :blue,
       35 => :magenta,
       36 => :cyan,
-      37 => :white,
+      37 => :white
     }
     colors.each do |k, v|
       define_method v do

data/lib/workspace/make.rb

@@ -242,7 +242,6 @@ module Canoe
         objs = ["$(OBJ_#{n})"] + extract_one_file_obj(filename, deps).map do |o|
           "$(OBJ_#{File.basename(o, '.*').upcase})"
         end
-
         makefile.puts("$(#{n}): #{objs.join ' '}\n\t$(#{cmplr}) $(#{cmplr}FLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS)")
         makefile.puts ''
       end
@@ -264,6 +263,7 @@ module Canoe
       make_out_rules makefile, deps
       makefile.puts ''
       make_obj_rules makefile, deps
+      makefile.puts ''
       make_tests_rules makefile, deps
       makefile.puts ''
       make_clean makefile

data/lib/workspace/test.rb

@@ -9,12 +9,45 @@ module Canoe
       test_single(args[0], args[1..].join(" "))
     end
 
-    # extract one test file's dependency
+    # extract all files the file depends on, including headers
     def extract_one_file(file, deps)
-      ret = deps[file].map { |f| f.gsub(".#{@header_suffix}", ".#{@source_suffix}") }
+      ret = []
+      holder = deps[file] + deps[file].map { |f| f.gsub(".#{@header_suffix}", ".#{@source_suffix}") }
+      extract_one_file_helper(file, deps, holder, ret)
+
+      ret = ret + ret.map{ |f| f.gsub(".#{@header_suffix}", ".#{@source_suffix}") }
+      ret.uniq
+    end
+
+    def extract_one_file_obj(file, deps)
+      ret = extract_one_file(file, deps).map do |f|
+        file_to_obj(f)
+      end
+      ret.uniq
+    end
+
+    def extract_one_file_header(file, deps)
+      ret = extract_one_file(file, deps).map do |f|
+        f.gsub(".#{@source_suffix}", ".#{@header_suffix}")
+      end
+      ret.uniq
+    end
+
+    def extract_one_file_source(file, deps)
+      ret = extract_one_file(file, deps).map do |f|
+        f.gsub(".#{@header_suffix}", ".#{@source_suffix}")
+      end
+      ret.uniq
+    end
+
+    private
+
+    # extract one test file's dependency
+    def extract_one_file_helper(file, deps, ref, ret)
       begin
-        deps[file].each do |f|
-          dep = extract_one_file(f, deps)
+        ref.each do |f|
+          ret << f unless ret.include?(f)
+          dep = extract_one_file_helper(f, deps, deps[f], ret)
           dep.each do |d|
             ret << d unless ret.include?(d)
           end
@@ -22,18 +55,9 @@ module Canoe
       rescue SystemStackError
         puts "#{"Fatal: ".red}file #{file} is circularly included"
         exit false
-      end      
-      ret.map { |f| f.gsub(".#{@header_suffix}", ".#{@source_suffix}") }
-    end
-
-    def extract_one_file_obj(file, deps)
-      extract_one_file(file, deps).map do |f|
-        file_to_obj(f)
       end
     end
 
-    private
-
     def test_all
       build_test
       fetch_all_test_files.each do |f|
@@ -52,6 +76,7 @@ module Canoe
       rebuild ||= File.mtime(bin) < File.mtime(file)
 
       deps = fetch_all_deps
+
       extract_one_file(file, deps).each do |f|
         rebuild ||= File.mtime(bin) < File.mtime(f) || File.mtime(bin) < File.mtime(hdr_of_src(f))
       end
@@ -84,13 +109,13 @@ module Canoe
 
     def link_one_test(test_file, deps)
       target = "#{@target_short}/#{File.basename(test_file, '.*')}"
-      @compiler.link_executable target, extract_one_file_obj(test_file, deps) + [file_to_obj(test_file)]
+      @compiler.link_executable target, [file_to_obj(test_file)] + extract_one_file_obj(test_file, deps)
     end
 
     def build_one_test(test_file, deps, indent = "")
       files = DepAnalyzer.compiling_filter(target_deps, Time.new(0), @source_suffix, @header_suffix)
+                .intersection(extract_one_file_source(test_file, deps)) << test_file
       flag = true
-      files << test_file
 
       stepper = Stepper.new(files.size, files.size)
 
@@ -101,7 +126,7 @@ module Canoe
         stepper.step
       end
       abort_on_err("Compiling errors encountered") unless flag;
-      
+
       printf "#{indent}#{stepper.progress_as_str.green} compiling finished\n"
       puts "#{indent}[100%]".green + " linking"
       link_one_test(test_file, deps)

data/lib/workspace/version.rb

@@ -2,7 +2,7 @@ module Canoe
   class WorkSpace
     def self.version
       puts <<~VER
-           canoe v0.3.3.4
+           canoe v0.3.3.7
            For features in this version, please visit https://github.com/Dicridon/canoe
            Currently, canoe can do below:
                - project creation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canoe
 version: !ruby/object:Gem::Version
-  version: 0.3.3.4
+  version: 0.3.3.7
 platform: ruby
 authors:
 - XIONG Ziwei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-19 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies: []
 description: |+
   Canoe offers project management and building facilities to C/C++ projects.