teapot 0.7.0 → 0.7.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWYwMzJlZTQ2ZGEzODQ4ODAwMzY1YWNlMDg2OWI0Mzg2MzFmODlhYQ==
+    NjhkODU0M2VmNzc4OWQwMGQzNGYyZTU4MzM0NTBjMWU1MTMxYmRjNg==
   data.tar.gz: !binary |-
-    ODk0NTJjMjllMDEzNWFmOWFmMGFlOWUyMjFhMjA0YTllYmQ2NGUzMg==
+    MmFiZDE4M2VlNGJkNzgyYWY4MDk4ZDI1YjMzNmJlNjZhZDJjY2Q5Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2NhNTdkYzgzZTRkZTFjZmFiNGZiMjVlNzkzZDc0ZTYwZThmMzQ3OGJiMjAy
-    NWE3MGNlZjM3NTJjYmY5M2RmYjMxZGRhYzYxMWY4ZDgyYjA0ZGE4M2ExYTJl
-    NTkxODQyNGU1NDk3NWRmMDkzODQ4Y2I1YTljNTIxNWNmYTdjOGM=
+    Y2ExNjk4YzUwM2UyM2QxYTYyOWIzZWQ2OTVlOGQyYWU0NTk4MTU3MWNlMDQ4
+    NTczNDgyZTA5YjdmNTljYTQ0MTM4ZTRmMzA1NjAyMzVjY2IzZWRmNGEyODVj
+    MmE3ZjU5ZjAyZDVmNWQwMjc0MmNkNWQzMjE4NzAwODg1NGZlZWY=
   data.tar.gz: !binary |-
-    NzBmODAzNjJiYjgzYjk2ZWI3OTc2NGJjZjY0YTM3MDk0NWFiYjI1OTA2ZjE4
-    NWExMGY0ZjAyZjNmZjMwMmZlMjIwMjU5ZDViNjU2N2M0OTkzN2RjMDUwMGNi
-    ODIyMWY5ZGYxMTczZTBlMzEyZDM0MTRlY2FjNWU4YTFmZWUxZTg=
+    ZjRlOTE3MmIxOGYxY2ZiZmI0MTg1N2RjZWRjODM5MzRmMGM2MzMyN2YwZDk5
+    MzYwM2E1YWQ2NjY0ZDg3YjY2MmYxYjEyMDNlNTFiNDkwNjVjMTY0OTQxOTcx
+    ZTRlYmE1ZmVjYzFjNmMxZWRkMjFlMzhjNjg1ZDAyZDE3MGYwN2I=

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+dream-framework

data/README.md

@@ -21,9 +21,11 @@ Teapot doesn't have a centralised package management system. As such, this examp
 
 Firstly, create your project by running:
 
-	$ teapot init "My Project" https://github.com/dream-framework project
+	$ teapot create "My Project" https://github.com/dream-framework project
 	$ cd my-project
 
+You will be asked to merge the project file. At present, merge tools are not very good and thus you may need to take a moment to review the changes. You want to keep most of the original file, but you would like to add the `define_target` blocks which are being added.
+
 In the resulting project directory that has been created, you can see the list of dependencies:
 
 	$ teapot list
@@ -39,6 +41,22 @@ The resulting libraries will be framework dependent, but are typically located i
 	$ cd teapot/$PROJECT_NAME/platforms/$PLATFORM_NAME/bin/
 	$ ./$PROJECT_NAME
 
+### Example: Compiling TaggedFormat
+
+For Linux (requires `clang` and `libc++`):
+
+	$ teapot create "Local Tagged Format" https://github.com/dream-framework platform-linux variants tagged-format
+	$ cd local-tagged-format
+	$ teapot build Library/TaggedFormat variant-debug
+
+For Mac OS X (requires Xcode Command Line Tools):
+	
+	$ teapot create "Local Tagged Format" https://github.com/dream-framework platform-darwin-osx variants tagged-format
+	$ cd local-tagged-format
+	$ teapot build Library/TaggedFormat variant-debug
+
+You need to make sure any basic tools, e.g. compilers, system libraries, are installed correctly before building. Consult the platform and library documentation for any dependencies.
+
 ## Contributing
 
 1. Fork it

data/bin/teapot

@@ -82,14 +82,12 @@ module Application
 			Teapot::Commands.run("git", "init")
 		end
 		
-		controller = make_controller(root)
-	
-		controller.create(project_name, source, packages)
-		controller.generate('project', [project_name])
+		make_controller(root).create(project_name, source, packages)
 	end
 	
 	def self.generate(arguments = ARGV)
-		make_controller.generate(arguments)
+		generator_name = arguments.shift
+		make_controller.generate(generator_name, arguments)
 	end
 end
 

data/lib/teapot/controller/create.rb

@@ -46,7 +46,21 @@ module Teapot
 				output.puts "end"
 			end
 
+			# Fetch all packages:
 			fetch
+
+			# Generate the default project if it is possible to do so:
+			generate_project(project_name)
+		end
+		
+		private
+		
+		def generate_project(project_name)
+			context, configuration = load_teapot
+
+			if context.generators.key? 'project'
+				generate('project', [project_name])
+			end
 		end
 	end
 end

data/lib/teapot/generator.rb

@@ -19,6 +19,8 @@
 # THE SOFTWARE.
 
 require 'teapot/definition'
+require 'teapot/substitutions'
+
 require 'tempfile'
 
 module Teapot
@@ -40,10 +42,13 @@ module Teapot
 		def substitute(text, substitutions)
 			return text unless substitutions
 			
-			# Use positive look behind so that the pattern is just the substitution key:
-			pattern = Regexp.new(substitutions.keys.map{|x| Regexp.escape(x)}.join('|'))
+			if Hash === substitutions
+				pattern = Regexp.new(substitutions.keys.map{|x| Regexp.escape(x)}.join('|'))
 			
-			text.gsub(pattern) {|key| substitutions[key]}
+				text.gsub(pattern) {|key| substitutions[key]}
+			else
+				substitutions.call(text)
+			end
 		end
 		
 		def write(source, destination, substitutions = nil, mode = "a")

data/lib/teapot/name.rb

@@ -33,5 +33,9 @@ module Teapot
 		def target
 			@target ||= @text.gsub(/\s+/, '-').downcase
 		end
+		
+		def macro
+			@guard ||= @text.upcase.gsub(/\s+/, '_')
+		end
 	end
 end

data/lib/teapot/package.rb

@@ -65,8 +65,12 @@ module Teapot
 			@options.key? :source
 		end
 
+		def source
+			@options[:source].to_s + '/'
+		end
+
 		def external_url(relative_root)
-			base_uri = URI(@options[:source].to_s)
+			base_uri = URI(source)
 
 			if base_uri.scheme == nil || base_uri.scheme == 'file'
 				base_uri = URI "file://" + File.expand_path(base_uri.path, relative_root) + "/"

data/lib/teapot/substitutions.rb

@@ -0,0 +1,202 @@
+# 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
+	class Indentation
+		def initialize(prefix, level, indent)
+			@prefix = prefix
+			@level = level
+			@indent = indent
+		end
+
+		def indentation
+			@indentation ||= @prefix + (@indent * @level)
+		end
+
+		def + other
+			indentation + other
+		end
+
+		def << text
+			text.gsub(/^/){|m| m + indentation}
+		end
+
+		def by(depth)
+			Indentation.new(@prefix, @level + depth, @indent)
+		end
+		
+		def with_prefix(prefix)
+			Indentation.new(prefix, @level, @indent)
+		end
+		
+		def self.none
+			self.new('', 0, "\t")
+		end
+	end
+	
+	class Substitutions
+		def initialize
+			@ordered = []
+		end
+		
+		def []= keyword, value
+			if Array === value
+				open, close = *value.each_slice(value.length / 2)
+				@ordered << NestedSubstitution.new(keyword, open, close)
+			else
+				@ordered << SymbolicSubstitution.new('$' + keyword, value.to_s)
+			end
+		end
+
+		def << substitution
+			@ordered << substition
+		end
+
+		attr :ordered
+
+		def call(text)
+			apply(text)
+		end
+
+		def apply(text)
+			return text unless @ordered.count
+			
+			grouped = [[@ordered.first]]
+			
+			@ordered.drop(1).each do |substitution|
+				if grouped.last[0].class == substitution.class
+					grouped.last << substitution
+				else
+					grouped << [substitution]
+				end
+			end
+			
+			grouped.each do |group|
+				text = group.first.class.apply(text, group)
+			end
+			
+			return text
+		end
+		
+		class SymbolicSubstitution
+			def initialize(keyword, value)
+				@keyword = keyword
+				@value = value
+			end
+
+			attr :keyword
+			attr :value
+
+			def apply(text)
+				text.gsub(@keyword, @value)
+			end
+
+			def self.apply(text, group)
+				substitutions = Hash[group.collect{|substitution| [substitution.keyword, substitution.value]}]
+
+				pattern = Regexp.new(substitutions.keys.map{|key| Regexp.escape(key)}.join('|'))
+
+				text.gsub(pattern) {|key| substitutions[key]}
+			end
+		end
+
+		class NestedSubstitution
+			def initialize(keyword, open, close, indent = "\t")
+				@keyword = keyword
+
+				@open = open
+				@close = close
+
+				@indent = indent
+			end
+
+			def line_pattern(prefix = '')
+				tag_pattern = Regexp.escape('<' + prefix + @keyword + '>')
+				
+				# Line matching pattern:
+				Regexp.new('^(.*?)' + tag_pattern + '(.*)$', Regexp::MULTILINE | Regexp::EXTENDED)
+			end
+
+			def write_open(prefix, postfix, output, indentation)
+				depth = @open.size
+				indentation = indentation.with_prefix(prefix)
+
+				#output.write(prefix)
+				(0...depth).each do |i|
+					chunk = @open[i]
+					chunk.chomp! if i == depth-1
+					
+					output.write(indentation.by(i) << chunk)
+				end
+				output.write(postfix)
+			end
+
+			def write_close(prefix, postfix, output, indentation)
+				depth = @close.size
+				indentation = indentation.with_prefix(prefix)
+
+				#output.write(prefix)
+				(0...depth).reverse_each do |i|
+					chunk = @close[-1 - i]
+					chunk.chomp! if i == 0
+					
+					output.write(indentation.by(i) << chunk)
+				end
+				output.write(postfix)
+			end
+
+			def apply(text, level = 0)
+				open_pattern = line_pattern
+				close_pattern = line_pattern('/')
+
+				lines = text.each_line
+				output = StringIO.new
+
+				indent = lambda do |level, indentation|
+					while line = lines.next rescue nil
+						if line =~ open_pattern
+							write_open($1, $2, output, indentation)
+
+							indent[level + @open.count, indentation.by(@open.count)]
+
+							write_close($1, $2, output, indentation)
+						elsif line =~ close_pattern
+							break
+						else
+							output.write(indentation + line)
+						end
+					end
+				end
+
+				indent[0, Indentation.none]
+
+				return output.string
+			end
+
+			def self.apply(text, group)
+				group.each do |substitution|
+					text = substitution.apply(text)
+				end
+				
+				return text
+			end
+		end
+	end
+end

data/lib/teapot/version.rb

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

data/test/test_substitutions.rb

@@ -0,0 +1,67 @@
+# Copyright, 2012, 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 'pathname'
+require 'test/unit'
+require 'stringio'
+
+require 'teapot/substitutions'
+
+class TestSubstitutions < Test::Unit::TestCase
+	def test_symobolic_substitutions
+		input = <<-EOF
+		$FOO $BAR
+		EOF
+		
+		output = <<-EOF
+		baz bar
+		EOF
+		
+		substitutions = Teapot::Substitutions.new
+		substitutions['FOO'] = 'baz'
+		substitutions['BAR'] = 'bar'
+		
+		assert_equal output, substitutions.apply(input)
+	end
+	
+	def test_nested_substitutions
+		input = <<-EOF
+		<FOO>
+		$BAR
+		</FOO>
+		EOF
+		
+		output = <<-EOF
+		enter
+		{
+			foo
+				Hello World
+			bar
+		}
+		exit
+		EOF
+		
+		substitutions = Teapot::Substitutions.new
+		substitutions['FOO'] = ["enter\n{\n", "foo\n", "bar\n", "}\nexit\n"]
+		substitutions['BAR'] = 'Hello World'
+		
+		assert_equal output, substitutions.apply(input)
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -117,12 +117,14 @@ files:
 - lib/teapot/loader.rb
 - lib/teapot/name.rb
 - lib/teapot/package.rb
+- lib/teapot/substitutions.rb
 - lib/teapot/target.rb
 - lib/teapot/version.rb
 - teapot.gemspec
 - test/teapot.rb
 - test/test_dependency.rb
 - test/test_environment.rb
+- test/test_substitutions.rb
 - test/test_teapot.rb
 homepage: ''
 licenses: []
@@ -151,4 +153,5 @@ test_files:
 - test/teapot.rb
 - test/test_dependency.rb
 - test/test_environment.rb
+- test/test_substitutions.rb
 - test/test_teapot.rb