bwrap 1.0.0 → 1.1.1

data/lib/bwrap/output/levels.rb

@@ -8,7 +8,8 @@ class Bwrap::Output::Levels
 
   @@_verbose = false
   @@_debug = false
-  @@_trace = ENV["BWRAP_TRACE"] && true || false
+  @@_trace = ENV.fetch("BWRAP_TRACE", nil) && true || false
+  @@_quiet = false
 
   # @see Bwrap::Output#verbose?
   def self.verbose?
@@ -25,8 +26,18 @@ class Bwrap::Output::Levels
     @@_trace
   end
 
+  # @see Bwrap::Output##quiet?
+  def self.quiet?
+    @@_quiet
+  end
+
   # Takes hash of options received from Optimist and checks output related flags.
   def self.handle_output_options options
+    if options[:quiet] or options[:silent]
+      quiet!
+      return
+    end
+
     # Set output level flags to true or false, if it was given.
     unless options[:trace].nil?
       @@_verbose = options[:trace]
@@ -64,6 +75,18 @@ class Bwrap::Output::Levels
     out
   end
 
+  # Formats given string and outputs it.
+  #
+  # @return formatted string
+  def self.info_print_formatted str, log_callback: 1
+    # TODO: Maybe have different color for NOTICE than for INFO?
+    out = "#{Bwrap::Output::Colors.color(130, 230, 130, bold: true)}[NOTICE]#{Bwrap::Output::Colors.stopcolor} #{str}"
+    out = append_caller out, log_callback: (log_callback + 1)
+    puts out
+
+    out
+  end
+
   # Formats given string and outputs it.
   #
   # @return formatted string
@@ -98,9 +121,16 @@ class Bwrap::Output::Levels
   # Appends caller information to given output.
   #
   # Used by *_print_formatted methods.
-  def self.append_caller out, log_callback: 1
+  private_class_method def self.append_caller out, log_callback: 1
     out = "#{out} (called at #{caller_locations(log_callback, 1)[0]})" if @@_trace
     out
   end
-  private_class_method :append_caller
+
+  # Sets variables so that no extra output is shown.
+  private_class_method def self.quiet!
+    @@_verbose = false
+    @@_debug = false
+    @@_trace = false
+    @@_quiet = true
+  end
 end

data/lib/bwrap/output/output_impl.rb

@@ -32,6 +32,8 @@ require_relative "log"
 # When using {Bwrap::Bwrap}, {Bwrap::Bwrap#parse_command_line_arguments}
 # causes output levels to be set if relevant CLI arguments have been
 # given. TODO: Add documentation about CLI args somewhere. Maybe README?
+#
+# TODO: Add new method info() which can then be silenced using --quiet or --silent.
 module Bwrap::Output
   # @see #verbose?
   def self.verbose?
@@ -43,6 +45,12 @@ module Bwrap::Output
     Bwrap::Output::Levels.debug?
   end
 
+  # @see #quiet?
+  # @see #info
+  def self.quiet?
+    Bwrap::Output::Levels.quiet?
+  end
+
   # @see #trace?
   def self.trace?
     Bwrap::Output::Levels.trace?
@@ -89,6 +97,18 @@ module Bwrap::Output
     Bwrap::Output::Log.puts_to_log out || str
   end
 
+  # Handler used by #info to output given string.
+  def self.info_output str, raw: false, log_callback: 1
+    return if quiet?
+
+    if raw
+      print str
+    else
+      out = Bwrap::Output::Levels.info_print_formatted str, log_callback: (log_callback + 1)
+    end
+    Bwrap::Output::Log.puts_to_log out || str
+  end
+
   # Handler used by #warn to output given string.
   def self.warn_output str, raw: false, log_callback: 1
     if raw
@@ -114,6 +134,13 @@ module Bwrap::Output
     exit exit_code
   end
 
+  # @see #info
+  #
+  # @return true if --quiet or --silent has been passed, false if not.
+  private def quiet?
+    Bwrap::Output::Levels.quiet?
+  end
+
   # @return true if --verbose, --debug or --trace has been passed, false if not.
   private def verbose?
     Bwrap::Output::Levels.verbose?
@@ -161,6 +188,33 @@ module Bwrap::Output
     Bwrap::Output.verb_output(str, raw: raw, log_callback: 2)
   end
 
+  # Outputs given string if info flag has been set.
+  #
+  # This is meant for notices, and the log will be labeled with
+  # [NOTICE].
+  #
+  # Output flags can be set with {.handle_output_options}.
+  #
+  # == Implementation hint
+  #
+  # Usually implementing --quiet and/or --silent flag
+  # to control these messages (and all other output) may make
+  # sense.
+  #
+  # That way it would be possible to have some important
+  # informational messages that should be shown, but for script
+  # usage, those could be muted.
+  #
+  # Warning messages are meant to be shown always. Error messages
+  # will always be printed, as execution is halted after the
+  # error message has been printed.
+  #
+  # @param str String to be outputted
+  # @param raw [Boolean] If true, disables output formatting
+  private def info str, raw: false
+    Bwrap::Output.info_output(str, raw: raw, log_callback: 2)
+  end
+
   # Outputs given string to `$stderr`.
   #
   # @param str String to be outputted

data/lib/bwrap/version.rb

@@ -2,7 +2,7 @@
 
 module Bwrap
   # Current version of bwrap.
-  VERSION = "1.0.0"
+  VERSION = "1.1.1"
 end
 
 require "deep-cover" if ENV["DEEP_COVER"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bwrap
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Samu Voutilainen
@@ -34,7 +34,7 @@ cert_chain:
   X4ioQwEn1/9tHs19VO1CLF58451HgEo1BXd7eWLmV1V5cqw0YWok1ly4L/Su/Phf
   MRxVMHiVAqY=
   -----END CERTIFICATE-----
-date: 2022-04-16 00:00:00.000000000 Z
+date: 2022-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,20 +92,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.11'
 description: For now this is tailored to my needs, so this may or may not be of any
   use.
 email:
@@ -121,23 +149,30 @@ files:
 - lib/bwrap/args/args.rb
 - lib/bwrap/args/bind.rb
 - lib/bwrap/args/bind/library.rb
+- lib/bwrap/args/bind/library/ruby_binds.rb
 - lib/bwrap/args/bind/mime.rb
 - lib/bwrap/args/construct.rb
 - lib/bwrap/args/environment.rb
 - lib/bwrap/args/features.rb
+- lib/bwrap/args/features/binds_base.rb
+- lib/bwrap/args/features/ruby_binds.rb
 - lib/bwrap/args/library.rb
 - lib/bwrap/args/machine_id.rb
 - lib/bwrap/args/mount.rb
+- lib/bwrap/args/network.rb
 - lib/bwrap/bwrap.rb
 - lib/bwrap/bwrap_module.rb
 - lib/bwrap/config.rb
 - lib/bwrap/config/features.rb
+- lib/bwrap/config/features/base.rb
+- lib/bwrap/config/features/ruby.rb
 - lib/bwrap/execution.rb
 - lib/bwrap/execution/exceptions.rb
 - lib/bwrap/execution/execute.rb
 - lib/bwrap/execution/execution.rb
 - lib/bwrap/execution/labels.rb
 - lib/bwrap/execution/path.rb
+- lib/bwrap/execution/popen2e.rb
 - lib/bwrap/output.rb
 - lib/bwrap/output/colors.rb
 - lib/bwrap/output/levels.rb