ruby-zoom 3.3.5 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e47fa196ad2da18ca070b935c083ae900e9e8ff9
-  data.tar.gz: e393b381ecacc5dd9a985f305bf3af7d8dde39b7
+  metadata.gz: 4b0167d84e86358ed277f8967bdb634e3038b4f3
+  data.tar.gz: 20c8158ecff707794d5711caeea8f305b930f46d
 SHA512:
-  metadata.gz: e76a1b1976380612115ef0c3f03a35afd29ff4a92c4634ee49f5d7d51b0761223fc666217abccd833d9e16d31c7ae396b3bcff3bb5f0aeb0b572a3486ab56032
-  data.tar.gz: e815694ae52ac23974aea9a4b68acc05785e6f434b31cb45b8451cce831b5b90dd65d634a9136ba2ae2ffca684694f699d9d70c3616ceb4c57527b35e12273ef
+  metadata.gz: d16ae4eca8e12c6ce49a31e9a6f054e53bc9126f30b0e71640b0f7587ffebf1c4586a1bfc759dc14ec4bcf7282a45607235dcee0a89e185047743af1ba308f45
+  data.tar.gz: 8b1e9e636145a1c4ab3823a6b7772e948171ed890e592e67b1834e6bfce7dad03d460d3371cf5eea4c551a1d31910711bbdb02ad194fe2dd3db6d2e154bd4b47

data/bin/z

@@ -200,18 +200,19 @@ end
 
 options = parse(ARGV)
 
+zoom = Zoom.new
 begin
     case options["action"]
     when "add"
-        Zoom.instance.interactive_add_profile(options["use"])
+        zoom.interactive_add_profile(options["use"])
     when "cache"
-        Zoom.instance.shortcut_cache
+        zoom.shortcut_cache
     when "delete"
-        Zoom.instance.delete_profile(options["use"])
+        zoom.delete_profile(options["use"])
     when "edit"
-        Zoom.instance.interactive_edit_profile(options["use"])
+        zoom.interactive_edit_profile(options["use"])
     when "editor"
-        Zoom.instance.configure_editor(options["use"])
+        zoom.configure_editor(options["use"])
     when "examples"
         puts [
             "EXAMPLES:",
@@ -238,31 +239,31 @@ begin
             "    $ z --go 10,20,30-40"
         ].join("\n")
     when "go"
-        Zoom.instance.loop_through_results(options["use"])
+        zoom.loop_through_results(options["use"])
     when "list_profiles"
-        Zoom.instance.list_profiles
+        zoom.list_profiles
     when "list_profile_names"
-        Zoom.instance.list_profile_names
+        zoom.list_profile_names
     when "list_tags"
-        Zoom.instance.list_tags
+        zoom.list_tags
     when "pager"
-        Zoom.instance.pager
+        zoom.pager
     when "repeat"
-        Zoom.instance.repeat
+        zoom.repeat
     when "rc"
-        Zoom.default
+        zoom.default
     when "rename"
-        Zoom.instance.rename_profile(
+        zoom.rename_profile(
             options["rename"],
             options["use"]
         )
     when "switch"
-        Zoom.instance.switch_profile(options["use"])
+        zoom.switch_profile(options["use"])
     when "which"
-        Zoom.instance.show_current
+        zoom.show_current
     else
         # Search and save results
-        Zoom.instance.exec_profile(
+        zoom.exec_profile(
             options["use"],
             options["subargs"],
             options["pattern"]

data/bin/zc

@@ -200,18 +200,19 @@ end
 
 options = parse(ARGV)
 
+zoom = Zoom.new
 begin
     case options["action"]
     when "add"
-        Zoom.instance.interactive_add_profile(options["use"])
+        zoom.interactive_add_profile(options["use"])
     when "cache"
-        Zoom.instance.shortcut_cache
+        zoom.shortcut_cache
     when "delete"
-        Zoom.instance.delete_profile(options["use"])
+        zoom.delete_profile(options["use"])
     when "edit"
-        Zoom.instance.interactive_edit_profile(options["use"])
+        zoom.interactive_edit_profile(options["use"])
     when "editor"
-        Zoom.instance.configure_editor(options["use"])
+        zoom.configure_editor(options["use"])
     when "examples"
         puts [
             "EXAMPLES:",
@@ -238,31 +239,31 @@ begin
             "    $ z --go 10,20,30-40"
         ].join("\n")
     when "go"
-        Zoom.instance.loop_through_results(options["use"])
+        zoom.loop_through_results(options["use"])
     when "list_profiles"
-        Zoom.instance.list_profiles
+        zoom.list_profiles
     when "list_profile_names"
-        Zoom.instance.list_profile_names
+        zoom.list_profile_names
     when "list_tags"
-        Zoom.instance.list_tags
+        zoom.list_tags
     when "pager"
-        Zoom.instance.pager
+        zoom.pager
     when "repeat"
-        Zoom.instance.repeat
+        zoom.repeat
     when "rc"
-        Zoom.default
+        zoom.default
     when "rename"
-        Zoom.instance.rename_profile(
+        zoom.rename_profile(
             options["rename"],
             options["use"]
         )
     when "switch"
-        Zoom.instance.switch_profile(options["use"])
+        zoom.switch_profile(options["use"])
     when "which"
-        Zoom.instance.show_current
+        zoom.show_current
     else
         # Search and save results
-        Zoom.instance.exec_profile(
+        zoom.exec_profile(
             options["use"],
             options["subargs"],
             options["pattern"]

data/bin/zf

@@ -200,18 +200,19 @@ end
 
 options = parse(ARGV)
 
+zoom = Zoom.new
 begin
     case options["action"]
     when "add"
-        Zoom.instance.interactive_add_profile(options["use"])
+        zoom.interactive_add_profile(options["use"])
     when "cache"
-        Zoom.instance.shortcut_cache
+        zoom.shortcut_cache
     when "delete"
-        Zoom.instance.delete_profile(options["use"])
+        zoom.delete_profile(options["use"])
     when "edit"
-        Zoom.instance.interactive_edit_profile(options["use"])
+        zoom.interactive_edit_profile(options["use"])
     when "editor"
-        Zoom.instance.configure_editor(options["use"])
+        zoom.configure_editor(options["use"])
     when "examples"
         puts [
             "EXAMPLES:",
@@ -238,31 +239,31 @@ begin
             "    $ z --go 10,20,30-40"
         ].join("\n")
     when "go"
-        Zoom.instance.loop_through_results(options["use"])
+        zoom.loop_through_results(options["use"])
     when "list_profiles"
-        Zoom.instance.list_profiles
+        zoom.list_profiles
     when "list_profile_names"
-        Zoom.instance.list_profile_names
+        zoom.list_profile_names
     when "list_tags"
-        Zoom.instance.list_tags
+        zoom.list_tags
     when "pager"
-        Zoom.instance.pager
+        zoom.pager
     when "repeat"
-        Zoom.instance.repeat
+        zoom.repeat
     when "rc"
-        Zoom.default
+        zoom.default
     when "rename"
-        Zoom.instance.rename_profile(
+        zoom.rename_profile(
             options["rename"],
             options["use"]
         )
     when "switch"
-        Zoom.instance.switch_profile(options["use"])
+        zoom.switch_profile(options["use"])
     when "which"
-        Zoom.instance.show_current
+        zoom.show_current
     else
         # Search and save results
-        Zoom.instance.exec_profile(
+        zoom.exec_profile(
             options["use"],
             options["subargs"],
             options["pattern"]

data/bin/zg

@@ -200,18 +200,19 @@ end
 
 options = parse(ARGV)
 
+zoom = Zoom.new
 begin
     case options["action"]
     when "add"
-        Zoom.instance.interactive_add_profile(options["use"])
+        zoom.interactive_add_profile(options["use"])
     when "cache"
-        Zoom.instance.shortcut_cache
+        zoom.shortcut_cache
     when "delete"
-        Zoom.instance.delete_profile(options["use"])
+        zoom.delete_profile(options["use"])
     when "edit"
-        Zoom.instance.interactive_edit_profile(options["use"])
+        zoom.interactive_edit_profile(options["use"])
     when "editor"
-        Zoom.instance.configure_editor(options["use"])
+        zoom.configure_editor(options["use"])
     when "examples"
         puts [
             "EXAMPLES:",
@@ -238,31 +239,31 @@ begin
             "    $ z --go 10,20,30-40"
         ].join("\n")
     when "go"
-        Zoom.instance.loop_through_results(options["use"])
+        zoom.loop_through_results(options["use"])
     when "list_profiles"
-        Zoom.instance.list_profiles
+        zoom.list_profiles
     when "list_profile_names"
-        Zoom.instance.list_profile_names
+        zoom.list_profile_names
     when "list_tags"
-        Zoom.instance.list_tags
+        zoom.list_tags
     when "pager"
-        Zoom.instance.pager
+        zoom.pager
     when "repeat"
-        Zoom.instance.repeat
+        zoom.repeat
     when "rc"
-        Zoom.default
+        zoom.default
     when "rename"
-        Zoom.instance.rename_profile(
+        zoom.rename_profile(
             options["rename"],
             options["use"]
         )
     when "switch"
-        Zoom.instance.switch_profile(options["use"])
+        zoom.switch_profile(options["use"])
     when "which"
-        Zoom.instance.show_current
+        zoom.show_current
     else
         # Search and save results
-        Zoom.instance.exec_profile(
+        zoom.exec_profile(
             options["use"],
             options["subargs"],
             options["pattern"]

data/bin/zl

@@ -200,18 +200,19 @@ end
 
 options = parse(ARGV)
 
+zoom = Zoom.new
 begin
     case options["action"]
     when "add"
-        Zoom.instance.interactive_add_profile(options["use"])
+        zoom.interactive_add_profile(options["use"])
     when "cache"
-        Zoom.instance.shortcut_cache
+        zoom.shortcut_cache
     when "delete"
-        Zoom.instance.delete_profile(options["use"])
+        zoom.delete_profile(options["use"])
     when "edit"
-        Zoom.instance.interactive_edit_profile(options["use"])
+        zoom.interactive_edit_profile(options["use"])
     when "editor"
-        Zoom.instance.configure_editor(options["use"])
+        zoom.configure_editor(options["use"])
     when "examples"
         puts [
             "EXAMPLES:",
@@ -238,31 +239,31 @@ begin
             "    $ z --go 10,20,30-40"
         ].join("\n")
     when "go"
-        Zoom.instance.loop_through_results(options["use"])
+        zoom.loop_through_results(options["use"])
     when "list_profiles"
-        Zoom.instance.list_profiles
+        zoom.list_profiles
     when "list_profile_names"
-        Zoom.instance.list_profile_names
+        zoom.list_profile_names
     when "list_tags"
-        Zoom.instance.list_tags
+        zoom.list_tags
     when "pager"
-        Zoom.instance.pager
+        zoom.pager
     when "repeat"
-        Zoom.instance.repeat
+        zoom.repeat
     when "rc"
-        Zoom.default
+        zoom.default
     when "rename"
-        Zoom.instance.rename_profile(
+        zoom.rename_profile(
             options["rename"],
             options["use"]
         )
     when "switch"
-        Zoom.instance.switch_profile(options["use"])
+        zoom.switch_profile(options["use"])
     when "which"
-        Zoom.instance.show_current
+        zoom.show_current
     else
         # Search and save results
-        Zoom.instance.exec_profile(
+        zoom.exec_profile(
             options["use"],
             options["subargs"],
             options["pattern"]

data/bin/zr

@@ -200,18 +200,19 @@ end
 
 options = parse(ARGV)
 
+zoom = Zoom.new
 begin
     case options["action"]
     when "add"
-        Zoom.instance.interactive_add_profile(options["use"])
+        zoom.interactive_add_profile(options["use"])
     when "cache"
-        Zoom.instance.shortcut_cache
+        zoom.shortcut_cache
     when "delete"
-        Zoom.instance.delete_profile(options["use"])
+        zoom.delete_profile(options["use"])
     when "edit"
-        Zoom.instance.interactive_edit_profile(options["use"])
+        zoom.interactive_edit_profile(options["use"])
     when "editor"
-        Zoom.instance.configure_editor(options["use"])
+        zoom.configure_editor(options["use"])
     when "examples"
         puts [
             "EXAMPLES:",
@@ -238,31 +239,31 @@ begin
             "    $ z --go 10,20,30-40"
         ].join("\n")
     when "go"
-        Zoom.instance.loop_through_results(options["use"])
+        zoom.loop_through_results(options["use"])
     when "list_profiles"
-        Zoom.instance.list_profiles
+        zoom.list_profiles
     when "list_profile_names"
-        Zoom.instance.list_profile_names
+        zoom.list_profile_names
     when "list_tags"
-        Zoom.instance.list_tags
+        zoom.list_tags
     when "pager"
-        Zoom.instance.pager
+        zoom.pager
     when "repeat"
-        Zoom.instance.repeat
+        zoom.repeat
     when "rc"
-        Zoom.default
+        zoom.default
     when "rename"
-        Zoom.instance.rename_profile(
+        zoom.rename_profile(
             options["rename"],
             options["use"]
         )
     when "switch"
-        Zoom.instance.switch_profile(options["use"])
+        zoom.switch_profile(options["use"])
     when "which"
-        Zoom.instance.show_current
+        zoom.show_current
     else
         # Search and save results
-        Zoom.instance.exec_profile(
+        zoom.exec_profile(
             options["use"],
             options["subargs"],
             options["pattern"]

data/lib/zoom.rb

@@ -1,17 +1,9 @@
 require "io/wait"
 require "json"
 require "pathname"
-require "singleton"
 require "string"
 
 class Zoom
-    include Singleton
-
-    @@cache_file = Pathname.new("~/.zoom_cache").expand_path
-    @@info_file = Pathname.new("~/.zoominfo").expand_path
-    @@rc_file = Pathname.new("~/.zoomrc").expand_path
-    @@shortcut_file = Pathname.new("~/.zoom_shortcuts").expand_path
-
     def add_profile(
         name,
         clas,
@@ -42,7 +34,7 @@ class Zoom
     end
 
     def clear_cache
-        @@cache_file.delete if (@@cache_file.exist?)
+        @cache_file.delete if (@cache_file.exist?)
     end
 
     def configure_editor(editor)
@@ -55,24 +47,24 @@ class Zoom
         write_zoomrc
     end
 
-    def self.default
+    def default
         default_zoominfo
         default_zoomrc
     end
 
-    def self.default_zoominfo
+    def default_zoominfo
         info = Hash.new
         info["profile"] = "default"
 
         # Reset last command to be empty
         info["last_command"] = Hash.new
 
-        File.open(@@info_file, "w") do |file|
+        File.open(@info_file, "w") do |file|
             file.write(JSON.pretty_generate(info))
         end
     end
 
-    def self.default_zoomrc
+    def default_zoomrc
         rc = Hash.new
         profiles = Hash.new
 
@@ -133,7 +125,7 @@ class Zoom
         # Default editor (use $EDITOR)
         rc["editor"] = ""
 
-        File.open(@@rc_file, "w") do |file|
+        File.open(@rc_file, "w") do |file|
             file.write(JSON.pretty_generate(rc))
         end
     end
@@ -209,7 +201,7 @@ class Zoom
 
     def get_location_of_result(result)
         count = 0
-        File.open(@@shortcut_file) do |file|
+        File.open(@shortcut_file) do |file|
             file.each do |line|
                 count += 1
                 if (count == result)
@@ -230,6 +222,11 @@ class Zoom
     private :get_new_value
 
     def initialize
+        @cache_file = Pathname.new("~/.zoom_cache").expand_path
+        @info_file = Pathname.new("~/.zoominfo").expand_path
+        @rc_file = Pathname.new("~/.zoomrc").expand_path
+        @shortcut_file = Pathname.new("~/.zoom_shortcuts").expand_path
+
         # Load custom profiles
         custom_profs = Pathname.new("~/.zoom_profiles.rb").expand_path
         require_relative custom_profs if (custom_profs.exist?)
@@ -243,6 +240,7 @@ class Zoom
         @editor = "vim" if (@editor.nil? || @editor.empty?)
         @editor = ScoobyDoo.where_are_you(@editor)
         @editor = ScoobyDoo.where_are_you("vi") if (@editor.nil?)
+
     end
 
     def interactive_add_profile(name)
@@ -359,13 +357,13 @@ class Zoom
     end
 
     def list_tags
-        return if (!@@cache_file.exist?)
+        return if (!@cache_file.exist?)
 
         # Open shortcut file for writing
-        shct = File.open(@@shortcut_file, "r")
+        shct = File.open(@shortcut_file, "r")
 
         # Read in cache
-        File.open(@@cache_file) do |cache|
+        File.open(@cache_file) do |cache|
             count = 1
 
             cache.each do |line|
@@ -442,7 +440,7 @@ class Zoom
     private :open_editor_to_result
 
     def pager
-        File.open(@@cache_file, "w") do |f|
+        File.open(@cache_file, "w") do |f|
             f.write("ZOOM_EXE_DIR=#{Dir.pwd}\n")
             begin
                 $stdin.each_line do |line|
@@ -477,20 +475,20 @@ class Zoom
     private :parse_tags
 
     def read_zoominfo
-        if (!@@info_file.exist? && !@@info_file.symlink?)
-            Zoom.default_zoominfo
+        if (!@info_file.exist? && !@info_file.symlink?)
+            default_zoominfo
         end
 
-        @info = JSON.parse(File.read(@@info_file))
+        @info = JSON.parse(File.read(@info_file))
     end
     private :read_zoominfo
 
     def read_zoomrc
-        if (!@@rc_file.exist? && !@@rc_file.symlink?)
-            Zoom.default_zoomrc
+        if (!@rc_file.exist? && !@rc_file.symlink?)
+            default_zoomrc
         end
 
-        @rc = JSON.parse(File.read(@@rc_file))
+        @rc = JSON.parse(File.read(@rc_file))
         @profiles = Hash.new
         @rc["profiles"].each do |name, prof|
             @profiles[name] = Zoom::Profile.from_json(prof)
@@ -540,7 +538,7 @@ class Zoom
     private :remove_colors
 
     def shortcut_cache(profile = nil)
-        return if (!@@cache_file.exist?)
+        return if (!@cache_file.exist?)
         return if (@info["last_command"].empty?)
 
         if (profile.nil?)
@@ -548,10 +546,10 @@ class Zoom
         end
 
         # Open shortcut file for writing
-        shct = File.open(@@shortcut_file, "w")
+        shct = File.open(@shortcut_file, "w")
 
         # Read in cache
-        File.open(@@cache_file) do |cache|
+        File.open(@cache_file) do |cache|
             start_dir = ""
             file = nil
             filename = ""
@@ -618,7 +616,7 @@ class Zoom
     end
 
     def write_zoominfo
-        File.open(@@info_file, "w") do |file|
+        File.open(@info_file, "w") do |file|
             file.write(JSON.pretty_generate(@info))
         end
     end
@@ -626,7 +624,7 @@ class Zoom
 
     def write_zoomrc
         @rc["profiles"] = @profiles
-        File.open(@@rc_file, "w") do |file|
+        File.open(@rc_file, "w") do |file|
             file.write(JSON.pretty_generate(@rc))
         end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-zoom
 version: !ruby/object:Gem::Version
-  version: 3.3.5
+  version: 3.4.0
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-06 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest