build-environment 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a75067001af37e60e254e389552e45fab4838436
-  data.tar.gz: 32da29ef60963f838c72847c18ce393f36a1b088
+  metadata.gz: fe7aa5350c0a0b7f20173f1b606a53612cc8c0eb
+  data.tar.gz: 6927c6e07f7c74356c4169c11421a6e274caad10
 SHA512:
-  metadata.gz: 32e81d1ac024530c33deeab102b52b8743f0c98020e08f8652c2d2428acdec97a9eb8847d9386bca9fa5730d870117b2c2de4c58c492b82417ca111775282f08
-  data.tar.gz: aa38cf0cb47d7a114e3ac9e1a347675d1c33fd610b631f245b74794f25926b8eccefea3f2e534975c793545abc645cd7326f22de827954354d1e3598049e7af2
+  metadata.gz: 3ad78c5d5e9fcd2af1aa9387dea06caec6841d83cd2c57ea88969ec30990952e07ae7b82acc59f8514ea0154a243eee86d0a8dd132272d93349047042b18f1fa
+  data.tar.gz: 4525981ee5c236120037de512f1a32cf4a439d105b452cc190a225acd45068b84460db6a703143808edf15276cf49d8f7fe2b2d95310b5f949d80dea77c3530f

data/.rspec

@@ -0,0 +1,4 @@
+--color
+--format documentation
+--backtrace
+--warnings

data/build-environment.gemspec

@@ -17,8 +17,7 @@ Gem::Specification.new do |spec|
 	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 	spec.require_paths = ["lib"]
 
-	spec.add_development_dependency "bundler", "~> 1.6"
+	spec.add_development_dependency "bundler", "~> 1.3"
+	spec.add_development_dependency "rspec", "~> 3.4.0"
 	spec.add_development_dependency "rake"
-	
-	spec.add_development_dependency "rspec", "~> 3.1.0"
 end

data/lib/build/environment/base.rb

@@ -30,6 +30,13 @@ module Build
 			end
 		end
 		
+		def freeze
+			@values.freeze
+			@parent.freeze
+			
+			super
+		end
+		
 		def self.hash(**values)
 			self.new(nil, values)
 		end
@@ -63,8 +70,16 @@ module Build
 			@values[key] = value
 		end
 		
+		def inspect
+			"#<#{self.class} #{self.to_s}>"
+		end
+		
 		def to_s
-			"<#{self.class} #{self.values}>"
+			if @parent
+				"#{@parent}->#{@values}"
+			else
+				@values.to_s
+			end
 		end
 	end
 end

data/lib/build/environment/constructor.rb

@@ -23,17 +23,13 @@ module Build
 		Default = Struct.new(:value)
 		Replace = Struct.new(:value)
 		
-		class Define
+		class Define < Struct.new(:klass, :block)
 			def initialize(klass, &block)
-				@klass = klass
-				@block = block
+				super klass, block
 			end
 			
-			attr :klass
-			attr :block
-			
 			def to_s
-				"<#{@klass.name} #{@block.source_location.join(':')}>"
+				"#<#{@klass.name} #{@block.source_location.join(':')}>"
 			end
 		end
 		
@@ -103,10 +99,7 @@ module Build
 		end
 		
 		def merge(&block)
-			self.class.combine(
-				self,
-				self.class.new(&block)
-			)
+			self.class.new(self, &block)
 		end
 		
 		# Convert the hierarchy of environments to an array where the parent comes before the child.

data/lib/build/environment/flatten.rb

@@ -55,10 +55,7 @@ module Build
 			@parent.inspect(output, indent + "\t") if @parent
 		end
 		
-		# This should be stable within environments that produce the same results.
-		def checksum
-			digester = Digest::MD5.new
-			
+		def checksum(digester: Digest::MD5.new)
 			checksum_recursively(digester)
 			
 			return digester.hexdigest
@@ -66,10 +63,14 @@ module Build
 		
 		protected
 		
+		def sorted_keys
+			@values.keys.sort
+		end
+		
 		def checksum_recursively(digester)
-			@values.each do |(key, value)|
+			sorted_keys.each do |key|
 				digester.update(key.to_s)
-				digester.update(value.to_s)
+				digester.update(@values[key].to_s)
 			end
 			
 			@parent.checksum_recursively(digester) if @parent

data/lib/build/environment/system.rb

@@ -62,7 +62,7 @@ module Build
 		
 		# Construct an environment from a given system environment:
 		def self.system_environment(env = ENV)
-			self.new(Hash[env.map{|key, value| [key.downcase.to_sym, value]}])
+			self.new(nil, Hash[env.map{|key, value| [key.downcase.to_sym, value]}])
 		end
 		
 		# Make a hash appropriate for a process environment

data/lib/build/environment/version.rb

@@ -1,5 +1,5 @@
 module Build
 	class Environment
-		VERSION = "1.1.0"
+		VERSION = "1.1.1"
 	end
 end

data/spec/build/environment/checksum_spec.rb

@@ -0,0 +1,37 @@
+# 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 'build/environment'
+
+module Build::ChecksumSpec
+	describe "Build::Environment#checksum" do
+		it "should compute a checksum" do
+			e = Build::Environment.hash(a: 10, b: 20)
+			
+			expect(e.checksum).to be == "0e29e95023819e0ecd2850edece5851a"
+		end
+		
+		it "should compute same checksum when keys are in different order" do
+			e = Build::Environment.hash(b: 20, a: 10)
+			
+			expect(e.checksum).to be == "0e29e95023819e0ecd2850edece5851a"
+		end
+	end
+end

data/spec/build/environment/freeze_spec.rb

@@ -0,0 +1,56 @@
+#!/usr/bin/env rspec
+#
+# Copyright, 2015, 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 'build/environment'
+
+module Build::Environment::FreezeSpec
+	describe "Build::Environment#freeze" do
+		it "should not be frozen by default" do
+			a = Build::Environment.new
+			b = a.merge
+			
+			expect(a.frozen?).to be_falsey
+			expect(b.frozen?).to be_falsey
+			expect(b.parent).to be a
+		end
+		
+		it "should freeze an environment and it's parent" do
+			a = Build::Environment.new
+			b = a.merge
+			
+			b.freeze
+			
+			expect(a.frozen?).to be_truthy
+			expect(b.frozen?).to be_truthy
+		end
+		
+		it "should only be partially frozen" do
+			a = Build::Environment.new
+			b = a.merge
+			
+			a.freeze
+			
+			expect(a.frozen?).to be_truthy
+			expect(b.frozen?).to be_falsey
+		end
+	end
+end

data/spec/build/environment/system_spec.rb

@@ -49,5 +49,14 @@ module Build::Environment::SystemSpec
 			expect(exported.size).to be == 1
 			expect(exported).to_not include('COMPILE.FOO')
 		end
+		
+		it "shold load current ENV" do
+			ENV['TEST_KEY'] = 'test-value'
+			
+			e = Build::Environment::system_environment
+			
+			expect(e.values).to include(:path, :user, :home)
+			expect(e[:test_key]).to be == 'test-value'
+		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-environment
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2016-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
 description: 
 email:
 - samuel.williams@oriontransfer.co.nz
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".simplecov"
 - ".travis.yml"
 - Gemfile
@@ -73,7 +74,9 @@ files:
 - lib/build/environment/flatten.rb
 - lib/build/environment/system.rb
 - lib/build/environment/version.rb
+- spec/build/environment/checksum_spec.rb
 - spec/build/environment/environment_spec.rb
+- spec/build/environment/freeze_spec.rb
 - spec/build/environment/system_spec.rb
 homepage: ''
 licenses:
@@ -95,10 +98,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A nested hash data structure for controlling build environments.
 test_files:
+- spec/build/environment/checksum_spec.rb
 - spec/build/environment/environment_spec.rb
+- spec/build/environment/freeze_spec.rb
 - spec/build/environment/system_spec.rb