cinnabar 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d83910154ce0808abd650b6516e0a18187de481de2021a38011673a4756de8bd
-  data.tar.gz: 5d91b4825c634344ce80327208b6e33875189c33ffc4aca7bb614645f7be21d7
+  metadata.gz: e6421e09dfa0c80203e6f23bcc2fab637dc1e8b1e8673d0f584a9bbcd323e3f4
+  data.tar.gz: 4828cb0de49dc9039b61ad2367913db43957a8debac9a5dad2224ed49a818872
 SHA512:
-  metadata.gz: 2b9016a81fe9afcdbb293748fd4b3054df0ba92e858c81a9a57f6bff082bc9a44cf78f63d8c076d592dfc66de3084241c55731ab76a40037711aea4dfa645bb9
-  data.tar.gz: 504b1cd43bfef722f3d3699d2695d23ad3da0134e1e3b99188359b2d7b5b83f0a32b1ea624ae129a0727775f4016a930ece24d98a746b8eecea813ea8ba68f36
+  metadata.gz: 6f29c1326ae25a3658027ae98dc160af3c31204e6f4d720e10094c10286591f34586fd07e231bc9604cdbeba40ddb93c8a9c35cd803e8821271f66d77a98a439
+  data.tar.gz: dfe9e80083ed0da1b47c0cde810f4dde2a0a33111d6e06a55bc59740c44cdc4fd5f4e208a6b7e647e28372b1a4015b665a2ba5e59a0cea4e3462f6b0b6a39981

data/.rubocop.yml

@@ -26,8 +26,6 @@ Style/Documentation:
   Enabled: false
 Style/ClassAndModuleChildren:
   EnforcedStyle: compact
-Style/RescueModifier:
-  Enabled: false
 
 # https://docs.rubocop.org/rubocop/cops_metrics.html
 Metrics/MethodLength:

data/docs/Readme.md

@@ -57,7 +57,7 @@ jobs:
         with:
           repository: 2moe/cinnabar
           path: cinnabar
-          ref: v0.0.3
+          ref: v0.0.7
 
       - name: (example) run cargo command
         run: |

data/lib/cinnabar/gem_path.rb

@@ -307,7 +307,11 @@ class Cinnabar::GemPath
       File.write(tmp, content)
       File.rename(tmp, path)
     ensure
-      File.unlink(tmp) rescue nil
+      begin
+        File.unlink(tmp)
+      rescue StandardError
+        nil
+      end
     end
   end
 

data/lib/cinnabar/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cinnabar
-  VERSION = '0.0.5'
+  VERSION = '0.0.7'
 end

data/misc/firb/bin/firb

@@ -22,8 +22,31 @@
 #   which :ruby #=> `which ruby`
 #   cdir '~/.cache' #=> `cd ~/.cache; pwd; ls`
 #   pwd         #=> Dir.pwd
+#
+# Install Dependencies:
+#
+# - Windows:
+#     winget install Microsoft.VCRedist.2015+.x64
+#     # OR: winget install Microsoft.VCRedist.2015+.arm64
+#
+#     scoop install bat eza
+#
+# - macOS:
+#     brew install bat eza
+#
+# - Debian:
+#
+#     apt update
+#     apt install -y bat eza
+#     ln -svf /usr/bin/batcat /usr/local/bin/bat
+#
+# - Arch:
+#   pacman -Sy bat eza
+#
+# - Alpine:
+#   apk add bat eza
+#
 # ====================
-
 Kernel.warn "  ruby:\t#{RUBY_VERSION}" if ARGV.empty?
 
 $ruby_cache_dir = -> {
@@ -39,10 +62,15 @@ $ruby_cache_dir = -> {
 }.call
 
 -> {
-  dir = $ruby_cache_dir.join('lib/cinnabar')
+  libs = %w[gem_path utils]
+  lib_dir = File.expand_path('../../../lib/cinnabar', __dir__).then { Pathname _1 }
+  if lib_dir.exist?
+    libs.each { require lib_dir.join(_1) }
+    return
+  end
 
-  %w[gem_path utils]
-    .each { require dir.join(_1) }
+  dir = $ruby_cache_dir.join('lib/cinnabar')
+  libs.each { require dir.join(_1) }
 }.call
 
 def new_cinnabar_gem_path_class(gems)
@@ -107,20 +135,9 @@ include Sinlog::Mixin
 include Argvise::HashMixin
 
 # load `which` & `sh-utils`
--> {
-  gem = 'cinnabar'
-
-  new_cinnabar_gem_path_class([gem])
-    .cache_hash[gem]
-    .last
-    .then { File.expand_path('../misc/firb/lib', _1).to_path }
-    .tap do |dir|
-      %w[which sh_utils]
-        .each { require dir.join(_1) }
-    end
-}.call
-# require_relative '../lib/which'
-# require_relative '../lib/sh_utils'
+require_relative '../lib/which'
+require_relative '../lib/version'
+require_relative '../lib/sh_utils'
 
 # ====================
 run_ruby_cli unless ARGV.empty?

data/misc/firb/bin/firb0

@@ -33,10 +33,15 @@ $ruby_cache_dir = -> {
 }.call
 
 -> {
-  dir = $ruby_cache_dir.join('lib/cinnabar')
+  libs = %w[gem_path utils]
+  lib_dir = File.expand_path('../../../lib/cinnabar', __dir__).then { Pathname _1 }
+  if lib_dir.exist?
+    libs.each { require lib_dir.join(_1) }
+    return
+  end
 
-  %w[gem_path utils]
-    .each { require dir.join(_1) }
+  dir = $ruby_cache_dir.join('lib/cinnabar')
+  libs.each { require dir.join(_1) }
 }.call
 
 def new_cinnabar_gem_path_class(gems)
@@ -71,6 +76,12 @@ def start_irb
   IRB.start
 end
 
+begin
+  require_relative '../lib/version'
+rescue StandardError
+  nil
+end
+
 unless ARGV.empty?
   require 'rbconfig'
   ENV['RUBYOPT'] = '--disable=gems'

data/misc/firb/lib/sh_utils.rb

@@ -4,17 +4,9 @@
 
 require_relative 'which'
 
-BAT_CAT_CMD = -> {
-  %w[bat batcat]
-    .each { return [_1, '-Pp'] if which(_1) }
-  ['cat']
-}.call
-
-EXA_LS_CMD = -> {
-  %w[eza exa]
-    .each { return [_1, '--icons=auto'] if which(_1) }
-  ['ls', '--color=auto']
-}.call
+BAT_CAT_CMD = ['bat', '-Pp'].freeze
+EXA_LS_CMD = ['eza', '--icons=auto'].freeze
+# EXA_LS_CMD = ['ls', '--color=auto'].freeze
 
 # Similar to `cd "/path/to/dir"; pwd; ls`
 def cdir(path = Dir.home)
@@ -31,10 +23,10 @@ def path_sym_to_str(path)
 end
 
 def run_eza_ls(path = '.', *rest)
-  cmd = EXA_LS_CMD
+  cmd = EXA_LS_CMD.dup
   cmd.concat(rest) unless rest.empty?
   path = path_sym_to_str(path)
-  cmd << File.expand_path(path)
+  cmd.push(File.expand_path(path))
   puts "\e[9m #{cmd} \e[0m"
   system(*cmd)
 end
@@ -53,7 +45,7 @@ def la(path = '.', *rest)
 end
 
 def cat(path, *rest)
-  cmd = BAT_CAT_CMD
+  cmd = BAT_CAT_CMD.dup
   path = path_sym_to_str(path)
   cmd << File.expand_path(path)
   cmd.concat(rest) unless rest.empty?

data/misc/firb/lib/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Firb
+  VERSION = '0.0.2'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinnabar
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - 2moe
@@ -49,6 +49,7 @@ files:
 - misc/firb/bin/firb0.bat
 - misc/firb/install-cinnabar.ps1
 - misc/firb/lib/sh_utils.rb
+- misc/firb/lib/version.rb
 - misc/firb/lib/which.rb
 homepage: https://github.com/2moe/cinnabar
 licenses: