synx 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDk2OThkYzE0NWYwNThkOTM0MjFlZDQ1MTkxZDAzYWM5ODc1ZDdlMA==
+    YjVjZDBiOTVjYmRmNmFhODI0ZmJlNDliMDM5ZTQwM2JjMDI3ODY0YQ==
   data.tar.gz: !binary |-
-    ZjAzY2U1YTJmM2VjMmRjNGM0MDFmYzU1N2Y4MWRkYTA1NmZmMzllZA==
+    ODcxNGFiZDQ1YjM1NjNkYTBhZGVmMGU2ZWFmYTUxOWVmMmYzMTA3Mg==
 SHA512:
   metadata.gz: !binary |-
-    NGEwZTY3MmQ3Zjc2OWRkMmYzZDAyNTEwYTFhNDYxMzA0ZDdiMDA5OTIxMjg3
-    ZmI3ZGQ4NzVhZDFkM2NmYmZjNGJhYTJhYzRjZWQ5NzJlYTY5NDcwMjg1MzM1
-    NTZkZGY3ZjZmNmRlMmFkNWVjMDViMmI4YTMzMzQwNjA5NWEyMzk=
+    ZDZjM2E0NjNhZTIzNjEyODgyY2UwZWVlYTc3Y2MxOWFlOGU2YWJkNWYxMDJl
+    MmNhMDUwNzEzOGU1MGY3NmEzMTVmZDc0OGNkZmNkNDcyNGFlNzI5Zjc1NDg5
+    Y2NmMDJiNzM2YjgyNzM5N2NhY2Y0Y2Y0ODcxOTU0NzMxNDEwMDQ=
   data.tar.gz: !binary |-
-    Nzk0NmUzNmM0NzA4ZTc2ZGQ4ZTY0ZjBmMmJlOTEwYWQzYTJkYjVlYjFmYWYx
-    MjVlYmMxMjM2YTRkOGU4ZTU1YjZmMmY0ZGUwZGJiOTc0MzU5ZjY3MzY1Y2Rm
-    ZDRiODFiOGY1MDNhMjk0ZTZhM2ExMmE1ZjNlY2E4ZTNkZDYxYWE=
+    MTdjN2NiMjMzODYzMGI2ZTVjNjRhMDk2NTJmYzIzZDg2OTQyMmUxNzJlNmQ3
+    M2MyMzMzYzY0YTcxNDZlMThkZjJhZGI3ZDE5MGZiMmUyOWRhNGJhZTg4OGRi
+    NWYwY2ViNTExNDVkZjBlODg3M2E3MzJhNzU3M2NkN2I3ZDg3NzA=

data/README.md

@@ -47,9 +47,9 @@ Synx supports the following options:
 
 OCMock, for example, could have done:
 
-    $ synx -p -e=OCMock/Core -e=OCKMockTests Source/OCMock.xcodeproj
+    $ synx -p -e "/OCMock/Core Mocks" -e /OCMockTests Source/OCMock.xcodeproj/
 
-if they wanted to not sync the `OCMock/Core` 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 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.
 
 ## Contributing
 

data/lib/synx/pbx_group.rb

@@ -124,6 +124,17 @@ module Xcodeproj
         end
         private :squash_duplicate_file_references
 
+        def groups_containing_forward_slash
+          found_groups = []
+          groups.each do |group|
+            unless group.excluded_from_sync?
+              found_groups << group if group.basename.include?("/")
+              found_groups |= group.groups_containing_forward_slash
+            end
+          end
+          found_groups
+        end
+
       end
     end
   end

data/lib/synx/project.rb

@@ -14,6 +14,7 @@ module Synx
 
     def sync(options={})
       set_options(options)
+      presync_check
       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) }
@@ -25,6 +26,18 @@ module Synx
       save
     end
 
+    def presync_check
+      forward_slash_groups = main_group.groups_containing_forward_slash
+      unless forward_slash_groups.empty?
+        Synx::Tabber.puts "Synx cannot sync projects with groups that contain '/'. Please rename the following groups before running synx again:".yellow
+        Synx::Tabber.increase
+        forward_slash_groups.each do |group|
+          Synx::Tabber.puts group.hierarchy_path
+        end
+        abort
+      end
+    end
+
     def set_options(options)
       self.prune = options[:prune]
 
@@ -79,11 +92,13 @@ module Synx
 
     def group_exclusions=(new_exclusions)
       new_exclusions.each do |exclusion|
+        # Group paths always start with a '/', so put one there if it isn't already.
+        exclusion.prepend("/") unless exclusion[0] == "/"
         # Don't check our own default exclusions -- they may not have it in their project.
         unless DEFAULT_EXCLUSIONS.include?(exclusion)
           # remove leading '/' for this check
           exclusion = exclusion.dup
-          exclusion[0] = '' if exclusion[0] == '/'
+          exclusion[0] = ''
           unless self[exclusion]
             raise IndexError, "No group #{exclusion} exists"
           end

data/lib/synx/version.rb

@@ -1,3 +1,3 @@
 module Synx
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/spec_helper.rb

@@ -3,9 +3,13 @@ Bundler.setup
 
 require 'synx'
 require 'pry'
-require 'coveralls'
 
-Coveralls.wear!
+DUMMY_SYNX_PATH = File.join(File.dirname(__FILE__), 'dummy')
+DUMMY_SYNX_TEST_PATH = File.join(File.dirname(__FILE__), 'test_dummy')
+DUMMY_SYNX_TEST_PROJECT_PATH = File.join(DUMMY_SYNX_TEST_PATH, 'dummy.xcodeproj')
+FileUtils.rm_rf(DUMMY_SYNX_TEST_PATH)
+FileUtils.cp_r(DUMMY_SYNX_PATH, DUMMY_SYNX_TEST_PATH)
+DUMMY_SYNX_TEST_PROJECT = Synx::Project.open(DUMMY_SYNX_TEST_PROJECT_PATH)
 
 RSpec.configure do |config|
 end

data/spec/synx/pbx_group_spec.rb

@@ -0,0 +1,30 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+describe Xcodeproj::Project::Object::PBXGroup do
+
+  describe "groups_containing_forward_slash" do
+
+    before(:all) do
+      DUMMY_SYNX_TEST_PROJECT.send(:set_options, {})
+    end
+
+    after(:all) do
+      DUMMY_SYNX_TEST_PROJECT["top group"].remove_from_project
+    end
+
+    it "should return all child and grandchild groups containing forward slash" do
+
+      top_group = DUMMY_SYNX_TEST_PROJECT.main_group.new_group("top group")
+
+      child_1 = top_group.new_group("have / slash")
+      child_1_1 = child_1.new_group("1 no slash")
+      child_1_2 = child_1.new_group("1 / slash")
+
+      child_2 = top_group.new_group("no slash")
+      child_2_1 = child_2.new_group("2 no slash")
+      child_2_2 = child_2.new_group("2 / slash")
+
+      expect(top_group.groups_containing_forward_slash).to eq([child_1, child_1_2, child_2_2])
+    end
+  end
+end

data/spec/synx/project_spec.rb

@@ -30,16 +30,6 @@ end
 
 describe Synx::Project do
 
-  DUMMY_SYNX_PATH = File.join(File.dirname(__FILE__), '..', 'dummy')
-  DUMMY_SYNX_TEST_PATH = File.join(File.dirname(__FILE__), '..', 'test_dummy')
-  DUMMY_SYNX_TEST_PROJECT_PATH = File.join(DUMMY_SYNX_TEST_PATH, 'dummy.xcodeproj')
-
-  before(:all) do
-    FileUtils.rm_rf(DUMMY_SYNX_TEST_PATH)
-    FileUtils.cp_r(DUMMY_SYNX_PATH, DUMMY_SYNX_TEST_PATH)
-    DUMMY_SYNX_TEST_PROJECT = Synx::Project.open(DUMMY_SYNX_TEST_PROJECT_PATH)
-  end
-
   describe "#sync" do
 
     def verify_group_structure(group, expected_structure)
@@ -164,6 +154,14 @@ describe Synx::Project do
 
       expect(DUMMY_SYNX_TEST_PROJECT.group_exclusions).to eq(group_exclusions)
     end
+
+    it "should be forgiving about missing '/' at beginning of group paths" do
+      group_exclusions = %W(dummy dummy/GroupThatDoubleReferencesFile dummy/SuchGroup/VeryChildGroup)
+      DUMMY_SYNX_TEST_PROJECT.group_exclusions = group_exclusions
+
+      expected = %W(/dummy /dummy/GroupThatDoubleReferencesFile /dummy/SuchGroup/VeryChildGroup)
+      expect(DUMMY_SYNX_TEST_PROJECT.group_exclusions).to eq(expected)
+    end
   end
 
   describe "#root_pathname" do

data/spec/synx/tabber_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 describe Synx::Tabber do
 
-  after(:each) do
+  before(:each) do
     Synx::Tabber.reset
   end
 

data/synx.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "coveralls"
   spec.add_development_dependency "rake", "~> 10.3"
   spec.add_development_dependency "rspec", "~> 2.14"
   spec.add_development_dependency "pry", "~> 0.9"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synx
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Mark Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,20 +24,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +170,7 @@ files:
 - spec/spec_helper.rb
 - spec/synx/expected_file_structure.yml
 - spec/synx/expected_group_structure.yml
+- spec/synx/pbx_group_spec.rb
 - spec/synx/project_spec.rb
 - spec/synx/tabber_spec.rb
 - synx.gemspec
@@ -249,5 +236,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/synx/expected_file_structure.yml
 - spec/synx/expected_group_structure.yml
+- spec/synx/pbx_group_spec.rb
 - spec/synx/project_spec.rb
 - spec/synx/tabber_spec.rb