cinnabar 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8b6184f3c8af69dfce30f53af0f8fcad8b34a380dae6bc3e21c32f3bde4753b
-  data.tar.gz: aa0f40c2a071eb846d01db60bdf60a9b738d8a3f0fe76e70bf57d48fa670376b
+  metadata.gz: d1b9aa28bb5ec0a8ab6c27fad3c32118087ddb9bf6caef21a4b511f0c2c0c4c8
+  data.tar.gz: 952f7f0c1d2b915f3fde32ead4cc36c4c96c482e616325a7df596ed8f1187fb4
 SHA512:
-  metadata.gz: 866a074b21a09531dd22c8f237f25ea9b86f96c2a431d99b010d7b375def9f58947f244ee67d4177c442c82bc16b7b4c578ad75ad5768ac90baae009663d714a
-  data.tar.gz: 5f65f8f023ba4281cc6afb755f8ab3f5f73faa627096a81cb2c78734ef14b36f686ee87ddd91912b07c2d8630a79730c2c7a3918be5723a7aa9ed2b87b388d8f
+  metadata.gz: 3b20bb4b422443e83afd40753ef2862ec59f8533b2b1e0fee3c33e755e42d1fc26b158b297f73c7ae402a09709be49e82b6f77053b3c761fea31da929d8244e4
+  data.tar.gz: c814343302e8e2f94e3ae04b9558b8306e0512b541e136391ce67863b40edc0468da990a9b69e58440a669424acca1bd352cdebb150dabd4d10dbf93a249da41

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.5
 
       - 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
 
@@ -394,6 +398,7 @@ class Cinnabar::GemPath
   # @return [Array<String>]
   def broken_gems
     @cache_hash
+      .filter { |k, _| @gems.include? k }
       .reject { |_, v| all_paths_exist?(v) }
       .keys
   end

data/lib/cinnabar/version.rb

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

data/misc/firb/bin/firb

@@ -39,10 +39,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 +112,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

@@ -8,13 +8,13 @@ BAT_CAT_CMD = -> {
   %w[bat batcat]
     .each { return [_1, '-Pp'] if which(_1) }
   ['cat']
-}.call
+}.call.freeze
 
 EXA_LS_CMD = -> {
   %w[eza exa]
     .each { return [_1, '--icons=auto'] if which(_1) }
   ['ls', '--color=auto']
-}.call
+}.call.freeze
 
 # Similar to `cd "/path/to/dir"; pwd; ls`
 def cdir(path = Dir.home)
@@ -31,10 +31,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 +53,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.1'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinnabar
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 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: