teapot 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 4f0ac3f8f5a835ed05d72ed5789a28617dc89672
-  data.tar.gz: 9cdbc779f23d8f16787091936845897a8ebfcaca
-SHA512:
-  metadata.gz: 763f58203bf5632541edf4cb1db726b955e7971adda43d7af17c0a816ac5dcbd8a0b5d52464c0564824c2e2550ebef04c785ac641f38bb4eb09156f3efb528d1
-  data.tar.gz: 2aa81a03e51e0d1cd0a4e028cfc610590941d4522de5b6ae549c80146719d141f3508e3afc3067c82e234f0dd95831b5292295fef42e1bcf89281566e26307d4
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTIzOGRjMDQzOGJmOTZmZmE0ODQ0NWU4MzA2YTNiMTJhYWU0YWI4Yg==
+  data.tar.gz: !binary |-
+    NTc4YWMzMjdjNjE4M2I0MWUxMmQxYjBhN2NlMmZiMTgwY2NkYThkNQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NTMxYzQ2Mzg3ODAzOTNiYjBhMDkzOTllOGM1NGE3YjUyNDczMzhkNGNlZWIz
+    MDJhMzUyMDlmNWFhOGM1YzQ3YzBjMDNmNDlhYzVkYjdlNjliOWQ4MzFlZTM5
+    MDY0M2UwMmQzNDI5MmNkOWE0MWZiMjhlNTJiZTE3MTE3ZTkyMjE=
+  data.tar.gz: !binary |-
+    OTIxOTIzNWVmZWVhZjMxZDU3OWZlYjk3NzZmOTgwNWE4YzkyYzUyOGNjMGNi
+    ZDIxNWFkYTAwYzQ1ZWZlYzdmY2I2MzU2M2RlMGU4ZDM2OGRhNmNkMWNjM2Rm
+    ODlkYzFiOWJhYjE4ZTEwOTliYTQwOTRhNjE3NDRlMzY0NjI5Mzg=

data/lib/teapot/commands.rb

@@ -25,6 +25,16 @@ require 'facter'
 
 module Teapot
 	module Commands
+		module Helpers
+			def run_executable(path, environment)
+				environment = environment.flatten
+		
+				executable = environment[:install_prefix] + path
+		
+				Commands.run(executable)
+			end
+		end
+		
 		def self.processor_count
 			# Get the number of virtual/physical processors
 			count = Facter.processorcount.to_i rescue 1
@@ -43,6 +53,9 @@ module Teapot
 		def self.run(*args)
 			args = args.flatten.collect &:to_s
 			
+			# Ensure we aren't invoking the shell
+			args[0] = [args[0], args[0]]
+			
 			puts args.join(' ').color(:blue)
 			
 			if system(*args)

data/lib/teapot/context.rb

@@ -45,6 +45,7 @@ module Teapot
 			@targets = {}
 			@generators = {}
 			@configurations = {}
+			@projects = {}
 
 			@dependencies = []
 			@selection = Set.new
@@ -72,6 +73,7 @@ module Teapot
 
 		attr :targets
 		attr :generators
+		attr :projects
 
 		# All public configurations.
 		attr :configurations
@@ -79,6 +81,9 @@ module Teapot
 		# The context's primary configuration.
 		attr :configuration
 
+		# The context's primary project.
+		attr :project
+
 		attr :dependencies
 		attr :selection
 
@@ -128,6 +133,12 @@ module Teapot
 
 					@configurations[definition.name] = definition
 				end
+			when Project
+				AlreadyDefinedError.check(definition, @projects)
+
+				@project ||= definition
+
+				@projects[definition.name] = definition
 			end
 		end
 

data/lib/teapot/controller/list.rb

@@ -38,6 +38,16 @@ module Teapot
 						end if definition.description
 				
 						case definition
+						when Project
+							log "\t\t- Summary: #{definition.summary}" if definition.summary
+							log "\t\t- License: #{definition.license}" if definition.license
+							log "\t\t- Website: #{definition.website}" if definition.website
+							log "\t\t- Version: #{definition.version}" if definition.version
+							
+							definition.authors.each do |author|
+								contact_text = [author.email, author.website].compact.collect{|text|" <#{text}>"}.join
+								log "\t\t- Author: #{author.name}" + contact_text
+							end
 						when Target
 							definition.dependencies.each do |name|
 								log "\t\t- depends on #{name.inspect}".color(:red)

data/lib/teapot/generator.rb

@@ -1,15 +1,15 @@
 # Copyright, 2013, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -20,14 +20,18 @@
 
 require 'teapot/definition'
 require 'teapot/substitutions'
+require 'teapot/merge'
 
 require 'tempfile'
 
 module Teapot
+	class GeneratorError < StandardError
+	end
+	
 	class Generator < Definition
 		def initialize(context, package, name)
 			super context, package, name
-			
+
 			@generate = nil
 		end
 
@@ -38,56 +42,52 @@ module Teapot
 		def generate!(*args)
 			@generate[*args]
 		end
-		
+
 		def substitute(text, substitutions)
 			return text unless substitutions
-			
+
 			if Hash === substitutions
 				pattern = Regexp.new(substitutions.keys.map{|x| Regexp.escape(x)}.join('|'))
-			
+
 				text.gsub(pattern) {|key| substitutions[key]}
 			else
 				substitutions.call(text)
 			end
 		end
-		
+
 		def write(source, destination, substitutions = nil, mode = "a")
 			source_path = Pathname(path) + source
 			destination_path = Pathname(context.root) + destination
-			
+
 			destination_path.dirname.mkpath
-			
+
 			File.open(destination_path, mode) do |file|
 				text = File.read(source_path)
-				
+
 				file.write substitute(text, substitutions)
 			end
 		end
-		
+
 		def append(source, destination, substitutions = nil)
 			write(source, destination, substitutions, "a")
 		end
-		
+
 		def merge(source, destination, substitutions = nil)
 			source_path = Pathname(path) + source
 			destination_path = Pathname(context.root) + destination
-			
+
 			if destination_path.exist?
 				temporary_file = Tempfile.new(destination_path.basename.to_s)
-				
+
 				# This functionality works, but needs improvements.
 				begin
 					# Need to ask user what to do?
 					write(source_path, temporary_file.path, substitutions, "w")
-					
-					if temporary_file.read != destination_path.read
-						if `which opendiff`.chomp != ''
-							system("opendiff", "-merge", destination_path.to_s, destination_path.to_s, temporary_file.path)
-						elsif `which sdiff`.chomp != ''
-							system("sdiff", "-o", destination_path.to_s, destination_path.to_s, temporary_file.path)
-						else
-							abort "Can't find diff/merge tools. Please install sdiff!"
-						end
+
+					result = Merge::combine(destination.readlines, temporary_file.readlines)
+
+					destination.open("w") do |file|
+						file.write result.join
 					end
 				ensure
 					temporary_file.unlink
@@ -96,13 +96,13 @@ module Teapot
 				write(source_path, destination_path, substitutions, "w")
 			end
 		end
-		
+
 		def copy(source, destination, substitutions = nil)
 			source_path = Pathname(path) + source
-			
+
 			if source_path.directory?
 				destination_path = Pathname(context.root) + destination
-				
+
 				source_path.children(false).each do |child_path|
 					copy(source_path + child_path, destination_path + substitute(child_path.to_s, substitutions), substitutions)
 				end

data/lib/teapot/loader.rb

@@ -18,6 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'teapot/project'
 require 'teapot/target'
 require 'teapot/generator'
 require 'teapot/configuration'
@@ -26,7 +27,7 @@ require 'teapot/name'
 require 'teapot/build'
 
 module Teapot
-	LOADER_VERSION = "0.8"
+	LOADER_VERSION = "0.9"
 	MINIMUM_LOADER_VERSION = "0.8"
 	
 	class IncompatibleTeapotError < StandardError
@@ -55,6 +56,9 @@ module Teapot
 		# Provides build_directory and build_external methods
 		include Build::Helpers
 		
+		# Provides run_executable and other related methods.
+		include Commands::Helpers
+		
 		def initialize(context, package)
 			@context = context
 			@package = package
@@ -80,6 +84,14 @@ module Teapot
 
 		alias required_version teapot_version
 
+		def define_project(*args)
+			project = Project.new(@context, @package, *args)
+			
+			yield project
+			
+			@defined << project
+		end
+
 		def define_target(*args)
 			target = Target.new(@context, @package, *args)
 
@@ -99,10 +111,10 @@ module Teapot
 		def define_configuration(*args)
 			configuration = Configuration.new(@context, @package, *args)
 
-			yield configuration
-
 			configuration.top!
 
+			yield configuration
+
 			@defined << configuration
 		end
 

data/lib/teapot/merge.rb

@@ -0,0 +1,142 @@
+#!/usr/bin/env ruby
+# Copyright, 2013, by Samuel G. D. Williams. <http://www.codeotaku.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module Teapot
+	module Merge
+		Difference = Struct.new(:type, :value)
+		
+		def self.combine(old_text, new_text)
+			lcs = lcs(old_text, new_text)
+			changes = []
+			
+			n = 0; o = 0; l = 0
+			while o < old_text.size and n < new_text.size and l < lcs.size
+				if !similar(old_text[o], lcs[l])
+					changes << Difference.new(:old, old_text[o])
+					o+=1
+				elsif !similar(new_text[n], lcs[l])
+					changes << Difference.new(:new, new_text[n])
+					n+=1
+				else
+					changes << Difference.new(:both, lcs[l])
+					o+=1; n+=1; l+=1
+				end
+			end
+
+			changes.map do |change|
+				change.value
+			end
+		end
+
+		# This code is based directly on the Text gem implementation
+		# Returns a value representing the "cost" of transforming str1 into str2
+		def self.levenshtein_distance(s, t)
+			n = s.length
+			m = t.length
+
+			return m if n == 0
+			return n if m == 0
+
+			d = (0..m).to_a
+			x = nil
+
+			n.times do |i|
+				e = i+1
+
+				m.times do |j|
+					cost = (s[i] == t[j]) ? 0 : 1
+					x = [
+						d[j+1] + 1, # insertion
+						e + 1,      # deletion
+						d[j] + cost # substitution
+					].min
+					d[j] = e
+					e = x
+				end
+
+				d[m] = x
+			end
+
+			return x
+		end
+
+		# Calculate the similarity of two sequences, return true if they are with factor% similarity.
+		def self.similar(s, t, factor = 0.15)
+			return true if s == t
+			
+			distance = levenshtein_distance(s, t)
+			average_length = (s.length + t.length) / 2.0
+
+			proximity = (distance.to_f / average_length)
+			
+			return proximity <= factor
+		end
+
+		LCSNode = Struct.new(:value, :previous)
+		
+		# Find the Longest Common Subsequence in the given sequences x, y.
+		def self.lcs(x, y)
+			# Create the lcs matrix:
+			m = Array.new(x.length + 1) do
+				Array.new(y.length + 1) do
+					LCSNode.new(nil, nil)
+				end
+			end
+
+			# LCS(i, 0) and LCS(0, j) are always 0:
+			for i in 0..x.length do m[i][0].value = 0 end
+			for j in 0..y.length do m[0][j].value = 0 end
+
+			# Main algorithm, solve row by row:
+			for i in 1..x.length do
+				for j in 1..y.length do
+					if similar(x[i-1], y[j-1])
+						# Value is based on maximizing the length of the matched strings:
+						m[i][j].value = m[i-1][j-1].value + (x[i-1].chomp.length + y[j-1].chomp.length) / 2.0
+						m[i][j].previous = [-1, -1]
+					else
+						if m[i-1][j].value >= m[i][j-1].value
+							m[i][j].value = m[i-1][j].value
+							m[i][j].previous = [-1, 0]
+						else
+							m[i][j].value = m[i][j-1].value
+							m[i][j].previous = [0, -1]
+						end
+					end
+				end
+			end
+
+			# Get the solution by following the path backwards from m[x.length][y.length]
+			lcs = []
+			
+			i = x.length; j = y.length
+			until m[i][j].previous == nil do
+				if m[i][j].previous == [-1, -1]
+					lcs << x[i-1]
+				end
+				
+				i, j = i + m[i][j].previous[0], j + m[i][j].previous[1]
+			end
+
+			return lcs.reverse!
+		end
+	end
+end

data/lib/teapot/name.rb

@@ -34,8 +34,8 @@ module Teapot
 			@target ||= @text.gsub(/\s+/, '-').downcase
 		end
 		
-		def macro
-			@guard ||= @text.upcase.gsub(/\s+/, '_')
+		def macro(prefix = [])
+			(Array(prefix) + [@text]).collect{|name| name.upcase.gsub(/\s+/, '_')}.join('_')
 		end
 	end
 end

data/lib/teapot/project.rb

@@ -0,0 +1,45 @@
+# Copyright, 2013, by Samuel G. D. Williams. <http://www.codeotaku.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'teapot/definition'
+
+module Teapot
+	class Project < Definition
+		Author = Struct.new(:name, :email, :website)
+		
+		def initialize(context, package, name)
+			super context, package, name
+			
+			@version = "0.0.0"
+			@authors = []
+		end
+		
+		attr :summary, true
+		attr :license, true
+		attr :website, true
+		attr :version, true
+		
+		attr :authors
+		
+		def add_author name, options
+			@authors << Author.new(name, options[:email], options[:website])
+		end
+	end
+end

data/lib/teapot/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Teapot
-	VERSION = "0.8.3"
+	VERSION = "0.9.0"
 end

metadata

@@ -1,74 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rexec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: facter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: "\tTeapot is a tool for managing complex cross-platform builds. It provides\n\tadvanced
-  dependency management via the Teapot file and is supported by\n\tthe infusions ecosystem
-  of packages and platform tooling.\n"
+description: ! "\tTeapot is a tool for managing complex cross-platform builds. It
+  provides\n\tadvanced dependency management via the Teapot file and is supported
+  by\n\tthe infusions ecosystem of packages and platform tooling.\n"
 email:
 - samuel.williams@oriontransfer.co.nz
 executables:
@@ -120,8 +120,10 @@ files:
 - lib/teapot/generator.rb
 - lib/teapot/graph.rb
 - lib/teapot/loader.rb
+- lib/teapot/merge.rb
 - lib/teapot/name.rb
 - lib/teapot/package.rb
+- lib/teapot/project.rb
 - lib/teapot/substitutions.rb
 - lib/teapot/target.rb
 - lib/teapot/version.rb
@@ -140,17 +142,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Teapot is a tool for managing complex cross-platform builds.