ruby-zoom 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e1f69ab0f382c214c1dc45f2c7be2582b30fdfa
-  data.tar.gz: b4d5e32bb2a5d928652dfbdaf070a22d806033bd
+  metadata.gz: 9141f80aa31064c2d7ccf3957398b2ccbed8426f
+  data.tar.gz: 708740ad09f2a5805126618ac5cc5ca9ec3b8736
 SHA512:
-  metadata.gz: d53bd4c5f32c7adbb988dc9e45933156cf6a276898029d64130a89255a02c7e4ef821b7f422d38e1fb7aeee33d71de5e1408e2a780ad6c9eee50d442dacec2a5
-  data.tar.gz: 8fc378eb702c002f991f536fea13f9eea8da6a7f8c75cbba665b2f4a9769cd08c1085acb34d3378f3bd4042e69ea56f761d90a4e2f396a2c0ec139533fb43f30
+  metadata.gz: 1523d19e9f3e6c87f4f44350a0682c3f6c2263f56357928766c7150f6d4b678c5972cc5052bcaf0bac031149795f4d2a54f4abc810fef471fc4c166a2d5b3f2d
+  data.tar.gz: 9dd372e874aa7a2cdbe535b672fefe1d0b5a15da849a516e0b53ff99c0dc434c8fcd4f5af9255cdec282b320ccc81eab475153915e1af1059e21eb2fc7a10859

data/bin/z

@@ -268,7 +268,7 @@ begin
             options["pattern"]
         )
     end
-rescue ZoomError::Error => e
+rescue Zoom::Error => e
     puts e.message
     exit ZoomExit::EXCEPTION
 end

data/bin/zc

@@ -268,7 +268,7 @@ begin
             options["pattern"]
         )
     end
-rescue ZoomError::Error => e
+rescue Zoom::Error => e
     puts e.message
     exit ZoomExit::EXCEPTION
 end

data/bin/zf

@@ -268,7 +268,7 @@ begin
             options["pattern"]
         )
     end
-rescue ZoomError::Error => e
+rescue Zoom::Error => e
     puts e.message
     exit ZoomExit::EXCEPTION
 end

data/bin/zg

@@ -268,7 +268,7 @@ begin
             options["pattern"]
         )
     end
-rescue ZoomError::Error => e
+rescue Zoom::Error => e
     puts e.message
     exit ZoomExit::EXCEPTION
 end

data/bin/zl

@@ -268,7 +268,7 @@ begin
             options["pattern"]
         )
     end
-rescue ZoomError::Error => e
+rescue Zoom::Error => e
     puts e.message
     exit ZoomExit::EXCEPTION
 end

data/bin/zr

@@ -268,7 +268,7 @@ begin
             options["pattern"]
         )
     end
-rescue ZoomError::Error => e
+rescue Zoom::Error => e
     puts e.message
     exit ZoomExit::EXCEPTION
 end

data/lib/zoom.rb

@@ -1,19 +1,11 @@
-require "ack_profile"
-require "ag_profile"
-require "find_profile"
-require "grep_profile"
 require "io/wait"
 require "json"
 require "pathname"
-require "passwords_profile"
 require "singleton"
 require "string"
-require "zoom_error"
-require "zoom_profile"
 
 class Zoom
     include Singleton
-    include ZoomError
 
     def add_profile(
         name,
@@ -24,14 +16,14 @@ class Zoom
         append = nil
     )
         if (@profiles.has_key?(name))
-            raise ZoomError::ProfileAlreadyExistsError.new(name)
+            raise Zoom::ProfileAlreadyExistsError.new(name)
         end
 
         default_class = nil
         begin
             default_class = Object::const_get(clas).new
         rescue NameError => e
-            raise ZoomError::ProfileClassUnknownError.new(clas)
+            raise Zoom::ProfileClassUnknownError.new(clas)
         end
 
         edit_profile(
@@ -51,7 +43,7 @@ class Zoom
     def configure_editor(editor)
         e = ScoobyDoo.where_are_you(editor)
         if (e.nil?)
-            raise ZoomError::ExecutableNotFoundError.new(editor)
+            raise Zoom::ExecutableNotFoundError.new(editor)
         end
 
         @rc["editor"] = e
@@ -82,8 +74,8 @@ class Zoom
 
         # Default ag profiles
         if (ScoobyDoo.where_are_you("ag"))
-            ag = AgProfile.new
-            all = AgProfile.new(nil, "-uS")
+            ag = Zoom::Profile::Ag.new
+            all = Zoom::Profile::Ag.new(nil, "-uS")
         else
             ag = nil
         end
@@ -93,15 +85,15 @@ class Zoom
             ScoobyDoo.where_are_you("ack") ||
             ScoobyDoo.where_are_you("ack-grep")
         )
-            ack = AckProfile.new
+            ack = Zoom::Profile::Ack.new
         else
             ack = nil
         end
 
         # Default grep profile (emulate ag/ack as much as possible)
-        grep = GrepProfile.new
+        grep = Zoom::Profile::Grep.new
         if (all.nil?)
-            all = GrepProfile.new
+            all = Zoom::ProfileGrep.new
             all.flags("--color=always -EHinR")
         end
 
@@ -115,7 +107,7 @@ class Zoom
         end
 
         # Create find profile
-        find = FindProfile.new
+        find = Zoom::Profile::Find.new
 
         # Put profiles into rc
         @profiles["ack"] = ack if (ack)
@@ -123,7 +115,7 @@ class Zoom
         @profiles["all"] = all if (all)
         @profiles["default"] = default
         @profiles["grep"] = grep
-        @profiles["passwords"] = PasswordsProfile.new
+        @profiles["passwords"] = Zoom::Profile::Passwords.new
         @profiles["zoom_find"] = find
 
         # Default editor (use $EDITOR)
@@ -135,15 +127,15 @@ class Zoom
 
     def delete_profile(name)
         if (name == "default")
-            raise ZoomError::ProfileCanNotBeModifiedError.new(name)
+            raise Zoom::ProfileCanNotBeModifiedError.new(name)
         end
 
         if (name == "zoom_find")
-            raise ZoomError::ProfileCanNotBeModifiedError.new(name)
+            raise Zoom::ProfileCanNotBeModifiedError.new(name)
         end
 
         if (!@profiles.has_key?(name))
-            raise ZoomError::ProfileDoesNotExistError.new(name)
+            raise Zoom::ProfileDoesNotExistError.new(name)
         end
 
         @profiles.delete(name)
@@ -164,13 +156,13 @@ class Zoom
         append = nil
     )
         if (name == "zoom_find")
-            raise ZoomError::ProfileCanNotBeModified.new(name)
+            raise Zoom::ProfileCanNotBeModifiedError.new(name)
         end
 
         profile = @profiles[name] if (profile.nil?)
 
         if (profile.nil?)
-            raise ZoomError::ProfileDoesNotExists.new(name)
+            raise Zoom::ProfileDoesNotExistsError.new(name)
         end
 
         profile.operator(operator) if (operator)
@@ -186,7 +178,7 @@ class Zoom
         name = @info["profile"] if (name.nil?)
 
         if (!@profiles.has_key?(name))
-            raise ZoomError::ProfileDoesNotExistError.new(name)
+            raise Zoom::ProfileDoesNotExistError.new(name)
         end
 
         @info["last_command"] = {
@@ -251,7 +243,7 @@ class Zoom
 
     def interactive_add_profile(name)
         if (@profiles.has_key?(name))
-            raise ZoomError::ProfileAlreadyExistsError.new(name)
+            raise Zoom::ProfileAlreadyExistsError.new(name)
         end
 
         default_op = "grep"
@@ -263,13 +255,17 @@ class Zoom
             default_op = "ack-grep"
         end
 
+        ack_class = Zoom::Profile::Ack.to_s
+        ag_class = Zoom::Profile::Ag.to_s
+        grep_class = Zoom::Profile::Grep.to_s
+
         case default_op
         when "ack", "ack-grep"
-            puts "Enter class (default AckProfile):"
+            puts "Enter class (default #{ack_class}):"
         when "ag"
-            puts "Enter class (default AgProfile):"
+            puts "Enter class (default #{ag_class}):"
         when "grep"
-            puts "Enter class (default GrepProfile):"
+            puts "Enter class (default #{grep_class}):"
         end
 
         clas = gets.chomp
@@ -277,11 +273,11 @@ class Zoom
 
         case default_op
         when "ack", "ack-grep"
-            clas = "AckProfile" if (clas.nil? || clas.empty?)
+            clas = ack_class if (clas.nil? || clas.empty?)
         when "ag"
-            clas = "AgProfile" if (clas.nil? || clas.empty?)
+            clas = ag_class if (clas.nil? || clas.empty?)
         when "grep"
-            clas = "GrepProfile" if (clas.nil? || clas.empty?)
+            clas = grep_class if (clas.nil? || clas.empty?)
         end
 
         add_profile(name, clas)
@@ -290,13 +286,13 @@ class Zoom
 
     def interactive_edit_profile(name, profile = nil)
         if (name == "zoom_find")
-            raise ZoomError::ProfileCanNotBeModifiedError.new(name)
+            raise Zoom::ProfileCanNotBeModifiedError.new(name)
         end
 
         profile = @profiles[name] if (profile.nil?)
 
         if (profile.nil?)
-            raise ZoomError::ProfileDoesNotExistError.new(name)
+            raise Zoom::ProfileDoesNotExistError.new(name)
         end
 
         # Get new operator
@@ -480,7 +476,7 @@ class Zoom
         @rc = JSON.parse(File.read(@rc_file))
         @profiles = Hash.new
         @rc["profiles"].each do |name, prof|
-            @profiles[name] = ZoomProfile.from_json(prof)
+            @profiles[name] = Zoom::Profile.from_json(prof)
         end
         @rc["profiles"] = @profiles
     end
@@ -490,15 +486,15 @@ class Zoom
         name = @info["profile"] if (name.nil?)
 
         if ((name == "default") || (name == "zoom_find"))
-            raise ZoomError::ProfileCanNotBeModifiedError.new(name)
+            raise Zoom::ProfileCanNotBeModifiedError.new(name)
         end
 
         if (!@profiles.has_key?(name))
-            raise ZoomError::ProfileDoesNotExistError.new(name)
+            raise Zoom::ProfileDoesNotExistError.new(name)
         end
 
         if (@profiles.has_key?(rename))
-            raise ZoomError::ProfileAlreadyExistsError.new(rename)
+            raise Zoom::ProfileAlreadyExistsError.new(rename)
         end
 
         @profiles[rename] = @profiles[name]
@@ -597,7 +593,7 @@ class Zoom
 
     def switch_profile(name)
         if (!@profiles.has_key?(name))
-            raise ZoomError::ProfileDoesNotExistError.new(name)
+            raise Zoom::ProfileDoesNotExistError.new(name)
         end
 
         @info["profile"] = name
@@ -619,3 +615,16 @@ class Zoom
     end
     private :write_zoomrc
 end
+
+require "zoom/error"
+require "zoom/executable_not_found_error"
+require "zoom/profile"
+require "zoom/profile_already_exists_error"
+require "zoom/profile_can_not_be_modified_error"
+require "zoom/profile_class_unknown_error"
+require "zoom/profile_does_not_exist_error"
+require "zoom/profile/ack"
+require "zoom/profile/ag"
+require "zoom/profile/find"
+require "zoom/profile/grep"
+require "zoom/profile/passwords"

data/lib/zoom/error.rb

@@ -0,0 +1,2 @@
+class Zoom::Error < RuntimeError
+end

data/lib/zoom/executable_not_found_error.rb

@@ -0,0 +1,7 @@
+require "zoom/error"
+
+class Zoom::ExecutableNotFoundError < Zoom::Error
+    def initialize(exe)
+        super("Executable #{exe} not found!")
+    end
+end

data/lib/{zoom_profile.rb → zoom/profile.rb}

@@ -1,7 +1,8 @@
 require "scoobydoo"
 require "shellwords"
+require "zoom/profile_class_unknown_error"
 
-class ZoomProfile < Hash
+class Zoom::Profile < Hash
     attr_accessor :taggable
 
     def append(append = nil)
@@ -26,13 +27,13 @@ class ZoomProfile < Hash
     def self.from_json(json)
         begin
             return Object::const_get(json["class"]).new(
-                json["operator"].nil? ? "" : json["class"],
+                json["operator"].nil? ? "" : json["operator"],
                 json["flags"].nil? ? "" : json["flags"],
                 json["prepend"].nil? ? "" : json["prepend"],
                 json["append"].nil? ? "" : json["append"]
             )
         rescue NameError => e
-            raise ZoomError::ProfileClassUnknownError.new(
+            raise Zoom::ProfileClassUnknownError.new(
                 json["class"]
             )
         end
@@ -55,10 +56,10 @@ class ZoomProfile < Hash
         append = ""
     )
         self["class"] = self.class.to_s
-        self.operator(operator)
         self.flags(flags)
         self.prepend(envprepend)
         self.append(append)
+        self.operator(operator)
         @pager = "z --pager"
         @taggable = false
     end
@@ -70,6 +71,9 @@ class ZoomProfile < Hash
                 self["operator"] = op
             else
                 self["operator"] = ScoobyDoo.where_are_you("echo")
+                flags("")
+                prepend("")
+                append("#{operator} is not installed!")
             end
         end
         return self["operator"]

data/lib/{ack_profile.rb → zoom/profile/ack.rb}

@@ -1,7 +1,7 @@
 require "shellwords"
-require "zoom_profile"
+require "zoom/profile"
 
-class AckProfile < ZoomProfile
+class Zoom::Profile::Ack < Zoom::Profile
     def colors
         'ACK_COLOR_LINENO=white ACK_COLOR_MATCH="black on_white"'
     end
@@ -27,20 +27,8 @@ class AckProfile < ZoomProfile
         append = ""
     )
         # Special case because of debian
-        operator = nil
-        if (ScoobyDoo.where_are_you("ack"))
-            operator = "ack"
-        elsif (ScoobyDoo.where_are_you("ack-grep"))
-            operator = "ack-grep"
-        else
-            # Oops
-            operator = "echo"
-            if (operator == "echo")
-                flags = "#"
-                envprepend = ""
-                append = ""
-            end
-        end
+        operator = "ack"
+        operator = "ack-grep" if (ScoobyDoo.where_are_you("ack-grep"))
 
         super(operator, flags, envprepend, append)
         @taggable = true

data/lib/{ag_profile.rb → zoom/profile/ag.rb}

@@ -1,7 +1,7 @@
 require "shellwords"
-require "zoom_profile"
+require "zoom/profile"
 
-class AgProfile < ZoomProfile
+class Zoom::Profile::Ag < Zoom::Profile
     def colors
         '--color-match "47;1;30" --color-line-number "0;37"'
     end

data/lib/{find_profile.rb → zoom/profile/find.rb}

@@ -1,7 +1,7 @@
 require "shellwords"
-require "zoom_profile"
+require "zoom/profile"
 
-class FindProfile < ZoomProfile
+class Zoom::Profile::Find < Zoom::Profile
     def exe(args, pattern)
         if (pattern.nil? || pattern.empty?)
             system(

data/lib/{grep_profile.rb → zoom/profile/grep.rb}

@@ -1,7 +1,7 @@
 require "shellwords"
-require "zoom_profile"
+require "zoom/profile"
 
-class GrepProfile < ZoomProfile
+class Zoom::Profile::Grep < Zoom::Profile
     def colors
         [
             'GREP_COLORS="',

data/lib/{passwords_profile.rb → zoom/profile/passwords.rb}

@@ -1,10 +1,10 @@
-require "ag_profile"
-require "ack_profile"
-require "grep_profile"
 require "shellwords"
-require "zoom_profile"
+require "zoom/profile"
+require "zoom/profile/ag"
+require "zoom/profile/ack"
+require "zoom/profile/grep"
 
-class PasswordsProfile < ZoomProfile
+class Zoom::Profile::Passwords < Zoom::Profile
     def colors
         return @profile.colors
     end
@@ -32,19 +32,24 @@ class PasswordsProfile < ZoomProfile
         @passwd_regex = "\"pass(word|wd)?[^:=,>]? *[:=,>]\""
 
         if (ScoobyDoo.where_are_you("ag"))
-            @profile = AgProfile.new(nil, "-uS", "", @passwd_regex)
+            @profile = Zoom::Profile::Ag.new(
+                nil,
+                "-uS",
+                "",
+                @passwd_regex
+            )
         elsif (
             ScoobyDoo.where_are_you("ack") ||
             ScoobyDoo.where_are_you("ack-grep")
         )
-            @profile = AckProfile.new(
+            @profile = Zoom::Profile::Ack.new(
                 nil,
                 "--smart-case",
                 "",
                 @passwd_regex
             )
         else
-            @profile = GrepProfile.new(
+            @profile = Zoom::Profile::Grep.new(
                 nil,
                 "--color=always -EHinR",
                 "",

data/lib/zoom/profile_already_exists_error.rb

@@ -0,0 +1,7 @@
+require "zoom/error"
+
+class Zoom::ProfileAlreadyExistsError < Zoom::Error
+    def initialize(profile)
+        super("Profile #{profile} already exists!")
+    end
+end

data/lib/zoom/profile_can_not_be_modified_error.rb

@@ -0,0 +1,7 @@
+require "zoom/error"
+
+class Zoom::ProfileCanNotBeModifiedError < Zoom::Error
+    def initialize(profile)
+        super("Profile #{profile} can not be modified!")
+    end
+end

data/lib/zoom/profile_class_unknown_error.rb

@@ -0,0 +1,7 @@
+require "zoom/error"
+
+class Zoom::ProfileClassUnknownError < Zoom::Error
+    def initialize(clas)
+        super("Profile class Zoom::#{clas} unknown!")
+    end
+end

data/lib/zoom/profile_does_not_exist_error.rb

@@ -0,0 +1,7 @@
+require "zoom/error"
+
+class Zoom::ProfileDoesNotExistError < Zoom::Error
+    def initialize(profile)
+        super("Profile #{profile} does not exist!")
+    end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-zoom
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-10 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -75,15 +75,20 @@ files:
 - bin/zg
 - bin/zl
 - bin/zr
-- lib/ack_profile.rb
-- lib/ag_profile.rb
-- lib/find_profile.rb
-- lib/grep_profile.rb
-- lib/passwords_profile.rb
 - lib/string.rb
 - lib/zoom.rb
-- lib/zoom_error.rb
-- lib/zoom_profile.rb
+- lib/zoom/error.rb
+- lib/zoom/executable_not_found_error.rb
+- lib/zoom/profile.rb
+- lib/zoom/profile/ack.rb
+- lib/zoom/profile/ag.rb
+- lib/zoom/profile/find.rb
+- lib/zoom/profile/grep.rb
+- lib/zoom/profile/passwords.rb
+- lib/zoom/profile_already_exists_error.rb
+- lib/zoom/profile_can_not_be_modified_error.rb
+- lib/zoom/profile_class_unknown_error.rb
+- lib/zoom/profile_does_not_exist_error.rb
 homepage: http://mjwhitta.github.io/zoom
 licenses:
 - GPL-3.0

data/lib/zoom_error.rb

@@ -1,34 +0,0 @@
-module ZoomError
-    class Error < RuntimeError
-    end
-
-    class ExecutableNotFoundError < Error
-        def initialize(exe)
-            super("Executable #{exe} not found!")
-        end
-    end
-
-    class ProfileAlreadyExistsError < Error
-        def initialize(profile)
-            super("Profile #{profile} already exists!")
-        end
-    end
-
-    class ProfileCanNotBeModifiedError < Error
-        def initialize(profile)
-            super("Profile #{profile} can not be modified!")
-        end
-    end
-
-    class ProfileClassUnknownError < Error
-        def initialize(clas)
-            super("Profile class #{clas} unknown!")
-        end
-    end
-
-    class ProfileDoesNotExistError < Error
-        def initialize(profile)
-            super("Profile #{profile} does not exist!")
-        end
-    end
-end