xcoder 0.1.6 → 0.1.7

data/lib/xcode/registry.rb

@@ -7,8 +7,10 @@ require 'xcode/group'
 require 'xcode/resource'
 require 'xcode/scheme'
 require 'xcode/simple_identifier_generator'
+require 'xcode/configuration_owner'
 require 'xcode/target'
 require 'xcode/variant_group'
+require 'xcode/project_reference'
 
 module Xcode
   
@@ -59,15 +61,16 @@ module Xcode
     # @see Resource#initialize
     # 
     # @param [String] isa the type of the object.
-    # @return [Module] the module name mapped to the parameter. If the parameter
-    #   matches no module then a nil is returned.
+    # @return [Array<Module>] an array of modules that are mapped to the 
+    #   string name.
     # 
     def self.isa_to_module isa
 
-      { 'XCBuildConfiguration' => Configuration,
+      modules = { 'PBXProject' => [ProjectReference, ConfigurationOwner],
+        'XCBuildConfiguration' => Configuration,
         'PBXFileReference' => FileReference,
         'PBXGroup' => Group,
-        'PBXNativeTarget' => Target,
+        'PBXNativeTarget' => [Target, ConfigurationOwner],
         'PBXAggregateTarget' => Target,
         'PBXFrameworksBuildPhase' => BuildPhase,
         'PBXSourcesBuildPhase' => BuildPhase,
@@ -76,6 +79,8 @@ module Xcode
         'PBXVariantGroup' => VariantGroup,
         'XCConfigurationList' => ConfigurationList,
         'PBXVariantGroup' => VariantGroup }[isa]
+        
+        Array(modules)
     end
     
     #

data/lib/xcode/resource.rb

@@ -190,13 +190,15 @@ module Xcode
       end
       
       #  
-      # Based on the `isa` property find if there is a constant within
+      # Based on the `isa` property find if there are constants within
       # the Xcode module that matches and if it does, then we want to 
-      # automatically include module into the Resource object.
+      # automatically include those modules into the Resource object.
       # 
-      constant = Registry.isa_to_module(isa)
-        
-      self.extend(constant) if constant
+      constants = Registry.isa_to_module(isa)
+      
+      constants.each do |constant|
+        self.extend(constant) if constant
+      end
       
     end
     

data/lib/xcode/target.rb

@@ -52,70 +52,6 @@ module Xcode
     # @return [Project] the reference to the project for which these targets reside.
     attr_accessor :project
     
-    #
-    # @return [Array<BuildConfiguration>] the configurations that this target 
-    #   supports. These are generally 'Debug' or 'Release' but may be custom 
-    #   created configurations.
-    # 
-    def configs
-      build_configuration_list.build_configurations.map do |config|
-        config.target = self
-        config
-      end
-    end
-    
-    #
-    # Return a specific build configuration. 
-    # 
-    # @note an exception is raised if no configuration matches the specified name.
-    # 
-    # 
-    # @param [String] name of a configuration to return
-    # 
-    # @return [BuildConfiguration] a specific build configuration that 
-    #   matches the specified name.
-    #
-    def config(name)
-      config = configs.select {|config| config.name == name.to_s }.first
-      raise "No such config #{name}, available configs are #{configs.map {|c| c.name}.join(', ')}" if config.nil?
-      yield config if block_given?
-      config
-    end
-    
-    #
-    # Create a configuration for the target.
-    # 
-    # @example debug configuration
-    # 
-    #   target.create_config 'Debug' do |config|
-    #     # configuration the new debug config.
-    #   end
-    # 
-    # @param [String] name of the configuration to create
-    # @return [BuildConfiguration] that is created
-    #
-    def create_configuration(name)
-      # To create a configuration, we need to create or retrieve the configuration list
-      
-      created_config = build_configuration_list.create_config(name) do |config|
-        yield config if block_given?
-      end
-      
-      created_config
-    end
-
-    def create_configurations(*configuration_names)
-      
-      configuration_names.compact.flatten.map do |config_name|
-        created_config = create_configuration config_name do |config|
-          yield config if block_given?
-        end
-        
-        created_config.save!
-      end
-      
-    end
-    
     # 
     # @return [BuildPhase] the framework specific build phase of the target.
     # 

data/lib/xcode/test/ocunit_report_parser.rb

@@ -11,7 +11,7 @@ module Xcode
   
     class OCUnitReportParser
 
-      attr_reader :reports, :end_time, :start_time
+      attr_reader :reports, :end_time, :start_timel
       attr_accessor :debug, :formatters
   
       def initialize
@@ -22,13 +22,18 @@ module Xcode
         @failed = false
         @start_time = nil
         @end_time = nil
+        @unexpected = false
         
         add_formatter :junit, 'test-reports'
         add_formatter :stdout
       end
       
+      def unexpected?
+        @unexpected
+      end
+      
       def failed?
-        @failed
+        @failed or @unexpected
       end
       
       def finished?
@@ -36,6 +41,7 @@ module Xcode
       end
       
       def duration
+        return 0 if @start_time.nil?
         return Time.now - @start_time if @end_time.nil?
         @end_time - @start_time
       end
@@ -118,6 +124,9 @@ module Xcode
           when /BUILD FAILED/ 
             flush
             
+          when /Segmentation fault/
+            @unexpected=true
+            
           when /Run test case (\w+)/
             # ignore
           when /Run test suite (\w+)/

data/lib/xcode/version.rb

@@ -1,3 +1,3 @@
 module Xcode
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/xcoder/rake_task.rb

@@ -0,0 +1,218 @@
+require 'xcoder'
+require 'rake'
+require 'rake/tasklib'
+
+
+module Xcode
+  class RakeTask < ::Rake::TaskLib
+    include ::Rake::DSL if defined?(::Rake::DSL)
+
+    # The name of the prefixed namespace. By default this will by 'xcode'
+    attr_accessor :name
+    
+    #
+    # @param [String,Array<String>] project_names names of the project and projects
+    #   that are found in the specified directory. 
+    #
+    def projects=(project_names)
+      @projects = Xcode.find_projects(directory).find_all{|project| Array(project_names).include? project.name }
+    end
+    
+    #
+    # @return [Array<Projects>] all the projects found that match the filtering
+    #   criteria at the specified directory or all projects at the specified 
+    #   directory.
+    # 
+    def projects
+      @projects ||= Xcode.find_projects(directory)
+    end
+
+    #
+    # @param [String] value file path to search for Xcode projects. Xcoder attempts
+    #   to find all the projects recursively from this specified path.
+    #
+    def directory=(value)
+      @directory = File.expand_path(value)
+    end
+    
+    #
+    # The default directory is the current working directory. This can be
+    # overriden to search for projects within a specified folder path.
+    # 
+    def directory
+      @directory ||= File.expand_path('.')
+    end
+    
+    #
+    # @todo this should likely be generated from the Xcode::Builder object/class
+    #   itself
+    # 
+    # @return [Array] available actions of a Builder
+    def builder_actions
+      [ :build, :test, :clean, :package ]
+    end
+    
+    #
+    # By default this will generate rake tasks within the 'xcode' namespace for
+    # all the projects (within the current working directory), all their targets, 
+    # and all their configs. This will also generate tasks for all of a projects
+    # schemes as well.
+    # 
+    # @example
+    # 
+    #       rake xcode:hackbook:hackbook:debug:build   
+    #       rake xcode:hackbook:hackbook:debug:clean         
+    #       rake xcode:hackbook:hackbook:debug:package       
+    #       rake xcode:hackbook:hackbook:debug:test          
+    #       rake xcode:hackbook:hackbook:release:build       
+    #       rake xcode:hackbook:hackbook:release:clean       
+    #       rake xcode:hackbook:hackbook:release:package     
+    #       rake xcode:hackbook:hackbook:release:test        
+    # 
+    # The task accepts a single parameter. This parameter allows you to change
+    # the root namespace that the tasks are generated within.
+    # 
+    # @example
+    # 
+    #     Xcode::RakeTask.new :apple
+    # 
+    #     rake apple:hackbook:hackbook:debug:build
+    #     # ...
+    # 
+    # Additionally a block can be specified to provide additional configuration:
+    # 
+    # @example specifying a directory parameter to search within a different folder
+    #
+    #     Xcode::RakeTask.new :apple do |xcoder|
+    #       xcoder.directory = "~/dayjobprojects"
+    #     end
+    #     
+    #     rake apple:dayjobproject1:moneytarget:debug:build
+    #     # ...
+    # 
+    # Often you do not want to generate rake tasks for all the projects. So you
+    # can specify the names of the projects you do want to have appear.
+    # 
+    # @example specifying projects to filter on by the name of a project
+    #
+    #     Xcode::RakeTask.new :apple do |xcoder|
+    #       xcoder.directory = "~/dayjobprojects"
+    #       xcoder.projects = "Dayjobproject2"
+    #     end
+    #     
+    #     rake apple:dayjobproject2:socialtarget:debug:build
+    #     # ...
+    # 
+    #
+    def initialize(name = :xcode)
+      
+      @name = name
+      
+      yield self if block_given?
+      
+      define_all_projects_list_task
+      define_project_list_tasks
+      define_per_project_scheme_builder_tasks
+      define_per_project_config_builder_tasks
+
+    end
+    
+    private
+    
+    def define_all_projects_list_task
+      desc "List details for all the projects"
+      task "#{name}:list" do
+        projects.each {|project| project.describe }
+      end
+    end
+    
+    def define_project_list_tasks
+      projects.each do |project|
+        desc "List details for all the projects"
+        task "#{name}:#{friendlyname(project.name)}:list" do
+          project.describe
+        end
+      end
+    end
+    
+    #
+    # Generate all the Builder Tasks for all the matrix of all the Projects and
+    # Schemes
+    # 
+    def define_per_project_scheme_builder_tasks
+      
+      projects.each do |project|
+        project.schemes.each do |scheme|
+          builder_actions.each do |action|
+            
+            description = "#{action.capitalize} #{project.name} #{scheme.name}"
+            task_name = friendlyname("#{name}:#{project.name}:scheme:#{scheme.name}:#{action}")
+            
+            define_task_with description, task_name do
+              scheme.builder.send(action)
+            end
+            
+          end
+        end
+      end
+      
+    end
+
+    #
+    # Generate all the Builder Tasks for all the matrix of all the Projects,
+    # Targets, and Configs
+    # 
+    def define_per_project_config_builder_tasks
+      
+      projects.each do |project|
+        project.targets.each do |target|
+          target.configs.each do |config|
+            
+            builder_actions.each do |action|
+              
+              description = "#{action.capitalize} #{project.name} #{target.name} #{config.name}"
+              task_name = friendlyname("#{name}:#{project.name}:#{target.name}:#{config.name}:#{action}")
+            
+              define_task_with description, task_name do
+                config.builder.send(action)
+              end
+              
+            end
+            
+          end
+        end
+      end
+      
+      
+    end
+    
+    
+    #
+    # @param [String] description the task decription
+    # @param [String] task_name the name of the task with namespace
+    #
+    def define_task_with(description,task_name,&block)
+      
+      desc description
+      task task_name do
+        block.call
+      end
+      
+    end
+    
+    
+    # 
+    # @param [String,Symbol] name to convert that may contain camel-casing and
+    #   spacing.
+    # 
+    # @return [String] a name which is all lower-cased, spaces are replaced with
+    #   underscores.
+    #
+    def friendlyname(name)
+      name.underscore.gsub(/\s/,'-')
+    end
+    
+    
+  end
+
+end

data/spec/configuration_spec.rb

@@ -56,35 +56,50 @@ describe Xcode::Configuration do
     
     it "should override existing settings" do
       linker_flags = settings['OTHER_LDFLAGS']
-      subject.set 'OTHER_LDFLAGS', '-NONE'
+      subject.set 'OTHER_LDFLAGS', '-NONE -FOR -ME'
       settings['OTHER_LDFLAGS'].should_not == linker_flags
     end
+    
+  end
+  
+  describe "#append" do
+
+    let(:settings) { subject.build_settings }
 
+    it "should append to  existing settings" do
+      subject.set 'OTHER_LDFLAGS', '-NONE'
+      subject.append 'OTHER_LDFLAGS', '-FOR -ME'
+      settings['OTHER_LDFLAGS'].should == "-NONE -FOR -ME"
+    end
+    
   end
   
   describe "#get" do
 
     let(:settings) { subject.build_settings }
     
-    it "should return the correct configuration value" do
-      subject.get('OTHER_LDFLAGS').should == settings['OTHER_LDFLAGS']
+    it "should return the configuration value processed through their property" do
+
+      subject.get('OTHER_LDFLAGS').should_not == settings['OTHER_LDFLAGS']
+      subject.get('OTHER_LDFLAGS').should == settings['OTHER_LDFLAGS'].split(" ")
+      
     end
 
   end
   
-  describe "String Properties" do
-    
-    let(:string_properties) do
-      [ :product_name, 
-        :prefix_header,
-        :info_plist_location,
-        :wrapper_extension,
-        :sdkroot,
-        :c_language_standard,
-        :gcc_version,
-        :code_sign_identity,
-        :iphoneos_deployment_target ]
+  let(:string_properties) do
+    [ :product_name, 
+      :prefix_header,
+      :info_plist_location,
+      :wrapper_extension,
+      :sdkroot,
+      :c_language_standard,
+      :gcc_version,
+      :code_sign_identity,
+      :iphoneos_deployment_target ]
     end
+
+  describe "String Properties" do
     
     it "should be able to correctly get the property" do
       
@@ -103,19 +118,29 @@ describe Xcode::Configuration do
       
     end
     
+    it "should be able to append to the property" do
+      
+      string_properties.each do |property|
+        subject.send("#{property}=","new value")
+        subject.send("append_to_#{property}"," there")
+        subject.send(property).should eq("new value there"), "#{property} failed to be set correctly"
+      end
+      
+    end
+    
+  end
+
+  let(:boolean_properties) do
+    [ :precompile_prefix_headers,
+      :always_search_user_paths,
+      :warn_about_missing_prototypes,
+      :warn_about_return_type,
+      :validate_product,
+      :copy_phase_strip ]
   end
   
   describe "Boolean Properties" do
 
-    let(:boolean_properties) do
-      [ :precompile_prefix_headers,
-        :always_search_user_paths,
-        :warn_about_missing_prototypes,
-        :warn_about_return_type,
-        :validate_product,
-        :copy_phase_strip ]
-    end
-    
     it "should be able to set to false with NO" do
       
       boolean_properties.each do |property|
@@ -151,16 +176,16 @@ describe Xcode::Configuration do
       end
       
     end
-    
+  end
+  
+  let(:space_delimited_string_properties) do
+    [ :architectures,
+      :supported_platforms,
+      :other_linker_flags ]
   end
   
   describe "Space Delimited String Properties" do
 
-    let(:space_delimited_string_properties) do
-      [ :architectures,
-        :supported_platforms ]
-    end
-    
     it "should be able to correctly get the property" do
       
       space_delimited_string_properties.each do |property|
@@ -187,16 +212,41 @@ describe Xcode::Configuration do
       
     end
     
+    it "should be able to append to the property" do
+      
+      space_delimited_string_properties.each do |property|
+        subject.send("#{property}=",["more", "value"])
+        subject.send("append_to_#{property}","there")
+        subject.send(property).should eq([ "more", "value", "there" ]), "#{property} failed to be appended correctly"
+      end
+      
+    end
+    
+    it "should not allow duplcate values" do
+      
+      space_delimited_string_properties.each do |property|
+        subject.send("#{property}=",["more", "value"])
+        subject.send("append_to_#{property}","value")
+        subject.send(property).should eq([ "more", "value" ]), "#{property} failed to be appended correctly"
+      end
+      
+    end
+    
   end
   
+  let(:targeted_device_family_properties) { [ :targeted_device_family ] }
+  
   describe "Targeted Device Family Properties" do
 
-    let(:targeted_device_family_properties) { [ :targeted_device_family ] }
+    let(:expect_device_family_for_config) { [] }
     
-    it "should be able to correctly get the property" do
+    let(:expect_device_family_for_global_config) { [ :iphone, :ipad ] }
+
+    it "should get the project's default property when it is not specified for the target configuration" do
       
       targeted_device_family_properties.each do |property|
-        subject.send(property).should == [ ]
+        
+        subject.send(property).should == expect_device_family_for_global_config
       end
       
     end
@@ -205,12 +255,80 @@ describe Xcode::Configuration do
       
       targeted_device_family_properties.each do |property|
         subject.send("#{property}=",[ 'IPHONE', :ipad ])
-        subject.get("TARGETED_DEVICE_FAMILY").should == "1,2"
+        subject.build_settings["TARGETED_DEVICE_FAMILY"].should == "1,2"
         subject.send(property).should == [ :iphone, :ipad ]
       end
       
     end
     
+    it "should be able to append to the property" do
+      
+      targeted_device_family_properties.each do |property|
+        subject.send("#{property}=",'IPHONE')
+        subject.send("append_to_#{property}","iPad")
+        subject.send(property).should == [ :iphone, :ipad ]
+      end
+      
+    end
+    
+  end
+  
+  let(:key_value_array_properties) do
+    [ :other_c_flags ]
+  end
+  
+  describe "Array Properties" do
+    it "should be able to correctly get the property" do
+      key_value_array_properties.each do |property|
+        subject.send(property).should be_kind_of(Array), "#{property} failed to return an Array"
+      end
+    end
+    
+    it "should be able to correctly set the property" do
+      key_value_array_properties.each do |property|
+        subject.send("#{property}=","PARAMETER=1")
+        subject.send(property).should eq(["PARAMETER=1"]), "The property #{property} failed to set correctly"
+      end
+    end
+    
+    it "should be able to correctly append the property" do
+      key_value_array_properties.each do |property|
+        subject.send("#{property}=","PARAMETER=1")
+        subject.send("append_to_#{property}",[ "PARAMETER=4", "PARAMETER2=2"])
+        subject.send(property).should eq([ "PARAMETER=4","PARAMETER2=2" ]), "The property #{property} failed to set correctly"
+      end
+    end
+  end
+  
+  
+  let(:all_properties) do
+    string_properties + 
+    boolean_properties + 
+    space_delimited_string_properties +
+    targeted_device_family_properties + 
+    key_value_array_properties
+  end
+  
+  describe "Property Environment Names" do
+    it "should have all property environment names available" do
+      all_properties.each do |property|
+        subject.send("env_#{property}").should_not be_nil, "The property #{property} does not have an env_#{property} method defined"
+      end
+    end
+  end
+  
+  describe "Raw Getter and Setter" do
+    it "should have a raw getter method" do
+      all_properties.each do |property|
+        subject.should respond_to("raw_#{property}"), "The property #{property} does not have a raw_#{property} getter method defined"
+      end
+    end
+    
+    it "should have a raw setter method" do
+      all_properties.each do |property|
+        subject.should respond_to("raw_#{property}="), "The property #{property} does not have a raw_#{property} setter method defined"
+      end
+    end
   end
   
 end

data/spec/project_spec.rb

@@ -158,4 +158,18 @@ describe Xcode::Project do
     end
   end
   
+  describe "#global_configs" do
+    it "should return all the configurations global for the project" do
+      project.global_configs
+    end
+  end
+  
+  describe "#global_config" do
+    it "should return the global configuration with the specified name" do
+      project.global_config('Debug')
+    end
+    
+
+  end
+  
 end