hiiro 0.1.239 → 0.1.240

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49a89f528721bce8e90b9d16c636699b1ea56aa635ac8cc405542e84f8f03a02
-  data.tar.gz: 576d71d1120411f76dc155cb11c088548009816fca3ea9a3950c750ccd182a81
+  metadata.gz: 564e6d6381c8870515ac768d4dc25a60f67160d0f42b814fbc6e0d97da7f0bb8
+  data.tar.gz: 56d033c22d775b97ae65fea82523ea2b0e67f47fc0afd59f5cc7cd211d29fffb
 SHA512:
-  metadata.gz: 3f16a209a289c0a606dc08010cb48e5a17f5d1df491ac23e1eb31085343856e405d427f6bcc02b645abc158d6ecb392b12939123c1f80ce9120762505fa084c1
-  data.tar.gz: 50428c767ea91a98a0eea9795978627b1ab54183ca3d20a3f41305968d00b993f520ab0186d8fdd73e60c1920f3bc25e0b7a30ae0fd1b21cf9161c49f1071896
+  metadata.gz: faa73ccb87c5e71a2e044a7642806e93a863b47d6003491143b513bb1fbd2b43490c9fed2c4b8ac8397a7669358d3aff9f818baf59afec116e999482872d4d9a
+  data.tar.gz: a00aa7f9d62699596f9aa8fb46583ea34e8356712c426789944d455a415d964d967c64f11da1298fb4ff9a01e7ec18c6ffa6df3cb6a4597689720a8055275db0

data/exe/h

@@ -4,29 +4,25 @@ require "hiiro"
 require "fileutils"
 
 def update_hiiro(version=nil)
-  ENV['RBENV_VERSION'] = version.to_s if version
+  ver = version || Hiiro::Rbenv.current_version
   puts
-  puts "INSTALLING RUBY VERSION #{version}"
-  env = version ? { 'RBENV_VERSION' => version.to_s } : {}
+  puts "INSTALLING RUBY VERSION #{ver}"
 
-  gems = Hiiro::Shell.capture_output('rbenv', 'exec', 'gem', 'list', 'hiiro', **env)
-
-  if gems.strip.empty?
-    system(env, 'rbenv', 'exec', 'gem', 'install', 'hiiro')
-  else
-    system(env, 'rbenv', 'exec', 'gem', 'update', 'hiiro')
-  end
-
-  system(env, 'rbenv', 'exec', 'h', 'setup')
-end
-
-def rbenv_versions
-  versions = `rbenv versions --bare`.lines(chomp: true)
+  Hiiro::Rbenv.install_gem('hiiro', version: ver)
+  Hiiro::Rbenv.run('h', 'setup', version: ver)
 end
 
 Hiiro.run(*ARGV, cwd: Dir.pwd, tasks: true) do
-  add_subcmd(:version) { |*args|
-    puts Hiiro::VERSION
+  add_flag(:all, short: :a, desc: 'Show the version of hiiro for all versions of ruby installed')
+
+  add_cmd(:version, opts: %i[all]) { |*args|
+    if get_flag(:all)
+      Hiiro::Rbenv.run_in_all('h', 'version') do |ver, _|
+        # version output printed by the subprocess
+      end
+    else
+      puts Hiiro::VERSION
+    end
   }
 
   add_subcmd(:ping) { |*args|
@@ -39,7 +35,7 @@ Hiiro.run(*ARGV, cwd: Dir.pwd, tasks: true) do
     }.parse!(ARGV)
 
     if opts.all
-      rbenv_versions.each do |ver|
+      Hiiro::Rbenv.versions.each do |ver|
         update_hiiro(ver)
       end
     else

data/lib/hiiro/rbenv.rb

@@ -0,0 +1,92 @@
+require 'open3'
+require 'shellwords'
+
+class Hiiro
+  class Rbenv
+    class << self
+      # --- Version queries ---
+
+      # All installed rbenv versions (bare list, one per line).
+      def versions
+        `rbenv versions --bare`.lines(chomp: true)
+      end
+      alias all_versions versions
+
+      # The currently active version (respects RBENV_VERSION, .ruby-version, global).
+      def current_version
+        `rbenv version-name`.strip
+      end
+
+      # The global default version.
+      def global_version
+        `rbenv global`.strip
+      end
+
+      # The local .ruby-version if one exists in the current directory tree, else nil.
+      def local_version
+        out = `rbenv local 2>/dev/null`.strip
+        out.empty? ? nil : out
+      end
+
+      # True if the given version is installed.
+      def has_version?(ver)
+        versions.include?(ver.to_s)
+      end
+
+      # Full `ruby --version` string for the given version.
+      def ruby_version(version: current_version)
+        capture('ruby', '--version', version: version).strip
+      end
+
+      # --- Running commands ---
+
+      # Run a command through `rbenv exec` in the given version.
+      # Returns the exit status (true/false) like Kernel#system.
+      def run(*cmd, version: current_version)
+        system({ 'RBENV_VERSION' => version.to_s }, 'rbenv', 'exec', *cmd)
+      end
+
+      # Run a command through `rbenv exec` and capture stdout. Returns the output string.
+      def capture(*cmd, version: current_version)
+        out, = Open3.capture2({ 'RBENV_VERSION' => version.to_s }, 'rbenv', 'exec', *cmd)
+        out
+      end
+
+      # Run a command in every installed version. Yields (version, success) if a block given.
+      def run_in_all(*cmd)
+        versions.each do |ver|
+          success = run(*cmd, version: ver)
+          yield ver, success if block_given?
+        end
+      end
+
+      # --- Gem helpers ---
+
+      # True if the named gem is installed in the given version.
+      def gem_installed?(gem_name, version: current_version)
+        !capture('gem', 'list', gem_name, version: version).strip.empty?
+      end
+
+      # Install or update a gem in the given version.
+      def install_gem(gem_name, version: current_version)
+        if gem_installed?(gem_name, version: version)
+          run('gem', 'update', gem_name, version: version)
+        else
+          run('gem', 'install', gem_name, version: version)
+        end
+      end
+
+      # Install or update a gem across all installed versions.
+      def install_gem_in_all(gem_name)
+        versions.each { |ver| install_gem(gem_name, version: ver) }
+      end
+
+      # --- Path helpers ---
+
+      # Absolute path to the rbenv shim (or versioned binary) for a command.
+      def which(cmd, version: current_version)
+        capture('which', cmd, version: version).strip
+      end
+    end
+  end
+end

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.239"
+  VERSION = "0.1.240"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.239
+  version: 0.1.240
 platform: ruby
 authors:
 - Joshua Toyota
@@ -155,6 +155,7 @@ files:
 - lib/hiiro/options.rb
 - lib/hiiro/paths.rb
 - lib/hiiro/queue.rb
+- lib/hiiro/rbenv.rb
 - lib/hiiro/runner_tool.rb
 - lib/hiiro/service_manager.rb
 - lib/hiiro/shell.rb