ruby-zoom 3.5.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 517419dd8be17242c6cfc38d97135a8ddfec8aa7
-  data.tar.gz: df6fbd65cf6a222d5b1563ea00b546142ffea688
+  metadata.gz: bab1b61a5d1d06ff37bd9bf9ebc277894d33daea
+  data.tar.gz: 40b6a5ecfc25d4fad4c91e0fd073d938d4e1a9cb
 SHA512:
-  metadata.gz: 94e7090be2059ec13abf0b4ef1f766b23ec52ab2612a87f413afa17405670222fdac7efc38042622f65ec398e29c6a3be466206a91dc28574c33201c0d017be9
-  data.tar.gz: d5a75653eb943b6c3211f218d42b154d9c15198647a45e5574a62f2508ec0e44748685d15b8f6b45b496a3c8111014a1f61a0c69e650d9e61fac8054da686626
+  metadata.gz: 1c5550f1a9c2a491785a7944a72acb72dc4dad442b47914288b9c6ea9f508f32739e390a92f9cf10acb9835911bf6e96709ecfaf8aac8c6a6f8eb703588f0217
+  data.tar.gz: b3e341aa612ac70c9c631261ff5ac1e190361b62a87a5d816dc2566532126f0d55efcb4cf1bc5ac45f685c28a90cccf3fa0f0d31b573787b673a77dd2cdfa1bd

data/bin/z

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
+require "djinni"
+require "fileutils"
+require "hilighter"
 require "optparse"
 require "zoom"
 
@@ -8,7 +11,9 @@ class ZoomExit
     INVALID_OPTION = 1
     INVALID_ARGUMENT = 2
     MISSING_ARGUMENT = 3
-    EXCEPTION = 4
+    EXTRA_ARGUMENTS = 4
+    EXCEPTION = 5
+    AMBIGUOUS_ARGUMENT = 6
 end
 
 def parse(args)
@@ -16,76 +21,50 @@ def parse(args)
     options["action"] = "exec"
     options["cache_file"] = nil
     options["use"] = nil
+    options["verbose"] = false
 
-    info = "Do you like to search through code using ag, ack, or " \
-        "grep? Good! This tool is for you! Zoom adds some " \
-        "convenience to ag/ack/grep by allowing you to quickly " \
-        "open your search results in your editor of choice. When " \
-        "looking at large code-bases, it can be a pain to have to " \
-        "scroll to find the filename of each result. Zoom prints a " \
-        "tag number in front of each result that ag/ack/grep " \
-        "outputs. Then you can quickly open that tag number with " \
-        "Zoom to jump straight to the source. Zoom is even " \
-        "persistent across all your sessions! You can search in " \
-        "one terminal and jump to a tag in another terminal from " \
-        "any directory!"
+    info = [
+        "Do you like to search through code using ag, ack, grep, or",
+        "pt? Good! This tool is for you! Zoom adds some convenience",
+        "to ag/ack/grep/pt by allowing you to quickly open your",
+        "search results in your editor of choice. When looking at",
+        "large code-bases, it can be a pain to have to scroll to",
+        "find the filename of each result. Zoom prints a tag number",
+        "in front of each result that ag/ack/grep/pt outputs. Then",
+        "you can quickly open that tag number with Zoom to jump",
+        "straight to the source. Zoom is even persistent across all",
+        "your sessions! You can search in one terminal and jump to a",
+        "tag in another terminal from any directory!"
+    ].join(" ")
 
     parser = OptionParser.new do |opts|
+        opts.summary_width = 25
+
         opts.banner =
-            "Usage: #{File.basename($0)} [OPTIONS] <pattern>"
+            "Usage: #{File.basename($0)} [OPTIONS] [pattern]"
 
-        opts.on(
-            "-a",
-            "--add=NAME",
-            "Add a new profile with specified name"
-        ) do |name|
-            options["action"] = "add"
-            options["use"] = name
+        opts.on("", "DESCRIPTION")
+
+        info.scan(/\S.{0,76}\S(?=\s|$)|\S+/).each do |line|
+            opts.on("    #{line}")
         end
 
+        opts.on("", "OPTIONS")
+
         opts.on("-c", "--cache", "Show previous results") do
             options["action"] = "cache"
         end
 
         opts.on(
+            "-o",
             "--cache-file=FILE",
-            "Use the specified cache file"
+            "Use alternate cache"
         ) do |file|
             options["cache_file"] = file
         end
 
-        opts.on(
-            "-d",
-            "--delete=NAME",
-            "Delete profile with specified name"
-        ) do |name|
-            options["action"] = "delete"
-            options["use"] = name
-        end
-
-        opts.on(
-            "-e",
-            "--edit=NAME",
-            "Edit profile with specified name"
-        ) do |name|
-            options["action"] = "edit"
-            options["use"] = name
-        end
-
-        opts.on(
-            "--editor=EDITOR",
-            "Use the specified editor"
-        ) do |editor|
-            options["action"] = "editor"
-            options["use"] = editor
-        end
-
-        opts.on("--examples", "Show some examples") do
-            options["action"] = "examples"
-        end
-
-        opts.on("--find", "Use the zoom_find profile") do
-            options["use"] = "zoom_find"
+        opts.on("--find", "Use built-in find profile") do
+            options["use"] = "find"
         end
 
         opts.on(
@@ -106,65 +85,78 @@ def parse(args)
             options["action"] = "list_profiles"
         end
 
-        opts.on(
-            "--list-profile-names",
-            "List profile names for completion functions"
-        ) do
-            options["action"] = "list_profile_names"
+        opts.on("-r", "--repeat", "Repeat last Zoom command") do
+            options["action"] = "repeat"
         end
 
-        opts.on(
-            "--list-tags",
-            "List tags for completion functions"
-        ) do
-            options["action"] = "list_tags"
+        opts.on("-u", "--use=NAME", "Run specified profile") do |name|
+            options["use"] = name
         end
 
-        opts.on(
-            "--pager",
-            "Treat Zoom as a pager (internal use only)"
-        ) do
-            options["action"] = "pager"
+        opts.on("-w", "--which", "Display current profile") do
+            options["action"] = "which"
         end
 
-        opts.on("-r", "--repeat", "Repeat the last Zoom command") do
-            options["action"] = "repeat"
+        opts.on("", "CONFIGURE_OPTIONS")
+
+        opts.on(
+            "--configure",
+            "Open prompt to edit profiles"
+        ) do
+            options["action"] = "configure"
         end
 
-        opts.on("--rc", "Create default .zoomrc file") do
+        opts.on("--rc", "Create default config file") do
             options["action"] = "rc"
         end
 
+        opts.on("", "MISC_OPTIONS")
+
         opts.on(
-            "--rename=NAME",
-            "Rename the current profile"
-        ) do |name|
-            options["action"] = "rename"
-            options["rename"] = name
+            "--list-profile-names",
+            "List profile names for completion functions"
+        ) do
+            options["action"] = "list_profile_names"
         end
 
         opts.on(
-            "-s",
-            "--switch=NAME",
-            "Switch to profile with specified name"
-        ) do |name|
-            options["action"] = "switch"
-            options["use"] = name
+            "--list-tags",
+            "List tags for completion functions"
+        ) do
+            options["action"] = "list_tags"
+        end
+
+        opts.on("--nocolor", "Disable colorized output") do
+            Hilighter.disable
         end
 
         opts.on(
-            "-u",
-            "--use=NAME",
-            "Use specified profile one time only"
-        ) do |name|
-            options["use"] = name
+            "-v",
+            "--verbose",
+            "Show backtrace when error occurs"
+        ) do
+            options["verbose"] = true
         end
 
-        opts.on("-w", "--which", "Display the current profile") do
-            options["action"] = "which"
+        opts.on("--version", "Show version") do
+            options["action"] = "version"
         end
 
-        opts.on("", info.word_wrap(80))
+        opts.on(
+            "",
+            "EXAMPLES",
+            "    Execute default profile:",
+            "    $ z PATTERN",
+            "",
+            "    Execute specified profile:",
+            "    $ z -u grep PATTERN",
+            "",
+            "    Pass additional flags to default profile:",
+            "    $ z -- -A 3 PATTERN",
+            "",
+            "    Open tags:",
+            "    $ zg 10,20,30-40"
+        )
     end
 
     begin
@@ -181,13 +173,17 @@ def parse(args)
         puts e.message
         puts parser
         exit ZoomExit::MISSING_ARGUMENT
+    rescue OptionParser::AmbiguousOption => e
+        puts e.message
+        puts parser
+        exit ZoomExit::AMBIGUOUS_ARGUMENT
     end
 
     case File.basename($0)
     when "zc"
         options["action"] = "cache"
     when "zf"
-        options["use"] = "zoom_find"
+        options["use"] = "find"
     when "zg"
         options["action"] = "go"
         options["use"] = args[0]
@@ -196,7 +192,7 @@ def parse(args)
     when "zr"
         options["action"] = "repeat"
     when "z"
-        # do nothing, this is the normal usage
+        # Do nothing, this is the normal usage
     else
         options["use"] = File.basename($0)
     end
@@ -208,80 +204,126 @@ end
 
 options = parse(ARGV)
 
-zoom = Zoom.new(options["cache_file"])
 begin
+    if (options["action"] == "rc")
+        FileUtils.rm_f(Pathname.new("~/.zoomrc").expand_path)
+    end
+
+    zoom = Zoom.new(options["cache_file"], nil, !Hilighter.disable?)
+
     case options["action"]
-    when "add"
-        zoom.interactive_add_profile(options["use"])
     when "cache"
-        zoom.shortcut_cache
-    when "delete"
-        zoom.delete_profile(options["use"])
-    when "edit"
-        zoom.interactive_edit_profile(options["use"])
-    when "editor"
-        zoom.configure_editor(options["use"])
-    when "examples"
-        puts [
-            "EXAMPLES:",
-            "",
-            "Add a profile named test:",
-            "    $ z --add test",
-            "",
-            "Edit a profile named test:",
-            "    $ z --edit test",
-            "",
-            "Execute the current profile:",
-            "    $ z PATTERN",
-            "",
-            "Repeat the previous Zoom command:",
-            "    $ z --repeat",
-            "",
-            "Pass additional flags to the choosen operator:",
-            "    $ z -- -A 3 PATTERN",
-            "",
-            "Open a tag:",
-            "    $ z --go 10",
-            "",
-            "Open multiple tags:",
-            "    $ z --go 10,20,30-40"
-        ].join("\n")
+        zoom.cache.shortcut(zoom.config)
+    when "configure"
+        Zoom.hilight(false)
+        djinni = Djinni.new
+        djinni.load_wishes(
+            "#{File.dirname(__FILE__)}/../lib/zoom/wish"
+        )
+        djinni.prompt(
+            {
+                "cache" => zoom.cache,
+                "config" => zoom.config,
+                "prompt_color" => "white",
+                "zoom" => zoom
+            },
+            "zoom(#{zoom.config.current_profile_name})> ".white
+        )
     when "go"
-        zoom.loop_through_results(options["use"])
+        if (options["use"])
+            results = zoom.cache.get_results(options["use"])
+            zoom.open(results)
+        end
     when "list_profiles"
-        zoom.list_profiles
+        profiles = zoom.config.get_profiles
+        profiles.keys.sort do |a, b|
+            a.downcase <=> b.downcase
+        end.each do |name|
+            if (name == zoom.config.current_profile_name)
+                print "*".red if (Zoom.hilight?)
+                print "*" if (!Zoom.hilight?)
+            end
+
+            lines = profiles[name].to_s.scan(
+                /\S.{0,76}\S(?=\s|$)|\S+/
+            )
+            puts lines.delete_at(0)
+            lines.each do |line|
+                puts "    #{line}"
+            end
+        end
     when "list_profile_names"
-        zoom.list_profile_names
+        puts zoom.config.get_profile_names
     when "list_tags"
-        zoom.list_tags
-    when "pager"
-        zoom.pager
+        puts zoom.cache.available_tags
     when "repeat"
         zoom.repeat
     when "rc"
-        zoom.default
-    when "rename"
-        zoom.rename_profile(
-            options["rename"],
-            options["use"]
-        )
-    when "switch"
-        zoom.switch_profile(options["use"])
+        zoom.config.default_config
+        zoom.cache.clear
+    when "version"
+        __FILE__.match(/ruby-zoom-(\d+\.\d+\.\d+)/) do |m|
+            puts m[1]
+        end
     when "which"
-        zoom.show_current
+        name = zoom.config.current_profile_name
+        profile = zoom.config.get_profiles[name]
+
+        print "*".red if (Zoom.hilight?)
+        print "*" if (!Zoom.hilight?)
+
+        lines = profile.to_s.scan(/\S.{0,76}\S(?=\s|$)|\S+/)
+        puts lines.delete_at(0)
+        lines.each do |line|
+            puts "    #{line}"
+        end
     else
-        # Search and save results
-        zoom.exec_profile(
+        # Search and cache results
+        zoom.run(
             options["use"],
             options["subargs"],
             options["pattern"]
         )
     end
+rescue SystemExit
+    # Quit from djinni
+    # Exit gracefully
 rescue Zoom::Error => e
-    puts e.message
+    $stderr.puts e.message
+    if (options["verbose"])
+        e.backtrace.each do |line|
+            $stderr.puts line.yellow
+        end
+    end
     exit ZoomExit::EXCEPTION
+rescue Interrupt
+    # ^C
+    # Exit gracefully
+rescue Errno::EPIPE
+    # Do nothing. This can happen if piping to another program such as
+    # less. Usually if less is closed before Zoom is done with STDOUT.
 rescue Exception => e
-    puts e.message
+    $stderr.puts
+    $stderr.puts "Oops! Looks like an error has occured! Try " \
+        "resetting your configs with the"
+    $stderr.puts "following comand:"
+    $stderr.puts
+    $stderr.puts "    z --rc"
+    $stderr.puts
+    $stderr.puts "If the error persists, file a bug at:"
+    $stderr.puts
+    $stderr.puts "    https://gitlab.com/mjwhitta/zoom/issues"
+    $stderr.puts
+    $stderr.puts "Maybe the message below will help. If not, you " \
+        "can use the --verbose flag to get"
+    $stderr.puts "a backtrace."
+
+    $stderr.puts e.message.white.on_red
+    if (options["verbose"])
+        e.backtrace.each do |line|
+            $stderr.puts line.yellow
+        end
+    end
     exit ZoomExit::EXCEPTION
 end
 exit ZoomExit::GOOD