canoe 0.3.0 → 0.3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6650afffc9e3aa13bb3489b419cd7e4f2b44f1f104be6fdffa77d0b2a66d072
-  data.tar.gz: fef3df6c97065e9274c2f95e2b2993a740d46a563e9e04b7359fbb4b69d4f95d
+  metadata.gz: 7c1916c0ee5ce05d67222c84f93ac7e41de04895ffb523b1a5435276c6f8e11f
+  data.tar.gz: f3b69717aed857c30f8154fb1f63126b8f84c42081890ef1be75c6d2a7250735
 SHA512:
-  metadata.gz: 1c093606ffcc64c3679afc3b8998841e7e1b8e83a2315d5bc8f1ad91e2c3b36d3eac5d649dda55d27287600ba52c9880c2f65b612b65f5fb57dbeac06ddc865b
-  data.tar.gz: 7483c43fa9d8f91c27be1b042f2b151187a867e85fd4cffc57f84b0a01c892583ef3f7d57ad6c816ad50668cabdfcb4e6c955db9c95aba8037ccf30c02eb0054
+  metadata.gz: adae82066e778ae3756d970b75fb87784087e25996051c9cd5dd5ad75f265c09418eeb5c4387db9b0c9c125d1b1739461f1f0a0dfc72cde9f1914a65023eb030
+  data.tar.gz: 7d31ba373cf0a9a7f41178a153ee8fd7f9eb442a2698ec464c5ea9ca247b9816765f2bc17db1d0902209c6e6e4ff4bc238a4d7e9fa59cf74ba29a841bf519c3b

data/lib/coloring.rb

@@ -0,0 +1,23 @@
+##
+# gem Colorize is a great tool, but I don't want add dependencies to Canoe
+class String
+  def self.define_coloring_methods
+    colors = {
+        30 => :black,
+        31 => :red,
+        32 => :green,
+        33 => :yellow,
+        34 => :blue,
+        35 => :magenta,
+        36 => :cyan,
+        37 => :white
+    }
+    colors.each do |k, v|
+      define_method v do
+        "\033[#{k}m#{self}\033[0m"
+      end
+    end
+  end
+
+  define_coloring_methods
+end

data/lib/default_files.rb

@@ -5,9 +5,9 @@
 class DefaultFiles
   class << self
     def open_file_and_write(filename, content)
-      File.open(filename, "w") {|f|
+      File.open(filename, "w") do |f|
         f.write(content)
-      }
+      end
     end
 
     def create_config(path, src_sfx='cpp', hdr_sfx='hpp')

data/lib/dependence.rb

@@ -31,14 +31,17 @@ class DepAnalyzer
   def self.compiling_filter(deps, build_time, src_sfx='cpp', hdr_sfx='hpp')
     files = []
     @processed = {}
+    @recompiles = {}
     deps.keys.each do |k|
       @processed[k] = false
+      @recompiles[k] = false
     end
     deps.each do |k, v|
       next if k.end_with? ".#{hdr_sfx}"
       if should_recompile?(k, build_time)
         files << k
         @processed[k] = true
+        @recompiles[k] = true
         next
       end
       v.each do |f|
@@ -58,9 +61,12 @@ class DepAnalyzer
       return true
     else
       deps[file].each do |f|
-        next if @processed[f]
+        return @recompiles[f] if @processed[f]
         @processed[f] = true
-        return true if mark(f, build_time, deps)
+        if mark(f, build_time, deps)
+          @recompiles[f] = true
+          return true 
+        end
       end
     end
     false
@@ -69,7 +75,11 @@ class DepAnalyzer
   def self.should_recompile?(file, build_time) 
     judge = build_time
     if build_time == Time.new(0)
-      objfile = "./obj/#{File.basename(file, ".*")}.o"
+      objfile = if file.start_with?("./src/components")
+                  './obj/' + file.delete_suffix(File.extname(file))['./src/components/'.length..].gsub('/', '_') + '.o'
+                else
+                  "./obj/#{File.basename(file, ".*")}.o"
+                end
       return true unless File.exists? objfile
       judge = File.mtime(objfile)
     end

data/lib/err.rb

@@ -1,7 +1,8 @@
+require_relative 'coloring'
 module Err
   def warn_on_err(err)
     puts <<~ERR
-           Warning: 
+           #{"Waring: ".yellow}
                #{err}
            try 'canoe help' for more information
          ERR
@@ -9,11 +10,11 @@ module Err
 
   def abort_on_err(err)
     abort <<~ERR
-            Fatal: 
+            #{"Fatal: ".red}
                 #{err}
             try 'canoe help' for more information
          ERR
   end
 
   module_function :warn_on_err, :abort_on_err
-end
+end

data/lib/workspace.rb

@@ -5,6 +5,7 @@ require_relative 'config_reader'
 require_relative 'default_files'
 require_relative 'err'
 require_relative 'dependence'
+require_relative 'coloring'
 
 class WorkSpace
   include Err
@@ -51,8 +52,7 @@ class WorkSpace
                 headers are added or removed from any file.
             
             update:
-                this command is needed because '.canoe.deps' is actually a cache of dependency relationships so that
-                canoe doesn't have to analyze all the files when building a project.
+                this command is needed because '.canoe.deps' is actually a cache of dependency relationships so that canoe doesn't have to analyze all the files when building a project.
                 So when a file includes new headers or some headers are removed, users have to use 'canoe udpate'
                 to update dependency relationships.
 
@@ -104,7 +104,11 @@ class WorkSpace
   end
 
   def new
-    Dir.mkdir(@name)
+    begin
+      Dir.mkdir(@name)
+    rescue
+      abort_on_err "workspace #{@name} already exsits"
+    end
     Dir.mkdir(@src)
     Dir.mkdir(@components)
     Dir.mkdir("#{@workspace}/obj")
@@ -122,7 +126,7 @@ class WorkSpace
     Dir.chdir(@workspace) do
       system "git init"
     end
-    puts "workspace #{@workspace} is created"
+    puts "workspace #{@workspace.blue} is created"
   end
 
   # args are commandline parameters passed to `canoe build`    
@@ -134,7 +138,7 @@ class WorkSpace
     build_time = File.exist?(target) ? File.mtime(target) : Time.new(0)
     files = DepAnalyzer.compiling_filter(deps, build_time, @source_suffix, @header_suffix)
 
-    if files.empty?
+    if files.empty? && File.exist?(target)
       puts "nothing to do, all up to date"
       return
     end
@@ -174,7 +178,7 @@ class WorkSpace
         unless Dir.exist? dir
           FileUtils.mkdir dir 
           Dir.chdir(dir) do
-            puts "created " + Dir.pwd
+            puts "created " + Dir.pwd.blue
             create_working_files prefix.join('__'), filename
           end
         end
@@ -186,8 +190,8 @@ class WorkSpace
     deps = DepAnalyzer.read_from(@deps) if File.exist?(@deps)
     deps.each do |k, v|
       unless v.empty?
-        puts "#{k} depends on: "
-        v.each {|f| puts "    #{f}"}
+        puts "#{k.blue} depends on: "
+        v.each {|f| puts "    #{f.blue}"}
         puts ""
       end
     end
@@ -241,35 +245,33 @@ class WorkSpace
   end
 
   def link_exectutable(odir, objs)
-    puts "[100%] linking"
+    puts "#{"[100%]".green} linking"
     @compiler.link_executable "#{odir}/#{@name}", objs
   end
 
   def link_shared(odir, objs)
-    puts "[100%] linking"
+    puts "#{"[100%]".green} linking"
     @compiler.link_shared "#{odir}/lib#{@name}", objs
   end
 
   def build_bin(files, args)
-    return if files.empty?
+    # return if files.empty?
     build_compiler_from_config args
-    if build_common(files, args)
-      link_exectutable('./target', Dir.glob("obj/*.o"))
-      puts "canoe: building succeeded"
+    if build_common(files, args) && link_exectutable('./target', Dir.glob("obj/*.o"))
+        puts "BUILDING SUCCEEDED".green
     else 
-      puts "canoe: building failed"
+      puts "building FAILED".red
     end
   end
 
   def build_lib(files, args)
-    return if files.empty?
+    # return if files.empty?
     build_compiler_from_config args
     @compiler.append_compiling_flag '-fPIC'
-    if (build_common files, args)
-      link_shared('./target', Dir.glob("obj/*.o"))
-      puts "canoe: building succeeded"
+    if (build_common files, args) && link_shared('./target', Dir.glob("obj/*.o"))
+      puts "BUILDING SUCCEEDED".green
     else 
-      puts "canoe: building failed"
+      puts "building FAILED".red
     end
   end
 
@@ -282,16 +284,16 @@ class WorkSpace
     flag = true;
     srcs.each do |f|
       progress = (compiled / total).round(2) * 100
-      printf "[#{progress.to_i}%%] compiling #{f}: "
+      printf "[#{progress.to_i}%%]".green + " compiling #{f}: "
       fname = f.split("/")[-1]
-      o = @obj_prefix + fname.delete_suffix(File.extname(fname)) + '.o'
+      o = @obj_prefix + File.basename(fname, ".*") + '.o'
       flag = false unless compile f, o 
       compiled += 1
     end
     
     comps.each do |f|
       progress = (compiled / total).round(2) * 100
-      printf "[#{progress.to_i}%%] compiling #{f}: "
+      printf "[#{progress.to_i}%%]".green + " compiling #{f}: "
       o = @obj_prefix + f.delete_suffix(File.extname(f))[@components_prefix.length..]
                          .gsub('/', '_') + '.o'
       flag = false unless compile f, o

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canoe
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.0.1
 platform: ruby
 authors:
 - XIONG Ziwei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2020-07-11 00:00:00.000000000 Z
 dependencies: []
 description: |+
   Canoe offers project management and building facilities to C/C++ projects.
@@ -28,6 +28,7 @@ files:
 - bin/canoe
 - lib/canoe.rb
 - lib/cmd.rb
+- lib/coloring.rb
 - lib/compiler.rb
 - lib/config_reader.rb
 - lib/default_files.rb