Merge pull request #324 from DannyBen/update/colsole

Update colsole to >= 0.8.1

Author: DannyBen

Runfile

@@ -25,11 +25,11 @@ action :shellcheck do
   Example.executables.each do |example|
     if File.exist? example
       success = system "shellcheck #{example}"
-      color = success ? 'txtgrn' : 'txtred'
-      say "- shellcheck !#{color}!#{example}"
+      color = success ? 'g' : 'r'
+      say "- shellcheck #{color}`#{example}`"
       exit 1 unless success
     else
-      say "- skip       !txtcyn!#{example}"
+      say "- skip       c`#{example}`"
       allowed_skips -= 1
       if allowed_skips < 0
         say "- aborted: too many skips"
@@ -44,7 +44,7 @@ action :shfmt do
   allowed_skips = 2
   Example.executables.each do |example|
     if example == 'examples/heredoc/cli' || !File.exist?(example)
-      say "- skip  !txtcyn!#{example}"
+      say "- skip  c`#{example}`"
       allowed_skips -= 1
       if allowed_skips < 0
         say "- aborted: too many skips"
@@ -54,8 +54,8 @@ action :shfmt do
     end
 
     success = system "shfmt -d -i 2 -ci #{example}"
-    color = success ? 'txtgrn' : 'txtred'
-    say "- shfmt !#{color}!#{example}"
+    color = success ? 'g' : 'r'
+    say "- shfmt #{color}`#{example}`"
     exit 1 unless success
   end
 end

bashly.gemspec

@@ -15,14 +15,12 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
   s.required_ruby_version = '>= 2.7.0'
 
-  # Sensitive dependencies, stricter version requirements
-  s.add_runtime_dependency 'completely', '~> 0.5.1'
-  s.add_runtime_dependency 'gtx', '~> 0.1.0'
-
-  s.add_runtime_dependency 'colsole', '~> 0.7'
+  s.add_runtime_dependency 'colsole', '~> 0.8', '>= 0.8.1'
+  s.add_runtime_dependency 'completely', '~> 0.5'
   s.add_runtime_dependency 'filewatcher', '~> 2.0'
+  s.add_runtime_dependency 'gtx', '~> 0.1'
   s.add_runtime_dependency 'lp', '~> 0.2'
-  s.add_runtime_dependency 'mister_bin', '~> 0.7.2'
+  s.add_runtime_dependency 'mister_bin', '~> 0.7'
   s.add_runtime_dependency 'requires', '~> 1.0'
 
   s.metadata = {

bin/bashly

@@ -12,6 +12,6 @@ rescue Bashly::Interrupt
   exit 1
 rescue => e
   puts e.backtrace.reverse if ENV['DEBUG']
-  say! "!undred!#{e.class}!txtrst!\n#{e.message}"
+  say! "rib` #{e.class} `\n#{e.message}"
   exit 1
 end

helpers/checklist.rb

@@ -12,17 +12,17 @@ def url_exist?(url)
   end
 
   def run(text)
-    say "!txtblu![....]!txtrst! #{text}  "
+    say "b`[....]` #{text}  "
     if failed >= limit
       say ''
       return
     end
 
     ok = yield
     if ok
-      resay "!txtgrn![PASS]!txtrst! #{text}"
+      say "g`[PASS]` #{text}", replace: true
     else
-      resay "!txtred![FAIL]!txtrst! #{text}"
+      say "r`[FAIL]` #{text}", replace: true
       @failed += 1
     end
   end

helpers/release.rb

@@ -5,7 +5,7 @@
 
   checklist = Checklist.new
 
-  say "Checklist for version !txtgrn!#{version}!txtrst!"
+  say "Checklist for version g`#{version}`"
 
   checklist.run 'git on master and clean' do
     `git status`.match(/On branch master.*nothing to commit/m)
@@ -68,6 +68,6 @@
     `curl -Ss https://raw.githubusercontent.com/DannyBen/bashly-book/master/retype.yml`.include? "label: v#{version}"
   end
 
-  color = checklist.failed.zero? ? '!bldgrn!' : '!bldred!'
-  say "       #{color}Done with #{checklist.failed} failed tasks"
+  color = checklist.failed.zero? ? 'gb' : 'rb'
+  say "       #{color}`Done with #{checklist.failed} failed tasks`"
 end

lib/bashly/cli.rb

@@ -7,7 +7,7 @@ class CLI
     def self.runner
       runner = MisterBin::Runner.new version: Bashly::VERSION,
         header: 'Bashly - Bash CLI Generator',
-        footer: "Help: !txtpur!bashly COMMAND --help!txtrst!\nDocs: !undblu!https://bashly.dannyb.co"
+        footer: "Help: m`bashly COMMAND --help`\nDocs: bu`https://bashly.dannyb.co`"
 
       runner.route 'init',      to: Commands::Init
       runner.route 'preview',   to: Commands::Preview

lib/bashly/commands/add.rb

@@ -124,18 +124,18 @@ def add_lib(name, *args)
       def safe_write(path, content)
         if !skip_src_check && !Dir.exist?(Settings.source_dir)
           raise InitError, <<~ERROR
-            Directory !txtgrn!#{Settings.source_dir}!txtrst! does not exist
-            Run !txtpur!bashly init!txtrst! first
+            Directory g`#{Settings.source_dir}` does not exist
+            Run m`bashly init` first
           ERROR
         end
 
         if File.exist?(path) && !args['--force']
-          say "!txtblu!skipped!txtrst! #{path} (exists)"
+          say "b`skipped` #{path} (exists)"
           false
 
         else
           File.deep_write path, content
-          say "!txtgrn!created!txtrst! #{path}"
+          say "g`created` #{path}"
           true
 
         end

lib/bashly/commands/doc.rb

@@ -35,35 +35,35 @@ def show
       end
 
       def show_key(key)
-        say "!txtgrn!#{key}"
+        say "g`#{key}`"
         say ''
       end
 
       def show_url(url)
-        say "  See !undblu!#{url}"
+        say "  See bu`#{url}`"
         say ''
       end
 
       def show_example(example)
         example = word_wrap "    #{example}"
-        example.gsub!(/^(\s*- )?(\s*\w+):/, '\1!txtblu!\2!txtrst!:')
-        example.gsub!(/^(\s*- )/, '!txtylw!\1!txtrst!')
-        example.gsub!(/^(\s*#.+)/, '!txtpur!\1!txtrst!')
+        example.gsub!(/^(\s*- )?(\s*\w+):/, '\1b`\2`:')
+        example.gsub!(/^(\s*- )/, 'y`\1`')
+        example.gsub!(/^(\s*#.+)/, 'm`\1`')
         say example
         say ''
       end
 
       def show_help(help)
         help = word_wrap "  #{help}"
-        help.gsub!(/`([^`]+)`/, '!txtgrn!\1!txtrst!')
+        help.gsub!(/`([^`]+)`/, 'g`\1`')
         say help
         say ''
       end
 
       def data
         return raw_data unless args['SEARCH']
 
-        result = raw_data.select { |k, _v| k.== args['SEARCH'] }
+        result = raw_data.select { |k, _v| k == args['SEARCH'] }
         return result if result.any?
 
         result = raw_data.select { |k, _v| k.include? args['SEARCH'] }

lib/bashly/commands/generate.rb

@@ -52,25 +52,25 @@ def run
     private
 
       def watch
-        quiet_say "!txtgrn!watching!txtrst! #{Settings.source_dir}\n"
+        quiet_say "g`watching` #{Settings.source_dir}\n"
 
         Filewatcher.new([Settings.source_dir]).watch do
           reset
           generate
 
         rescue Bashly::ConfigurationError => e
-          say! "!undred!#{e.class}!txtrst!\n#{e.message}"
+          say! "rib` #{e.class} `\n#{e.message}"
 
         ensure
-          quiet_say "!txtgrn!waiting\n"
+          quiet_say "g`waiting`\n"
         end
       end
 
       def generate
         with_valid_config do
-          quiet_say 'creating !txtgrn!production!txtrst! version' if Settings.production?
+          quiet_say 'creating g`production` version' if Settings.production?
           generate_all_files
-          quiet_say "run !txtpur!#{master_script_path} --help!txtrst! to test your bash script" unless watching
+          quiet_say "run m`#{master_script_path} --help` to test your bash script" unless watching
         end
       end
 
@@ -110,7 +110,7 @@ def upgrade(existing_file, library_name, *args)
         if Library.exist? library_name
           upgrade! existing_file, library_name, *args
         else
-          quiet_say "!txtred!warning!txtrst! not upgrading !txtcyn!#{existing_file}!txtrst!, " \
+          quiet_say "r`warning` not upgrading c`#{existing_file}`, " \
             "unknown library '#{library_name}'"
         end
       end
@@ -121,14 +121,14 @@ def upgrade!(existing_file, library_name, *args)
 
         if file
           File.deep_write file[:path], file[:content]
-          quiet_say "!txtcyn!updated!txtrst! #{file[:path]}"
+          quiet_say "c`updated` #{file[:path]}"
         else
-          quiet_say "!txtred!warning!txtrst! not upgrading !txtcyn!#{existing_file}!txtrst!, path mismatch"
+          quiet_say "r`warning` not upgrading c`#{existing_file}`, path mismatch"
         end
       end
 
       def create_user_files
-        quiet_say "creating user files in !txtgrn!#{Settings.source_dir}"
+        quiet_say "creating user files in g`#{Settings.source_dir}`"
 
         create_file "#{Settings.source_dir}/initialize.#{Settings.partials_extension}",
           command.render(:default_initialize_script)
@@ -156,17 +156,17 @@ def create_all_command_files
 
       def create_file(file, content)
         if File.exist?(file) && !args['--force']
-          quiet_say "!txtblu!skipped!txtrst! #{file} (exists)"
+          quiet_say "b`skipped` #{file} (exists)"
         else
           File.deep_write file, content
-          quiet_say "!txtgrn!created!txtrst! #{file}"
+          quiet_say "g`created` #{file}"
         end
       end
 
       def create_master_script
         File.write master_script_path, script.code(tab_indent: Settings.tab_indent)
         FileUtils.chmod '+x', master_script_path
-        quiet_say "!txtgrn!created!txtrst! #{master_script_path}"
+        quiet_say "g`created` #{master_script_path}"
       end
 
       def script

lib/bashly/commands/init.rb

@@ -13,13 +13,13 @@ class Init < Base
 
       def run
         if Dir.exist?(target_dir) && !Dir.empty?(target_dir)
-          raise InitError, "Directory !txtgrn!#{target_dir}!txtrst! already exists and is not empty"
+          raise InitError, "Directory g`#{target_dir}` already exists and is not empty"
         end
 
         FileUtils.mkdir_p target_dir
         File.write "#{target_dir}/bashly.yml", yaml_content
-        say "!txtgrn!created!txtrst! #{target_dir}/bashly.yml"
-        say 'run !txtpur!bashly generate!txtrst! to create the bash script'
+        say "g`created` #{target_dir}/bashly.yml"
+        say 'run m`bashly generate` to create the bash script'
       end
 
     private