zerg_xcode 0.3 → 0.3.1

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.3.1. Tiny hack to allow importing Xcode 3.0 projects.
+
 v0.3. Implemented addtarget.
 
 v0.2.1. Implemented lstargets.

data/README.textile

@@ -25,6 +25,9 @@ zerg-xcode help ls
 zerg-xcode ls ProjectName
 </pre>
 
+You can learn all about importing projects in
+"this blog post":http://blog.costan.us/2009/02/iphone-development-and-code-sharing.html
+
 h2. Developer Notes
 
 The rest of the file is useful if you're considering tweaking the code. Here are

data/lib/zerg_xcode/plugins/import.rb

@@ -219,8 +219,10 @@ END
   
   # Cross-references the objects in two object graphs that are to be merged.
   # Returns a Hash associating objects in both the source and the target object
-  # graphs with the corresponding objects in the 
-  def cross_reference(source, target, mappings = {})
+  # graphs with the target objects that represent the same entities.
+  # Setting strict to true returns fewer matches, and should be used for
+  # entangling projects. Setting strict to false should work better for merges.
+  def cross_reference(source, target, strict = false, mappings = {})
     if source.class != target.class
       raise "Attempting to cross-reference different kinds of objects - " +
             "#{source.class} != #{target.class}"
@@ -237,29 +239,32 @@ END
       return mappings
     end
     
-    self.send cross_op, source, target, mappings
+    self.send cross_op, source, target, strict, mappings
   end
     
-  def cross_reference_objects(source, target, mappings)
-    return mappings if mappings[source] || mappings[target]    
-    return mappings if source.xref_key != target.xref_key
+  def cross_reference_objects(source, target, strict, mappings)
+    return mappings if mappings[source] || mappings[target]
+    
+    if strict
+      return mappings if source.xref_key != target.xref_key
+    end
     
     mappings[target] = target
     mappings[source] = target
-    cross_reference source._attr_hash, target._attr_hash, mappings
+    cross_reference source._attr_hash, target._attr_hash, strict, mappings
   end
   private :cross_reference_objects
   
-  def cross_reference_hashes(source, target, mappings)
+  def cross_reference_hashes(source, target, strict, mappings)
     source.each_key do |key|
       p [source.keys, key] if source[key].nil? 
-      cross_reference source[key], target[key], mappings if target[key]
+      cross_reference source[key], target[key], strict, mappings if target[key]
     end
     mappings
   end
   private :cross_reference_hashes
   
-  def cross_reference_enumerables(source, target, mappings)
+  def cross_reference_enumerables(source, target, strict, mappings)
     source_keys = {}
     source.each do |value|
       next unless value.kind_of? ZergXcode::XcodeObject
@@ -268,7 +273,7 @@ END
     target.each do |value|
       next unless value.kind_of? ZergXcode::XcodeObject
       next unless source_value = source_keys[value.xref_key]
-      cross_reference source_value, value, mappings
+      cross_reference source_value, value, strict, mappings
     end
     mappings
   end

data/test/plugins/import_test.rb

@@ -25,14 +25,34 @@ class Plugins::ImportTest < Test::Unit::TestCase
     project = ZergXcode.load 'testdata/ZergSupport'
     assert_import_identical project    
   end
+
+  def test_import_identical_30app
+    project = ZergXcode.load 'testdata/TestApp30'
+    assert_import_identical project
+  end
   
+  def test_import_identical_30lib
+    project = ZergXcode.load 'testdata/TestApp30'
+    assert_import_identical project
+  end
+
   def test_import_differents
     small = ZergXcode.load 'testdata/TestApp'
+    large = ZergXcode.load 'testdata/ZergSupport'
+    assert_import_differents small, large
+  end
+  
+  def test_import_differents_30
+    small = ZergXcode.load 'testdata/TestApp30'
+    large = ZergXcode.load 'testdata/TestLib30'
+    assert_import_differents small, large    
+  end
+
+  def assert_import_differents(small, large)
     small_file_set = Set.new(small.all_files.map { |file| file[:path] })
     small_target_set = Set.new(small['targets'].map { |t| t['name'] })
     small_target_filesets = target_filesets small
     
-    large = ZergXcode.load 'testdata/ZergSupport'
     large_file_set = Set.new(large.all_files.map { |file| file[:path] })
     large_target_set = Set.new(large['targets'].map { |t| t['name'] })
     large_target_filesets = target_filesets large
@@ -108,6 +128,16 @@ class Plugins::ImportTest < Test::Unit::TestCase
     project = ZergXcode.load 'testdata/ZergSupport'
     assert_cross_reference_covers_project project    
   end
+
+  def test_cross_reference_identical_30app
+    project = ZergXcode.load 'testdata/TestApp30'
+    assert_cross_reference_covers_project project
+  end
+
+  def test_cross_reference_identical_30lib
+    project = ZergXcode.load 'testdata/TestLib30'
+    assert_cross_reference_covers_project project
+  end
   
   def assert_cross_reference_covers_project(project)
     cloned_project = ZergXcode::XcodeObject.from project
@@ -120,7 +150,8 @@ class Plugins::ImportTest < Test::Unit::TestCase
     end
     
     objects.each do |object|
-      assert map.include?(object), "Missed object #{object.xref_key.inspect}"
+      assert map.include?(object),
+             "Missed object #{object.xref_key.inspect}: #{object.inspect}"
       
       assert_equal object.xref_key, map[object].xref_key,
                    "Merge keys for cross-referenced objects do not match"

data/zerg_xcode.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zerg_xcode}
-  s.version = "0.3"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2009-02-28}
+  s.date = %q{2009-03-28}
   s.default_executable = %q{bin/zerg-xcode}
   s.description = %q{Automated modifications for Xcode project files}
   s.email = %q{victor@zergling.net}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zerg_xcode
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: 0.3.1
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-28 00:00:00 -05:00
+date: 2009-03-28 00:00:00 -04:00
 default_executable: bin/zerg-xcode
 dependencies: []