canoe 0.3.2.2 → 0.3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50752029532b56ce10a610ae7d9705212a1c424533ed2fde71a3133505c11d0e
-  data.tar.gz: 501d882198eb59157961a741d786dbbe5c420e9d2704d37e7b1ca9a0f651854a
+  metadata.gz: f306cd1daca6a05e5ed98b6bac0d638ee6c8b3deb8f033573254b40e0e111f04
+  data.tar.gz: 20025070fa9b8880e7702fa1560458c6c02f3bd6ef544f0c105c04c4eabbb08b
 SHA512:
-  metadata.gz: 2da665d3e3ce5e073a207863fc2cc2f06a892d9e7889d3e0e29617c673c01d5aa503854c5effb80b34989b3cdf9743a1b8ada49c537920ba06f5ec1e5cd836c0
-  data.tar.gz: 9d13815277a02e41a894cee4528c3742d35a6e81cbc84828a0f8dc857aae1c7356de4cc05511ca9145a2f4d2912315955746541bd47d35d949c38863d1ddecf7
+  metadata.gz: 57d280fbde673916e1abc93a027cb9be3eda421a9bf9e65ece2c5415d9c0be19236070575b464b09d934aad7729343afcbd9e105424105417e1ea14db50e300c
+  data.tar.gz: b0724750762fe724958ec732e7f701d13f8b0d7c2cfaf80f8e32c01e959b982e682594cc543cc45115e0aef0a70bfd93c0ca53cd48aa8278b905d87904f52ad7

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/source_files.rb

@@ -30,13 +30,14 @@ class SourceFiles
     def get_all_helper(dir, &block)
       Dir.each_child(dir) do |f|
         file = "#{dir}/#{f}"
+        # we don't handle symlinks
         if File.file? file
           if block_given?
             @files << "#{file}" if yield(f)
           else
             @files << "#{file}"
           end
-        else
+        elsif File.directory? file
           get_all_helper("#{file}", &block)
         end
       end

data/lib/util.rb

@@ -1,5 +1,7 @@
 require_relative 'coloring'
 
+require 'English'
+
 module Canoe
   ##
   # Stepper record the progress of a task
@@ -25,7 +27,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'
@@ -60,7 +62,14 @@ module Canoe
   module SystemCommand
     def issue_command(cmd_str)
       puts cmd_str
-      system cmd_str
+      system(cmd_str)
+    end
+
+    def run_command(cmd_str)
+      puts cmd_str
+      status = system(cmd_str)
+      puts $CHILD_STATUS unless status
+      status
     end
   end
   

data/lib/workspace/build.rb

@@ -18,9 +18,14 @@ 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')
+      build_compiler_from_config
       send "build_#{arg}"
     end
 
@@ -42,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)
 
@@ -132,8 +137,6 @@ module Canoe
       build_time = File.exist?(target) ? File.mtime(target) : Time.new(0)
       files = DepAnalyzer.compiling_filter target_deps, build_time, @source_suffix, @header_suffix 
 
-      build_compiler_from_config
-
       if files.empty? && File.exist?(target)
         puts "nothing to do, all up to date"
         return true
@@ -145,7 +148,6 @@ module Canoe
     # generate a compile_commands.json file
     def build_base
       deps = target_deps.merge tests_deps
-      build_compiler_from_config
       database = CompilationDatabase.new
       deps.each_key do |k|
         next if k.end_with? @header_suffix

data/lib/workspace/help.rb

@@ -53,9 +53,10 @@ module Canoe
       build [all|test]:
           build current project, 'all' builds both target and tests, 'test' builds tests only
 
-      test [tests]:
+      test [tests] [args]:
           build and run tests
           [tests]: 'all' for all tests, or a name of a test for a single test
+          [args]: args are passed to the single test
         
       run [options]:
           build current project with no specific compilation flags, and run this project, passing [options] as command line arguments to the binary

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/new.rb

@@ -8,7 +8,8 @@ module Canoe
       end
       Dir.mkdir(@src)
       Dir.mkdir(@components)
-      Dir.mkdir("#{@workspace}/obj")
+      Dir.mkdir(@obj)
+      add_gitignore @obj
       if @mode == :bin
         DefaultFiles.create_main(@src, @source_suffix)
       else
@@ -20,12 +21,23 @@ module Canoe
 
       Dir.mkdir(@third)
       Dir.mkdir(@target)
+      add_gitignore @target      
       Dir.mkdir(@tests)
       Dir.chdir(@workspace) do
-        system 'git init'
-        system 'canoe add tests'
+        issue_command 'git init'
+        issue_command 'canoe add tests'
       end
       puts "workspace #{@workspace.blue} is created"
     end
+
+    private
+
+    def add_gitignore(dir)
+      Dir.chdir(dir) do
+        File.open('.gitignore', 'w') do |f|
+          f.write "*\n!.gitignore\n"
+        end
+      end
+    end
   end
 end

data/lib/workspace/run.rb

@@ -6,7 +6,7 @@ module Canoe
       return unless build
       
       args = args.join ' '
-      issue_command "#{@target_short}/#{@name} #{args}"
+      run_command "#{@target_short}/#{@name} #{args}"
     end
   end
 end

data/lib/workspace/test.rb

@@ -5,20 +5,13 @@ module Canoe
         test_all
         return
       end
-
-      args.each do |arg|
-        case arg
-        when 'all'
-          test_all
-        else
-          test_single arg
-        end
-      end
+      # we don't handle spaces
+      test_single(args[0], args[1..].join(" "))
     end
     
     # extract one test file's dependency
     def extract_one_file(file, deps)
-      ret = deps[file]
+      ret = deps[file].map { |f| f.gsub(".#{@header_suffix}", ".#{@source_suffix}") }
 
       deps[file].each do |f|
         dep = extract_one_file(f, deps)
@@ -44,13 +37,27 @@ module Canoe
       end
     end
 
-    def test_single(name)
+    def test_single(name, args = "")
+      rebuild = false;
       bin = "#{@target_short}/test_#{name}"
+
+      rebuild ||= !File.exist?(bin)
+      
       file = "#{@tests_short}/test_#{name}.#{@source_suffix}"
-      abort_on_err "Can not find source file #{file.red} for test #{name.red}" unless File.exist?(file)
-      build_one_test(file, fetch_all_deps) unless File.exist?(bin)
+      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
 
-      issue_command bin
+      cmd = "#{bin} #{args}"
+      if rebuild
+        build_compiler_from_config
+        run_command cmd if build_one_test(file, deps)
+      else
+        run_command cmd
+      end
     end
 
     def fetch_all_test_files
@@ -76,7 +83,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.2
+           canoe v0.3.3.1
            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.2
+  version: 0.3.3.1
 platform: ruby
 authors:
 - XIONG Ziwei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2021-08-18 00:00:00.000000000 Z
 dependencies: []
 description: |+
   Canoe offers project management and building facilities to C/C++ projects.