canoe 0.3.2.3 → 0.3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0518fcb695948644be7df59c7200eaf996a1c753bb8b575721764d36fcde61cb'
-  data.tar.gz: 385806c9e2035fa9c0cd1caf2556ca8aba1994ca73caad835f252003bbe1c36e
+  metadata.gz: 18aa4cddd71a6a2b06ea69ea320de7e75b5a9155685d5f4918b5047faf9a83af
+  data.tar.gz: 488a487b6b2cb872fed7b81e604756c7676e279a3b750e720f3c219aa1f29210
 SHA512:
-  metadata.gz: fe763993a442305afd7180eba5bb52fe63cd5ba9c8520c985a1cecec3ecbabb52296c5b6afd5ac7a72fa2341ebe432a6e7ca7b261145ca211dfc436f5066d22c
-  data.tar.gz: 9eb610ca364b557e9e1999c18dd497912503cdc0580f3f403ef3abf6f4ac58803b81d5a1c352f02e5e00685d6bb1e471866f33c3da2f12651063fb4e6a5f33bc
+  metadata.gz: c0e5a956513c53ecee63750c6d13b2ff5ebba51716e72e6631aed667962d5df5e0ea3eee064ba0435a6d3f37ebf3cc2d6128bc5fce0145d6952500ef39eac0e4
+  data.tar.gz: 1cf7cd8b486bb92f32c646fa0eebebf94288a97c00362e6af749814c352305a2b3903e4df2ffde3689365d90020522eb681e5e07d9ed486b3a0871a49edb16e7

data/lib/config_reader.rb

@@ -1,11 +1,17 @@
 require 'json'
+require_relative 'util'
 
 ##
 # class ConfigReader
 #   Just read a json file
 class ConfigReader
-  def self.extract_flags(file)
-    abort_on_err("config file #{file} does not exsit") unless File.exist? file
-    JSON.parse(File.read(file))
+  include Canoe::Err
+  def initialize(file)
+    @config_file = file
+  end
+
+  def extract_flags
+    abort_on_err("config file #{@config_file} does not exsit") unless File.exist? @config_file
+    JSON.parse(File.read(@config_file))
   end
 end

data/lib/util.rb

@@ -25,7 +25,7 @@ module Canoe
   module WorkSpaceUtil
     def current_workspace
       abort_on_err 'not in a canoe workspace' unless File.exist? '.canoe'
-      config = ConfigReader.extract_flags('config.json')
+      config = ConfigReader.new('config.json').extract_flags
 
       src_sfx = config['source-suffix'] || 'cpp'
       hdr_sfx = config['header-suffix'] || 'hpp'

data/lib/workspace/build.rb

@@ -18,6 +18,10 @@ module Canoe
       end
     end
 
+    def hdr_of_src(file)
+      file.gsub(".#{@source_suffix}", ".#{@header_suffix}")
+    end
+
     # args are commandline parameters passed to `canoe build`,
     # could be 'all', 'test', 'target', 'base' or empty
     def build(arg = 'target')
@@ -43,14 +47,14 @@ module Canoe
     end
 
     def build_compiler_from_config
-      flags = ConfigReader.extract_flags "config.json"
-      compiler_name = flags["compiler"] ? flags["compiler"] : "clang++"
+      flags = ConfigReader.new('config.json').extract_flags
+      compiler_name = flags['compiler'] ? flags['compiler'] : 'clang++'
 
       abort_on_err "compiler #{compiler_name} not found" unless system "which #{compiler_name} > /dev/null"
-      compiler_flags = ["-Isrc/components"]
+      compiler_flags = ['-Isrc/components']
       linker_flags = []
 
-      c_flags, l_flags = flags["flags"]["compile"], flags["flags"]["link"]
+      c_flags, l_flags = flags['flags']['compile'], flags['flags']['link']
       build_flags(compiler_flags, c_flags)
       build_flags(linker_flags, l_flags)
 

data/lib/workspace/make.rb

@@ -267,7 +267,7 @@ module Canoe
 
   class WorkSpace
     def make
-      config = ConfigReader.extract_flags "config.json"
+      config = ConfigReader.new('config.json').extract_flags
 
       deps = target_deps.merge tests_deps
 

data/lib/workspace/test.rb

@@ -50,15 +50,19 @@ module Canoe
       rebuild ||= !File.exist?(bin)
       
       file = "#{@tests_short}/test_#{name}.#{@source_suffix}"
+      rebuild ||= File.mtime(bin) < File.mtime(file)
       
       deps = fetch_all_deps
-      extract_one_file(file, deps).push(file).each do |f|
-        rebuild ||= File.mtime(bin) < File.mtime(f)
+      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
 
-      build_compiler_from_config && build_one_test(file, deps) if rebuild
-
-      issue_command bin
+      if rebuild
+        build_compiler_from_config
+        issue_command bin if build_one_test(file, deps)
+      else
+        issue_command bin
+      end
     end
 
     def fetch_all_test_files
@@ -84,7 +88,7 @@ module Canoe
     def compile_one_test(test_file, deps)
       extract_one_file(test_file, deps).each do |f|
         o = file_to_obj(f)
-        next if File.exist?(o) && File.mtime(o) > File.mtime(f)
+        next if File.exist?(o) && File.mtime(o) > File.mtime(f) && File.mtime(o) > File.mtime(hdr_of_src(f))
 
         compile(f, o)
       end

data/lib/workspace/version.rb

@@ -2,7 +2,7 @@ module Canoe
   class WorkSpace
     def self.version
       puts <<~VER
-           canoe v0.3.2.3
+           canoe v0.3.2.4
            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.2.3
+  version: 0.3.2.4
 platform: ruby
 authors:
 - XIONG Ziwei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-18 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies: []
 description: |+
   Canoe offers project management and building facilities to C/C++ projects.