canoe 0.3.0.2 → 0.3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acf64e52f86562fbb4103263adf6ac25d3583fdd8cc935df460d6df89ffa4367
-  data.tar.gz: 8f3e6ba476da88e1cd34abffb4bfa70e0ac910fb5bc93977601df49e44a75735
+  metadata.gz: 50752029532b56ce10a610ae7d9705212a1c424533ed2fde71a3133505c11d0e
+  data.tar.gz: 501d882198eb59157961a741d786dbbe5c420e9d2704d37e7b1ca9a0f651854a
 SHA512:
-  metadata.gz: e39ce423d813c64ef43c4440990439463a99dcb724771adc2d4d5db130c8206d7a3801c9fd036ee1477cd5c162f19b3da3dbc123e6114cba5bc7d8c0bf7d03a0
-  data.tar.gz: fe49d0b455bb21deb30b149f08736e2cff7091d8a3d38f87ac395fa1800c8b9abdb7c17594007412f5aacce448da5ebb60fd9a986fbf2ab645737aa59cd9100f
+  metadata.gz: 2da665d3e3ce5e073a207863fc2cc2f06a892d9e7889d3e0e29617c673c01d5aa503854c5effb80b34989b3cdf9743a1b8ada49c537920ba06f5ec1e5cd836c0
+  data.tar.gz: 9d13815277a02e41a894cee4528c3742d35a6e81cbc84828a0f8dc857aae1c7356de4cc05511ca9145a2f4d2912315955746541bd47d35d949c38863d1ddecf7

data/bin/canoe

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# require_relative '../lib/canoe'
 require 'canoe'
 
-Canoe.new.parse ARGV
+Canoe::Builder.new.parse ARGV

data/lib/canoe.rb

@@ -1,24 +1,27 @@
-require_relative "workspace/workspace.rb"
-require_relative "cmd"
-require_relative "source_files"
+require_relative 'workspace/workspace'
+require_relative 'cmd'
+require_relative 'source_files'
 
-class Canoe
-  def initialize
-    options = ['new', 
-               'add',
-               'build',
-               'generate',
-               'run',
-               'dep',
-               'clean',
-               'version',
-               'help',
-               'update',
-               'test']
-    @cmd = CmdParser.new options
-  end
+module Canoe
+  class Builder
+    def initialize
+      options = ['new',
+                 'add',
+                 'build',
+                 'generate',
+                 'make',
+                 'run',
+                 'dep',
+                 'clean',
+                 'version',
+                 'help',
+                 'update',
+                 'test']
+      @cmd = CmdParser.new options
+    end
 
-  def parse(args)
+    def parse(args)
       @cmd.parse args
+    end
   end
 end

data/lib/cmd.rb

@@ -1,114 +1,106 @@
-require_relative "workspace/workspace"
-require_relative "err"
-require_relative "config_reader"
+require_relative 'workspace/workspace'
+require_relative 'util'
+require_relative 'config_reader'
 
 ##
 # class CmdParser
 #   Parsing command arguments passed to canoe
-class CmdParser
-  include Err
-  def initialize(options)
-    @options = options 
-  end
+module Canoe
+  class CmdParser
+    include Err
+    include WorkSpaceUtil
 
-  def parse(args)
-    if args.size < 1 
-      abort_on_err "please give one command among #{@options.join(', ')}"
+    def initialize(options)
+      @options = options
     end
 
-    unless @options.include?(args[0])
-      abort_on_err "unknown command #{args[0]}"
+    def parse(args)
+      if args.size < 1
+        abort_on_err "please give one command among #{@options.join(", ")}"
+      end
+
+      unless @options.include?(args[0])
+        abort_on_err "unknown command #{args[0]}"
+      end
+
+      self.send "parse_#{args[0]}", args[1..]
     end
 
-    self.send "parse_#{args[0]}", args[1..]
-  end
+    private
+    def parse_new(args)
+      abort_on_err "not enough arguments to canoe new" if args.size < 1
+
+      name, mode = nil, "bin"
+      suffixes = ["cpp", "hpp"]
+
+      args.each do |arg|
+        case arg
+        when "--bin", "--lib"
+          mode = arg[2..]
+        when /--suffix=(\w+)\:(\w+)/
+          suffixes[0], suffixes[1] = $1, $2
+        else
+          name = arg unless name
+        end
+      end
 
-  private
-  def get_current_workspace
-    abort_on_err "not in a canoe workspace" unless File.exists? ".canoe"
-    config = ConfigReader.extract_flags("config.json")
+      abort_on_err('please give a name to this project') unless name
+      WorkSpace.new(name, mode.to_sym, suffixes[0], suffixes[1], true).new
+    end
 
-    src_sfx = config["source-suffix"] ? config["source-suffix"] : "cpp"
-    hdr_sfx = config["header-suffix"] ? config["header-suffix"] : "hpp"
+    def parse_add(args)
+      if args.size < 1
+        abort_on_err "it's not reasonable to add a component with no name given"
+      end
 
-    name = Dir.pwd.split("/")[-1]
-    mode = File.exists?("src/main.#{src_sfx}") ? :bin : :lib
+      current_workspace.add args
+    end
 
-    Dir.chdir('..') do
-      return WorkSpace.new(name, mode, src_sfx, hdr_sfx)
+    def parse_build(args)
+      options = {[] => 'target', ['all'] => 'all', ['test'] => 'test', ['base'] => 'base'}
+      abort_on_err "Unkown subcommand #{args.join(" ").red}" unless options.include?(args)
+      current_workspace.build options[args]
     end
-  end
 
-  def parse_new(args)
-    abort_on_err "not enough arguments to canoe new" if args.size < 1
-
-    name, mode = nil, "bin"
-    suffixes = ["cpp", "hpp"]
-    
-    args.each do |arg|
-      case arg
-      when '--bin', '--lib'
-        mode = arg[2..]
-      when /--suffix=(\w+)\:(\w+)/
-        suffixes[0], suffixes[1] = $1, $2
-      else
-        name = arg unless name
-      end
+    def parse_generate(args)
+      current_workspace.generate
     end
-    
-    abort_on_err("please give a name to this project") unless name
-    WorkSpace.new(name, mode.to_sym, suffixes[0], suffixes[1]).new
-  end
 
-  def parse_add(args)
-    if args.size < 1
-      abort_on_err "it's not reasonable to add a component with no name given"
+    def parse_run(args)
+      current_workspace.run args
     end
 
-    get_current_workspace.add args
-  end
-  
-  def parse_build(args)
-    get_current_workspace.build args
-  end
+    def parse_dep(args)
+      current_workspace.dep
+    end
 
-  def parse_generate(args)
-    get_current_workspace.generate
-  end
-  
-  def parse_run(args)
-    get_current_workspace.run args
-  end
+    def parse_clean(args)
+      options = {
+        [] => 'all', ['all'] => 'all',
+        ['target'] => 'target', ['tests'] => 'tests', ['obj'] => 'obj'
+      }
+      abort_on_err "Unkown subcommand #{args.join(" ").red}" unless options.include?(args)
+      current_workspace.clean options[args]
+    end
 
-  def parse_dep(args)
-    get_current_workspace.dep 
-  end
-  
-  def parse_clean(args)
-    get_current_workspace.clean
-  end
+    def parse_test(args)
+      current_workspace.test args
+    end
 
-  def parse_test(args)
-    get_current_workspace.test args
-  end
+    def parse_version(args)
+      WorkSpace.version
+    end
 
-  def parse_version(args)
-    puts <<~VER
-        canoe v0.3.0.2
-        For features in this version, please visit https://github.com/Dicridon/canoe
-        Currently, canoe can do below:
-            - project creation
-            - project auto build and run (works like Cargo for Rust)
-            - project structure management
-        by XIONG Ziwei
-        VER
-  end
-  
-  def parse_help(args)
-    WorkSpace.help
-  end
+    def parse_help(args)
+      WorkSpace.help
+    end
 
-  def parse_update(args)
-    get_current_workspace.update
+    def parse_update(args)
+      current_workspace.update
+    end
+
+    def parse_make(args)
+      current_workspace.make
+    end
   end
 end

data/lib/coloring.rb

@@ -3,14 +3,14 @@
 class String
   def self.define_coloring_methods
     colors = {
-        30 => :black,
-        31 => :red,
-        32 => :green,
-        33 => :yellow,
-        34 => :blue,
-        35 => :magenta,
-        36 => :cyan,
-        37 => :white
+      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
@@ -20,4 +20,4 @@ class String
   end
 
   define_coloring_methods
-end
+end

data/lib/compiler.rb

@@ -1,51 +1,49 @@
+require_relative 'util'
+
 ##
 # class Compiler
 #   Storing compiler name in String and flags as an array
-class Compiler
-  attr_reader :name, :flags
-  ##
-  # @name: String
-  # @flgs: Array of String
-  def initialize(name, compiling_flags, linking_flags)
-    @name = name
-    @linking_flags = linking_flags
-    @compiling_flags = compiling_flags
-  end
-
-  def compiling_flags_as_str
-    @compiling_flags.join " "
-  end
-
-  def linking_flags_as_str
-    @linking_flags.join " "
-  end
-
-
-  def append_compiling_flag(flag)
-    @compiling_flags << flag
-  end
-
-  def append_linking_flag(flag)
-    @linking_flags << flag
-  end
-
-  def compile(src, out)
-    puts "#{name} -o #{out} #{compiling_flags_as_str} -c #{src}"
-    system "#{name} -o #{out} #{compiling_flags_as_str} -c #{src}"
-  end
-
-  def link_executable(out, objs)
-    puts "#{name} -o #{out} #{objs.join(" ")} #{linking_flags_as_str}"
-    system "#{name} -o #{out} #{objs.join(" ")} #{linking_flags_as_str}"
-  end
-
-  def link_shared(out, objs)
-    puts "#{name} -shared -o #{out}.so #{objs.join(" ")} #{linking_flags_as_str}"
-    system "#{name} -shared -o #{out}.so #{objs.join(" ")} #{linking_flags_as_str}"
-  end
-  
-  def inspect
-    puts "compiler name: #{name.inspect}"
-    puts "compiler flags: #{flags.inspect}"
+module Canoe
+  class Compiler
+    include SystemCommand
+
+    attr_reader :name, :flags
+
+    ##
+    # @name: String
+    # @flgs: Array of String
+    def initialize(name, compiling_flags, linking_flags)
+      @name = name
+      @linking_flags = linking_flags
+      @compiling_flags = compiling_flags
+    end
+
+    def compiling_flags_as_str
+      @compiling_flags.join ' '
+    end
+
+    def linking_flags_as_str
+      @linking_flags.join ' '
+    end
+
+    def append_compiling_flag(flag)
+      @compiling_flags << flag
+    end
+
+    def append_linking_flag(flag)
+      @linking_flags << flag
+    end
+
+    def compile(src, out)
+      issue_command "#{name} -o #{out} #{compiling_flags_as_str} -c #{src}"
+    end
+
+    def link_executable(out, objs)
+      issue_command "#{name} -o #{out} #{objs.join(' ')} #{linking_flags_as_str}"
+    end
+
+    def link_shared(out, objs)
+      issue_command "#{name} -shared -o #{out}.so #{objs.join(' ')} #{linking_flags_as_str}"
+    end
   end
 end

data/lib/config_reader.rb

@@ -5,7 +5,7 @@ require 'json'
 #   Just read a json file
 class ConfigReader
   def self.extract_flags(file)
-    abort_on_err("config file #{file} does not exsit") unless File.exists? file
+    abort_on_err("config file #{file} does not exsit") unless File.exist? file
     JSON.parse(File.read(file))
   end
 end

data/lib/default_files.rb

@@ -5,27 +5,26 @@
 class DefaultFiles
   class << self
     def open_file_and_write(filename, content)
-      File.open(filename, "w") do |f|
+      File.open(filename, 'w') do |f|
         f.write(content)
       end
     end
 
-    def create_config(path, src_sfx='cpp', hdr_sfx='hpp')
+    def create_config(path, compiler = 'clang++', src_sfx = 'cpp', hdr_sfx = 'hpp')
       open_file_and_write(
-        "#{path}/config.json", 
+        "#{path}/config.json",
         <<~CONFIG
           {
-              "compiler": "clang++",
+              "compiler": "#{compiler}",
               "header-suffix": "#{hdr_sfx}",
               "source-suffix": "#{src_sfx}",
               "flags": {
                   "compile": {
                       "opt": "-O2",
-                      "debug": "-g",
-                      "std": "-std=c++17"
+                      "debug": "-g"
                   },
                   "link": {
-                    
+
                   }
               }
           }
@@ -33,58 +32,47 @@ class DefaultFiles
       )
     end
 
-    def create_main(path, suffix='cpp')
+    def create_main(path, suffix = 'cpp')
+      header = suffix == 'c' ? 'stdio.h' : 'iostream'
       open_file_and_write(
         "#{path}/main.#{suffix}",
         <<~DOC
-          #include <iostream>
+          #include <#{header}>
           int main(int argc, char *argv[]) {
-              std::cout << "hello world!" << std::endl;
+
           }
         DOC
       )
     end
 
-    def create_lib_header(path, lib_name, suffix='hpp')
+    def create_lib_header(path, lib_name, suffix = 'hpp')
       open_file_and_write(
         "#{path}/#{lib_name}.#{suffix}",
         <<~DOC
           #ifndef __#{lib_name.upcase}__
           #define __#{lib_name.upcase}__
-         
+
           #endif
         DOC
       )
     end
 
-    # def create_emacs_dir_local(path)
-    #   open_file_and_write(
-    #     "#{path}/.dir-locals.el",
-    #     <<~DOC
-    #       ((nil . ((company-clang-arguments . ("-I./src/components/"
-    #                                            "-I./components/"))))
-    #        (nil . ((company-c-headers-path-user . ("./src/components/"
-    #                                "./components/")))))
-    #     DOC
-    #   )
-    # end
-
-    def create_cpp(filename, src_sfx='cpp', hdr_sfx='hpp')
+    def create_cpp(filename, src_sfx = 'cpp', hdr_sfx = 'hpp')
       open_file_and_write(
-        "#{filename}.#{src_sfx}", 
+        "#{filename}.#{src_sfx}",
         <<~DOC
           #include "#{filename}.#{hdr_sfx}"
         DOC
       )
     end
 
-    def create_hpp(workspace, prefix, filename, hdr_sfx='hpp')
+    def create_hpp(workspace, prefix, filename, hdr_sfx = 'hpp')
       open_file_and_write(
         "#{filename}.#{hdr_sfx}",
         <<~DOC
           #ifndef __#{workspace.upcase}__#{prefix.upcase}__#{filename.upcase}__
           #define __#{workspace.upcase}__#{prefix.upcase}__#{filename.upcase}__
-          
+
           #endif
         DOC
       )