tabry 0.2.2 → 0.2.4

data/treesitter/tabry-compile.js

@@ -317,6 +317,12 @@ const handlers = {
     createOpts(state, {type: 'shell', value: textFromString(value)});
   },
 
+  handleOptsMethodStatement(state, node) {
+    checkContext(state, node, ['arg', 'flag', 'option_include']);
+    const {value} = pick(node, {value: 'string'});
+    createOpts(state, {type: 'method', value: textFromString(value)});
+  },
+
   handleOptsFileStatement(state, node) {
     checkContext(state, node, ['arg', 'flag', 'option_include']);
     createOpts(state, {type: 'file'});

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tabry
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Evan Battaglia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-15 00:00:00.000000000 Z
+date: 2023-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-byebug
@@ -84,7 +84,9 @@ description:
 email: battaglia.evan@gmail.com
 executables:
 - tabry-bash
+- tabry-fish
 - tabry-generate-bash-complete
+- tabry-generate-fish-complete
 - tabry-help
 - tabry-test-options
 - tabry-test-parse
@@ -92,7 +94,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/tabry-bash
+- bin/tabry-fish
 - bin/tabry-generate-bash-complete
+- bin/tabry-generate-fish-complete
 - bin/tabry-help
 - bin/tabry-test-options
 - bin/tabry-test-parse
@@ -132,6 +136,7 @@ files:
 - lib/tabry/models/include_flag.rb
 - lib/tabry/models/include_option.rb
 - lib/tabry/models/include_sub.rb
+- lib/tabry/models/method_option.rb
 - lib/tabry/models/option.rb
 - lib/tabry/models/option_base.rb
 - lib/tabry/models/option_includes.rb
@@ -140,14 +145,19 @@ files:
 - lib/tabry/models/sub.rb
 - lib/tabry/models/subs_list.rb
 - lib/tabry/options_finder.rb
+- lib/tabry/replty/base.rb
+- lib/tabry/replty/builder.rb
 - lib/tabry/result.rb
 - lib/tabry/runner.rb
-- lib/tabry/shell_splitter.rb
+- lib/tabry/shell_tokenizer.rb
 - lib/tabry/shells/bash.rb
 - lib/tabry/shells/bash/wrapper.rb
+- lib/tabry/shells/fish.rb
+- lib/tabry/shells/fish/wrapper.rb
 - lib/tabry/state.rb
 - lib/tabry/usage_generator.rb
 - lib/tabry/util.rb
+- lib/tabry/version.rb
 - sh/bash/README.md
 - sh/bash/tabry_bash.sh
 - sh/bash/tabry_bash_core.sh
@@ -173,6 +183,7 @@ files:
 - spec/fixtures/config_builder/underscoresdashes.rb
 - spec/fixtures/config_builder/underscoresdashes.tabry
 - spec/fixtures/config_builder/underscoresdashes.yml
+- spec/fixtures/vehicles-expectations.json
 - spec/fixtures/vehicles.tabry
 - spec/fixtures/vehicles.yaml
 - spec/spec_helper.rb
@@ -194,7 +205,7 @@ files:
 - spec/tabry/options_finder_spec.rb
 - spec/tabry/result_spec.rb
 - spec/tabry/runner_spec.rb
-- spec/tabry/shell_splitter_spec.rb
+- spec/tabry/shell_tokenizer_spec.rb
 - spec/tabry/shells/bash_spec.rb
 - spec/tabry/usage_generator_spec.rb
 - tabry.gemspec
@@ -253,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Tab completion and CLIs extraordinaire

data/lib/tabry/shell_splitter.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-# Use Shellwords.split() to split a command line + comp point (index of the
-# cursor in the command line) into the args up to the current token plus
-# current token
-module Tabry
-  module ShellSplitter
-    module_function
-
-    COMP_POINT_SENTINEL = "\uFFFF"
-
-    def split(cmd_line, comp_point)
-      # Returns [cmd_name, args, last_arg]
-      # cmd_name is the basename of the command run
-      #
-      # TODO: in weird scenarios this acts weird: namely, special shell operators like <(ls), $$((1 + 1))
-      # Also it crashed on unbalanced quotes, like: foo "bar<TAB>
-      # however, this will handle the common scenarios of escaping with quotes, single quotes, and backslashes
-      # Split up args and put the argument that comp_point is in in the `last_arg` variable.
-      # Just cutting off everything after comp_point might have worked, although
-      # maybe we wanted the whole arg? Not sure this is the best.
-      cmd_line = cmd_line.dup
-      cmd_line[comp_point.to_i...comp_point.to_i] = COMP_POINT_SENTINEL
-      cmd, *all_args = Shellwords.split(cmd_line)
-      last_arg_index = all_args.index { |arg| arg.include?(COMP_POINT_SENTINEL) }
-      args = all_args[0..last_arg_index]
-      last_arg = args.pop.gsub! COMP_POINT_SENTINEL, ""
-
-      cmd_name = cmd.gsub(%r{.*/}, "")
-
-      [cmd_name, args, last_arg]
-    end
-  end
-end

data/spec/tabry/shell_splitter_spec.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "../../lib/tabry/shell_splitter"
-
-describe Tabry::ShellSplitter do
-  describe ".split" do
-    it "returns the command basename, argument, and last argument" do
-      str = "foo/bar abc def ghi"
-      expect(described_class.split(str, 13)).to eq(["bar", ["abc"], "def"])
-    end
-
-    it "handles quotes and backslashes like a shell" do
-      expect(described_class.split('"/foo bar/waz" a\'b \'c\\ d "ef g" "hi jk" lmn', 38)).to eq(
-        [
-          "waz",
-          ["ab c d", "ef g"],
-          "hi jk"
-        ]
-      )
-    end
-  end
-end