phoenx 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 963226c9078e130ef2598a6c492f3be316df19e6
-  data.tar.gz: 2057ca4d0d70d4a6eb5ead440fbbb5c061ed6093
+  metadata.gz: feded64f42c998c69a907d3072b3bc79d663afe3
+  data.tar.gz: ad664cdeaa3e933fe747d8d46b8e1fdfdbce2060
 SHA512:
-  metadata.gz: 6a67de14d50e88466874f6bfe93e955a2c8ae1662690a647cab14a78c999d1ce79ab21fd769064181e8d0e35dea99d30e90c3de4cb0e43d11c79320331699c60
-  data.tar.gz: 72a7354bdbefe9cd2264d4c1cc8ae601424e4f677552a362440b2bb11ed075679bf3ac4d896c2412e39101f8bcb0df77ae8494f634ab45721b67af35541997dc
+  metadata.gz: 934d06c3ed6c0a0ed1a8d5a8b52c9d6771aaa7fecbe76085fefc3f4e860cfc7f47a46bcd7446aea7304a43782d72fa9b5d94fbf8897b334c16dd600d145904f1
+  data.tar.gz: 01dde15c9767dd129bfad8b5645520d4bd8a5958b7975fa851220cc7da50bf3d4b7a5d2256ce14c7343a2fdaaca2ae84845248bada2b9fd342f7e7bb7f582da1

data/lib/phoenx/cli/cli_factory.rb

@@ -7,193 +7,115 @@ module Phoenx
 		class Factory
 		
 			def workspace_command
-
 				command = Phoenx::Cli::Command.new "workspace", "Builds the workspace and projects" do
-	
 					command.print
 					exit
-
 				end
-
 				command.base_command = "phoenx workspace"
 				command.usage = "Initializes the workspace by generating the xcodeproj and xcworkspace files."
-
 				# Add workspace build command
-
 				build_command = Phoenx::Cli::Command.new "build", "Builds the workspace and projects" do
-
 					workspaces = Dir["*." + Phoenx::WORKSPACE_EXTENSION]
-	
 					if workspaces.count < 1
-
 						puts "Error: No workspace spec found!".red
 						exit
-
 					end
-
 					workspace = eval File.read(workspaces.first)
-	
 					if !workspace
-
 						puts "Error: No workspace spec found!".red
 						exit
-
 					end
-
 					puts "\r\nWorkspace ".green + workspace.name.bold
-		
 					generator = Phoenx::GenerateWorkspace.new workspace
 					generator.generate
-	
 					exit
-
 				end
-	
-
 				build_command.base_command = "phoenx workspace"
 				build_command.usage = "Initializes the workspace by generating the xcodeproj and xcworkspace files."
-
 				build_help_option = Phoenx::Cli::Option.new("--help", "-h","Shows this help",false) do
 					build_command.print
 					exit
 				end
-
 				build_command.add_option build_help_option
-	
 				command.add_command build_command
-	
 				return command
-
 			end
 			
 			def project_command
-
 				command = Phoenx::Cli::Command.new "project", "Builds the project" do
-	
 					command.print
 					exit
-
 				end
-
 				command.base_command = "phoenx project"
 				command.usage = "Generates the xcodeproj file from the pxproject specification."
-
 				# Add project build command
-
 				build_command = Phoenx::Cli::Command.new "build", "Builds the project" do
-
 					projects = Dir["*." + Phoenx::PROJECT_EXTENSION]
-	
 					if projects.count < 1
-
 						puts "Error: No project spec found!".red
 						exit
-
 					end
-
 					project = eval File.read(projects.first)
-	
 					if !project
-
 						puts "Error: No project spec found!".red
 						exit
-
 					end
-
 					puts "\r\nGenerating project ".green + project.project_name.bold + ".xcodeproj".bold
-		
 					generator = Phoenx::GenerateProject.new project
 					generator.build
-	
 					exit
-
 				end
-	
-
 				build_command.base_command = "phoenx project"
 				build_command.usage = "Generates the xcodeproj file."
-
 				build_help_option = Phoenx::Cli::Option.new("--help", "-h","Shows this help",false) do
 					build_command.print
 					exit
 				end
-
 				build_command.add_option build_help_option
-	
 				command.add_command build_command
-				
 				# Add project extract command
-
 				extract_command = Phoenx::Cli::Command.new "extract", "Extracts all build settings." do
-
 					projects = Dir["*.xcodeproj"]
-					
 					if projects.length < 1
-					
 						puts "No Xcode project found.".red
 						exit
-					
 					end
-					
 					project = Xcodeproj::Project::open(projects[0])
-					
 					extractor = Phoenx::ExtractBuildSettings.new project
 					extractor.extract
-	
 					exit
-
 				end
-	
-
 				extract_command.base_command = "phoenx project"
 				extract_command.usage = "Extracts all project and scheme build settings to separate xcconfig files"
-
 				extract_help_option = Phoenx::Cli::Option.new("--help", "-h","Shows this help",false) do
 					extract_command.print
 					exit
 				end
-
 				extract_command.add_option extract_help_option
-	
 				command.add_command extract_command
-	
 				return command
-
 			end
 		
 			def cli
-			
 				# Build cli
-
 				cli = Phoenx::Cli::Command.new "root", "" do |c|
-
 					c.print
-
 				end
-
 				cli.base_command = "phoenx"
-
 				# Add version and help options
-
 				version_option = Phoenx::Cli::Option.new("--version","-v","Shows version information",false) do
 					puts "phoenx version " + Phoenx::VERSION.bold
-	
 					exit
 				end
-
 				help_option = Phoenx::Cli::Option.new("--help","-h","Shows this help",false) do
 					cli.print
 					exit
 				end
-
 				cli.add_option version_option
 				cli.add_option help_option
-
 				cli.add_command self.workspace_command
 				cli.add_command self.project_command
-				
 				return cli
-			
 			end
 		
 		end

data/lib/phoenx/cli/command.rb

@@ -16,166 +16,99 @@ module Phoenx
 			@@indent = 20
 		
 			def initialize(name, description, &block)
-		
 				@name = name
 				@description = description
 				@block = block
-			
 				@options = []
 				@commands = []
-		
 			end
 		
 			def add_option(option)
-		
 				@options << option
-		
 			end
 		
 			def add_command(command)
-		
 				@commands << command
-		
 			end
 		
 			def parse(args)
-		
 				args_tmp = args.dup
-		
 				if args_tmp.empty?
-		
 					@block.call self
-				
 				else
-				
 					args_tmp.each do |arg|
-				
 						@commands.each do |command|
-				
 							if arg == command.name
-
 								args_tmp.delete(arg)
-
 								command.parse(args_tmp)
-					
 							end
-				
 						end
-				
 						@options.each do |option|
-				
 							if arg == option.name || arg == option.short_cut
-					
-								args_tmp.delete(arg)
-							
+								args_tmp.delete(arg)			
 								option.execute
-					
 							end
-				
 						end
-				
 					end
-			
 				end
-			
 				unless args_tmp.empty?
-			
 					error = "Unknown arguments: "
-				
 					args_tmp.each do |arg|
-				
 						error += arg + " "
-				
 					end
-				
 					puts error
-				
 					print
-				
 					exit
-			
 				end
-		
 			end
 		
 			def print
-		
 				puts
 				puts "Usage".underline
 				puts
 				cmd = "     $ ".bold + base_command
-			 
 				unless @commands.empty?
-			
 					cmd += " " + "[command]".green.bold
-			
 				end
-			
 				unless @options.empty?
-			
 					cmd += " [options]".blue.bold
-			
 				end
-			
 				puts cmd
-			
 				unless @usage.nil?
-			
 					puts 
 					puts "     " + @usage
-			
 				end
-			
-			
 				if !@commands.empty?
-			
 					puts
 					puts "Commands".underline
 					puts
-			
 					@commands.each do |command|
-			
 						puts "     ".green + command.name.green.bold + whitespace(command.name) + command.description	
-			
 					end
-			
 				end
-			
 				if !@options.empty?
-			
 					puts
 					puts "Options".underline
 					puts
-			
 					@options.each do |option|
-			
 						output = option.name + ", " + option.short_cut
 						puts "     " + output.bold.blue + whitespace(output) + option.description	
-			
 					end
 				end
-			
 				puts
-		
 			end
 		
 			private
 		
 			def whitespace(message)
-		
 				count = @@indent - message.length
 				i = 0
 				result = ""
-			
 				until count == i do
-			
 					result << " "
 					i += 1
-
 				end
-			
 				return result
-		
 			end
 	
 		end

data/lib/phoenx/cli/option.rb

@@ -12,19 +12,15 @@ module Phoenx
 			@block
 		
 			def initialize(name, short_cut, description, has_argument, &block)
-		
 				@name = name
 				@short_cut = short_cut
 				@description = description
 				@has_argument = has_argument
-				@block = block
-			
+				@block = block	
 			end
 		
 			def execute
-		
 				@block.call
-		
 			end
 	
 		end

data/lib/phoenx/entities/configuration.rb

@@ -1,15 +1,12 @@
 module Phoenx
 
 	class Configuration
-	
 		attr_accessor :parent
 		attr_accessor :name
 		
 		def initialize(name, parent)
-		
 			@name = name
 			@parent = parent
-		
 		end
 	
 	end

data/lib/phoenx/entities/dependency.rb

@@ -1,17 +1,14 @@
 module Phoenx
 
 	class Dependency
-	
 		attr_accessor :target_name
 		attr_accessor :path
 		attr_accessor :embed
 	
 		def initialize(target_name, embed = true, path = nil)
-		
 			@target_name = target_name
 			@path = path
 			@embed = embed
-		
 		end
 	
 	end

data/lib/phoenx/entities/project.rb

@@ -1,10 +1,8 @@
 module Phoenx
 	
 	class Project
-
 		attr_reader :configurations
 		attr_reader :config_files
-		
 		attr_accessor :pre_install_scripts
 		attr_accessor :post_install_scripts
 		attr_accessor :project_name
@@ -14,7 +12,6 @@ module Phoenx
 		attr_accessor :deterministic_project
 
 		def initialize
-	
 			@configurations = []
 			@config_files = {}
 			@targets = []
@@ -23,27 +20,19 @@ module Phoenx
 			@support_files = []
 			@excluded_support_files = []
 			@deterministic_project = false
-			
 			yield self
-	
 		end
 		
 		def configuration(name, parent)
-		
 			@configurations << Configuration.new(name, parent)
-		
 		end
 		
 		def target(name, type, platform, version, &block)
-
 			targets << Phoenx::TestableTarget.new(name, type, platform, version, &block)
-		
 		end
 		
 		def project_file_name
-		
 			return @project_name + "." + XCODE_PROJECT_EXTENSION
-		
 		end
 	
 	end