ruby-zoom 4.5.0 → 4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e24741581c5ef1f83d4decb56f4174ba0daf8fe
-  data.tar.gz: e891c15c54c8d463da1bf1cf6df704d174f2c93b
+  metadata.gz: 10788664e72eaeaad581c1097eecd0e7114fc31a
+  data.tar.gz: b7bff318e1386bb839520de8ebe62315434b9ec8
 SHA512:
-  metadata.gz: a8328bc8f7e697de49828c0dea1e81fc464eb8130a52294af8b60bb35ccf168a2a044055048d37f39250c9bb2160a162ce551fd1e997548dd242b5858c65a962
-  data.tar.gz: 88da71aee03e6e74d28c58981cc7ee608b6f8ec6f47e5cbf262a0db54ea8fb37c65d35235dfbec539a3d0f61df200debafa527910107ac2ba9358288ffd0e470
+  metadata.gz: 1f5b567886b3ee100cf19c2065bf4bc3fd98b42c1a7eb42c12c129f1be21379e80a20b93adec218d64ed70456ee273a0cce5592cf917053f9fbdda8dfd301223
+  data.tar.gz: abcbb6123f6e5bbbcef0132515d50321200f070c5cd6d11273b92b002061bf02853b86b2a40c8fca0eddeb7d9777fec1b8909cbd8e426004ab5b33dc01f22c80

data/lib/zoom/profile.rb

@@ -19,6 +19,16 @@ class Zoom::Profile < Hash
         return self["before"]
     end
 
+    def camel_case_to_underscore(clas)
+        # Convert camelcase class to unscore separated string
+        name = clas.to_s.split("::")[-1]
+        name.gsub!(/([A-Z]+)([A-Z][a-z])/, "\\1_\\2")
+        name.gsub!(/([a-z0-9])([A-Z])/, "\\1_\\2")
+        name.tr!("-", "_")
+        return name.downcase
+    end
+    private :camel_case_to_underscore
+
     def class_name
         return self["class"]
     end
@@ -119,7 +129,13 @@ class Zoom::Profile < Hash
     end
     private :hilight_pattern
 
-    def initialize(n, o = "echo", f = "#", b = "", a = "")
+    def initialize(n = nil, o = nil, f = nil, b = nil, a = nil)
+        a ||= ""
+        b ||= ""
+        f ||= ""
+        n ||= camel_case_to_underscore(self.class.to_s)
+        o ||= "echo"
+
         self["class"] = self.class.to_s
         after(a)
         before(b)

data/lib/zoom/profile/ack.rb

@@ -1,10 +1,12 @@
 class Zoom::Profile::Ack < Zoom::Profile
-    def initialize(n, o = "ack", f = "--smart-case", b = "", a = "")
+    def initialize(n = nil, o = nil, f = nil, b = nil, a = nil)
         # Special case because of debian
+        o ||= "ack"
         if ((o == "ack") && ScoobyDoo.where_are_you("ack-grep"))
             o = "ack-grep"
         end
 
+        f ||= "--smart-case"
         super(n, o, f, b, a)
         @format_flags = [
             "--follow",

data/lib/zoom/profile/ag.rb

@@ -1,5 +1,7 @@
 class Zoom::Profile::Ag < Zoom::Profile
-    def initialize(n, o = "ag", f = "-S", b = "", a = "")
+    def initialize(n = nil, o = nil, f = nil, b = nil, a = nil)
+        f ||= "-S"
+        o ||= "ag"
         super(n, o, f, b, a)
         @format_flags = [
             "-f",

data/lib/zoom/profile/find.rb

@@ -1,5 +1,7 @@
 class Zoom::Profile::Find < Zoom::Profile
-    def initialize(n, o = "find", f = "", b = "", a = "")
+    def initialize(n = nil, o = nil, f = nil, b = nil, a = nil)
+        f ||= ""
+        o ||= "find"
         super(n, o, f, b, a)
         @taggable = true
     end

data/lib/zoom/profile/grep.rb

@@ -1,5 +1,7 @@
 class Zoom::Profile::Grep < Zoom::Profile
-    def initialize(n, o = "grep", f = "-i", b = "", a = "")
+    def initialize(n = nil, o = nil, f = nil, b = nil, a = nil)
+        f ||= "-i"
+        o ||= "grep"
         super(n, o, f, b, a)
         @format_flags = [
             "--color=never",

data/lib/zoom/profile/passwords.rb

@@ -1,18 +1,17 @@
 class Zoom::SecurityProfile::Passwords < Zoom::SecurityProfile
-    def initialize(n, o = nil, f = "", b = "", a = "")
-        flags = ""
+    def initialize(n = nil, o = nil, f = nil, b = nil, a = nil)
         case Zoom::ProfileManager.default_profile
         when /^ack(-grep)?$/
-            flags = "--smart-case"
+            f ||= "--smart-case"
         when "ag"
-            flags = "-Su"
+            f ||= "-Su"
         when "grep"
-            flags = "-ai"
+            f ||= "-ai"
         when "pt"
-            flags = "-SU --hidden"
+            f ||= "-SU --hidden"
         end
 
-        super(n, nil, flags, b, a)
+        super(n, nil, f, b, a)
         @pattern = "(key|pass(wd|word)?)[^:=,>]? *[:=,>]"
         @taggable = true
     end

data/lib/zoom/profile/pt.rb

@@ -1,5 +1,7 @@
 class Zoom::Profile::Pt < Zoom::Profile
-    def initialize(n, o = "pt", f = "-S", b = "", a = "")
+    def initialize(n = nil, o = nil, f = nil, b = nil, a = nil)
+        f ||= "-S"
+        o ||= "pt"
         super(n, o, f, b, a)
         @format_flags = "-e -f --nocolor --nogroup"
         @taggable = true

data/lib/zoom/profile/unsafe_c.rb

@@ -1,18 +1,17 @@
 class Zoom::SecurityProfile::UnsafeC < Zoom::SecurityProfile
-    def initialize(n, o = nil, f = "", b = "", a = "")
-        flags = ""
+    def initialize(n = nil, o = nil, f = nil, b = nil, a = nil)
         case Zoom::ProfileManager.default_profile
         when /^ack(-grep)?$/
-            flags = "--smart-case --cc --cpp"
+            f ||= "--smart-case --cc --cpp"
         when "ag"
-            flags = "-S -G \"\\.(c|h)(pp)?$\""
+            f ||= "-S -G \"\\.(c|h)(pp)?$\""
         when "grep"
-            flags = "-i --include=\"*.[ch]\" --include=\"*.[ch]pp\""
+            f ||= "-i --include=\"*.[ch]\" --include=\"*.[ch]pp\""
         when "pt"
-            flags = "-S -G \"\\.(c|h)(pp)?$\""
+            f ||= "-S -G \"\\.(c|h)(pp)?$\""
         end
 
-        super(n, nil, flags, b, a)
+        super(n, nil, f, b, a)
         @pattern = [
             "(",
             [

data/lib/zoom/profile/unsafe_java.rb

@@ -1,22 +1,21 @@
 class Zoom::SecurityProfile::UnsafeJava < Zoom::SecurityProfile
-    def initialize(n, o = nil, f = "", b = "", a = "")
-        flags = ""
+    def initialize(n = nil, o = nil, f = nil, b = nil, a = nil)
         case Zoom::ProfileManager.default_profile
         when /^ack(-grep)?$/
-            flags = "--smart-case --java"
+            f ||= "--smart-case --java"
         when "ag"
-            flags = "-S -G \"\\.(java|properties)$\""
+            f ||= "-S -G \"\\.(java|properties)$\""
         when "grep"
-            flags = [
+            f ||= [
                 "-i",
                 "--include=\"*.java\"",
                 "--include=\"*.properties\""
             ].join(" ")
         when "pt"
-            flags = "-S -G \"\\.(java|properties)$\""
+            f ||= "-S -G \"\\.(java|properties)$\""
         end
 
-        super(n, nil, flags, b, a)
+        super(n, nil, f, b, a)
         @pattern = [
             "(sun\\.misc\\.)?Unsafe",
             "(\\.getRuntime|readObject|Runtime)\\("

data/lib/zoom/profile/unsafe_js.rb

@@ -1,18 +1,17 @@
 class Zoom::SecurityProfile::UnsafeJs < Zoom::SecurityProfile
-    def initialize(n, o = nil, f = "", b = "", a = "")
-        flags = ""
+    def initialize(n = nil, o = nil, f = nil, b = nil, a = nil)
         case Zoom::ProfileManager.default_profile
         when /^ack(-grep)?$/
-            flags = "--smart-case --js"
+            f ||= "--smart-case --js"
         when "ag"
-            flags = "-S -G \"\\.js$\""
+            f ||= "-S -G \"\\.js$\""
         when "grep"
-            flags = "-i --include=\"*.js\""
+            f ||= "-i --include=\"*.js\""
         when "pt"
-            flags = "-S -G \"\\.js$\""
+            f ||= "-S -G \"\\.js$\""
         end
 
-        super(n, nil, flags, b, a)
+        super(n, nil, f, b, a)
         @pattern = "\\.((append|eval|html)\\(|innerHTML)"
         @taggable = true
     end

data/lib/zoom/profile/unsafe_php.rb

@@ -1,23 +1,22 @@
 class Zoom::SecurityProfile::UnsafePhp < Zoom::SecurityProfile
-    def initialize(n, o = nil, f = "", b = "", a = "")
-        flags = ""
+    def initialize(n = nil, o = nil, f = nil, b = nil, a = nil)
         case Zoom::ProfileManager.default_profile
         when /^ack(-grep)?$/
-            flags = "--smart-case --php"
+            f ||= "--smart-case --php"
         when "ag"
-            flags = "-S -G \"\\.ph(p[345t]?|tml)$\""
+            f ||= "-S -G \"\\.ph(p[345t]?|tml)$\""
         when "grep"
-            flags = [
+            f ||= [
                 "-i",
                 "--include=\"*.php\"",
                 "--include=\"*.php[345t]\"",
                 "--include=\"*.phtml\""
             ].join(" ")
         when "pt"
-            flags = "-S -G \"\\.ph(p[345t]?|tml)$\""
+            f ||= "-S -G \"\\.ph(p[345t]?|tml)$\""
         end
 
-        super(n, nil, flags, b, a)
+        super(n, nil, f, b, a)
         # From here: https://www.eukhost.com/blog/webhosting/dangerous-php-functions-must-be-disabled/
         # OMG is anything safe?!
         @pattern = [

data/lib/zoom/profile/unsafe_python.rb

@@ -1,18 +1,17 @@
 class Zoom::SecurityProfile::UnsafePython < Zoom::SecurityProfile
-    def initialize(n, o = nil, f = "", b = "", a = "")
-        flags = ""
+    def initialize(n = nil, o = nil, f = nil, b = nil, a = nil)
         case Zoom::ProfileManager.default_profile
         when /^ack(-grep)?$/
-            flags = "--smart-case --python"
+            f ||= "--smart-case --python"
         when "ag"
-            flags = "-S -G \"\\.py$\""
+            f ||= "-S -G \"\\.py$\""
         when "grep"
-            flags = "-i --include=\"*.py\""
+            f ||= "-i --include=\"*.py\""
         when "pt"
-            flags = "-S -G \"\\.py$\""
+            f ||= "-S -G \"\\.py$\""
         end
 
-        super(n, nil, flags, b, a)
+        super(n, nil, f, b, a)
         @pattern = [
             "(",
             [

data/lib/zoom/profile/unsafe_ruby.rb

@@ -1,16 +1,15 @@
 class Zoom::SecurityProfile::UnsafeRuby < Zoom::SecurityProfile
-    def initialize(n, o = nil, f = "", b = "", a = "")
-        flags = ""
+    def initialize(n = nil, o = nil, f = nil, b = nil, a = nil)
         case Zoom::ProfileManager.default_profile
         when /^ack(-grep)?$/
-            flags = "--smart-case --ruby"
+            f ||= "--smart-case --ruby"
         when "ag"
-            flags = [
+            f ||= [
                 "-S",
                 "-G \"\\.(erb|r(ake|b|html|js|xml)|spec)$|Rakefile\""
             ].join(" ")
         when "grep"
-            flags = [
+            f ||= [
                 "-i",
                 "--include=\"*.erb\"",
                 "--include=\"*.rake\"",
@@ -22,13 +21,13 @@ class Zoom::SecurityProfile::UnsafeRuby < Zoom::SecurityProfile
                 "--include=\"Rakefile\""
             ].join(" ")
         when "pt"
-            flags = [
+            f ||= [
                 "-S",
                 "-G \"\\.(erb|r(ake|b|html|js|xml)|spec)$|Rakefile\""
             ].join(" ")
         end
 
-        super(n, nil, flags, b, a)
+        super(n, nil, f, b, a)
         @pattern = [
             "%x\\(",
             "\\.constantize",

data/lib/zoom/profile_manager.rb

@@ -39,12 +39,7 @@ class Zoom::ProfileManager
     def self.security_profiles
         profs = Array.new
         Zoom::SecurityProfile.subclasses.each do |clas|
-            # Convert camelcase class to unscore separated string
-            name = clas.to_s.split("::")[-1]
-            name.gsub!(/([A-Z]+)([A-Z][a-z])/, "\\1_\\2")
-            name.gsub!(/([a-z0-9])([A-Z])/, "\\1_\\2")
-            name.tr!("-", "_")
-            profs.push(clas.new(name.downcase))
+            profs.push(clas.new)
         end
         return profs
     end

data/lib/zoom/security_profile.rb

@@ -1,7 +1,7 @@
 clas = Zoom::ProfileManager.default_profile.capitalize
 superclass = Zoom::Profile.profile_by_name("Zoom::Profile::#{clas}")
 class Zoom::SecurityProfile < superclass
-    def initialize(n, o = nil, f = "", b = "", a = "")
+    def initialize(n = nil, o = nil, f = nil, b = nil, a = nil)
         super(n, Zoom::ProfileManager.default_profile, f, b, a)
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-zoom
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.5.1
 platform: ruby
 authors:
 - Miles Whittaker
@@ -59,7 +59,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: fagin
   requirement: !ruby/object:Gem::Requirement