synx 0.0.51 → 0.0.52

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGExZTMxYzAxZDFiODY4YzNhYTc4YTM0OTczOGIwMTM5Mjg5NWI4MQ==
+    YzdhZjY3ZjRkNjJkOTgzOTIzYTE1YmI2ZTBhY2JmNjMxNjA3NTU2Yw==
   data.tar.gz: !binary |-
-    NDA0MDNlMzMzMjNkZGY4OThjMTYwOGViMDRjMDViOTEzNGY0MWM1YQ==
+    MjFmMzIxZjM1MjYzZTYzYWRjYzg5YTY2M2I4ZjA2NDY1YTQ1NThiMQ==
 SHA512:
   metadata.gz: !binary |-
-    OWZkMTBmNDVlNmU5N2E1MmY3ZWFmNzVkYjk1M2ZmMWJhZWE0YzQ2NjAxYTFm
-    ZDJlMThjNWVjOTZlMjE3NzNmNjMzNTBiYWFlZTIyYzdlYTQyNzdmYTYyMmMz
-    MjNkYzI4MjcwYWFiYTE3MTM1M2Y2ODJlYWQwYWE2YTM0MGZmNGY=
+    Y2RhN2E4MmUwYjViNGQ0ZDgzYjM1MzVhN2M3NDE1MTFlM2FhOGE2MmZmOTQ0
+    YmJjMzJlNDM1ZTNkMGIyZjY3MGI1NTVlYWY4NGFlMDljYmVlYzA0OGEzM2Mz
+    ZWZmN2I1MzNjNWViN2NiYmJlODgyZTRiN2RlYWQ1N2FkNDJlZjA=
   data.tar.gz: !binary |-
-    ZDkxYjA5M2U1MWM5ZWNmNjRkZmQ5ZDMyYTgxMzRmNGI2MTQ3NjI4MmY1MjJk
-    ODNhNjY0MjEzNmExNDkyMjZmNDY3ZGNiNDdmZGM3Zjk4MjIzNGQ3MWNlOTcw
-    YTVmODE2YTc4NWVlYzU5Yjc5YWUxNTEzYzdlODNiZmMyMjAwNDI=
+    ZjMxMWMwNWY2OGEyNzMyZWRiN2Y3N2Y1NTRjODY2NjEzNTMwMjZlMjhkM2Qw
+    N2UyZTJmN2Y3MDYxMDA2YWE2YjFlM2MwMGMyN2MzZDlhYjdkOTVjOTM0YTM3
+    ODc5ZDI3Mjg2ZGE0OTY4ZTMzYTI0OGY1YzkzZTc5YjgwZDUyMjg=

data/bin/synx

@@ -8,11 +8,12 @@ Clamp do
   parameter "xcodeproj", "Path to the xcodeproj", :attribute_name => :xcodeproj_path
   option ["--prune", "-p"], :flag, "remove source files and image resources that are not referenced by the the xcode project"
   option "--no-default-exclusions", :flag, "doesn't use the default exclusions of /Libraries, /Frameworks, and /Products"
+  option ["--quiet", "-q"], :flag, "silence all output"
   option ["--exclusion", "-e"], "EXCLUSION", "ignore an Xcode group while syncing", :multivalued => true
 
   def execute
     project = Synx::Project.open(xcodeproj_path)
-    project.sync(:prune => prune?, :no_default_exclusions => no_default_exclusions?, :group_exclusions => exclusion_list)
+    project.sync(:prune => prune?, :quiet => quiet?, :no_default_exclusions => no_default_exclusions?, :group_exclusions => exclusion_list)
   end
 
-end
+end

data/lib/synx/pbx_group.rb

@@ -33,9 +33,9 @@ module Xcodeproj
           else
             Synx::Tabber.puts "#{basename}/".green
             Synx::Tabber.increase
-            Dir[real_path.to_s + "/{*,.*}"].each do |entry|
+            Dir[real_path.to_s + "/{*,.*}"].reject { |e| %W(. ..).include?(Pathname(e).basename.to_s) }.each do |entry|
               entry_pathname = real_path + entry
-              unless has_entry?(entry_pathname)
+              unless project.has_object_for_pathname?(entry_pathname)
                 handle_unused_entry(entry_pathname)
               end
             end
@@ -50,13 +50,6 @@ module Xcodeproj
         end
         private :sync_path
 
-        def has_entry?(entry_pathname)
-          %W(. ..).include?(entry_pathname.basename.to_s) || children.any? do |child|
-            child.real_path.cleanpath == entry_pathname.realpath.cleanpath
-          end
-        end
-        private :has_entry?
-
         def all_groups
           groups | version_groups | variant_groups
         end
@@ -73,7 +66,7 @@ module Xcodeproj
               work_entry_pathname = project.pathname_to_work_pathname(entry_pathname)
               # The directory may have already been created for one of two reasons
               # 1. It was created as a piece of another path, ie, /this/middle/directory.mkdir got called.
-              # 2. OS X has case insensitive folder names, so has_entry may have failed to notice it had the folder.
+              # 2. OS X has case insensitive folder names, so has_object_for_pathname? may have failed to notice it had the folder.
               work_entry_pathname.mkdir unless work_entry_pathname.exist?
               # recurse
               Synx::Tabber.puts entry_pathname.basename.to_s.green

data/lib/synx/pbx_variant_group.rb

@@ -5,15 +5,32 @@ module Xcodeproj
     module Object
       class PBXVariantGroup
         
+        # Need to retain *.lproj files on the system
         def sync(group)
           ensure_internal_consistency(group)
-          folder_path = children.first.real_path.parent
-          work_destination_pathname = parent.work_pathname
-          if folder_path.exist?
-            FileUtils.mv(folder_path, work_destination_pathname.realpath)
+
+          file = files.first
+          if lproj_as_group?
+            FileUtils.mv(file.real_path, work_pathname)
+            Synx::Tabber.puts file.real_path.basename.to_s.green
+          else
+            parent_folder_path = children.first.real_path.parent
+            work_destination_pathname = parent.work_pathname
+
+            if parent_folder_path.exist?
+              FileUtils.mv(parent_folder_path, work_destination_pathname.realpath)
+            end
+            Synx::Tabber.puts (parent_folder_path.basename.to_s + "/").green
+            Synx::Tabber.increase
+            Synx::Tabber.puts file.real_path.basename.to_s.green
+            Synx::Tabber.decrease
           end
         end
 
+        def lproj_as_group?
+          parent.basename =~ /.+\.lproj$/
+        end
+
       end
     end
   end

data/lib/synx/project.rb

@@ -18,7 +18,7 @@ module Synx
       Synx::Tabber.increase
       Synx::Tabber.puts "Syncing files that are included in Xcode project...".bold.white
       main_group.all_groups.each { |gr| gr.sync(main_group) }
-      puts "\n\n"
+      puts "\n\n" unless options[:quiet]
       Synx::Tabber.puts "Syncing files that are not included in Xcode project..".bold.white
       main_group.all_groups.each(&:move_entries_not_in_xcodeproj)
       transplant_work_project
@@ -48,6 +48,8 @@ module Synx
       end
 
       self.group_exclusions |= options[:group_exclusions] if options[:group_exclusions]
+
+      Synx::Tabber.quiet = options[:quiet]
     end
     private :set_options
 
@@ -108,6 +110,17 @@ module Synx
       @group_exclusions = new_exclusions
     end
 
+    def has_object_for_pathname?(pathname)
+      @unmodified_project ||= Synx::Project.open(path)
+      @unmodified_project.objects.any? do |o| 
+        begin
+          o.real_path.cleanpath == pathname.cleanpath 
+        rescue 
+          false 
+        end
+      end
+    end
+
   end
 end
 

data/lib/synx/tabber.rb

@@ -1,6 +1,7 @@
 module Synx
   class Tabber
 
+    @@quiet = false
     @@tabbing = 0
 
     class << self
@@ -19,10 +20,19 @@ module Synx
 
       def reset
         @@tabbing = 0
+        self.quiet = false
+      end
+
+      def quiet=(quiet)
+        @@quiet = quiet
+      end
+
+      def quiet?
+        @@quiet
       end
 
       def puts(str="")
-        Kernel.puts (a_single_tab * @@tabbing) + str.to_s
+        Kernel.puts (a_single_tab * @@tabbing) + str.to_s unless quiet?
       end
 
       def a_single_tab
@@ -32,4 +42,4 @@ module Synx
 
     end
   end
-end
+end

data/lib/synx/version.rb

@@ -1,3 +1,3 @@
 module Synx
-  VERSION = "0.0.51"
+  VERSION = "0.0.52"
 end

data/spec/dummy/dummy.xcodeproj/project.pbxproj

@@ -89,6 +89,7 @@
 		8C848C65190DB9B300E9727B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		8C848C67190DB9B300E9727B /* dummyTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = dummyTests.m; sourceTree = "<group>"; };
 		8CADDD3A19354F120076033B /* image.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = image.png; sourceTree = "<group>"; };
+		8CD2ABF219558D7800341C58 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = Localizable.strings; sourceTree = "<group>"; };
 		8CDA046319374F35004435A1 /* data.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = data.json; path = FolderWithGroupNotLinked/data.json; sourceTree = "<group>"; };
 		8CE2DA1D19220F7B00D06F5E /* dummyTests-prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "dummyTests-prefix.pch"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -206,6 +207,7 @@
 		8C848C4E190DB9B300E9727B /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				8CD2ABF019558D4100341C58 /* en.lproj */,
 				8C848C4F190DB9B300E9727B /* dummy-Prefix.pch */,
 			);
 			name = "Supporting Files";
@@ -247,6 +249,14 @@
 			name = Resources;
 			sourceTree = "<group>";
 		};
+		8CD2ABF019558D4100341C58 /* en.lproj */ = {
+			isa = PBXGroup;
+			children = (
+				8CD2ABF119558D7800341C58 /* Localizable.strings */,
+			);
+			path = en.lproj;
+			sourceTree = "<group>";
+		};
 		8CDA046219374F15004435A1 /* FolderWithGroupNotLinked */ = {
 			isa = PBXGroup;
 			children = (
@@ -375,6 +385,14 @@
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
 		};
+		8CD2ABF119558D7800341C58 /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				8CD2ABF219558D7800341C58 /* en */,
+			);
+			name = Localizable.strings;
+			sourceTree = "<group>";
+		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
@@ -557,6 +575,7 @@
 				8CDA046C1937DDAA004435A1 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 

data/spec/dummy/dummy/en.lproj/Localizable.strings

@@ -0,0 +1,7 @@
+/* 
+  Localizable.strings
+  dummy
+
+  Created by Mark Larsen on 6/21/14.
+  Copyright (c) 2014 marklarr. All rights reserved.
+*/

data/spec/synx/expected_file_structure.yml

@@ -28,6 +28,8 @@ dummy:
     ManyFiles.m:
   Supporting Files:
     dummy-Prefix.pch:
+    en.lproj:
+      Localizable.strings:
   dummy.h:
   dummy.m:
   FileNotInXcodeProj.h:
@@ -42,6 +44,6 @@ dummyTests:
     en.lproj:
       InfoPlist.strings:
   Supporting Files:
-    dummyTests-Prefix.pch:
+    dummyTests-prefix.pch:
     dummyTests-Info.plist:
   dummyTests.m:

data/spec/synx/expected_group_structure.yml

@@ -22,6 +22,8 @@ dummy:
     ManyFiles.m:
   Supporting Files:
     dummy-Prefix.pch:
+    en.lproj:
+      Localizable.strings:
   dummy.h:
   dummy.m:
   SuchGroup:

data/spec/synx/project_spec.rb

@@ -40,6 +40,18 @@ describe Synx::Project do
 
         if object.instance_of?(Xcodeproj::Project::Object::PBXGroup)
           object_children ||= {}
+          found_children = object.children.map(&:basename)
+          missing_children_in_group = object_children.keys - found_children
+          extra_children_in_group = found_children - object_children.keys
+          failure_message = "In group #{object.hierarchy_path}:"
+
+          unless missing_children_in_group.empty?
+            failure_message += "\n  Expected to find children: #{missing_children_in_group.join(", ")}"
+          end
+
+          unless extra_children_in_group.empty?
+            failure_message += "\n  Did not expect to find children: #{extra_children_in_group.join(", ")}"
+          end
           failure_message = "Expected #{object_name} to have #{object_children.count} children, found #{object.children.count}"
           expect(object_children.count).to eq(object.children.count), failure_message
           verify_group_structure(object, object_children) if object_children.count > 0
@@ -54,9 +66,20 @@ describe Synx::Project do
 
         if File.directory?(entry_pathname)
           entry_entries ||= {}
-          # '.' and '..' show up in entries, so add 2
-          failure_message = "Expected #{entry_pathname} to have #{entry_entries.count} children, found #{entry_pathname.entries.count - 2}"
-          expect(entry_entries.count + 2).to eq(entry_pathname.entries.count), failure_message
+          found_entries = entry_pathname.entries.reject { |e| [".", ".."].include?(e.to_s) }.map(&:to_s)
+          missing_entries_on_file_system = entry_entries.keys - found_entries
+          extra_entries_on_file_system = found_entries - entry_entries.keys
+          failure_message = "In #{entry_pathname}:"
+
+          unless missing_entries_on_file_system.empty?
+            failure_message += "\n  Expected to find entries: #{missing_entries_on_file_system.join(", ")}"
+          end
+
+          unless extra_entries_on_file_system.empty?
+            failure_message += "\n  Did not expect to find entries: #{extra_entries_on_file_system.join(", ")}"
+          end
+
+          expect(missing_entries_on_file_system.count + extra_entries_on_file_system.count).to be(0), failure_message
           verify_file_structure(entry_pathname, entry_entries) if entry_entries.count > 0
         end
       end

data/spec/synx/tabber_spec.rb

@@ -53,6 +53,13 @@ describe Synx::Tabber do
       expect(Kernel).to receive(:puts).with("      Hello, world.")
       Synx::Tabber.puts("Hello, world.")
     end
+
+    it "should not print anything if quiet is true" do
+      Synx::Tabber.quiet = true
+      Synx::Tabber.increase(3)
+      expect(Kernel).to_not receive(:puts)
+      Synx::Tabber.puts("Hello, world.")
+    end
   end
 
   describe "::a_single_tab" do
@@ -61,4 +68,4 @@ describe Synx::Tabber do
     end
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synx
 version: !ruby/object:Gem::Version
-  version: 0.0.51
+  version: 0.0.52
 platform: ruby
 authors:
 - Mark Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,6 +160,7 @@ files:
 - spec/dummy/dummy/dummy-Prefix.pch
 - spec/dummy/dummy/dummy.h
 - spec/dummy/dummy/dummy.m
+- spec/dummy/dummy/en.lproj/Localizable.strings
 - spec/dummy/dummy/folderWithGroupNotLinked/data.json
 - spec/dummy/dummy/image-not-in-xcodeproj.png
 - spec/dummy/dummy/image.png
@@ -226,6 +227,7 @@ test_files:
 - spec/dummy/dummy/dummy-Prefix.pch
 - spec/dummy/dummy/dummy.h
 - spec/dummy/dummy/dummy.m
+- spec/dummy/dummy/en.lproj/Localizable.strings
 - spec/dummy/dummy/folderWithGroupNotLinked/data.json
 - spec/dummy/dummy/image-not-in-xcodeproj.png
 - spec/dummy/dummy/image.png