xcoder 0.1.2 → 0.1.3

data/spec/build_phase_spec.rb

@@ -12,6 +12,25 @@ describe Xcode::BuildPhase do
     let(:first_build_file) { "main.m" }
     let(:second_build_file) { "AppDelegate.m" }
     
+    describe "#files" do
+      it "should return the correct number of build files" do
+        subject.files.count.should == 2
+      end
+      
+      it "should return BuildFiles with references to their files" do
+        subject.files.each do |file| 
+          file.file_ref.should be_kind_of Xcode::FileReference
+        end
+      end
+    end
+    
+    describe "#file" do
+      it "should return the build file specified from the file name" do
+        subject.file('main.m').should_not be_nil
+        subject.file('main.m').file_ref.path.should == 'main.m'
+      end
+    end
+    
     describe "#build_files" do
       it "should return the correct number of build files" do
         subject.build_files.count.should == 2
@@ -37,6 +56,15 @@ describe Xcode::BuildPhase do
         subject.build_file('NewFile.m').should_not be_nil
       end
     end
+    
+    describe "#add_build_file_without_arc" do
+      it "should add the specified file to the build phase with the correct parameters" do
+        source_file = project.groups.create_file 'ArcLessSource.m'
+        subject.add_build_file_without_arc source_file
+        subject.build_file('ArcLessSource.m').should_not be_nil
+        subject.file('ArcLessSource.m').settings.should == { 'COMPILER_FLAGS' => "-fno-objc-arc" }
+      end
+    end
   end
   
   

data/spec/builder_spec.rb

@@ -43,8 +43,9 @@ describe Xcode::Builder do
       end
     
       it "should upload ipa and dsym to testflight" do 
-        Xcode::Shell.should_receive(:execute).with(testflight_parameters).and_return(['{}'])
+        subject.build.package
         
+        Xcode::Shell.should_receive(:execute).with(testflight_parameters).and_return(['{}'])
         subject.testflight("api_token", "team_token") do |tf|
           tf.proxy = "http://proxyhost:8080"
           tf.notes = "some notes"

data/spec/group_spec.rb

@@ -34,7 +34,7 @@ describe Xcode::Group do
     end
   end
   
-  describe "#add_group" do
+  describe "#create_group" do
     it "should return the group" do
       subject.create_group('TestGroup').should_not be_nil
     end
@@ -50,7 +50,19 @@ describe Xcode::Group do
         subgroup.identifier.should == found_subgroup.identifier
       end
     end
+  end
+  
+  describe "#remove!" do
 
+    let!(:subject) { project.group('created/groups/to') }
+    let!(:group_losing_a_child) { project.group('created/groups') }
+    let!(:remove_grandchild) { project.group('created/groups/to/here') }
+    
+    it "should remove the group and all the children" do
+      subject.supergroup.remove!
+      group_losing_a_child.groups.should be_empty
+    end
+    
   end
   
   describe "Files" do
@@ -86,6 +98,47 @@ describe Xcode::Group do
       end
     end
     
+    describe "#create_system_framework" do
+
+      let(:framework_name) { 'CFNetwork' }
+      let(:full_framework_name) { 'CFNetwork.framework' }
+      
+      before(:each) do
+        subject.create_system_framework framework_name
+      end
+      
+      it "should create the framework within the group" do
+        subject.file(full_framework_name).should_not be_nil
+      end
+      
+      it "should not create the framework again if it exists" do
+        subject.exists?(full_framework_name).should be_true
+        subject.create_system_framework framework_name
+        subject.file(full_framework_name).count.should == 1
+      end
+
+    end
+    
+    describe "#create_system_library" do
+
+      let(:library_name) { 'libz.dylib' }
+      
+      it "should create the system library within the group" do
+        subject.create_system_library library_name
+      end
+      
+      it "should create a system library with the correct path" do
+        subject.create_system_library(library_name).path.should == "usr/lib/libz.dylib"
+      end
+      
+      it "should not create a system library twice" do
+        subject.create_system_library library_name
+        subject.create_system_library library_name
+        subject.file(library_name).count.should == 1
+      end
+
+    end
+    
   end
   
 end

data/spec/integration/cedar_install_spec.rb

@@ -21,71 +21,46 @@ describe "Cedar", :integration => true do
       target.name = 'Specs'
       target.product_name = 'Specs'
       
-      # @todo create the following files within the project file
-    
-      # E21EB9D614E357CF0058122A /* Specs.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Specs.app; sourceTree = BUILT_PRODUCTS_DIR; };
-      # Adding an application needs to set the productReference in the target
-      # productReference = E21EB9D614E357CF0058122A /* Specs.app */;
-    
       application_file = target.create_product_reference 'Specs'
       
       # Create the Specs group
     
-      specs_group = project.groups.create_group('Specs')
-      supporting_group = specs_group.create_group('Supporting Files')
-    
+      supporting_group = project.group('Specs/SupportingFiles')
+
+      # Create the Source File and add it to the sources build phase
     
-      # E21EB9E114E357CF0058122A /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
       main_source = supporting_group.create_file 'name' => 'main.m', 'path' => 'Specs/main.m'
     
       target.create_build_phase :sources do |source|
         source.add_build_file main_source
       end
-    
-      # E21EB9DD14E357CF0058122A /* Specs-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Specs-Info.plist"; sourceTree = "<group>"; };
-    
+      
+      # Create the InfoPlist file and add it to the Resrouces build phase
+      
       supporting_group.create_file 'name' => 'Specs-Info.plist', 'path' => 'Specs/Specs-Info.plist'
-    
-      # E2B8B9F214E395B400D08897 /* InfoPlist.strings */ = {
-      #   isa = PBXVariantGroup;
-      #   children = (
-      #     E2B8B9F314E395B400D08897 /* en */,
-      #   );
-      #   name = InfoPlist.strings;
-      #   path = Specs/en.lproj;
-      #   sourceTree = "<group>";
-      # };
-          
+        
       infoplist_file = supporting_group.create_infoplist 'name' => 'InfoPlist.strings', 'path' => 'Specs'
       infoplist_file.create_file 'name' => 'en', 'path' => 'en.lproj/InfoPlist.strings'
       
-      # E21EB9DF14E357CF0058122A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-      # infofile = supporting_group.create_file 'name' => 'en', 'path' => 'en.lproj/InfoPlist.strings'
-    
       target.create_build_phase :resources do |resources|
         resources.add_build_file infoplist_file
       end
     
-      # E21EB9E314E357CF0058122A /* Specs-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Specs-Prefix.pch"; sourceTree = "<group>"; };
       prefix_file = supporting_group.create_file 'name' => 'Specs-Prefix.pch', 'path' => 'Specs/Specs-Prefix.pch'
-    
-      # E21EB9D814E357CF0058122A /* UIKit.framework in Frameworks */,
-      # 7165D454146B4EA100DE2F0E /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-      # E21EB9D914E357CF0058122A /* Foundation.framework in Frameworks */,
-      # E21EB9DA14E357CF0058122A /* CoreGraphics.framework in Frameworks */,
-    
-      # E21EB9EE14E359840058122A /* Cedar-iPhone.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "Cedar-iPhone.framework"; path = "Vendor/Frameworks/Cedar-iPhone.framework"; sourceTree = "<group>"; };
-      cedar_framework = target.project.frameworks_group.create_framework 'name' => 'Cedar-iPhone.framework', 'path' => 'Vendor/Frameworks/Cedar-iPhone.framework', 'sourceTree' => '<group>'
       
-      # @todo this is dumb to have the first being called. There must be a more clear way
+      # Create the custom framework and add it to the frameworks build phase
+      
+      cedar_framework = target.project.frameworks_group.create_framework 'name' => 'Cedar-iPhone.framework', 'path' => 'Vendor/Frameworks/Cedar-iPhone.framework', 'sourceTree' => '<group>'
       
       target.create_build_phase :framework do |frameworks|
         frameworks.add_build_file cedar_framework
-        frameworks.add_build_file target.project.frameworks_group.file('UIKit.framework').first
-        frameworks.add_build_file target.project.frameworks_group.file('Foundation.framework').first
-        frameworks.add_build_file target.project.frameworks_group.file('CoreGraphics.framework').first
+        frameworks.add_build_file project.file('Frameworks/UIKit.framework')
+        frameworks.add_build_file project.file('Frameworks/Foundation.framework')
+        frameworks.add_build_file project.file('Frameworks/CoreGraphics.framework')
       end
       
+      # Add the necessary configurations
+      
       target.create_configurations :debug, :release do |config|
         config.set 'GCC_PREFIX_HEADER', 'Specs/Specs-Prefix.pch'
         config.set 'INFOPLIST_FILE', 'Specs/Specs-Info.plist'

data/spec/keychain_spec.rb

@@ -3,23 +3,31 @@ require 'xcoder'
 
 describe Xcode::Keychain do 
   it "should create a keychain" do 
-    kc = Xcode::Keychain.temp_keychain('Test.keychain') do |kc|
-      puts kc.path
+    path = nil
+    kc = Xcode::Keychain.temp do |kc|
+      path = kc.path
       File.exists?(kc.path).should==true
     end
-    File.exists?(Xcode::Keychain.new('Test.keychain').path).should==false
+    File.exists?(path).should==false
   end
   
   it "should import a certificate" do 
-    Xcode::Keychain.temp_keychain('Test2.keychain') do |kc|
+    Xcode::Keychain.temp do |kc|
       kc.import "#{File.dirname(__FILE__)}/Provisioning/TestUser.p12", 'testpassword'
       kc.identities.size.should==1
       kc.identities[0].should=="Test User"
     end
   end
   
+  it "should open an existing keychain" do
+    kc = Xcode::Keychain.new("#{File.dirname(__FILE__)}/Provisioning/Test.keychain")
+    kc.unlock 'testpassword'
+    kc.identities.size.should==1
+    kc.identities[0].should=="Test User"
+  end
+  
   it "should fetch the login keychain" do
-    kc = Xcode::Keychain.login_keychain
+    kc = Xcode::Keychain.login
     File.exists?(kc.path).should==true
   end
 end

data/spec/project_spec.rb

@@ -146,4 +146,16 @@ describe Xcode::Project do
     end
   end
   
+  describe "#object_version" do
+    it "should return the correct version" do
+      project.object_version.should == 46
+    end
+  end
+  
+  describe "#archive_version" do
+    it "should return the correct version" do
+      project.archive_version.should == 1
+    end
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcoder
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-12 00:00:00.000000000Z
+date: 2012-02-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70112887595360 !ruby/object:Gem::Requirement
+  requirement: &70167770001540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112887595360
+  version_requirements: *70167770001540
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &70112887594940 !ruby/object:Gem::Requirement
+  requirement: &70167770001120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112887594940
+  version_requirements: *70167770001120
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70112887594520 !ruby/object:Gem::Requirement
+  requirement: &70167770000700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112887594520
+  version_requirements: *70167770000700
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70112887594100 !ruby/object:Gem::Requirement
+  requirement: &70167770000280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112887594100
+  version_requirements: *70167770000280
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70112887593680 !ruby/object:Gem::Requirement
+  requirement: &70167769999860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112887593680
+  version_requirements: *70167769999860
 description: Provides a ruby based object-model for parsing project structures and
   invoking builds
 email:
@@ -118,6 +118,7 @@ files:
 - lib/xcode/workspace.rb
 - lib/xcoder.rb
 - xcoder.gemspec
+- spec/Provisioning/Test.keychain
 - spec/Provisioning/TestUser.p12
 - spec/TestProject/Buildfile
 - spec/TestProject/TestProject.xcodeproj/project.pbxproj
@@ -178,6 +179,7 @@ signing_key:
 specification_version: 3
 summary: Ruby wrapper around xcodebuild, xcrun, agvtool and pbxproj files
 test_files:
+- spec/Provisioning/Test.keychain
 - spec/Provisioning/TestUser.p12
 - spec/TestProject/Buildfile
 - spec/TestProject/TestProject.xcodeproj/project.pbxproj
@@ -213,3 +215,4 @@ test_files:
 - spec/test_report_spec.rb
 - spec/workspace_spec.rb
 - spec/xcode_spec.rb
+has_rdoc: