phoenx 0.3.2 → 0.3.3

data/lib/phoenx/entities/scheme.rb

@@ -1,18 +1,13 @@
 module Phoenx
 
 	class Scheme
-	
 		attr_accessor :name
-	
 		attr_accessor :archive_configuration
 		attr_accessor :launch_configuration
 		
 		def initialize(name, block)
-		
 			@name = name
-			
 			self.instance_eval(&block)
-		
 		end
 	
 	end

data/lib/phoenx/entities/target.rb

@@ -1,7 +1,6 @@
 module Phoenx
 
 	class AbstractTarget
-	
 		attr_accessor :name
 		attr_accessor :resources
 		attr_accessor :excluded_resources
@@ -16,11 +15,9 @@ module Phoenx
 		attr_accessor :support_files
 		attr_accessor :excluded_support_files
 		attr_reader   :dependencies
-		
 		attr_reader :config_files
 		
 		def initialize
-		
 			@dependencies = []
 			@config_files = {}
 			@frameworks = []
@@ -35,23 +32,18 @@ module Phoenx
 			@excluded_sources = []
 			@support_files = []
 			@excluded_support_files = []
-		
 		end
 		
 		def dependency(target_name, embed = true, path = nil)
-		
 			dependencies << Dependency.new(target_name, embed, path)
-		
 		end
 	
 	end
 	
 	class TestableTarget < AbstractTarget
-	
 		attr_reader :test_targets
 		attr_reader :schemes
 		attr_accessor :version
-	
 		attr_accessor :platform
 		attr_reader :target_type
 		attr_accessor :sub_projects
@@ -67,7 +59,6 @@ module Phoenx
 		public
 		
 		def initialize(name, type, platform, version)
-		
 			super()
 			@test_targets = []
 			@schemes = []
@@ -82,24 +73,17 @@ module Phoenx
 			@excluded_project_headers = []
 			@public_headers = []
 			@excluded_public_headers = []
-			
 			yield(self)
-		
 		end
 		
 		def test_target(name, &block)
-		
 			target = Phoenx::TestTarget.new &block
 			target.name = name
-			
 			@test_targets << target
-		
 		end
 		
 		def scheme(name, &block)
-		
 			@schemes << Phoenx::Scheme.new(name, block)
-		
 		end
 	
 	end
@@ -109,11 +93,8 @@ module Phoenx
 		public
 	
 		def initialize
-		
 			super
-
 			yield(self)
-		
 		end
 	
 	end

data/lib/phoenx/entities/workspace.rb

@@ -1,32 +1,29 @@
 module Phoenx
 
 	class Workspace
-	
 		attr_accessor :name
 		attr_reader   :main_project_name
 		attr_reader   :main_project_path
 		attr_reader   :projects
+		attr_reader   :generated_projects
 		
 		def initialize
-		
 			@main_project = {}
 			@projects = {}
-
+			@generated_projects = {}
 			yield(self)
-		
 		end
 		
-		def project(name, path = nil)
-		
+		def project(name, path = nil, generate = true)
 			@projects[name] = path
-		
+			if generate
+				@generated_projects[name] = path
+			end
 		end
 		
 		def main_project(name, path = nil)
-		
 			@main_project_name = name
 			@main_project_path = path
-		
 		end
 	
 	end

data/lib/phoenx/gem_version.rb

@@ -1,5 +1,5 @@
 module Phoenx
   
-  	VERSION = "0.3.2".freeze unless defined? Phoenx::VERSION
+  	VERSION = "0.3.3".freeze unless defined? Phoenx::VERSION
   
 end

data/lib/phoenx/use_cases/extract_build_settings.rb

@@ -5,58 +5,38 @@ module Phoenx
 		:project
 	
 		def initialize(project)
-		
 			@project = project
-		
 		end
 		
 		def extract_target_settings
-		
 			@project.targets.each do |target|
-					
 				FileUtils::mkdir_p 'xcconfig/' + target.name
-					
 				target.build_configuration_list.build_configurations.each do |config|
-						
 					extract_settings(config, 'xcconfig/' + target.name + '/')
-						
 				end
-					
 			end
-		
 		end
 		
 		def extract_project_settings
-		
 			FileUtils::mkdir_p 'xcconfig'
-					
 			@project.build_configuration_list.build_configurations.each do |config|
-						
 				extract_settings(config, 'xcconfig/')
-						
 			end
-		
 		end
 
 		def extract_settings(config, to_folder)
-
 			build_settings = config.build_settings.map { |key,values|
 				key + ' = ' + (values.is_a?(String) ? values  : values.join(' '))
 			}
-
 			build_settings.sort!
-
 			open(to_folder + config.name + '.xcconfig', 'w') { |file|
 				build_settings.each { |setting| file.puts(setting) }
 			}
-			
 		end
 	
 		def extract
-		
 			self.extract_target_settings
 			self.extract_project_settings
-		
 		end
 		
 	end

data/lib/phoenx/use_cases/generate_project.rb

@@ -6,115 +6,71 @@ module Phoenx
 		:project
 	
 		def initialize(project_spec)
-		
 			@project_spec = project_spec
-		
 		end
 		
 		def build
-		
 			@project_spec.pre_install_scripts.each do |pre_script|
-			
 				abort "Missing pre install script ".red + pre_script.bold unless File.exists?(pre_script)
 				puts `./#{pre_script}`
-			
 			end
-		
 			# Build Project
-
 			@project = Xcodeproj::Project::new(@project_spec.project_file_name)
-			
 			self.generate_configurations
 			self.add_config_files
 			self.add_support_files
 			self.build_targets
-			
 			@project.main_group.sort_recursively
-			
 			if @project_spec.deterministic_project
 				@project.predictabilize_uuids
 			end
-
 			@project.save(@project_spec.project_file_name)	
-			
 			@project_spec.post_install_scripts.each do |post_script|
-			
 				abort "Missing post install script ".red + post_script.bold unless File.exists?(post_script)
 				puts `./#{post_script}`
-			
 			end	
-		
 		end
 		
 		def build_targets
-		
 			@project_spec.targets.each do |target|
-
 				if target.target_type == :application
-				
 					builder = ApplicationTargetBuilder.new @project, target, @project_spec
 					builder.build
-				
 				elsif target.target_type == :framework
-
 					builder = FrameworkTargetBuilder.new @project, target, @project_spec
 					builder.build
-				
 				end
-			
 			end
-		
 		end
 		
 		def generate_configurations
-			
 			@project_spec.configurations.each do |config|
-			
 				@project.add_build_configuration(config.name, config.parent)
-			
 			end
-		
 		end
 		
 		def add_config_files
-			
 			Phoenx::add_groups_for_files(@project,@project_spec.config_files.values)
-		
 			@project_spec.config_files.keys.each do |config|
-			
 				file_name = @project_spec.config_files[config]
-
 				unless file_name == nil
-				
 					g = @project.main_group.find_subpath(File.dirname(file_name), false)
-
 					file = g.find_file_by_path(File.basename(file_name))
-					
 					unless file != nil
-					
 						file = g.new_reference(File.basename(file_name))
-					
 					end
-					
 					configuration = @project.build_configuration_list[config]
-
 					unless configuration
 						abort "Config file assigned to invalid configuration '#{config}'' ".red + file_name.bold
 					end
-					
 					configuration.base_configuration_reference = file
-				
 				end
-			
 			end
-		
 		end
 
 		def add_support_files
-		
 			files = Phoenx.merge_files_array(@project_spec.support_files, @project_spec.excluded_support_files)
 			Phoenx.get_or_add_files(@project, files)
-		
 		end
 	
 	end

data/lib/phoenx/use_cases/generate_target.rb

@@ -9,272 +9,165 @@ module Phoenx
 		attr_reader :framework_files
 		
 		def initialize(project, target_spec, project_spec)
-		
 			@project = project
 			@target_spec = target_spec
 			@project_spec = project_spec
 			@framework_files = []
-		
 		end
 		
 		def add_support_files
-		
 			files = Phoenx.merge_files_array(@target_spec.support_files, @target_spec.excluded_support_files)
 			Phoenx.get_or_add_files(@project, files)
-		
 		end
 		
 		def add_frameworks_and_libraries
-	
 			# Add Framework dependencies
-
 			frameworks_group = @project.main_group.find_subpath(FRAMEWORKS_ROOT, true)
 			Phoenx.add_groups_for_files(@project,@target_spec.frameworks)
-
 			frameworks = Phoenx.merge_files_array(@target_spec.frameworks)
-
 			frameworks.each do |framework|
-
 				file = Phoenx.get_or_add_file(@project,framework)
 				@framework_files << file
-			
 				self.target.frameworks_build_phases.add_file_reference(file)
-
 			end
-			
 			Phoenx.add_groups_for_files(@project, @target_spec.libraries)
 			libraries = Phoenx.merge_files_array(@target_spec.libraries)
-			
 			libraries.each do |framework|
-
 				file = Phoenx.get_or_add_file(@project,framework)
 				self.target.frameworks_build_phases.add_file_reference(file)
-
 			end
-	
 		end
 		
 		def add_build_phase_scripts
-
 			@target_spec.pre_build_scripts.each do |script|
-			
 				phase = self.target.new_shell_script_build_phase(script[:name])
 				phase.shell_script = script[:script]
-				
 				self.target.build_phases.move(phase, 0)
-			
 			end
-			
 			@target_spec.post_build_scripts.each do |script|
-			
 				phase = self.target.new_shell_script_build_phase(script[:name])
 				phase.shell_script = script[:script]
-				
 				self.target.build_phases.move(phase, self.target.build_phases.count - 1)
-			
 			end
-		
 		end
 		
 		def add_system_dependencies
-	
 			# Add Framework dependencies
-
 			@target_spec.system_frameworks.each do |framework|
-
 				self.target.add_system_framework(framework)
-
 			end
-		
 			@target_spec.system_libraries.each do |library|
-
 				self.target.add_system_library(library)
-
 			end
-	
 		end
 		
 		def add_resources
-	
 			# Add Resource files
 			resources = Phoenx.merge_files_array(@target_spec.resources, @target_spec.excluded_resources)
-			
 			unless !@target_spec.resources || @target_spec.resources.empty? || !resources.empty?
 				puts "No resources found".yellow
 			end
-
 			Phoenx.add_groups_for_files(@project, resources)
-
 			resources.each do |source|
-			
 				file = nil
-				
 				if Phoenx.is_bundle?(source)
-				
 					parts = source.split("/")
-					
 					group = @project.main_group
-					
 					parts.each do |part|
-						
 						if Phoenx.is_bundle?(part)
-							
 							file = group.find_file_by_path(part)
-							
 							unless file != nil
-							
 								file = group.new_file(part)
 								self.target.resources_build_phase.add_file_reference(file)
-							
 							end
-							
 							break
-							
 						else
-						
 							group = group.find_subpath(part, false)
-						
 						end
-					
 					end
-				
 				elsif Phoenx.is_translation_folder?(source)
-
 					parts = source.split("/")
 					translation_folder_index = parts.index { |part| Phoenx.is_translation_folder?(part) }
-					
 					parent_path = parts[0..translation_folder_index - 1].join('/')
 					parent_group = @project.main_group.find_subpath(parent_path)
-
 					variant_group = parent_group[File.basename(source)]
 					if variant_group == nil
 						variant_group = parent_group.new_variant_group(File.basename(source))
 						self.target.resources_build_phase.add_file_reference(variant_group)
 					end
-
 					variant_group.new_file(parts[translation_folder_index..parts.count].join('/'))
-
 				else
-				
 					group = @project.main_group.find_subpath(File.dirname(source), false)
-				
 					unless group == nil
-						
 						file = group.find_file_by_path(File.basename(source))
-							
 						unless file != nil
-							
 							file = group.new_file(File.basename(source))
 							self.target.resources_build_phase.add_file_reference(file)
-							
 						end
-				
 					end
-					
-				
 				end
-
 			end
-	
 		end
 		
 		def add_sources
-	
 			# Add Source files
 			sources = Phoenx.merge_files_array(@target_spec.sources, @target_spec.excluded_sources)
-			
 			unless !@target_spec.sources || @target_spec.sources.empty? || !sources.empty?
 				puts "No sources found".yellow
 			end
-
 			Phoenx.add_groups_for_files(@project, sources)
-
 			sources.each do |source|
-
 				file = Phoenx.get_or_add_file(@project,source)
-	
 				# Add to Compile sources phase
-
 				unless File.extname(source) == ".h" || File.extname(source) == ".pch"
-				
 					self.target.add_file_references([file])
-				
 				end
-
 			end
-	
 		end
 		
 		def add_headers(header_files, excluded_header_files, attributes)
-		
 			headers = Phoenx.merge_files_array(header_files, excluded_header_files)
-
 			unless !header_files || header_files.empty? || !headers.empty?
 				puts "No #{attributes["ATTRIBUTES"].first} headers found".yellow
 			end
-
 			Phoenx.add_groups_for_files(@project, headers)
-
 			headers.each do |header|
-			
 				file = Phoenx.get_or_add_file(@project,header)
-	
 				build_file = self.target.headers_build_phase.add_file_reference(file, true)
 				build_file.settings = attributes
-
 			end
-	
 		end
 		
 		def add_public_headers
-		
 			self.add_headers(@target_spec.public_headers, @target_spec.excluded_public_headers, ATTRIBUTES_PUBLIC_HEADERS)
-	
 		end
 		
 		def add_private_headers
-		
 			self.add_headers(@target_spec.private_headers, @target_spec.excluded_private_headers, ATTRIBUTES_PRIVATE_HEADERS)
-	
 		end
 		
 		def add_project_headers
-		
 			self.add_headers(@target_spec.project_headers, @target_spec.excluded_project_headers, ATTRIBUTES_PROJECT_HEADERS)
-	
 		end
 		
 		def add_config_files
-		
 			# Add configuration group
-			
 			Phoenx.add_groups_for_files(@project, @target_spec.config_files.values)
-		
 			@target_spec.config_files.each do |config,file_name|
-
 				unless file_name == nil
-				
 					file = Phoenx.get_or_add_file(@project,file_name)
-					
 					configuration = self.target.build_configuration_list[config]
-
 					unless configuration
 						abort "Config file assigned to invalid configuration '#{config}' ".red + file_name.bold
 					end
-					
 					configuration.base_configuration_reference = file
-				
 				end
-			
 			end
-		
 		end
 		
 		def configure_target
-		
 			Phoenx.set_target_build_settings_defaults(self.target)
 			Phoenx.set_project_build_settings_defaults(@project)
-		
 		end
 		
 		def build
@@ -282,9 +175,7 @@ module Phoenx
 		end
 		
 		def target
-		
 			return nil
-		
 		end
 	
 	end
@@ -294,112 +185,71 @@ module Phoenx
 		:test_target
 		
 		def generate_target_scheme
-		
 			# Generate main scheme
-	
 			scheme = Xcodeproj::XCScheme.new
 			scheme.configure_with_targets(self.target, @test_target)
 			scheme.test_action.code_coverage_enabled = true
 			scheme.add_build_target(self.target, true)
-			
 			scheme.save_as(@project_spec.project_file_name, @target_spec.name, false)	
-		
 		end
 		
 		def sort_build_phases
-		
 			self.target.build_phases.objects.each do |phase|
-			
 				phase.sort
-				
 			end
-		
 		end
 		
 		def add_sub_projects
-			
 			frameworks_group = @project.main_group.find_subpath(FRAMEWORKS_ROOT,false)
-
 			@target_spec.dependencies.each do |dp|
-
 				proj = nil
-				
 				if dp.path == nil
-				
 					proj = @project
 				else
-				
 					abort "Missing dependency ".red + dp.path.bold unless File.exists?(dp.path)
-
 					file_ref = frameworks_group.find_file_by_path(dp.path)
-				
 					unless file_ref != nil
-				
 						frameworks_group.new_file(dp.path)
-				
 					end
-
 					proj = Xcodeproj::Project::open(dp.path)
-					
 				end
-				
 				target = Phoenx.target_for_name(proj,dp.target_name)
-				
 				abort "Missing target for dependency '#{dp.path}' ".red + dp.target_name.bold unless target
-
 				self.target.add_dependency(target)
-				
 			end
-	
 		end
 		
 		def add_schemes
-		
 			@target_spec.schemes.each do |s|
-			
 				scheme = Xcodeproj::XCScheme.new
 				scheme.configure_with_targets(self.target, @test_target)
 				scheme.test_action.code_coverage_enabled = true
 				scheme.add_build_target(self.target, true)
 				scheme.add_test_target(@test_target)
-				
 				archive_configuration = self.target.build_configuration_list[s.archive_configuration]
 				unless archive_configuration
 					abort "Invalid archive configuration assigned for scheme '#{s.name}' ".red + s.archive_configuration.bold
 				end
-
 				launch_configuration = self.target.build_configuration_list[s.launch_configuration]
 				unless launch_configuration
 					abort "Invalid launch configuration assigned for scheme '#{s.name}' ".red + s.launch_configuration.bold
 				end
-
 				scheme.archive_action.build_configuration = archive_configuration
 				scheme.launch_action.build_configuration = launch_configuration
-			
 				scheme.save_as(@project_spec.project_file_name, s.name, false)
-			
 			end
-		
 		end
 		
 		def add_test_targets
-		
 			@target_spec.test_targets.each do |test_target_spec|
-			
 				builder = TestTargetBuilder.new(@target, @project, test_target_spec, @project_spec, @target_spec, self.framework_files)
 				builder.build
-				
 				@test_target = builder.target
-			
 			end	
-		
 		end
 		
 		def build
-			
-
 			puts ">> Target ".green + @target_spec.name.bold unless @project_spec.targets.length == 1
-
 			self.add_sources
 			Phoenx::Target::HeaderBuilder.new(@project, @target, @target_spec).build
 			self.add_resources
@@ -408,192 +258,132 @@ module Phoenx
 			self.add_system_dependencies
 			self.add_frameworks_and_libraries
 			self.add_build_phase_scripts
-			
 			self.add_test_targets
 			self.generate_target_scheme
 			self.add_schemes
 			self.add_support_files
 			self.sort_build_phases
 			self.configure_target
-		
 		end
 	
 	end
 	
 	class ApplicationTargetBuilder < TestableTargetBuilder
-	
 		:target
 		:copy_frameworks
 		
 		def add_sub_projects
-
 			super
-			
 			frameworks_group = @project.main_group.find_subpath(FRAMEWORKS_ROOT,false)
-			
 			@target_spec.dependencies.each do |dp|
-			
 				file = nil
-				
 				if dp.embed == false
-				
 					next
-				
 				end
-				
 				if dp.path == nil
-				
 					# Copy internal references
-				
 					target = Phoenx.target_for_name(@project,dp.target_name)
-					
 					build_file = @copy_frameworks.add_file_reference(target.product_reference)
 					build_file.settings = ATTRIBUTES_CODE_SIGN_ON_COPY
-				
 				else
-				
 					# Copy external products
-				
 					proj_file = frameworks_group.find_file_by_path(dp.path)
 					proj = Xcodeproj::Project::open(dp.path)
-					
 					target = Phoenx.target_for_name(proj,dp.target_name)
-					
 					proj_file.file_reference_proxies.each do |e|
-					
 						if e.remote_ref.remote_global_id_string == target.product_reference.uuid
-							
 							build_file = @copy_frameworks.add_file_reference(e)
 							build_file.settings = ATTRIBUTES_CODE_SIGN_ON_COPY
-						
 						end
-					
 					end
-					
 				end
-				
-				
-			
 			end
-	
 		end
 	
 		def build
-		
 			@target = @project.new_target(@target_spec.target_type, @target_spec.name, @target_spec.platform, @target_spec.version)
 			@copy_frameworks = @target.new_copy_files_build_phase "Embed Frameworks"
 			@copy_frameworks.symbol_dst_subfolder_spec = :frameworks
-
 			super()
-			
 			self.framework_files.each do |file|
-
 				build_file = @copy_frameworks.add_file_reference(file)
 				build_file.settings = ATTRIBUTES_CODE_SIGN_ON_COPY
-
 			end
 		end
 		
 		def target
-		
 			return @target
-		
 		end
 	
 	end
 	
 	class FrameworkTargetBuilder < TestableTargetBuilder
-	
 		:target
 	
 		def build
-
 			@target = @project.new_target(@target_spec.target_type, @target_spec.name, @target_spec.platform, @target_spec.version)
 			super()
-			
 		end
 		
 		def target
-		
 			return @target
-		
 		end
 	
 	end
 	
 	class TestTargetBuilder < TargetBuilder
-	
 		:target
 		:main_target
 		:main_target_spec
 		:main_target_frameworks_files
 		
 		def initialize(main_target, project, target_spec, project_spec, main_target_spec, main_target_frameworks_files)
-		
 			super(project, target_spec, project_spec)
 			@main_target = main_target
 			@main_target_spec = main_target_spec
 			@main_target_frameworks_files = main_target_frameworks_files
-		
 		end
 	
 		def build
-	
 			@target = @project.new(Xcodeproj::Project::PBXNativeTarget)
 			@project.targets << @target
 			@target.name = @target_spec.name
 			@target.product_name = @target_spec.name
 			@target.product_type = Xcodeproj::Constants::PRODUCT_TYPE_UTI[:unit_test_bundle]
 			@target.build_configuration_list = Xcodeproj::Project::ProjectHelper.configuration_list(@project, @main_target_spec.platform, @main_target_spec.version)
-
 			product_ref = @project.products_group.new_reference(@target_spec.name + '.' + XCTEST_EXTENSION, :built_products)
 			product_ref.include_in_index = '0'
 			product_ref.set_explicit_file_type
 			@target.product_reference = product_ref
-
 			@target.build_phases << @project.new(Xcodeproj::Project::PBXSourcesBuildPhase)
 			@target.build_phases << @project.new(Xcodeproj::Project::PBXFrameworksBuildPhase)
 			@target.build_phases << @project.new(Xcodeproj::Project::PBXResourcesBuildPhase)
-		
 			self.add_sources
 			self.add_config_files
 			self.add_frameworks_and_libraries
 			self.add_system_dependencies
-			
 			self.add_build_phase_scripts
 			self.add_resources
 			self.add_support_files
-			
 			copy_frameworks = @target.new_copy_files_build_phase "Embed Frameworks"
 			copy_frameworks.symbol_dst_subfolder_spec = :frameworks
-		
 			frameworks_group = @project.main_group.find_subpath(FRAMEWORKS_ROOT, false)
-		
 			self.framework_files.each do |file|
-		
 				build_file = copy_frameworks.add_file_reference(file)
 				build_file.settings = ATTRIBUTES_CODE_SIGN_ON_COPY
-		
 			end
-			
 			@main_target_frameworks_files.each do |file|
-		
 				build_file = copy_frameworks.add_file_reference(file)
 				build_file.settings = ATTRIBUTES_CODE_SIGN_ON_COPY
-		
 			end
-			
 			# Add target dependency.
 			@target.add_dependency(@main_target)
 			@target.frameworks_build_phase.add_file_reference(@main_target.product_reference)
 			self.configure_target
-	
 		end
 		
 		def target
-		
 			return @target
-		
 		end
 	
 	end