phoenx 0.3.2 → 0.3.3

data/lib/phoenx/use_cases/generate_workspace.rb

@@ -3,78 +3,50 @@ require 'colored'
 module Phoenx
 
 	class GenerateWorkspace
-	
 		:project_files
 		:workspace
 	
 		def initialize(workspace)
-
 			@workspace = workspace
 			@project_files = []
-		
 		end
 		
 		def generate_workspace
-		
 			workspace = Xcodeproj::Workspace.new(@workspace.main_project_path + @workspace.main_project_name + "." + XCODE_PROJECT_EXTENSION)
-
 			@workspace.projects.each do |key,value| 
-
 				workspace << value + key + "." + XCODE_PROJECT_EXTENSION
-
 			end
-
 			workspace.save_as(@workspace.name + "." + XCODE_WORKSPACE_EXTENSION)
-		
 		end
 		
 		def generate_project(name, value)
-		
 			path = value
-			
 			if path == nil
-			
 				path = '.'
-			
 			end
-
 			abort "Missing project folder ".red + path.bold unless Dir.exists?(path)
-
 			Dir.chdir(path) do
-				
 				file_name = name + '.' + PROJECT_EXTENSION
 				specs = Dir[file_name]
-				
 				puts "> Project ".green + name.bold
-
 				abort "Missing project specification ".red + (path + file_name).bold unless specs.first
-
 				file = File.read(specs.first)
 				spec = eval(file)
-			
 				generator = Phoenx::GenerateProject.new spec
 				generator.build
 			end
-		
 		end
 		
 		def generate_projects
-		
-			@workspace.projects.each do |key,value| 
-			
+			@workspace.generated_projects.each do |key,value| 
 				self.generate_project(key,value)
-			
 			end
-			
 			self.generate_project(@workspace.main_project_name,@workspace.main_project_path)
-		
 		end
 		
 		def generate
-
 			self.generate_projects
 			self.generate_workspace
-		
 		end
 	
 	end

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

@@ -3,58 +3,39 @@ 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) + '>'
@@ -63,44 +44,31 @@ module Phoenx
 						end
 						'#import ' + import
 					}.sort
-
 					open(@target_spec.umbrella_header, "w") { |file| 
 						entries.each { |header| file.puts header }
 					}
-
 					self.add_header(@target_spec.umbrella_header, ATTRIBUTES_PUBLIC_HEADERS)
-
 				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|
-				
 					self.add_header(header, attributes)
-
 				end
-
 				if add_to_umbrella_header
 					@umbrella_headers += headers
 				else 
 					@umbrella_headers -= headers
 				end
-		
 			end
 
 			def add_header(header, attributes)
 				file = Phoenx.get_or_add_file(@project, header)
-		
 				build_file = @target.headers_build_phase.add_file_reference(file, true)
 				build_file.settings = attributes
 			end

data/lib/phoenx/utilities/files_utils.rb

@@ -1,28 +1,17 @@
 module Phoenx
 
 	def Phoenx.merge_files_array(files, excluded_files = nil)
-	
 		if files == nil
-		
 			return nil
-		
 		end
-		
 		resources = []
 		files.each do |source|
-			
 			resources.concat Dir[source]
-			
 		end
-
 		unless excluded_files == nil
-
 			resources -= merge_files_array(excluded_files)
-			
 		end
-		
 		return resources
-	
 	end
 
 end

data/lib/phoenx/utilities/xcodeproj_utils.rb

@@ -3,112 +3,69 @@ require 'xcodeproj'
 module Phoenx
 
 	def Phoenx.is_bundle?(file)
-		
 		return file.include?('xcassets') || file.include?('bundle') || file.include?('playground')
-		
 	end
 
 	def Phoenx.is_translation_folder?(file)
-		
 		return file.include?('lproj')
-		
 	end
 
 	def Phoenx.add_groups_for_files(project,files)
-	
 		files.each do |path|
-			
 			abort "Missing file ".red + path.bold unless File.exists?(path)
-
 			groups = File.dirname(path).split("/")
 			concate = ""
-				
 			groups.each do |g|
-			
 				if Phoenx.is_bundle?(g) || Phoenx.is_translation_folder?(g)
-						
 					break
-							
 				end
-				
 				concate +=  g + "/"
 				group_ref = project.main_group.find_subpath(concate, true)
 				group_ref.set_path(g)
-				
 			end
-			
 		end
-	
 	end
 	
 	def Phoenx.get_or_add_files(project, files)
-	
 		resources = Phoenx.merge_files_array(files)
-			
 		Phoenx.add_groups_for_files(project, resources)
-
 		resources.each do |source|
-				
 			Phoenx.get_or_add_file(project,source)
-				
 		end
-	
 	end
 	
 	def Phoenx.get_or_add_file(project,file)
-	
 		abort "Missing file ".red + path.bold unless File.exists?(file)
-
 		filename = File.basename(file)
 		dir = File.dirname(file)
-		
 		group = project.main_group.find_subpath(dir, false)
 		file_ref = group.find_file_by_path(filename)
-				
 		unless file_ref != nil
-				
 			file_ref = group.new_file(filename)
-				
 		end	
-		
 		return file_ref
 	
 	end
 	
 	def Phoenx.set_target_build_settings_defaults(target)
-		
 		target.build_configuration_list.build_configurations.each do |config|
-
 			config.build_settings = {}
-
 		end
-		
 	end
 	
 	def Phoenx.set_project_build_settings_defaults(project)
-		
 		project.build_configuration_list.build_configurations.each do |config|
-
 			config.build_settings = {}
-
 		end
-		
 	end
 	
 	def Phoenx.target_for_name(project,name)
-	
 		project.targets.each do |t|
-		
 			if t.name == name
-			
 				return t
-			
 			end
-		
 		end
-
 		return nil
-	
 	end
 
 end

data/lib/phoenx/validators/project_validator.rb

@@ -1,22 +1,16 @@
 module Phoenx
 	
 	class ProjectValidator
-	
 		ERROR_NONE         = 0
 		ERROR_INVALID_NAME = 1
-
+		
 		def validate(project)
-	
 			if project.name == nil || project.name == ""
-			
 				return ERROR_INVALID_NAME
-			
 			end
-			
 			return ERROR_NONE
-	
 		end
-	
+		
 	end
 
 end

data/lib/phoenx/validators/workspace_validator.rb

@@ -1,27 +1,18 @@
 module Phoenx
 
 	class WorkspaceValidator
-	
 		ERROR_NONE                 = 0
 		ERROR_INVALID_NAME         = 1
 		ERROR_INVALID_MAIN_PROJECT = 2
 		
 		def validate(workspace)
-		
 			if workspace.name == nil || workspace.name == ""
-			
 				return ERROR_INVALID_NAME
-			
 			end
-			
 			if workspace.main_project == nil || workspace.main_project == ""
-			
-				return ERROR_INVALID_MAIN_PROJECT
-				
+				return ERROR_INVALID_MAIN_PROJECT			
 			end
-			
 			return ERROR_NONE
-		
 		end
 	
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phoenx
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Jens Meder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj