synx 0.0.61 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e7857c0dc76b55453433714997f34307c5e0fa0
-  data.tar.gz: 12ab93749daa6a68902913eb595106eae891b726
+  metadata.gz: 10c43f35ee30b2df933b75f0c688bce5a444ec92
+  data.tar.gz: 4ef3bb91d86404cf63fed5e99c11c836a3c30b2b
 SHA512:
-  metadata.gz: cdea1a333bba58a9b18e310f3438f38ace0b755aceaa97bc9d52198e0737f124edbb1c0a6b600dfecd4739c27832847b0bace69b17992c2d91ce700f31b17c81
-  data.tar.gz: ef602a4b02017f3e5b8060e1e40c33402a76d2895de1b61bc2da1123781d55d45420e1304c7aa7624e6f38ada350075ded32d7fbd2ab566e032da19fd0ffd022
+  metadata.gz: 57fe510721e42fac4126f9fe4c4389ad2a9823614a0a771a480d4f7eaec542d15a00119cd44a568e47b71f83a1f0e5ebab88434e49c534e04576bb635aa38569
+  data.tar.gz: 80e8a96b519869da76d2be8bf5eb81f11d80d145b9524cd6148385484626d6cb14b54568d8387614d503aebd079014dfe0e7afc4fa882dc2348c08b456ea23ce

data/README.md

@@ -22,14 +22,13 @@ A command-line tool that reorganizes your Xcode project folder to match your Xco
 ## Usage
 
 ### Basic
-
-**WARNING: Make sure that your project is backed up through source control before doing anything**
+:warning: **WARNING: Make sure that your project is backed up through source control before doing anything** :warning:
 
 Execute the command on your project to have it reorganize the files on the file system:
 
      $ synx path/to/my/project.xcodeproj
      
-It may have confused cocoapods. Pod install, if you use them:
+It may have confused CocoaPods. If you use them, execute this command:
 
     $ pod install
     
@@ -40,18 +39,18 @@ You're good to go!
 Synx supports the following options:
 
 ```
-  --prune, -p                   remove source files and image resources that are not referenced by the the xcode project
+  --prune, -p                   remove source files and image resources that are not referenced by the the Xcode project
   --no-color                    removes all color from the output
   --no-default-exclusions       doesn't use the default exclusions of /Libraries, /Frameworks, and /Products
   --quiet, -q                   silence all output
   --exclusion, -e EXCLUSION     ignore an Xcode group while syncing
 ```
 
-OCMock, for example, could have done:
+For example, OCMock could have been organized using this command:
 
     $ synx -p -e "/OCMock/Core Mocks" -e /OCMockTests Source/OCMock.xcodeproj/
 
-if they wanted to not sync the `/OCMock/Core Mocks` and `/OCMockTests` groups, and also remove (`-p`) any image/source files found by synx that weren't ever referenced by any groups in Xcode.
+if they had wanted not to sync the `/OCMock/Core Mocks` and `/OCMockTests` groups, and also remove (`-p`) any image/source files found by synx that weren't referenced by any groups in Xcode.
 
 ## Contributing
 

data/lib/synx/project.rb

@@ -21,6 +21,7 @@ module Synx
       Synx::Tabber.puts "\n\n"
       Synx::Tabber.puts "Syncing files that are not included in Xcode project..".bold.white
       main_group.all_groups.each(&:move_entries_not_in_xcodeproj)
+      main_group.sort_by_name
       transplant_work_project
       Synx::Tabber.decrease
       save
@@ -67,7 +68,7 @@ module Synx
     end
 
     def work_root_pathname
-      if @work_root_pathname 
+      if @work_root_pathname
         @work_root_pathname
       else
         @work_root_pathname = Pathname(File.join(SYNXRONIZE_DIR, root_pathname.basename.to_s))
@@ -111,17 +112,14 @@ module Synx
 
     def has_object_for_pathname?(pathname)
       @unmodified_project ||= Synx::Project.open(path)
-      @unmodified_project.objects.any? do |o| 
+      @unmodified_project.objects.any? do |o|
         begin
-          o.real_path.cleanpath == pathname.cleanpath 
-        rescue 
-          false 
+          o.real_path.cleanpath == pathname.cleanpath
+        rescue
+          false
         end
       end
     end
-
   end
 end
 
-
-

data/lib/synx/version.rb

@@ -1,3 +1,3 @@
 module Synx
-  VERSION = "0.0.61"
+  VERSION = "0.1.0"
 end

data/lib/synx/xcodeproj_ext/project/object/pbx_group.rb

@@ -24,6 +24,7 @@ module Xcodeproj
               group.sync(self)
             end
             sync_path
+            sort_by_name
 
             Synx::Tabber.decrease
           end
@@ -33,6 +34,20 @@ module Xcodeproj
           project.group_exclusions.include?(hierarchy_path)
         end
 
+        def sort_by_name
+          children.sort! do |x, y|
+            if x.isa == 'PBXGroup' && !(y.isa == 'PBXGroup')
+              -1
+            elsif !(x.isa == 'PBXGroup') && y.isa == 'PBXGroup'
+              1
+            elsif x.display_name && y.display_name
+              x.display_name <=> y.display_name
+            else
+              0
+            end
+          end
+        end
+
         def move_entries_not_in_xcodeproj
           if excluded_from_sync?
             Synx::Tabber.puts "#{basename}/ (excluded)".yellow

data/spec/synx/expected_group_structure.yml

@@ -1,8 +1,6 @@
+Frameworks:
+Products:
 dummy:
-  FolderWithGroupNotLinked:
-      data.json:
-  Resources:
-    image.png:
   AlreadySynced:
     Core Data.xcdatamodeld:
       Core Data.xcdatamodel:
@@ -17,25 +15,28 @@ dummy:
     NSObject+abc.m:
     Woot.h:
     Woot.m:
+  FolderWithGroupNotLinked:
+      data.json:
   GroupThatDoubleReferencesFile:
     ManyFiles.h:
     ManyFiles.m:
-  Supporting Files:
-    dummy-Prefix.pch:
-    en.lproj:
-      Localizable.strings:
-  dummy.h:
-  dummy.m:
+  Resources:
+    image.png:
   SuchGroup:
-    Wow.h:
-    Wow.m:
     VeryChildGroup:
       Wowwww.h:
       Wowwww.m:
+    Wow.h:
+    Wow.m:
+  Supporting Files:
+    Localizable.strings:
+    dummy-Prefix.pch:
+  dummy.h:
+  dummy.m:
 dummyTests:
   Other Files:
     InfoPlist.strings:
   Supporting Files:
-    dummyTests-Prefix.pch:
     dummyTests-Info.plist:
+    dummyTests-prefix.pch:
   dummyTests.m:

data/spec/synx/project_spec.rb

@@ -32,10 +32,12 @@ describe Synx::Project do
   describe "#sync" do
 
     def verify_group_structure(group, expected_structure)
-      expected_structure.each do |object_name, object_children|
+      expected_structure.each_with_index do |(object_name, object_children), index|
         failure_message = "expected group `#{group.basename}` to have child `#{object_name}`"
-        object = group.children.detect { |child| child.basename == object_name }
+        object = group.children[index]
+        expect(object.basename).to eq(object_name)
         expect(group).to_not be_nil, failure_message
+        next if ["Products", "Frameworks"].include?(object.display_name)
 
         if object.instance_of?(Xcodeproj::Project::Object::PBXGroup)
           object_children ||= {}
@@ -235,4 +237,4 @@ describe Synx::Project do
       expect(value).to eq(expected)
     end
   end
-end
+end

data/synx.gemspec

@@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "clamp", "~> 0.6"
   spec.add_dependency "colorize", "~> 0.7"
-  spec.add_dependency "xcodeproj", "~> 0.20.0"
+  spec.add_dependency "xcodeproj", "~> 0.24.1"
 end

metadata

@@ -1,113 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: synx
 version: !ruby/object:Gem::Version
-  version: 0.0.61
+  version: 0.1.0
 platform: ruby
 authors:
 - Mark Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.24.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.24.1
 description: |2
                          A command-line tool that reorganizes your Xcode project folder to match your Xcode groups
                          Synx parses your .xcodeproj to build the same group structure out on the file system.
@@ -118,8 +118,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -187,17 +187,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A command-line tool that reorganizes your Xcode project folder to match your