yarsh 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 149709074192906833f0d530ba07da00c9a6591ea79864fd5d5f2e9c39019ad8
-  data.tar.gz: 4c7336c81d2531dd94052c05344d186e97878b94c92e1ad5852955d10df07da3
+  metadata.gz: a2abe40eb2be33ef53eba4b99743447c9db93831dd1e8c00221b1934cd5bc264
+  data.tar.gz: 3f53d3e1a4a560b7c04982a7874899d8be8aaba714a3cc42dc4ecff6adae99b2
 SHA512:
-  metadata.gz: 030f6d98caa7410911fd8cff2e55e9062dda276c6f45f27d2e29073b53717aa273a0b58ad3b761833c1a955fa0b8ade8501c7c0fcab0af8095eff09a906451ce
-  data.tar.gz: 85d5081c0f07e9ddea3e0ea5202abea2d2adbea4b6cedf22f8d9a81c4a34fad0b1a9c037de8da601579b2e5bbbea4f649e9a2661b31c3496bf5f8f91d65f727f
+  metadata.gz: d89b9258f28f13778ad03734cd98db71e09f0b55132631fb2e054ec37286cde8ba688db5dede69835f1ca2ce51fd2cce4a9759707ef5df27cfe8218e6305f6c3
+  data.tar.gz: 7ca6c547b1eb3aac0c4c8c1582e42b71007fe2181877aa2d74379c24a175ff48d6307dc978c13a752d4ca054e69a40fc94ee0f4c661e0ca4ed571e82653926de

data/CHANGES.md

@@ -200,4 +200,13 @@ See commits: `bcc25b4`, `ea92742`, `51c9db8`, `2218f29`, `0fceeb8`. Tests in
 transformation, heredoc handling, binding threading, integration with
 `Yarsh::Shell`).
 
+## 0.3.0
 
+A completion engine for writing shell commands complete in ruby. It comes with a Shell completion engine using bash autocomplete when available.
+
+It alos comes with completion for the gem command.
+
+## 0.3.1
+
+* Small bug fix for the REPL.
+* Added the export reserved word to define global variables in the shell.

data/lib/yarsh/shell.rb

@@ -14,6 +14,8 @@ module Yarsh
                         local logout mapfile popd printf pushd pwd read readonly
                         return set shift shopt source suspend test times trap true
                         type typeset ulimit umask unalias unset wait].freeze
+    EXPORT = 'export'
+    DO_NOT_PRINT_RETURN_VALUE = :do_not_print_return_value80y0327y47123
 
     def initialize(bind)
       @bind = bind
@@ -65,7 +67,7 @@ module Yarsh
     private
 
     def format_output(object)
-      pp object
+      pp object unless object == DO_NOT_PRINT_RETURN_VALUE
     end
     alias fp format_output
 
@@ -89,6 +91,7 @@ module Yarsh
 
     def unclosed_quote?(line)
       return false if line.nil?
+
       double_quotes = line.scan(/(?<!\\)"/).size
       single_quotes = line.scan(/(?<!\\)'/).size
       double_quotes.odd? || single_quotes.odd?
@@ -96,6 +99,7 @@ module Yarsh
 
     def inside_quote?(pre)
       return false if pre.nil? || pre.empty?
+
       double_quotes = pre.scan(/(?<!\\)"/).size
       single_quotes = pre.scan(/(?<!\\)'/).size
       double_quotes.odd? || single_quotes.odd?
@@ -116,7 +120,17 @@ module Yarsh
 
       if input == 'cd' || input.start_with?('cd ')
         cd(input.split(' ', 2)[1])
-        return nil
+        return DO_NOT_PRINT_RETURN_VALUE
+      end
+
+      if input.start_with?("#{EXPORT} ")
+        assignment = input[EXPORT.length + 1..].strip.split('=', 2)
+        if assignment.size == 2
+          ENV[assignment[0]] = assignment[1].gsub(/\A['"]|['"]\z/, '') # Remove surrounding quotes if present
+          return DO_NOT_PRINT_RETURN_VALUE
+        end
+        puts @cf.fg_red("Error: Invalid export syntax. Use 'export VAR=value'")
+        return DO_NOT_PRINT_RETURN_VALUE
       end
 
       begin
@@ -131,11 +145,13 @@ module Yarsh
         begin
           input = Yarsh.expand_aliases(input, Config.instance.aliases)
           execute(input)
+          DO_NOT_PRINT_RETURN_VALUE
         rescue Exception => e
           $sher = e
           info("#{e.class}: #{e.message}")
           puts "#{@cf.bold.underline.fg_blue('Shell:')} '#{input}': #{e.message}"
           puts "#{@cf.bold.underline.fg_red('Ruby:')} '#{input}': #{rb_error.message}"
+          DO_NOT_PRINT_RETURN_VALUE
         end
       end
     end
@@ -161,10 +177,6 @@ module Yarsh
     end
 
     def execute(cmd)
-      return system(cmd, exception: true) if cmd.match?(/[|;&`$(){}\[\]<>]/)
-      args = Shellwords.shellsplit(cmd)
-      system(*args, exception: true)
-    rescue ArgumentError
       system(cmd, exception: true)
     end
 
@@ -191,17 +203,17 @@ module Yarsh
 
       if word.empty?
         return ENV['PATH'].split(File::PATH_SEPARATOR)
-                   .flat_map { |dir| Dir["#{dir}/*"] }
-                   .map { |f| File.basename(f) }
-                   .uniq
-                   .sort
+                          .flat_map { |dir| Dir["#{dir}/*"] }
+                          .map { |f| File.basename(f) }
+                          .uniq
+                          .sort
       end
 
       cmd = word.strip.split(/\s+/).first
       return [] if cmd.nil? || cmd.empty?
 
       # Strip privileged prefix (sudo, doas, etc.) — complete the real command
-      if Yarsh::Completion::Engine::PRIVILEGED_COMMANDS.include?(cmd)
+      if Yarsh::Completion::Engine::PRIVILEGED_COMMANDS.include?(cmd) && cmd != word
         remaining = word.sub(/\A#{Regexp.escape(cmd)}\s+/, '')
         return complete_command(remaining)
       end
@@ -228,7 +240,7 @@ module Yarsh
 
     def complete_ruby(word)
       IRB::InputCompletor.retrieve_completion_data(word, bind: @bind)
-    rescue
+    rescue StandardError
       []
     end
 
@@ -322,8 +334,9 @@ module Yarsh
       Reline.autocompletion = Config.instance.autocompletion
       Reline.completion_append_character = ' '
       Reline.core.config.keyseq_timeout = 0.5
-      Reline.completion_proc = proc { |target, pre, post|
-        next [] if inside_quote?(pre)
+      Reline.completion_proc = proc { |target, pre, _post|
+        next [] if inside_quote?(pre) || pre =~ /'|"\z/
+
         full = pre.empty? ? target : pre.rstrip + ' ' + target
         first_word = full.strip.split(/\s+/).first.to_s
         ruby_completions = if !Config.instance.ruby_completion ||

data/lib/yarsh/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yarsh
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yarsh
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - yarsh4all