cocoapods-prune-localizations 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1772c80903e5f7a17d9c618d51a0096d185092af
-  data.tar.gz: 1f7741bef9920363de9faa52be1398f0d9824b18
+  metadata.gz: a54b0308170f33c73a30ca35348c2b7c0029bf1e
+  data.tar.gz: deeff23b273884bceca64fc75a945bfd4c576e4e
 SHA512:
-  metadata.gz: 1437df160da25f7ee1c5d2e33bee4924b6006d08ed0eceb4815d2886dfad0da1acb80ec1fc8f50224301faa62e3f6a8b2fb000d59337cc0e24ee6a6c1f077184
-  data.tar.gz: 817f33cc8a346541b72ebe92c72b24a369d0d6fe4a616a0ae794ad26fbd97f80e0e1fbab36b7bf7eb95b346cadec3a52a28b9c6683857a6eb066ea33069aee05
+  metadata.gz: e26a00f7aae6919dd5277492d6cd86ef996c3412e0c6bb8f2fdea1fee644765ad71da80273a0e1fa1fc61fdf25cbb29c55a05094e82c7e671a202e3ca5c77885
+  data.tar.gz: b95fc1fad0f148eddd1d54415f912b9ed039c59199fc67bbdd9631a22d956192aebcfa562b030ad646323d08ae6984a45648bc64215bc2a04fe42047a18193ec

data/lib/cocoapods-prune-localizations.rb

@@ -1,3 +1,3 @@
 module CocoapodsPruneLocalizations
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/pruner.rb

@@ -29,36 +29,49 @@ module CocoapodsPruneLocalizations
       end
       
       langs_to_keep = @user_options["localizations"] || []
-      Pod::UI.section 'Pruning unused localizations' do
+      Pod::UI.title 'Pruning unused localizations' do
+
+        #Group all the Pods
         pod_groups = @pod_project["Pods"].children.objects
         dev_pod_group = @pod_project["Development Pods"]
         pod_groups += dev_pod_group.children.objects if dev_pod_group
+
         pod_groups.each do |group|
-          resGroup = group["Resources"]
-          next unless resGroup
+
+          #Gather all Resources groups
+          resGroups = group.recursive_children_groups.select do |group|
+            group.name == "Resources"
+          end
+          next unless resGroups.length > 0
           
           markForRemoval = []
           trimmedBundlesToAdd = Hash.new
-          resGroup.files.each do |file|
-            keep = true
-            if file.path.end_with? ".lproj"
-              keep = langs_to_keep.include?(File.basename(file.path))
-            elsif file.path.end_with? ".bundle"
-              trimmed_bundle = self.trimmed_bundle(file.real_path)
-              if trimmed_bundle 
-                trimmedBundlesToAdd[file.real_path] = trimmed_bundle
-                keep = false
+
+          resGroups.each do |resGroup|
+            subTrimmedBundlesToAdd = Hash.new
+            resGroup.files.each do |file|
+              keep = true
+              if file.path.end_with? ".lproj"
+                keep = langs_to_keep.include?(File.basename(file.path))
+              elsif file.path.end_with? ".bundle"
+                trimmed_bundle = self.trimmed_bundle(file.real_path)
+                if trimmed_bundle 
+                  subTrimmedBundlesToAdd[file.real_path] = trimmed_bundle
+                  keep = false
+                end
+              end
+              if !keep
+                markForRemoval << file
               end
             end
-            if !keep
-              markForRemoval << file
-            end
+            trimmedBundlesToAdd[resGroup] = subTrimmedBundlesToAdd unless subTrimmedBundlesToAdd.length == 0              
           end
-          
+
+          #Remove file references indentified for removal
           if markForRemoval.length > 0
             Pod::UI.section "Pruning in #{group.path}" do
               markForRemoval.each do |file|
-                Pod::UI.message "Pruning #{file}"
+                Pod::UI.message "- Pruning #{file}"
                 
                 unless file.path.end_with? ".bundle"
                   relative_path = file.real_path.relative_path_from @sandbox_root
@@ -75,23 +88,25 @@ module CocoapodsPruneLocalizations
               end
             end
           end
-          
+
           if trimmedBundlesToAdd.length > 0
-            group_path = File.join(@pruned_bundles_path, group.path)
-            FileUtils.mkdir group_path unless Dir.exist? group_path
-            Pod::UI.message "Adding trimmed bundles to #{group.path}" do
-              trimmedBundlesToAdd.each_pair do |original_bundle_path, bundle_path|
-                bundle_name = File.basename(original_bundle_path)
-                new_bundle_path = File.join(group_path, bundle_name)
-                FileUtils.rm_r(new_bundle_path) if File.exist? new_bundle_path
-                FileUtils.mv(bundle_path, new_bundle_path)
-                group.new_reference(new_bundle_path)
-                
-                relative_path = original_bundle_path.relative_path_from(@sandbox_root).to_s
-                new_relative_path = Pathname.new(new_bundle_path).relative_path_from(@sandbox_root).to_s
-                rsrc_scripts_files.each_value do |lines|
-                  for i in 0...lines.length
-                    lines[i] = lines[i].gsub(relative_path, new_relative_path)
+            Pod::UI.section "Adding trimmed bundles to #{group.path}" do
+              group_path = File.join(@pruned_bundles_path, group.path)
+              FileUtils.mkdir group_path unless Dir.exist? group_path
+              trimmedBundlesToAdd.each_pair do |resGroup, bundleArray|
+                bundleArray.each_pair do |original_bundle_path, bundle_path|
+                  bundle_name = File.basename(original_bundle_path)
+                  new_bundle_path = File.join(group_path, bundle_name)
+                  FileUtils.rm_r(new_bundle_path) if File.exist? new_bundle_path
+                  FileUtils.mv(bundle_path, new_bundle_path)
+                  resGroup.new_reference(new_bundle_path)
+                  
+                  relative_path = original_bundle_path.relative_path_from(@sandbox_root).to_s
+                  new_relative_path = Pathname.new(new_bundle_path).relative_path_from(@sandbox_root).to_s
+                  rsrc_scripts_files.each_value do |lines|
+                    for i in 0...lines.length
+                      lines[i] = lines[i].gsub(relative_path, new_relative_path)
+                    end
                   end
                 end
               end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-prune-localizations
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Diego Torres
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler