phoenx 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f57ae4761329ab96177d22d98390f03ccf0bb6ac
-  data.tar.gz: ee04aa336a76774a7fec2fc0bf3884e4b124e097
+  metadata.gz: 77be760e6ace31cc917984b3878086334c43b606
+  data.tar.gz: 36913b36166d02da9736e2c7b3a2a58c8c7b7a73
 SHA512:
-  metadata.gz: fa60e2bae2751112d89bd87e7a47b12282d8e32acff93aadca0facd833cac9268ddf593c31e7609ae85a7ec1cff3be0aba1111d8792e001e178602fb98db4365
-  data.tar.gz: c26339416e8b0717f315d2c77c07249367de3ace2757cd8587f93961e9c1558bf1b8591d303081d386d9e47f3da3a5048ed295dad5165676d824b74959916f8e
+  metadata.gz: 1f234bc43090dae81275b4c830d85d09bdfed54a01ffaa5ae48c5ba02865a4169013aa884a98c1c9aae7c8148dce0fd702f7d6d788e1278e0dd89061357a8790
+  data.tar.gz: 970ae5cab4bab7f4ee73bcaa4a33c092bbec6a86bf58eae808806d643ee17fec596da9be19038ab06f30fcb02d5c8e5c39d28bb34b76a6cfdb94b6f3ea8517bd

data/lib/phoenx/cli/cli_factory.rb

@@ -40,7 +40,7 @@ module Phoenx
 
 					end
 
-					puts "\r\nGenerating workspace ".green + workspace.name.bold + ".xcworkspace".bold
+					puts "\r\nWorkspace ".green + workspace.name.bold
 		
 					generator = Phoenx::GenerateWorkspace.new workspace
 					generator.generate

data/lib/phoenx/gem_version.rb

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

data/lib/phoenx/use_cases/generate_project.rb

@@ -15,6 +15,7 @@ module Phoenx
 		
 			@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
@@ -33,6 +34,7 @@ module Phoenx
 			
 			@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	
@@ -90,10 +92,12 @@ module Phoenx
 					end
 					
 					configuration = @project.build_configuration_list[config]
-					
-					unless configuration == nil
-						configuration.base_configuration_reference = file
+
+					unless configuration
+						abort "Config file assigned to invalid configuration '#{config}'' ".red + file_name.bold
 					end
+					
+					configuration.base_configuration_reference = file
 				
 				end
 			

data/lib/phoenx/use_cases/generate_target.rb

@@ -98,6 +98,10 @@ module Phoenx
 			# Add Resource files
 			resources = Phoenx.merge_files_array(@target_spec.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|
@@ -162,6 +166,10 @@ module Phoenx
 			# Add Source files
 			sources = Phoenx.merge_files_array(@target_spec.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|
@@ -184,6 +192,10 @@ module Phoenx
 		
 			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|
@@ -228,10 +240,12 @@ module Phoenx
 					file = Phoenx.get_or_add_file(@project,file_name)
 					
 					configuration = self.target.build_configuration_list[config]
-					
-					unless configuration == nil
-						configuration.base_configuration_reference = file
+
+					unless configuration
+						abort "Config file assigned to invalid configuration '#{config}' ".red + file_name.bold
 					end
+					
+					configuration.base_configuration_reference = file
 				
 				end
 			
@@ -298,6 +312,8 @@ module Phoenx
 					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
@@ -311,6 +327,9 @@ module Phoenx
 				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
@@ -327,8 +346,18 @@ module Phoenx
 				scheme.add_build_target(self.target, true)
 				scheme.add_test_target(@test_target)
 				
-				scheme.archive_action.build_configuration = self.target.build_configuration_list[s.archive_configuration]
-				scheme.launch_action.build_configuration = self.target.build_configuration_list[s.launch_configuration]
+				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)
 			
@@ -351,6 +380,9 @@ module Phoenx
 		
 		def build
 			
+
+			puts ">> Target ".green + @target_spec.name.bold unless @project_spec.targets.length == 1
+
 			self.add_sources
 			self.add_public_headers
 			self.add_private_headers

data/lib/phoenx/use_cases/generate_workspace.rb

@@ -37,14 +37,17 @@ module Phoenx
 				path = '.'
 			
 			end
-		
-			previous = Dir.pwd
+
+			abort "Missing project folder ".red + path.bold unless Dir.exists?(path)
 
 			Dir.chdir(path) do
 				
-				specs = Dir[name + '.' + PROJECT_EXTENSION]
+				file_name = name + '.' + PROJECT_EXTENSION
+				specs = Dir[file_name]
 				
-				puts "Processing ".green + specs.first.bold
+				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)
@@ -52,9 +55,6 @@ module Phoenx
 				generator = Phoenx::GenerateProject.new spec
 				generator.build
 			end
-			
-			# Monkey patch due to bug in Xcode 8 that prevents chdir to switch back to previous dir
-			Dir.cp_chdir previous
 		
 		end
 		

data/lib/phoenx/utilities/xcodeproj_utils.rb

@@ -12,8 +12,9 @@ module Phoenx
 	
 		files.each do |path|
 			
+			abort "Missing file ".red + path.bold unless File.exists?(path)
+
 			groups = File.dirname(path).split("/")
-			groups.delete("..")
 			concate = ""
 				
 			groups.each do |g|
@@ -48,18 +49,12 @@ module Phoenx
 	
 	end
 	
-	def Phoenx.get_absolute_path(path)
-	
-		groups = File.dirname(path).split("/")
-		groups.delete("..")
-		return groups.join("/")
-	
-	end
-	
 	def Phoenx.get_or_add_file(project,file)
 	
+		abort "Missing file ".red + path.bold unless File.exists?(file)
+
 		filename = File.basename(file)
-		dir = Phoenx.get_absolute_path(file)	
+		dir = File.dirname(file)
 		
 		group = project.main_group.find_subpath(dir, false)
 		file_ref = group.find_file_by_path(filename)
@@ -105,6 +100,8 @@ module Phoenx
 			end
 		
 		end
+
+		return nil
 	
 	end
 

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: phoenx
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Jens Meder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2017-01-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.3.2
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        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,8 +74,6 @@ 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
@@ -96,6 +94,8 @@ files:
 - 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 +106,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.5.0
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Phoenx generates Xcode projects (*.xcodeproj) and workspaces (*.xcworkspace)