tabry 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87fa1708b1efb9ef81588017419bb6c63455ee786870f882783cf59f22ea462b
-  data.tar.gz: f0822419f2a36d48148cf7cf0ecdbd195666e2c5fe284d2e8dd6a563976c0842
+  metadata.gz: c824df1e6a6631ef74c0d450831fbb665dec5f95fd9ea204b539ed1042225e5b
+  data.tar.gz: c4c88089e043818c58e38ea126a2eb40b9710e0e7b3204aa615c89e6cace9ca5
 SHA512:
-  metadata.gz: de752dc58cefc4cc1caed94a4f0ae34758fdb40a9973f48ed5471b17fef517b0eecfbfd7e3735179793cce8d16d739d2cb2fe6d833c3f765f5c57e353dac1b7a
-  data.tar.gz: 3e26e31d951fbc7f076b3c6e5b2c96eccfd1287c5469f84447ec549dc6aca51746dc193cbed36276b2e81dab67ce2bee8204cc0e8bb6b4010a07b284bac75f32
+  metadata.gz: c3a91bd4f7f95c2ec10fda6747329c66b7d276cf17e1852af2a3c32cb314914598fee712e88a429b094bf6b5ca8e2269d13c64af51433e2eba54384470c5ec52
+  data.tar.gz: 989588444d36596bf18310f35428b545d2489935469ad0fe58069f53f7f7e8bb19627720ada337c2f5b2b4917cb53b9471a0c00eb86e16f6e7b6b48fbef0c424

data/lib/tabry/models/dir_option.rb

@@ -11,9 +11,9 @@ module Tabry
 
       attr_reader(*FIELDS.keys)
 
-      # Handled by tabru=bash/tabry-bash.sh/shell, we just return a symbol to
+      # Handled by tabry-bash/tabry-bash.sh/shell, we just return a symbol to
       # communicate to tabry-bash
-      def options(_token)
+      def options(_token, _params)
         [:directory]
       end
 

data/lib/tabry/models/file_option.rb

@@ -11,9 +11,9 @@ module Tabry
 
       attr_reader(*FIELDS.keys)
 
-      # Handled by tabru=bash/tabry-bash.sh/shell, we just return a symbol to
+      # Handled by tabry-bash/tabry-bash.sh/shell, we just return a symbol to
       # communicate to tabry-bash
-      def options(_token)
+      def options(_token, _params)
         [:file]
       end
 

data/lib/tabry/models/flags_list.rb

@@ -16,7 +16,7 @@ module Tabry
         end
       end
 
-      def options(token, used:, params:)
+      def options(token, params, used:)
         to_a.map do |flag|
           if token&.start_with?("-") && flag.name_with_dashes.start_with?(token) && !used[flag.name]
             if params[:descriptions]

data/lib/tabry/options_finder.rb

@@ -78,7 +78,7 @@ module Tabry
 
       result
         .sub_stack
-        .map { |sub| sub.flags.options(token, used: state.flags, params: params) }
+        .map { |sub| sub.flags.options(token, params, used: state.flags) }
         .flatten(1)
         .uniq
     end

data/lib/tabry/version.rb

@@ -1,3 +1,3 @@
 module Tabry
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/tabry/config_builder_spec.rb

@@ -55,6 +55,10 @@ describe Tabry::ConfigBuilder do
             {
               "description" => "Get tab completion for bash or zsh",
               "name" => "bash"
+            },
+            {
+              "description" => "Get tab completion for fish",
+              "name" => "fish"
             }
           ]
         }

data/spec/tabry/models/const_option_spec.rb

@@ -9,9 +9,9 @@ describe Tabry::Models::ConstOption do
   end
 
   it "filters by prefix" do
-    expect(subject.options("")).to eq(%w[foobar])
-    expect(subject.options("f")).to eq(%w[foobar])
-    expect(subject.options("foo")).to eq(%w[foobar])
-    expect(subject.options("w")).to eq(%w[])
+    expect(subject.options("", {})).to eq(%w[foobar])
+    expect(subject.options("f", {})).to eq(%w[foobar])
+    expect(subject.options("foo", {})).to eq(%w[foobar])
+    expect(subject.options("w", {})).to eq(%w[])
   end
 end

data/spec/tabry/models/dir_option_spec.rb

@@ -11,6 +11,6 @@ describe Tabry::Models::DirOption do
   # Handled by tabru=bash/tabry-bash.sh/shell, we just return a symbol to
   # communicate to tabry-bash
   it "returns a array with a symbol" do
-    expect(subject.options("whatever")).to eq([:directory])
+    expect(subject.options("whatever", {})).to eq([:directory])
   end
 end

data/spec/tabry/models/file_option_spec.rb

@@ -11,6 +11,6 @@ describe Tabry::Models::FileOption do
   # Handled by tabru=bash/tabry-bash.sh/shell, we just return a symbol to
   # communicate to tabry-bash
   it "returns a array with a symbol" do
-    expect(subject.options("whatever")).to eq([:file])
+    expect(subject.options("whatever", {})).to eq([:file])
   end
 end

data/spec/tabry/models/options_list_spec.rb

@@ -39,9 +39,9 @@ describe Tabry::Models::OptionsList do
         %w[d c b a]
       ]
       subject.each_with_index do |opt, i|
-        expect(opt).to receive(:options).with("some-token").and_return(opts_results[i])
+        expect(opt).to receive(:options).with("some-token", {}).and_return(opts_results[i])
       end
-      expect(subject.options("some-token")).to match_array(%w[a b c d foo bar waz ok 1])
+      expect(subject.options("some-token", {})).to match_array(%w[a b c d foo bar waz ok 1])
     end
   end
 end

data/spec/tabry/models/shell_option_spec.rb

@@ -11,9 +11,9 @@ describe Tabry::Models::ShellOption do
   end
 
   it "filters by prefix" do
-    expect(subject.options("")).to match_array(%w[a a1 b])
-    expect(subject.options("a")).to match_array(%w[a a1])
-    expect(subject.options("a1")).to match_array(%w[a1])
-    expect(subject.options("a1 ")).to match_array(%w[])
+    expect(subject.options("", {})).to match_array(%w[a a1 b])
+    expect(subject.options("a", {})).to match_array(%w[a a1])
+    expect(subject.options("a1", {})).to match_array(%w[a1])
+    expect(subject.options("a1 ", {})).to match_array(%w[])
   end
 end

data/spec/tabry/options_finder_spec.rb

@@ -85,7 +85,7 @@ describe Tabry::OptionsFinder do
       hash[:subcommand_stack] = hash.delete(:subs) || []
       defaults = { mode: :subcommand, args: [], flags: {}, current_flag: nil, dashdash: nil }
       result = Tabry::Result.new(config, Tabry::State.new(defaults.merge(hash)))
-      expect(described_class.options(result, token)).to match_array expected_options
+      expect(described_class.options(result, token, {})).to match_array expected_options
     end
   end
 
@@ -115,12 +115,12 @@ describe Tabry::OptionsFinder do
         )
       end
 
-      described_class.options(result, "abcd")
+      described_class.options(result, "abcd", {})
     end
 
     it "sets TABRY_AUTOCOMPLETE_STATE back to what it was before" do
       ENV["TABRY_AUTOCOMPLETE_STATE"] = "foobar1234"
-      described_class.options(result, "foo")
+      described_class.options(result, "foo", {})
       expect(ENV.fetch("TABRY_AUTOCOMPLETE_STATE", nil)).to eq("foobar1234")
     end
   end

data/spec/tabry/runner_spec.rb

@@ -28,7 +28,7 @@ describe Tabry::Runner do
     it "runs OptionsFinder" do
       res = instance_double(Tabry::Result)
       expect(subject).to receive(:parse).with(%w[foo bar]).and_return res
-      expect(Tabry::OptionsFinder).to receive(:options).with(res, "waz").and_return %w[a b c]
+      expect(Tabry::OptionsFinder).to receive(:options).with(res, "waz", {}).and_return %w[a b c]
       expect(subject.options(%w[foo bar], "waz")).to eq(%w[a b c])
     end
   end

data/spec/tabry/shell_tokenizer_spec.rb

@@ -23,6 +23,11 @@ describe Tabry::ShellTokenizer do
       )
     end
 
+    it "uses comppoint to correctly figures out whether we are still on the last token" do
+      expect(described_class.split_with_comppoint("jir add ", 7)).to eq(["jir", [], "add"])
+      expect(described_class.split_with_comppoint("jir add ", 8)).to eq(["jir", ["add"], ""])
+    end
+
     it "supports tokens with argument (tab on command), yielding the last arg" do
       expect(described_class.split_with_comppoint("abc", 2)).to eq([nil, [], "abc"])
     end

data/spec/tabry/shells/bash_spec.rb

@@ -30,13 +30,13 @@ describe Tabry::Shells::Bash do
   describe '.generate' do
     it 'tells bash to use tabry-bash with a import path to get completion options' do
       result = described_class.generate("my-cmd", "/path/to/mycmd.tabry")
-      expect(result).to include("TABRY_IMPORTS_PATH=/path/to/mycmd.tabry _tabry_MY_CMD_completions_internal /home/evan/dev/tabry/bin/tabry-bash \n")
+      expect(result).to include("TABRY_IMPORTS_PATH=/path/to/mycmd.tabry _tabry_MY_CMD_completions_internal /")
       expect(result).to include("complete -F _tabry_MY_CMD_completions my-cmd\n")
     end
 
     it "takes a uniq_fn_id parameter to override the default function names" do
       result = described_class.generate("my-cmd", "/path/to/mycmd.tabry", uniq_fn_id: "my cmd tabryv0.2.0")
-      expect(result).to include("TABRY_IMPORTS_PATH=/path/to/mycmd.tabry _tabry_MY_CMD_TABRYV0_2_0_completions_internal /home/evan/dev/tabry/bin/tabry-bash \n")
+      expect(result).to include("TABRY_IMPORTS_PATH=/path/to/mycmd.tabry _tabry_MY_CMD_TABRYV0_2_0_completions_internal /")
       expect(result).to include("complete -F _tabry_MY_CMD_TABRYV0_2_0_completions my-cmd\n")
       expect(result).to include("_tabry_MY_CMD_TABRYV0_2_0_completions_internal()")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tabry
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Evan Battaglia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-19 00:00:00.000000000 Z
+date: 2023-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-byebug