teapot 0.8.2 → 0.8.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTgyNWI2ZGE5ZjMxZDliMTg5YTcyZWUwNjVhMWQ0NzQ0Yzk5ZDg0Nw==
-  data.tar.gz: !binary |-
-    ZDJjMjY0ZTg4OWI3ODBjNWU2YjJiY2U3N2M0ZDg4NWQzOTA3YzkzNQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    Yjc4NDQ1Mzg0N2EyNDllZmEzMzI2OWI5OGYzZTNiN2ExYjI2YTM3MzEwMmZk
-    MTYwZjg4ZjQxZGU4YzRhMGJjZDJlZTczNzY0YzViYWMyNzA4ZmQzMzc1OTVl
-    YjgxNTY5ZjQ2NGQwODNiNjA0MTZkZmVjYWViNzJlZWY4ZTI3ZDQ=
-  data.tar.gz: !binary |-
-    YjU4NzU4N2VhZDQxYzZkMGIyYWNmYmJlYzM2ZDJkY2UzMmZjYWRmODdlZDg3
-    N2JiYzM3Nzc3ZDkxOGFkNWUwZjg1MmQ1MzBmNDg5NWRmODMwNzZmM2Y1YmU2
-    MTZiZTY1MmEyZTFmZjgxZGUxOTgxNjY3ZjllZjBhZjRjNGJhNTQ=
+SHA1:
+  metadata.gz: 4f0ac3f8f5a835ed05d72ed5789a28617dc89672
+  data.tar.gz: 9cdbc779f23d8f16787091936845897a8ebfcaca
+SHA512:
+  metadata.gz: 763f58203bf5632541edf4cb1db726b955e7971adda43d7af17c0a816ac5dcbd8a0b5d52464c0564824c2e2550ebef04c785ac641f38bb4eb09156f3efb528d1
+  data.tar.gz: 2aa81a03e51e0d1cd0a4e028cfc610590941d4522de5b6ae549c80146719d141f3508e3afc3067c82e234f0dd95831b5292295fef42e1bcf89281566e26307d4

data/README.md

@@ -43,7 +43,7 @@ The resulting libraries will be framework dependent, but are typically located i
 
 ### Example: Compiling TaggedFormat
 
-For Linux (requires `clang` and `libc++`):
+For Linux (requires `clang-3.2` and `libstdc++-4.8`):
 
 	$ teapot create "Local Tagged Format" https://github.com/dream-framework platform-linux variants tagged-format
 	$ cd local-tagged-format

data/lib/teapot/configuration.rb

@@ -137,7 +137,9 @@ module Teapot
 			return self if @imports.count == 0
 			
 			# Before trying to materialize, we should load all possible packages:
-			@packages.each{|package| @context.load(package) rescue nil}
+			@packages.each do |package|
+				@context.load(package) rescue nil
+			end
 			
 			# Create a new configuration which will represent the materialised version:
 			configuration = self.class.new(@context, @package, @name, @packages.dup, @options.dup)
@@ -146,7 +148,7 @@ module Teapot
 			@imports.each do |import|
 				named_configuration = @context.configurations[import.name]
 				
-				if named_configuration
+				if named_configuration && named_configuration != self
 					configuration.append(named_configuration.materialize, import.options)
 				else
 					# It couldn't be resolved...

data/lib/teapot/version.rb

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

metadata

@@ -1,74 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-18 00:00:00.000000000 Z
+date: 2013-06-12 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:
@@ -140,17 +140,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.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Teapot is a tool for managing complex cross-platform builds.