grepo 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6c3ad42653c32ac58ada7702ec5a010464aaa2f
-  data.tar.gz: 4fdb1a86070fc887833214c9b104c990a4c624ff
+  metadata.gz: 91c96fa7f55a0e07b910a9eed01a7b7fe37d820b
+  data.tar.gz: 5a9224fadf7c8870369fbd4e1db9a1ea0a7b90f7
 SHA512:
-  metadata.gz: eab4ee5420c86d62def83e2b0bbeb1b8ec0cdf8825db029068c4fc34c78fec5ffe1f20a39bc8a86bedba3170ba9d6d298214a8b323cae5ea2de25dbb97339f32
-  data.tar.gz: 11d055ab629a6d759678f2051dad6ff09b75869dd39e459256abd5795beec44051159c7fd80407273d622e496124d39dd571225cddbebb7f1cb7ddeb3f115c22
+  metadata.gz: a85bdda56d97297d71d0e39a95b9bda0b12bba82047380e01c6d96ae0f57b3ba8349e5d350465a95b2e8b83ee00725bf15a9841f22c6edb65af30a1a8fe696d0
+  data.tar.gz: 5ec7006b18998df266ce8da47cf76ac5b53d6c205fef3a3443f41e08fb33eb3eb7baff6c6f6974c4700a56c4d27ddbed0ef308bd5480ec9c1795d987347f1ea6

data/bin/grepo

@@ -5,19 +5,32 @@ require_relative '../lib/grepo.rb'
 arg = ARGV
 action_arg = arg[0] 
 
+def get_depth
+  if arg[3]
+    depth_arg = arg[3].split(":")
+    if depth_arg[1]
+      return depth_arg[1].to_i
+    else
+      return 1
+    end
+  else
+    return 1
+  end
+end
+
 case action_arg
 when "find"
   file_one = arg[1] || "config/locales/en.yml"
   file_two = arg[2] || "app/"
 
-  depth = arg[3] || 1
+  depth = get_depth arg[3]
  
-  Grepo.new.find(file_one, "file_two", {depth: depth} )
+  Grepo.new.find(file_one, file_two, {depth: depth} )
 when "compare"
   file_one = arg[1] || "config/locales/hr.yml"
   file_two = arg[2] || "config/locales/en.yml"
 
-  depth = arg[3] || 1
+  depth = get_depth arg[3]
 
   Grepo.new.compare(file_one, file_two, {depth: depth})
 when "find_duplicates"

data/lib/grepo.rb

@@ -58,12 +58,12 @@ class Grepo
     # what IS NOT in en.yml
     difference = @for_compare_two - @for_compare_one
     if difference.count > 0
-      puts "Strings that are in #{file_two} and not in #{file_one} are:"
+      puts "In #{file_two} and not in #{file_one} :"
       difference.each do |dif|
         puts "  #{dif}"
       end
     else
-      puts "Same strings in #{file_one} and #{file_two}"
+      puts "Same in #{file_one} and #{file_two}"
     end
   end
 
@@ -152,20 +152,24 @@ class Grepo
       end
 
       # now find out which keys are repeating and print them out like: hr.form.whatever
-      duplicated_keys.map do |dk|
-        puts "There are some duplicated:" 
-        if dk[:value].is_a? String 
-          # print double keys that haw no more nested keys
-          look_for = @grep_for.find{|str| str.include? "#{dk[:key]}:#{dk[:value].delete(" ")}"}
-          
-          puts "  #{look_for.split(":")[0]}" if look_for
-        else
-          # print double keys that have nested keys
-          dk[:value].keys.map{|v| "#{dk[:key]}.#{v}"}.each do |sub_str|
-            look_for = @grep_for.find{|str| str.include? sub_str}
+      if duplicated_keys.count > 0
+        duplicated_keys.map do |dk|
+          puts "There are some duplicated:" 
+          if dk[:value].is_a? String 
+            # print double keys that haw no more nested keys
+            look_for = @grep_for.find{|str| str.include? "#{dk[:key]}:#{dk[:value].delete(" ")}"}
+
             puts "  #{look_for.split(":")[0]}" if look_for
+          else
+            # print double keys that have nested keys
+            dk[:value].keys.map{|v| "#{dk[:key]}.#{v}"}.each do |sub_str|
+              look_for = @grep_for.find{|str| str.include? sub_str}
+              puts "  #{look_for.split(":")[0]}" if look_for
+            end
           end
         end
+      else
+        puts "There are no duplicates!"
       end
     end
   end
@@ -207,8 +211,9 @@ class Grepo
   end
 end
 
+#Grepo.new.find("test_project/config/locales/en.yml", "test_project/app/")
 #Grepo.new.find("config/locales/en.yml", "app/", {depth: 1} )
 #Grepo.new.find("config/locales/en.yml", "umye_cms/app/", {depth: 0})
-#Grepo.new.compare("config/locales/hr.yml", "config/locales/en.yml", {depth: 1})
+#Grepo.new.compare("test_project/config/locales/hr.yml", "test_project/config/locales/en.yml", {depth: 1})
 #Grepo.new.compare("config/locales/hr.yml")
-#Grepo.new.find_duplicates("config/locales/en.yml")
+#Grepo.new.find_duplicates("test_project/config/locales_json/en.json")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grepo
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Mislav Kvesić