zerg_xcode 0.4.0 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/lib/zerg_xcode/objects/pbx_group.rb

@@ -10,34 +10,76 @@ module ZergXcode::Objects
 
 # A group of files (shown as a folder) in an Xcode project.
 class PBXGroup < ZergXcode::XcodeObject
-  def find_group_named(group_name)
-    self['children'].each do |child|
-      if child.isa == :PBXGroup
-        if child.xref_name == group_name
-          return child
-        elsif grandchild = child.find_group_named(group_name)
-          return grandchild
-        end
-      end
+
+  # call-seq:
+  #  mkdir(name) ⇒ aChild
+  #
+  # Creates a child group with name _name_.  Raises Errno::EEXIST if a child
+  # with that name already exists.
+  def mkdir name
+    raise Errno::ENOTNAM if name =~ /\//
+    raise Errno::EEXIST if exists? name
+    group = ZergXcode::Objects::PBXGroup.new 'name' => name, 
+                                             'path' => name, 
+                                             'children' => [], 
+                                             'sourceTree' => '<group>'
+    self.children << group
+    group
+  end
+
+  # call-seq:
+  #  mkdir_f(name) ⇒ aChild
+  #
+  # If a child with name _name_ already exists, that child is returned;
+  # otherwise, a new child group is created and returned.
+  def mkdir_f name
+    child_with_name(name) || mkdir(name)
+  end
+
+  # call-seq:
+  #  mkdir_p(path) ⇒ aChild
+  #
+  # If a child with path _path_ exists, that child is returned; otherwise,
+  # groups are created to make the path exist and the deepest group is
+  # returned.
+  def mkdir_p path
+    path_elements(path).inject(self) do |group, path_element|
+      group.mkdir_f path_element
     end
-    return nil
   end
-  
+
+  # An array of all immediate children of this node
+  attr_reader :children
   def children
     self['children']
   end
   
-  def create_group(path_name, group_name=nil, source_tree='<group>')
-    group_name = group_name || path_name
-    unless group = find_group_named(group_name)
-      group = ZergXcode::Objects::PBXGroup.new 'name' => group_name, 
-                                               'path' => path_name, 
-                                               'children' => [], 
-                                               'sourceTree' => source_tree
-      self.children << group
+  # If a child exists at the specified path (which may contain slashes), that
+  # child is returned.  Otherwise, nil is returned.
+  def child_with_path path
+    path_elements(path).inject(self) do |group, path_element|
+      group.child_with_name(path_element) if group
     end
-    group
   end
-end  # class ZergXcode::Objects::PBXGroup
+  alias_method :exist?, :child_with_path
+  alias_method :exists?, :child_with_path
+
+  # If this group has an _immediate_ child with the specified name, it is
+  # returned; otherwise, nil is returned.
+  def child_with_name name
+    children.detect {|child| child.xref_name == name}
+  end
+
+  # :nodoc:
+  def to_s
+    "PBXGroup<#{xref_name}>"
+  end
+
+private
+  def path_elements path
+    path.split('/')
+  end
+
+end
 
-end  # namespace ZergXcode::Objects
+end

data/lib/zerg_xcode/objects/pbx_project.rb

@@ -43,10 +43,6 @@ class PBXProject < ZergXcode::XcodeObject
     isa.to_s
   end  
   
-  def find_group_named name
-    self["mainGroup"].find_group_named name
-  end  
-
   # Container for the visitor that lists all files in a project.
   module FileVisitor
     def self.visit(object, root_path, files)

data/spec/objects/pbx_group_spec.rb

@@ -0,0 +1,134 @@
+require 'zerg_xcode'
+
+describe PBXGroup = ZergXcode::Objects::PBXGroup do
+  let(:proj) { ZergXcode.load 'spec/fixtures/project.pbxproj' } 
+  let(:main_group) { proj['mainGroup'] }
+  
+  context "when the meta data says it should be a pbx group" do
+    subject { main_group }
+    it { should be_a PBXGroup }
+  end
+  
+  describe '#mkdir' do
+    context 'when the group does not already exist' do
+      describe 'the new group' do
+        subject { main_group.mkdir 'New Group' }
+        it { should_not be_nil }
+        it 'should have children' do
+          subject.children.should_not be_nil
+        end
+        it 'should have a "sourceTree" of "<group>"' do
+          subject['sourceTree'].should eq "<group>"
+        end
+        it { should be_found_within main_group } 
+      end
+    end
+    context 'when the group already exists' do
+      before {main_group.mkdir 'New Group'}
+      describe 'the invocation' do
+        subject {lambda {main_group.mkdir 'New Group'}}
+        it {should raise_error(Errno::EEXIST)}
+      end
+    end
+    context 'using a group name with a slash' do
+      describe 'the invocation' do
+        subject {lambda {main_group.mkdir 'Foo/Bar'}}
+        it {should raise_error(Errno::ENOTNAM)}
+      end
+    end
+  end
+
+  describe '#mkdir_f' do
+    context 'when the group already exists' do
+      let(:the_group) {main_group.mkdir 'Foo'}
+      subject {main_group.mkdir_f 'Foo'}
+      it 'should be that group' do
+        should be(the_group)
+      end
+    end
+    context 'when the group does not exist' do
+      subject {main_group.mkdir_f 'Foo'}
+      it 'should create it' do
+        subject.xref_name.should eq 'Foo'
+        subject.should be_found_within main_group
+      end
+    end
+  end
+
+  describe '#mkdir_p' do
+    before {main_group.mkdir_p 'Foo/Bar'}
+    it 'creates the first part of the path' do
+      main_group.exists?('Foo').should be_true
+    end
+    it 'creates the second part of the path' do
+      main_group.exists?('Foo/Bar').should be_true
+    end
+    context 'when the first part of the path exists' do
+      before do
+        @first = main_group.mkdir 'First'
+        @second = main_group.mkdir_p 'First/Second'
+      end
+      it 'reuses the first part' do
+        @second.should be_found_within @first
+      end
+    end
+  end
+
+  describe '#child_with_path' do
+    context 'with a one-element path' do
+      subject {main_group.exists?('Foo')}
+      context 'when the element does not exist' do
+        it {should be_nil}
+      end
+
+      context 'when the element exists' do
+        let(:foo) {main_group.mkdir 'Foo'}
+        it 'should be that element' do
+          should be(foo)
+        end
+      end
+    end
+
+    context 'with a multiple element path' do
+      subject {main_group.exists?('Foo/Bar/Baz')}
+      context 'when no elements of the path exist' do
+        it {should be_nil}
+      end
+      context 'when part of the path exists' do
+        before {main_group.mkdir('Foo').mkdir('Bar')}
+        it {should be_nil}
+      end
+      context 'when all of the path exists' do
+        let(:last_element) {main_group.mkdir('Foo').mkdir('Bar').mkdir('Baz')}
+        it 'should be the last element of that path' do
+          should be(last_element)
+        end
+      end
+    end
+  end
+
+  describe '#child_with_name' do
+    subject {main_group.child_with_name 'Foo'}
+    context 'when the child does not exist' do
+      it {should be_nil}
+    end
+    context 'when the child exists' do
+      let(:the_child) {main_group.mkdir 'Foo'}
+      it 'should be that child' do
+        should be(the_child)
+      end
+    end
+
+  end
+
+end
+
+Rspec::Matchers.define :be_found_within do |expected|
+  match do |actual| 
+    expected.child_with_name(actual.xref_name).equal? actual 
+  end
+  failure_message_for_should do |actual|
+    "expected #{expected.xref_name} to be found within #{actual.xref_name}"
+  end
+end
+

data/test/objects/pbx_project_test.rb

@@ -81,11 +81,4 @@ class PBXProjectTest < Test::Unit::TestCase
     assert_equal 'PBXProject', project.xref_name
   end
   
-  def test_find_group_named
-    project = ZergXcode.load('spec/fixtures/project.pbxproj')
-    found_group = project.find_group_named("Classes")
-    assert_not_nil found_group
-    assert_equal PBXGroup, found_group.class
-    assert_equal "Classes", found_group.xref_name
-  end
 end

data/zerg_xcode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "zerg_xcode"
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = "2012-01-03"
+  s.date = "2012-01-12"
   s.email = "victor@zergling.net"
   s.executables = ["zerg-xcode"]
   s.extra_rdoc_files = [
@@ -74,13 +74,13 @@ Gem::Specification.new do |s|
     "spec/fixtures/project.pbxproj.compat",
     "spec/id_generator_spec.rb",
     "spec/lexer_spec.rb",
+    "spec/objects/pbx_group_spec.rb",
     "spec/parser_spec.rb",
     "spec/paths_spec.rb",
     "spec/shortcuts_spec.rb",
     "test/objects/pbx_build_file_test.rb",
     "test/objects/pbx_build_phase_test.rb",
     "test/objects/pbx_container_item_proxy_test.rb",
-    "test/objects/pbx_group_test.rb",
     "test/objects/pbx_native_target_test.rb",
     "test/objects/pbx_project_test.rb",
     "test/objects/pbx_target_dependency_test.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zerg_xcode
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-03 00:00:00.000000000 Z
+date: 2012-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70360439882840 !ruby/object:Gem::Requirement
+  requirement: &70192525123100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70360439882840
+  version_requirements: *70192525123100
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70360439895920 !ruby/object:Gem::Requirement
+  requirement: &70192525135440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70360439895920
+  version_requirements: *70192525135440
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70360439892000 !ruby/object:Gem::Requirement
+  requirement: &70192525132800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70360439892000
+  version_requirements: *70192525132800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70360439948260 !ruby/object:Gem::Requirement
+  requirement: &70192525144980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70360439948260
+  version_requirements: *70192525144980
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &70360439945920 !ruby/object:Gem::Requirement
+  requirement: &70192525142780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70360439945920
+  version_requirements: *70192525142780
 description: 
 email: victor@zergling.net
 executables:
@@ -132,13 +132,13 @@ files:
 - spec/fixtures/project.pbxproj.compat
 - spec/id_generator_spec.rb
 - spec/lexer_spec.rb
+- spec/objects/pbx_group_spec.rb
 - spec/parser_spec.rb
 - spec/paths_spec.rb
 - spec/shortcuts_spec.rb
 - test/objects/pbx_build_file_test.rb
 - test/objects/pbx_build_phase_test.rb
 - test/objects/pbx_container_item_proxy_test.rb
-- test/objects/pbx_group_test.rb
 - test/objects/pbx_native_target_test.rb
 - test/objects/pbx_project_test.rb
 - test/objects/pbx_target_dependency_test.rb
@@ -167,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3299336587567125592
+      hash: 4530039425077302079
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/test/objects/pbx_group_test.rb

@@ -1,44 +0,0 @@
-# Author:: Christopher Garrett
-# Copyright:: Copyright (C) 2009 Zergling.Net
-# License:: MIT
-
-require 'zerg_xcode'
-require 'test/unit'
-
-class PBXGroupTest < Test::Unit::TestCase
-  PBXGroup = ZergXcode::Objects::PBXGroup
-  
-  def setup
-    @proj = ZergXcode.load 'spec/fixtures/project.pbxproj'
-    @main_group = @proj['mainGroup']
-  end
-  
-  def test_instantiation
-    assert_equal PBXGroup, @main_group.class
-  end
-  
-  def test_find_group_named
-    found_group = @main_group.find_group_named 'Classes'
-    assert_not_nil found_group
-    assert_equal PBXGroup, found_group.class
-    assert_equal 'Classes', found_group.xref_name
-  end
-  
-  def test_create_group
-    assert_nil @main_group.find_group_named('Foo'), 'Found inexistent group Foo'
-
-    created_group = @main_group.create_group 'Foo'
-    assert_not_nil created_group, 'Newly created group Foo'    
-    assert_not_nil created_group.children,
-                   "Newly created group's children attribute"
-    
-    new_group = @main_group.find_group_named 'Foo'
-    assert_not_nil new_group, 'Did not find group Foo after creating it'
-    
-    # Should return the existing group if it is already there
-    assert_operator created_group, :equal?, @main_group.create_group('Foo'),
-                    "create_group should return an existing group if it's there"
-    
-    assert_equal "<group>", new_group["sourceTree"]    
-  end  
-end