beaver-build 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa3e53273d2fd49984ac532f522eefad45a60b53ed8ee79e8f8ca4db819f43b9
-  data.tar.gz: 37b8f8c9e771c9f265096fa9adddc935f77d2592250a15ade2daf6b19a24fe17
+  metadata.gz: 7c14453e56d234a62a48d99e3151389a8987ad31413fb822e3c239309b3a933b
+  data.tar.gz: ad7487c17109c457e5d7d9fbda58a7479599f947f8c74be00623d10c6170627d
 SHA512:
-  metadata.gz: 6190cb42ae9716e86244ee74a0959bb6fd48b0c7b2a4e45e40585583bec89259044948ce21efe7fabefec41256cdab3b502e745fdc0ddd77b484b301a3e5e522
-  data.tar.gz: '00930de6654e5ea1db3769a59d38d6602b6d50c70cc2e6623968b35007134895f2dab9781c98fbfe880beb9b2593e077b35bfdd05963a4fde7a1ce216c18d875'
+  metadata.gz: fa4a243e27a05613f9e042bd2e2a17419d461b17cef85865bef00ce57f6141e9fe383891ac229c5f9481a256e5785d4f88edd60796e3769255cb6ae8b9ab21c2
+  data.tar.gz: 50a9fbb0f1103e13b00025dd84707c8c175b70f906e7a8e49b5806c91185822af4751096b5ac5c278dd7f01f7704d7ef5d3b31eaecd322b7bc02c89b885fde97

data/lib/beaver.rb

@@ -60,26 +60,51 @@ class Beaver
   def call(cmd)
     _cmd = @commands[cmd.to_sym]
     if _cmd.nil?
-      puts "No command called #{cmd} found"
+      STDERR.puts "No command called #{cmd} found"
       exit 1
     end
 
     _cmd.call
   end
 
+  # Run this command when it is called, no matter if its dependencies did not change
+  def must_run cmd
+    _cmd = @commands[cmd.to_sym]
+    if _cmd.nil?
+      STDERR.puts "\001b[31mNON-FATAL ERROR\001b[0m: Command #{cmd} does not exist, so `must_run` has not effect"
+      exit 1
+    end
+    _cmd.overwrite_should_run = true
+
+    _cmd.call
+  end
+
+  def set_main(cmd)
+    @mainCommand = cmd.to_sym
+  end
+
   # Put this at the end of a file
   def end
     $cache = CacheManager.new # load cache file
     
     command = ARGV[0] || @mainCommand
+    if command == "--" # passing arguments to be processed by the builld file -> pass "--" as the command to specify the default
+      command = @mainCommand
+    end
     self.call command
 
     $cache.save # save cache file
   end
 
+  # Returns all available commands as an array
+  def list_commands
+    return @commands.map { |k, v| k }
+  end
+
   # Clean cache
   def clean
     FileUtils.rm_r @cache_loc
+    reset_cache
   end
 end
 
@@ -95,3 +120,7 @@ require 'sh'
 def call(cmd)
   $beaver.call cmd
 end
+
+def must_run(cmd)
+  $beaver.musts_run cmd
+end

data/lib/command.rb

@@ -1,8 +1,11 @@
 require 'file.rb'
 
+$__BEAVER_SHOULD_RUN_SCOPE = false
+
 class Command
   attr_accessor :name
   attr_accessor :fn
+  attr_accessor :overwrite_should_run
 
   def initialize(name, file_deps, fn)
     @name = name
@@ -10,19 +13,38 @@ class Command
     # Type: FileDep, or nil
     @file_deps = file_deps
     @fn = fn
+    @overwrite_should_run = false
   end
 
   # Execute the command if needed (dependency files changed)
   def call
+    global_alread_defined = $__BEAVER_SHOULD_RUN_SCOPE
+    if self.overwrite_should_run
+      $__BEAVER_SHOULD_RUN_SCOPE  = true
+    end
+    if $__BEAVER_SHOULD_RUN_SCOPE 
+      self.overwrite_should_run = true
+    end
+    
     if self.should_run?
       self.call_now()
     end
+
+    if !global_alread_defined && $__BEAVER_SHOULD_RUN_SCOPE 
+      $__BEAVER_SHOULD_RUN_SCOPE  = false
+    end
   end
 
   # Force call the command, even if none of the files changed
   def call_now
     $file = nil
     $files = nil
+
+    if @file_deps.nil?
+      @fn.call()
+      return
+    end
+    
     if @file_deps.type == :each
       @file_deps.files.each do |file_obj|
         $file = file_obj
@@ -37,6 +59,8 @@ class Command
   # Returns wheter the command should run, meaning if any of the depency
   # files changed
   def should_run?
+    return true if @overwrite_should_run
+    
     if changed? "__BEAVER__CONFIG__", $PROGRAM_NAME
       # Ruby script itself changed
       # TODO: does not account for dependencies of the script (probably uncommon though)
@@ -71,6 +95,6 @@ class Command
 end
 
 def cmd(name, deps = nil, &fn)
-  cmd = Command.new name, deps, fn
+  cmd = Command.new name.to_sym, deps, fn
   $beaver.__appendCommand cmd
 end

data/lib/file.rb

@@ -78,6 +78,9 @@ class CacheManager
 
   def save
     packed = MessagePack.pack(@files)
+    unless Dir.exist? $beaver.cache_loc
+      Dir.mkdir $beaver.cache_loc
+    end
     File.binwrite($beaver.file_cache_file, packed)
   end
 end

data/lib/file_dep.rb

@@ -43,7 +43,7 @@ class FileDep
     globs = nil
     if @glob.respond_to? :each
       # array
-      globs = glob
+      globs = @glob
     else
       # string
       globs = [@glob]

data/lib/sh.rb

@@ -10,14 +10,21 @@ def sh(strcmd)
     end
   end
 
-  if strcmd.is_a? SilentAll
+  if strcmd.is_a?(SilentAll) || strcmd.is_a?(SilentOutput)
     `#{strcmd}`
   else
-    puts `#{strcmd}`
+    system "#{strcmd}"
   end
 
   if $beaver.has(:e)
-    exit($?.exitstatus) if $?.exitstatus != 0
+    if $?.to_i != 0
+      if $?.exitstatus.nil?
+        puts $?
+      end
+      exit($?.exitstatus || -1)
+    end
+  elsif $?.to_i != 0 && $?.exitstatus.nil?
+    puts $?
   end
 end
 
@@ -31,6 +38,11 @@ SilentAll = Struct.new(:strcmd) do
     strcmd
   end
 end
+SilentOutput = Struct.new(:strcmd) do
+  def to_s
+    strcmd
+  end
+end
 
 # Do not print the command
 def silent(strcmd)
@@ -41,3 +53,8 @@ end
 def full_silent(strcmd)
   return SilentAll.new(strcmd)
 end
+
+# Do not print out the output of the command
+def output_silent(strcmd)
+  return SilentOutput.new(strcmd)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaver-build
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Jonas Everaert
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2023-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -26,7 +26,7 @@ dependencies:
         version: 1.6.0
 description: |-
   Beaver is an easy to understand build tool with a lot of capabilities.
-  Documentation and examples on [github](https://github.com/jomy10/beaver) (https://github.com/jomy10/beaver).
+  Documentation and examples on [github](https://github.com/jomy10/beaver).
 email:
 executables:
 - beaver