ruby-zoom 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebff587285a99a0ba23191a2804e777bd25c61ee
-  data.tar.gz: daa4d4164a07af61dc61e49a1ead0d7f18895ddd
+  metadata.gz: 6a69c2cba288ca27e2764b47c1c9b5e45b5c1421
+  data.tar.gz: fb172ea95ccc3f4a59e3026965483a45d424a88a
 SHA512:
-  metadata.gz: d399470ddd80929196185fc768d4bac488b14078b582455c980825145a89bbf2dc3be8e29c1b80037fde82b32066d78725920286df2190b269cbe2825e35f0e4
-  data.tar.gz: dfc18c77189a0ef1517ec67c5d681e66a1ab9d047b7b1d30ebb3837c20754e5e6ba275f2bac1c44938aa5f9c064e032b04faa67b25cf8808239afd40b940d1ab
+  metadata.gz: c3d09ac12e8c720971bf54967dad1dc83477dfc0873e615f4ab871f94a3c58074e1923bbd0dc7348a1952470a4b2fb3a78356fa7b87c0965d18bb3c6aeaf6c08
+  data.tar.gz: c16313a83fdc52820e81344ed6251b513e0acb0cadcd3eef8b231e5505481da6310b5c620bf80697273803d9ea05a7abb8a2525c66394a661c850ea64f5a072b

data/bin/z

@@ -250,7 +250,7 @@ begin
     when "repeat"
         Zoom.instance.repeat
     when "rc"
-        Zoom.instance.default
+        Zoom.default
     when "rename"
         Zoom.instance.rename_profile(
             options["rename"],
@@ -271,5 +271,8 @@ begin
 rescue Zoom::Error => e
     puts e.message
     exit ZoomExit::EXCEPTION
+rescue Exception => e
+    puts e.message
+    exit ZoomExit::EXCEPTION
 end
 exit ZoomExit::GOOD

data/bin/zc

@@ -250,7 +250,7 @@ begin
     when "repeat"
         Zoom.instance.repeat
     when "rc"
-        Zoom.instance.default
+        Zoom.default
     when "rename"
         Zoom.instance.rename_profile(
             options["rename"],
@@ -271,5 +271,8 @@ begin
 rescue Zoom::Error => e
     puts e.message
     exit ZoomExit::EXCEPTION
+rescue Exception => e
+    puts e.message
+    exit ZoomExit::EXCEPTION
 end
 exit ZoomExit::GOOD

data/bin/zf

@@ -250,7 +250,7 @@ begin
     when "repeat"
         Zoom.instance.repeat
     when "rc"
-        Zoom.instance.default
+        Zoom.default
     when "rename"
         Zoom.instance.rename_profile(
             options["rename"],
@@ -271,5 +271,8 @@ begin
 rescue Zoom::Error => e
     puts e.message
     exit ZoomExit::EXCEPTION
+rescue Exception => e
+    puts e.message
+    exit ZoomExit::EXCEPTION
 end
 exit ZoomExit::GOOD

data/bin/zg

@@ -250,7 +250,7 @@ begin
     when "repeat"
         Zoom.instance.repeat
     when "rc"
-        Zoom.instance.default
+        Zoom.default
     when "rename"
         Zoom.instance.rename_profile(
             options["rename"],
@@ -271,5 +271,8 @@ begin
 rescue Zoom::Error => e
     puts e.message
     exit ZoomExit::EXCEPTION
+rescue Exception => e
+    puts e.message
+    exit ZoomExit::EXCEPTION
 end
 exit ZoomExit::GOOD

data/bin/zl

@@ -250,7 +250,7 @@ begin
     when "repeat"
         Zoom.instance.repeat
     when "rc"
-        Zoom.instance.default
+        Zoom.default
     when "rename"
         Zoom.instance.rename_profile(
             options["rename"],
@@ -271,5 +271,8 @@ begin
 rescue Zoom::Error => e
     puts e.message
     exit ZoomExit::EXCEPTION
+rescue Exception => e
+    puts e.message
+    exit ZoomExit::EXCEPTION
 end
 exit ZoomExit::GOOD

data/bin/zr

@@ -250,7 +250,7 @@ begin
     when "repeat"
         Zoom.instance.repeat
     when "rc"
-        Zoom.instance.default
+        Zoom.default
     when "rename"
         Zoom.instance.rename_profile(
             options["rename"],
@@ -271,5 +271,8 @@ begin
 rescue Zoom::Error => e
     puts e.message
     exit ZoomExit::EXCEPTION
+rescue Exception => e
+    puts e.message
+    exit ZoomExit::EXCEPTION
 end
 exit ZoomExit::GOOD

data/lib/zoom.rb

@@ -7,6 +7,11 @@ 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,
@@ -37,7 +42,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)
@@ -50,25 +55,26 @@ class Zoom
         write_zoomrc
     end
 
-    def default
+    def self.default
         default_zoominfo
         default_zoomrc
     end
 
-    def default_zoominfo
-        @info = Hash.new
-        @info["profile"] = "default"
+    def self.default_zoominfo
+        info = Hash.new
+        info["profile"] = "default"
 
         # Reset last command to be empty
-        @info["last_command"] = Hash.new
+        info["last_command"] = Hash.new
 
-        write_zoominfo
+        File.open(@@info_file, "w") do |file|
+            file.write(JSON.pretty_generate(info))
+        end
     end
-    private :default_zoominfo
 
-    def default_zoomrc
-        @rc = Hash.new
-        @profiles = Hash.new
+    def self.default_zoomrc
+        rc = Hash.new
+        profiles = Hash.new
 
         all = nil
 
@@ -110,34 +116,32 @@ class Zoom
         find = Zoom::Profile::Find.new
 
         # Put profiles into rc
-        @profiles["ack"] = ack if (ack)
-        @profiles["ag"] = ag if (ag)
-        @profiles["all"] = all if (all)
-        @profiles["default"] = default
-        @profiles["grep"] = grep
-        @profiles["passwords"] = Zoom::Profile::Passwords.new
-        @profiles["zoom_find"] = find
+        profiles["ack"] = ack if (ack)
+        profiles["ag"] = ag if (ag)
+        profiles["all"] = all if (all)
+        profiles["default"] = default
+        profiles["grep"] = grep
+        profiles["passwords"] = Zoom::Profile::Passwords.new
+        profiles["zoom_find"] = find
+        rc["profiles"] = profiles
 
         # Default editor (use $EDITOR)
-        @rc["editor"] = ""
+        rc["editor"] = ""
 
-        write_zoomrc
+        File.open(@@rc_file, "w") do |file|
+            file.write(JSON.pretty_generate(rc))
+        end
     end
-    private :default_zoomrc
 
     def delete_profile(name)
-        if (name == "default")
-            raise Zoom::ProfileCanNotBeModifiedError.new(name)
+        if (!@profiles.has_key?(name))
+            raise Zoom::ProfileDoesNotExistError.new(name)
         end
 
-        if (name == "zoom_find")
+        if ((name == "default") || @profiles[name].immutable)
             raise Zoom::ProfileCanNotBeModifiedError.new(name)
         end
 
-        if (!@profiles.has_key?(name))
-            raise Zoom::ProfileDoesNotExistError.new(name)
-        end
-
         @profiles.delete(name)
         write_zoomrc
 
@@ -155,16 +159,16 @@ class Zoom
         envprepend = nil,
         append = nil
     )
-        if (name == "zoom_find")
-            raise Zoom::ProfileCanNotBeModifiedError.new(name)
-        end
-
         profile = @profiles[name] if (profile.nil?)
 
         if (profile.nil?)
             raise Zoom::ProfileDoesNotExistsError.new(name)
         end
 
+        if (profile.immutable)
+            raise Zoom::ProfileCanNotBeModifiedError.new(name)
+        end
+
         profile.operator(operator) if (operator)
         profile.flags(flags) if (flags)
         profile.prepend(envprepend) if (envprepend)
@@ -200,7 +204,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)
@@ -225,11 +229,6 @@ class Zoom
         custom_profs = Pathname.new("~/.zoom_profiles.rb").expand_path
         require_relative custom_profs if (custom_profs.exist?)
 
-        @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
-
         read_zoomrc
         read_zoominfo
 
@@ -285,16 +284,16 @@ class Zoom
     end
 
     def interactive_edit_profile(name, profile = nil)
-        if (name == "zoom_find")
-            raise Zoom::ProfileCanNotBeModifiedError.new(name)
-        end
-
         profile = @profiles[name] if (profile.nil?)
 
         if (profile.nil?)
             raise Zoom::ProfileDoesNotExistError.new(name)
         end
 
+        if (profile.immutable)
+            raise Zoom::ProfileCanNotBeModifiedError.new(name)
+        end
+
         # Get new operator
         puts "Enter operator (default #{profile.operator}):"
 
@@ -348,13 +347,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|
@@ -431,7 +430,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|
@@ -462,18 +461,18 @@ class Zoom
     private :parse_tags
 
     def read_zoominfo
-        if (!@info_file.exist? && !@info_file.symlink?)
+        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
-        default_zoomrc if (!@rc_file.exist? && !@rc_file.symlink?)
+        default_zoomrc if (!@@rc_file.exist? && !@@rc_file.symlink?)
 
-        @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)
@@ -523,7 +522,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?)
@@ -531,10 +530,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 = ""
@@ -601,7 +600,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
@@ -609,7 +608,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

data/lib/zoom/profile.rb

@@ -3,6 +3,7 @@ require "shellwords"
 require "zoom/profile_class_unknown_error"
 
 class Zoom::Profile < Hash
+    attr_accessor :immutable
     attr_accessor :taggable
 
     def append(append = nil)
@@ -60,6 +61,8 @@ class Zoom::Profile < Hash
         self.prepend(envprepend)
         self.append(append)
         self.operator(operator)
+
+        @immutable = false
         @pager = "z --pager"
         @taggable = false
     end

data/lib/zoom/profile/find.rb

@@ -23,6 +23,7 @@ class Zoom::Profile::Find < Zoom::Profile
         append = ""
     )
         super("find", flags, envprepend, append)
+        @immutable = true
         @taggable = true
     end
 end

data/lib/zoom/profile/passwords.rb

@@ -1,4 +1,3 @@
-require "shellwords"
 require "zoom/profile"
 require "zoom/profile/ag"
 require "zoom/profile/ack"
@@ -63,6 +62,7 @@ class Zoom::Profile::Passwords < Zoom::Profile
             @profile.prepend,
             @profile.append
         )
+        @immutable = true
         @taggable = true
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-zoom
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-11 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest