canoe 0.3.2.3 → 0.3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0518fcb695948644be7df59c7200eaf996a1c753bb8b575721764d36fcde61cb'
-  data.tar.gz: 385806c9e2035fa9c0cd1caf2556ca8aba1994ca73caad835f252003bbe1c36e
+  metadata.gz: 74d6ddb337f4f8d2b52f18e5f6d3f2925211481dd5ad139ba555675bf434d356
+  data.tar.gz: 9828b9850dc35c90ba98a93f3b63a53df1ac102ba0c3c5ae41716f1f670e702d
 SHA512:
-  metadata.gz: fe763993a442305afd7180eba5bb52fe63cd5ba9c8520c985a1cecec3ecbabb52296c5b6afd5ac7a72fa2341ebe432a6e7ca7b261145ca211dfc436f5066d22c
-  data.tar.gz: 9eb610ca364b557e9e1999c18dd497912503cdc0580f3f403ef3abf6f4ac58803b81d5a1c352f02e5e00685d6bb1e471866f33c3da2f12651063fb4e6a5f33bc
+  metadata.gz: bbd6271cff5a4a5c6342918b9b9c1420216016d185a8979d7d177ce78a3e01e26d4984dc69c90aec0706824fd14e6be0dd9cfb1fb612988bad9412241e16326f
+  data.tar.gz: 0e39977c7d620b0cc5b8fc55ab9e6b79049c9ca01534e75ef2f856d5fd2005e56102337aeb19e34800d948058e83c6e74af54e51bf6f646fe61edbd002e14c40

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,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)
 
@@ -131,7 +135,7 @@ module Canoe
       puts "#{'[BUILDING TARGET]'.magenta}..."
       target = "#{@target}/#{@name}"
       build_time = File.exist?(target) ? File.mtime(target) : Time.new(0)
-      files = DepAnalyzer.compiling_filter target_deps, build_time, @source_suffix, @header_suffix 
+      files = DepAnalyzer.compiling_filter(target_deps, build_time, @source_suffix, @header_suffix)
 
       if files.empty? && File.exist?(target)
         puts "nothing to do, all up to date"

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,21 +37,28 @@ 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 "No test file exists for #{name}" unless File.exist?(file)
+      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
+      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
@@ -78,26 +78,22 @@ module Canoe
       end.min
     end
 
-    # @deps is the dependency hash for tests
-    # cyclic dependency is not handled
-    # compiler should first be built
-    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)
-
-        compile(f, o)
-      end
-      compile(test_file, file_to_obj(test_file))
-    end
-
     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)]
     end
 
     def build_one_test(test_file, deps)
-      compile_one_test(test_file, deps)
+      files = DepAnalyzer.compiling_filter(target_deps, Time.new(0), @source_suffix, @header_suffix)
+      flag = true
+      files << test_file
+
+      files.each do |f|
+        o = file_to_obj(f)
+        flag = false unless compile f, o
+      end
+
+      abort_on_err("Compiling errors encountered") unless flag;
       link_one_test(test_file, deps)
     end
 
@@ -110,7 +106,7 @@ module Canoe
 
       files.each do |f|
         printf "#{stepper.progress_as_str.green} compiling #{f} "
-        compile_one_test(f, deps)
+        build_one_test(f, deps)
         stepper.step
       end
     end
@@ -127,6 +123,7 @@ module Canoe
     end
 
     def build_test
+      build_compiler_from_config
       puts "#{'[COMPILING TESTS]'.magenta}..."
       return unless test_build_time
 

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.3.2
            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.3.2
 platform: ruby
 authors:
 - XIONG Ziwei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-18 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies: []
 description: |+
   Canoe offers project management and building facilities to C/C++ projects.