wordstress 0.25.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d9d3ce6342547c89da59a3c3cfd7c209d0c75ea
-  data.tar.gz: 5fd672e93154cc12c33165c18e502b948919af42
+  metadata.gz: ec2d1bdf19fed96cb2415b71df03a5a6e81422bb
+  data.tar.gz: 653958b73a60f4dac746d88d7a3af073ee8eab83
 SHA512:
-  metadata.gz: bf3141b393ad954d9d80b64b9916342d1e18d8df22331ad43cad35529210ddcb8cdddf6240b5e08f2db4dcdff8f2a0c9e82199c9536746affe6da6d0205a3e65
-  data.tar.gz: 1936e5078b99ce7b0a468fabdd414d8e909b1e635c82c924ab03bbbaa9c4a6500b329ba277b9e7c61935022bfe4158880680a4c844529ac25ee616698b8f4764
+  metadata.gz: 94d66e0a989016ffaac389867c1f214194b713a457eabf5f7e18cea65b5a601f111714ef01b79c488387e44661563e78d583a98fa207613e69b222aae1378118
+  data.tar.gz: 68de0225374d311b219056ecc05b3c8698a29a58000c7286ab27a7e7dd91022aab7d637681a70f951db2a0a7eea2214e1be0d9cf025ee6f876b20ed469d4ee5f

data/lib/wordstress/site.rb

@@ -152,12 +152,18 @@ module Wordstress
     end
 
     private
+    def is_already_detected?(array, name)
+      a = array.detect {|elem| elem[:name] == name }
+      return false if array.empty?
+      return (!a.nil?)
+    end
+
     def find_plugins_interactive
       ret = []
       doc = Nokogiri::HTML(@wordstress_page.body)
       doc.css('#all_plugin').each do |link|
         l=link.text.split(',')
-        ret << {:name=>l[2], :version=>l[1], :status=>l[3]}
+        ret << {:name=>l[2], :version=>l[1], :status=>l[3]} unless is_already_detected?(ret, l[2])
       end
       $logger.debug ret
       ret
@@ -167,7 +173,7 @@ module Wordstress
       doc = Nokogiri::HTML(@wordstress_page.body)
       doc.css('#all_theme').each do |link|
         l=link.text.split(',')
-        ret << {:name=>l[2], :version=>l[1]}
+        ret << {:name=>l[2], :version=>l[1]} unless is_already_detected?(ret, l[2])
       end
       $logger.debug ret
       ret
@@ -179,7 +185,7 @@ module Wordstress
       doc.css('link').each do |link|
         if link.attr('href').include?("wp-content/themes")
         theme = theme_name(link.attr('href'))
-        ret << {:name=>theme, :version=>""} if ret.index(theme).nil?
+        ret << {:name=>theme, :version=>""} unless is_already_detected?(ret, theme)
         end
       end
       ret
@@ -199,7 +205,7 @@ module Wordstress
         if ! link.attr('src').nil?
           if link.attr('src').include?("wp-content/plugins")
           plugin = plugin_name(link.attr('src'))
-          ret << {:name=>plugin, :version=>"", :status=>"active"} if ret.index(plugin).nil?
+          ret << {:name=>plugin, :version=>"", :status=>"active"} unless is_already_detected?(ret, plugin)
           end
         end
       end

data/lib/wordstress/version.rb

@@ -1,3 +1,3 @@
 module Wordstress
-  VERSION = "0.25.0"
+  VERSION = "0.30.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordstress
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Paolo Perego