build-environment 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f20e0d466cc74671971daf58b04fba2745c0902c2defa35674f34a7c162110e
-  data.tar.gz: 6c42c806db26e5fbcd53a1963039226307fbd6ffde19e9542459aec90dc957ab
+  metadata.gz: 492f25a57714d2d9919a2f2a104b087f4544fd4b4cfbb6add3ab752197214970
+  data.tar.gz: c0080ffc1303d650ae5fdb6a45fb7e2fd315590c6a341da5e6a006b10ddab71f
 SHA512:
-  metadata.gz: c67764751cbe331d6b8e550a1eb0244d774466aa950d5c40dcdf3d4bc1bdbcf02ea5a1a0629349294ec7f284efcc85ec8b3a513735e0afda6b48900b454ad66e
-  data.tar.gz: 2630b3c80822d7b5789c086704c155f4c8e9e45ebfef7dc0265b4b932598666684b562d8a6466b42704ccdf3736651daf7a58e9f1b79ed207fb5cac4121206e6
+  metadata.gz: c6d269df24c6a24c8497ec2639c5f0a66382920cf70b69ff20623d484e6cf9e32b6860a416998a699fb717b1b4a0cf93f667ab9e34701cab22b480a6199c77f2
+  data.tar.gz: 5c18852270059bf9b6341e84861940ee4fa4161dd25538e122a7eeb209c0e0e697d50b9c5277c84af456fc55b34973b5df0d88fb871817d5b53b849729bd9ad9

data/lib/build/environment/base.rb

@@ -21,8 +21,6 @@
 module Build
 	# This is the basic environment data structure which is essentially a linked list of hashes. It is primarily used for organising build configurations across a wide range of different sub-systems, e.g. platform configuration, target configuration, local project configuration, etc.
 	class Environment
-		include Comparable
-		
 		def initialize(parent = nil, values = nil, name: nil, &block)
 			@parent = parent
 			@values = (values || {}).to_h
@@ -31,6 +29,23 @@ module Build
 			@name = name
 		end
 		
+		def == other
+			self.equal?(other) or
+				self.class == other.class and
+				@parent == other.parent and
+				@values == other.values and
+				@update == other.update and
+				@name == other.name
+		end
+		
+		def eql?(other)
+			self == other
+		end
+		
+		def hash
+			@parent.hash ^ @values.hash ^ @update.hash ^ @name.hash
+		end
+		
 		attr :parent
 		attr :values
 		attr :update
@@ -40,10 +55,6 @@ module Build
 			self.class.new(parent, values.dup, name: name, &update)
 		end
 		
-		def <=> other
-			self.to_h <=> other.to_h
-		end
-		
 		def freeze
 			return self if frozen?
 			

data/lib/build/environment/version.rb

@@ -1,5 +1,5 @@
 module Build
 	class Environment
-		VERSION = "1.11.0"
+		VERSION = "1.12.0"
 	end
 end

data/spec/build/environment/environment_spec.rb

@@ -59,7 +59,7 @@ RSpec.describe Build::Environment do
 		b[:cflags] = ["-stdlib=libc++"]
 		b[:rcflags] = lambda {cflags.reverse}
 		
-		expect(b.evaluate).to be == {
+		expect(b.evaluate.to_h).to be == {
 			:cflags => ["-std=c++11", "-stdlib=libc++"],
 			:rcflags => ["-stdlib=libc++", "-std=c++11"]
 		}
@@ -110,7 +110,7 @@ RSpec.describe Build::Environment do
 			architectures ["-march", "i386"]
 		end
 		
-		expect(platform).to be == {
+		expect(platform.to_h).to be == {
 			os: "linux",
 			compiler: "cc",
 			architectures: ["-march", "i386"]
@@ -121,7 +121,7 @@ RSpec.describe Build::Environment do
 			default architectures ["-march", "i686"]
 		end
 		
-		expect(local).to be == {
+		expect(local.to_h).to be == {
 			compiler: "clang",
 			architectures: ["-march", "i686"]
 		}
@@ -131,7 +131,7 @@ RSpec.describe Build::Environment do
 			local
 		).flatten
 		
-		expect(combined).to be == {
+		expect(combined.to_h).to be == {
 			os: "linux",
 			compiler: "clang",
 			architectures: ["-march", "i386"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-environment
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-09 00:00:00.000000000 Z
+date: 2019-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: covered