phoenx 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77be760e6ace31cc917984b3878086334c43b606
-  data.tar.gz: 36913b36166d02da9736e2c7b3a2a58c8c7b7a73
+  metadata.gz: 35e088d7d32779137e61c4ced1fc7346134f3a9d
+  data.tar.gz: 58141339eb08460992ee1b724916beec44fe89ca
 SHA512:
-  metadata.gz: 1f234bc43090dae81275b4c830d85d09bdfed54a01ffaa5ae48c5ba02865a4169013aa884a98c1c9aae7c8148dce0fd702f7d6d788e1278e0dd89061357a8790
-  data.tar.gz: 970ae5cab4bab7f4ee73bcaa4a33c092bbec6a86bf58eae808806d643ee17fec596da9be19038ab06f30fcb02d5c8e5c39d28bb34b76a6cfdb94b6f3ea8517bd
+  metadata.gz: c7580465b974fd07f8f33d9abf3351ddbbc22e59d8de85292611550f1c8ba4b6c1a937ccef91eb7fc3f03d2cf28037feaf0bd1d704cedab26da30dc189e8fe36
+  data.tar.gz: a2635e5c9c72c02c23d7761f934a361393f96a04b4285c84c8d252d1024cd004c5a21a6913ecc8e23cc05dfcc0d018ec9bebeb1d490617a1a2553ae0cd1a9200

data/lib/phoenx.rb

@@ -18,6 +18,7 @@ require 'phoenx/entities/dependency'
 require 'phoenx/use_cases/generate_workspace'
 require 'phoenx/use_cases/generate_project'
 require 'phoenx/use_cases/generate_target'
+require 'phoenx/use_cases/target/add_header'
 require 'phoenx/use_cases/extract_build_settings'
 
 require 'phoenx/utilities/xcodeproj_utils'

data/lib/phoenx/entities/project.rb

@@ -8,7 +8,10 @@ module Phoenx
 		attr_accessor :pre_install_scripts
 		attr_accessor :post_install_scripts
 		attr_accessor :project_name
+		attr_accessor :support_files
+		attr_accessor :excluded_support_files
 		attr_reader   :targets
+		attr_accessor :deterministic_project
 
 		def initialize
 	
@@ -17,6 +20,9 @@ module Phoenx
 			@targets = []
 			@pre_install_scripts = []
 			@post_install_scripts = []
+			@support_files = []
+			@excluded_support_files = []
+			@deterministic_project = false
 			
 			yield self
 	

data/lib/phoenx/entities/target.rb

@@ -4,14 +4,17 @@ module Phoenx
 	
 		attr_accessor :name
 		attr_accessor :resources
+		attr_accessor :excluded_resources
 		attr_accessor :frameworks
 		attr_accessor :libraries
 		attr_accessor :sources
+		attr_accessor :excluded_sources
 		attr_accessor :system_frameworks
 		attr_accessor :system_libraries
 		attr_accessor :pre_build_scripts
 		attr_accessor :post_build_scripts
 		attr_accessor :support_files
+		attr_accessor :excluded_support_files
 		attr_reader   :dependencies
 		
 		attr_reader :config_files
@@ -27,8 +30,11 @@ module Phoenx
 			@pre_build_scripts = []
 			@post_build_scripts = []
 			@resources = []
+			@excluded_resources = []
 			@sources = []
+			@excluded_sources = []
 			@support_files = []
+			@excluded_support_files = []
 		
 		end
 		
@@ -50,8 +56,13 @@ module Phoenx
 		attr_reader :target_type
 		attr_accessor :sub_projects
 		attr_accessor :private_headers
+		attr_accessor :excluded_private_headers
 		attr_accessor :project_headers
+		attr_accessor :excluded_project_headers
 		attr_accessor :public_headers
+		attr_accessor :excluded_public_headers
+		attr_accessor :umbrella_header
+		attr_accessor :module_name
 	
 		public
 		
@@ -66,8 +77,11 @@ module Phoenx
 			@version = version
 			@sub_projects = []
 			@private_headers = []
+			@excluded_private_headers = []
 			@project_headers = []
+			@excluded_project_headers = []
 			@public_headers = []
+			@excluded_public_headers = []
 			
 			yield(self)
 		

data/lib/phoenx/gem_version.rb

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

data/lib/phoenx/use_cases/extract_build_settings.rb

@@ -18,31 +18,7 @@ module Phoenx
 					
 				target.build_configuration_list.build_configurations.each do |config|
 						
-					file = open('xcconfig/' + target.name + '/' + config.name + '.xcconfig', 'w')
-							
-					config.build_settings.each do |key,values|
-							
-						file.write(key + ' = ')
-								
-						if values.is_a?(String)
-								
-							file.write(values)
-									
-						else
-								
-							values.each do |value|
-								
-								file.write(value + ' ')
-								
-							end
-								
-						end
-								
-						file.puts
-							
-					end
-							
-					file.close
+					extract_settings(config, 'xcconfig/' + target.name + '/')
 						
 				end
 					
@@ -56,35 +32,25 @@ module Phoenx
 					
 			@project.build_configuration_list.build_configurations.each do |config|
 						
-				file = open('xcconfig/' + config.name + '.xcconfig', 'w')
-							
-				config.build_settings.each do |key,values|
-							
-					file.write(key + ' = ')
-								
-					if values.is_a?(String)
-								
-						file.write(values)
-									
-					else
-								
-						values.each do |value|
-								
-							file.write(value + ' ')
-								
-						end
-								
-					end
-								
-					file.puts
-							
-				end
-							
-				file.close
+				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
 		

data/lib/phoenx/use_cases/generate_project.rb

@@ -26,10 +26,15 @@ module Phoenx
 			
 			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|
@@ -104,6 +109,13 @@ module Phoenx
 			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

@@ -19,7 +19,8 @@ module Phoenx
 		
 		def add_support_files
 		
-			Phoenx.get_or_add_files(@project, @target_spec.support_files)
+			files = Phoenx.merge_files_array(@target_spec.support_files, @target_spec.excluded_support_files)
+			Phoenx.get_or_add_files(@project, files)
 		
 		end
 		
@@ -96,7 +97,7 @@ module Phoenx
 		def add_resources
 	
 			# Add Resource files
-			resources = Phoenx.merge_files_array(@target_spec.resources)
+			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
@@ -137,6 +138,22 @@ module Phoenx
 					
 					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)
@@ -164,7 +181,7 @@ module Phoenx
 		def add_sources
 	
 			# Add Source files
-			sources = Phoenx.merge_files_array(@target_spec.sources)
+			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
@@ -188,9 +205,9 @@ module Phoenx
 	
 		end
 		
-		def add_headers(header_files,attributes)
+		def add_headers(header_files, excluded_header_files, attributes)
 		
-			headers = Phoenx.merge_files_array(header_files)
+			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
@@ -211,19 +228,19 @@ module Phoenx
 		
 		def add_public_headers
 		
-			self.add_headers(@target_spec.public_headers,ATTRIBUTES_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,ATTRIBUTES_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,ATTRIBUTES_PROJECT_HEADERS)
+			self.add_headers(@target_spec.project_headers, @target_spec.excluded_project_headers, ATTRIBUTES_PROJECT_HEADERS)
 	
 		end
 		
@@ -384,9 +401,7 @@ module Phoenx
 			puts ">> Target ".green + @target_spec.name.bold unless @project_spec.targets.length == 1
 
 			self.add_sources
-			self.add_public_headers
-			self.add_private_headers
-			self.add_project_headers
+			Phoenx::Target::HeaderBuilder.new(@project, @target, @target_spec).build
 			self.add_resources
 			self.add_config_files
 			self.add_sub_projects

data/lib/phoenx/use_cases/target/add_header.rb

@@ -0,0 +1,104 @@
+module Phoenx
+
+	module Target
+
+		class HeaderBuilder
+
+			attr_reader :project
+			attr_reader :target
+			
+			attr_reader :target_spec
+
+			attr_reader :umbrella_headers
+
+			def initialize(project, target, target_spec)
+			
+				@project = project
+				@target = target
+
+				@target_spec = target_spec
+			
+				@umbrella_headers = []
+
+			end
+
+			def build
+
+				self.add_public_headers
+				self.add_project_headers
+				self.add_private_headers
+
+				self.generate_umbrella_header
+
+			end
+			
+			def add_public_headers
+			
+				self.add_headers(@target_spec.public_headers, ATTRIBUTES_PUBLIC_HEADERS, true)
+		
+			end
+
+			def add_project_headers
+			
+				self.add_headers(@target_spec.project_headers, ATTRIBUTES_PROJECT_HEADERS, true)
+		
+			end
+			
+			def add_private_headers
+			
+				self.add_headers(@target_spec.private_headers, ATTRIBUTES_PRIVATE_HEADERS, false)
+		
+			end
+			
+
+			def generate_umbrella_header
+
+				unless @target_spec.umbrella_header == nil
+					
+					entries = @umbrella_headers.map{ |header| 
+						unless @target_spec.module_name == nil
+							import = '<' + @target_spec.module_name + '/' + File.basename(header) + '>'
+						else
+							import = '"'  + File.basename(header) + '"'
+						end
+						'#import ' + import
+					}
+
+					open(@target_spec.umbrella_header, "w") { |file| 
+						entries.each { |header| file.puts header }
+					}
+
+				end
+				
+			end
+
+			def add_headers(header_files, attributes, add_to_umbrella_header)
+			
+				headers = Phoenx.merge_files_array(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 = @target.headers_build_phase.add_file_reference(file, true)
+					build_file.settings = attributes
+
+					if add_to_umbrella_header
+						@umbrella_headers << header
+					end
+
+				end
+		
+			end
+
+		end
+
+	end
+
+end

data/lib/phoenx/utilities/files_utils.rb

@@ -1,6 +1,6 @@
 module Phoenx
 
-	def Phoenx.merge_files_array(files)
+	def Phoenx.merge_files_array(files, excluded_files = nil)
 	
 		if files == nil
 		
@@ -14,9 +14,15 @@ module Phoenx
 			resources.concat Dir[source]
 			
 		end
+
+		unless excluded_files == nil
+
+			resources -= merge_files_array(excluded_files)
+			
+		end
 		
 		return resources
 	
 	end
 
-end
+end

data/lib/phoenx/utilities/xcodeproj_utils.rb

@@ -8,6 +8,12 @@ module Phoenx
 		
 	end
 
+	def Phoenx.is_translation_folder?(file)
+		
+		return file.include?('lproj')
+		
+	end
+
 	def Phoenx.add_groups_for_files(project,files)
 	
 		files.each do |path|
@@ -19,7 +25,7 @@ module Phoenx
 				
 			groups.each do |g|
 			
-				if Phoenx.is_bundle?(g)
+				if Phoenx.is_bundle?(g) || Phoenx.is_translation_folder?(g)
 						
 					break
 							

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: phoenx
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Jens Meder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 description: An Xcode Project and Workspace Generator
@@ -74,6 +74,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/phoenx
+- lib/phoenx.rb
 - lib/phoenx/cli/cli_factory.rb
 - lib/phoenx/cli/command.rb
 - lib/phoenx/cli/option.rb
@@ -89,13 +91,12 @@ files:
 - lib/phoenx/use_cases/generate_project.rb
 - lib/phoenx/use_cases/generate_target.rb
 - lib/phoenx/use_cases/generate_workspace.rb
+- lib/phoenx/use_cases/target/add_header.rb
 - lib/phoenx/utilities/files_utils.rb
 - lib/phoenx/utilities/xcodeproj_utils.rb
 - lib/phoenx/validators/configuration_validator.rb
 - lib/phoenx/validators/project_validator.rb
 - lib/phoenx/validators/workspace_validator.rb
-- lib/phoenx.rb
-- bin/phoenx
 homepage: https://www.github.com/jensmeder/Phoenx
 licenses:
 - MIT
@@ -106,17 +107,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Phoenx generates Xcode projects (*.xcodeproj) and workspaces (*.xcworkspace)