envo 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fa260370764e3c4a2572f56b6c35e2dcf67ae4b0f472ff68b73ede8379baa59
-  data.tar.gz: f544d7f23a506033845e274b09edd0a64b5d75e659ef6e665c0523ecb0e886b6
+  metadata.gz: 230b0d48de4d6bbe0e3b47c43ad57a9e318087b14b2321709a46aeb7a5efdf82
+  data.tar.gz: 39c5e2c9c6d000ec3571bf31d3fb79c788e81ea1700303fb84e365afc599c7da
 SHA512:
-  metadata.gz: 2ff4f904d7a4f2301c50dbd8064f7b1205e166c7de23b353f55184c2f3385fa33173f4cfba67874803c0a16aeb1a395cda51c7208370a7c98a5d215440b867cd
-  data.tar.gz: bcaeb1403f08292a407cc7ceaae314e76dc07fd3c63d2db93129a56851acbd2e2fb3ff70b441f27f8a251065f1e6635dbcf656aa317e533895e90a9274008f70
+  metadata.gz: 4d00ebac8fbf454a4a1189b6e426f69f84b5e0971f7489f16906076a2eb946439d88eac420f3741686ca97b9a4f9d232ef317d41fe03599223c3851ac860634c
+  data.tar.gz: 9260b54fb17cbf07b38b3df416546180d7095817472d447d53a7a016d88633e69fc7270dbe90694cbc113e3417ea170a532743e98b79974d2ece70d0cbae5a4d

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Borislav Stanimirov
+Copyright (c) 2020-2024 Borislav Stanimirov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -65,4 +65,4 @@ Please take a look at [the implementation notes](doc/impl-notes.md) and [the roa
 
 This software is distributed under the MIT Software License. See accompanying LICENSE file or copy [here](https://opensource.org/licenses/MIT).
 
-Copyright © 2020 [Borislav Stanimirov](http://github.com/iboB)
+Copyright © 2020-2024 [Borislav Stanimirov](http://github.com/iboB)

data/bin/envo-install

@@ -10,7 +10,7 @@ end
 
 begin
   shell = Envo::HostShell
-  installer = shell.installer.new
+  installer = shell.make_installer
   exit installer.run(ARGV.dup)
 rescue Envo::Error => e
   STDERR.puts e.message

data/bin/envo_gen_tmp_helper.rb

@@ -13,7 +13,6 @@ fname = "envo-" + Time.now.to_i.to_s(16) + '-' + rand(1_000_000).to_s(16) + ".ba
 # find the os, and use OS-specific ways, but we're trying to be fast here
 
 def temp_dirs(&block)
-  yield 'C:/windows/system32'
   yield '/tmp' # most unixes
   yield ENV['TMP'] # good guess for windows
   yield '/var/tmp'

data/lib/envo/cli/{installer_bash.rb → installer_sh_like.rb}

@@ -2,12 +2,16 @@
 
 module Envo
   module Cli
-    class InstallerBash
+    class InstallerShLike
       # def detect_installed_envo?()
       #   stdout, stderr, code = Open3.capture3("bash -ic 'command -v envo'")
       #   code.success?
       # end
 
+      def initialize(default_dotfile)
+        @default_dotfile = File.join(Dir.home, default_dotfile)
+      end
+
       ENVO_INSTALLATION_BEGIN = '### BEGIN envo installation (don\'t remove line)'
       ENVO_INSTALLATION_END = '### END envo installation (don\'t remove line)'
 
@@ -32,7 +36,7 @@ module Envo
 
         if !first || !last
           raise Envo::Error.new <<~EOF
-            #{dotfile}' contains a broken confy insallation.
+            #{dotfile}' contains a broken envo insallation.
             You need to remove it manually
           EOF
         end
@@ -62,8 +66,8 @@ module Envo
 
         File.open(dotfile, openmode) { |f| f.puts install_lines }
         puts <<~EOF
-          Sucessfully installed confy to '#{dotfile}'
-          Source the file, or restart the bash session if the file is auto-sourced.
+          Sucessfully installed envo to '#{dotfile}'
+          Source the file, or restart the shell session if the file is auto-sourced.
         EOF
       end
 
@@ -76,16 +80,15 @@ module Envo
         lines = found[:lines]
         lines[found[:first], found[:num]] = []
         File.open(dotfile, 'w') { |f| f.puts lines }
-        puts "Suncessfully uninstalled confy from '#{dotfile}'"
+        puts "Suncessfully uninstalled envo from '#{dotfile}'"
       end
 
-      DEFAULT_DOTFILE = File.join(Dir.home, '.bashrc')
       USAGE = <<~EOF
         usage: envo-install [u] [--dotfile <path>]
       EOF
       def run(argv)
         if argv.empty?
-          try_install(DEFAULT_DOTFILE)
+          try_install(@default_dotfile)
           return 0
         end
 
@@ -103,7 +106,7 @@ module Envo
           argv.shift
         end
 
-        dotfile = DEFAULT_DOTFILE
+        dotfile = @default_dotfile
         if !argv.empty?
           arg = argv.shift
           if arg != '--dotfile'

data/lib/envo/host_shell.rb

@@ -5,6 +5,8 @@ module Envo
     if env_shell =~ /bash/
       raise Error.new "bash on Windows (msys) is not supported yet" if env_shell =~ /^[a-zA-Z]\:/
       break Shell::Bash
+    elsif env_shell =~ /zsh/
+      break Shell::Zsh
     end
     raise Error.new "Unknown shell! Please report on https://github.com/iboB/envo/issues"
   }.()

data/lib/envo/shell/bash.rb

@@ -1,62 +1,11 @@
 module Envo
   module Shell
     module Bash
+      extend ShLike
       extend self
 
-      def installer
-        Cli::InstallerBash
-      end
-
-      def path_var_name
-        'PATH'
-      end
-      def home_var_name
-        'HOME'
-      end
-
-      def likely_abs_path?(val)
-        !val.empty? && val[0] == '/'
-      end
-      def likely_rel_path?(val)
-        return !val.empty? && val[0] == '.'
-      end
-      def fix_path(path)
-        path
-      end
-
-      LIST_SEP = ':'
-      def likely_list?(val)
-        # we have some work
-        # if the value includes our list separtor ":", we need to make sure whether a url:port combination is not a better fit
-        return false if !val.include?(LIST_SEP)
-
-        sep_cnt = val.count(LIST_SEP)
-        return true if sep_cnt > 2
-
-        # match scheme://url
-        return false if val =~ /^\w+\:\/\//
-
-        return true if sep_cnt == 2 # everything else with 2 separators is a list
-
-        # match display type strings address:digit.digit
-        return false if val =~ /\:\d.\d$/
-
-        # match something:number to be interpreted as addr:port
-        !(val =~ /.*\:\d+$/)
-      end
-      def list_to_ar(list)
-        list.split(LIST_SEP)
-      end
-      def ar_to_list(ar)
-        ar.join(LIST_SEP)
-      end
-
-      def cmd_set_env_var(name, value)
-        escaped = value.to_s.inspect.gsub("'"){ "\\'" }
-        "export #{name}=#{escaped}"
-      end
-      def cmd_unset_env_var(name)
-        "unset -v #{name}"
+      def make_installer
+        Cli::InstallerShLike.new '.bashrc'
       end
     end
   end

data/lib/envo/shell/sh_like.rb

@@ -0,0 +1,57 @@
+module Envo
+  module Shell
+    module ShLike
+      def path_var_name
+        'PATH'
+      end
+      def home_var_name
+        'HOME'
+      end
+
+      def likely_abs_path?(val)
+        !val.empty? && val[0] == '/'
+      end
+      def likely_rel_path?(val)
+        return !val.empty? && val[0] == '.'
+      end
+      def fix_path(path)
+        path
+      end
+
+      LIST_SEP = ':'
+      def likely_list?(val)
+        # we have some work
+        # if the value includes our list separtor ":", we need to make sure whether a url:port combination is not a better fit
+        return false if !val.include?(LIST_SEP)
+
+        sep_cnt = val.count(LIST_SEP)
+        return true if sep_cnt > 2
+
+        # match scheme://url
+        return false if val =~ /^\w+\:\/\//
+
+        return true if sep_cnt == 2 # everything else with 2 separators is a list
+
+        # match display type strings address:digit.digit
+        return false if val =~ /\:\d.\d$/
+
+        # match something:number to be interpreted as addr:port
+        !(val =~ /.*\:\d+$/)
+      end
+      def list_to_ar(list)
+        list.split(LIST_SEP)
+      end
+      def ar_to_list(ar)
+        ar.join(LIST_SEP)
+      end
+
+      def cmd_set_env_var(name, value)
+        escaped = value.to_s.inspect.gsub("'"){ "\\'" }
+        "export #{name}=#{escaped}"
+      end
+      def cmd_unset_env_var(name)
+        "unset -v #{name}"
+      end
+    end
+  end
+end

data/lib/envo/shell/win_cmd.rb

@@ -3,8 +3,8 @@ module Envo
     module WinCmd
       extend self
 
-      def installer
-        Cli::InstallerWinCmd
+      def make_installer
+        Cli::InstallerWinCmd.new
       end
 
       def path_var_name

data/lib/envo/shell/zsh.rb

@@ -0,0 +1,12 @@
+module Envo
+  module Shell
+    module Zsh
+      extend ShLike
+      extend self
+
+      def make_installer
+        Cli::InstallerShLike.new '.zshrc'
+      end
+    end
+  end
+end

data/lib/envo/version.rb

@@ -1,4 +1,4 @@
 module Envo
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
   VERSION_TYPE = 'alpha'
 end

data/lib/envo.rb

@@ -32,7 +32,9 @@ module Envo
   autoload :Logger, "envo/logger"
 
   module Shell
-    autoload :Bash,   'envo/shell/bash'
+    autoload :ShLike, 'envo/shell/sh_like'
+    autoload :Bash, 'envo/shell/bash'
+    autoload :Zsh, 'envo/shell/zsh'
     autoload :WinCmd, 'envo/shell/win_cmd'
   end
 
@@ -40,6 +42,6 @@ module Envo
     autoload :Runner, 'envo/cli/runner'
     autoload :Help, 'envo/cli/help'
     autoload :InstallerWinCmd, 'envo/cli/installer_win_cmd'
-    autoload :InstallerBash, 'envo/cli/installer_bash'
+    autoload :InstallerShLike, 'envo/cli/installer_sh_like'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: envo
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Borislav Stanimirov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-14 00:00:00.000000000 Z
+date: 2024-06-16 00:00:00.000000000 Z
 dependencies: []
 description: |
   A CLI environment variable manager.
@@ -29,7 +29,7 @@ files:
 - lib/envo/cli/envo.bat
 - lib/envo/cli/envo.sh
 - lib/envo/cli/help.rb
-- lib/envo/cli/installer_bash.rb
+- lib/envo/cli/installer_sh_like.rb
 - lib/envo/cli/installer_win_cmd.rb
 - lib/envo/cli/runner.rb
 - lib/envo/cli_parser.rb
@@ -54,7 +54,9 @@ files:
 - lib/envo/parsed_cmd.rb
 - lib/envo/script_parser.rb
 - lib/envo/shell/bash.rb
+- lib/envo/shell/sh_like.rb
 - lib/envo/shell/win_cmd.rb
+- lib/envo/shell/zsh.rb
 - lib/envo/state.rb
 - lib/envo/val/list_val.rb
 - lib/envo/val/no_val.rb
@@ -68,7 +70,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |
-  Thanks for installing envo v0.1.2 alpha!
+  Thanks for installing envo v0.1.3 alpha!
   For the tool to work you must also run the installation program:
   $ envo-install
   Running it will complete the setup and 'envo' should be available as a command.
@@ -88,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.25
 signing_key:
 specification_version: 4
 summary: A CLI environment variable manager