build-environment 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f012093ceab4f38096a0f1b49a80b6c0de0ec75d
-  data.tar.gz: 7be8813be74fe6f4b7708b243be04b8e2e795eb6
+  metadata.gz: a75067001af37e60e254e389552e45fab4838436
+  data.tar.gz: 32da29ef60963f838c72847c18ce393f36a1b088
 SHA512:
-  metadata.gz: a9a8a44708e5b21e6bdcd65f4f160547b294cd6e076184b68c9230929c4564b91bf26042c8c81fe100e060619d6d2d0809aed8848128ab0207a2e0450f583139
-  data.tar.gz: f7199c17fadd8c062c4ef47b0e5fbe96a13ff01071491ea3ef68e69c909ed4366d92af3daec0ec77df2792512d1f464116eebfb51446be8c3d45d7c298eecab4
+  metadata.gz: 32e81d1ac024530c33deeab102b52b8743f0c98020e08f8652c2d2428acdec97a9eb8847d9386bca9fa5730d870117b2c2de4c58c492b82417ca111775282f08
+  data.tar.gz: aa38cf0cb47d7a114e3ac9e1a347675d1c33fd610b631f245b74794f25926b8eccefea3f2e534975c793545abc645cd7326f22de827954354d1e3598049e7af2

data/lib/build/environment/base.rb

@@ -45,6 +45,14 @@ module Build
 			end
 		end
 		
+		def include?(key)
+			lookup(key) != nil
+		end
+		
+		def size
+			@values.size + (@parent ? @parent.size : 0)
+		end
+		
 		def [] (key)
 			environment = lookup(key)
 			

data/lib/build/environment/system.rb

@@ -31,8 +31,29 @@ module Build
 				end
 			end
 			
+			def self.valid_for_export(value)
+				case value
+				when Array
+					true
+				when Symbol
+					false
+				when Proc
+					false
+				when Default
+					false
+				when Replace
+					false
+				when Define
+					false
+				else
+					true
+				end
+			end
+			
 			def self.convert_to_shell(environment)
-				Hash[environment.values.map{|key, value| [
+				values = environment.values.select{|key, value| valid_for_export(value)}
+				
+				Hash[values.map{|key, value| [
 					key.to_s.upcase,
 					shell_escape(value)
 				]}]
@@ -43,5 +64,10 @@ module Build
 		def self.system_environment(env = ENV)
 			self.new(Hash[env.map{|key, value| [key.downcase.to_sym, value]}])
 		end
+		
+		# Make a hash appropriate for a process environment
+		def export
+			System::convert_to_shell(self)
+		end
 	end
 end

data/lib/build/environment/version.rb

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

data/spec/build/environment/system_spec.rb

@@ -0,0 +1,53 @@
+# 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'
+require 'build/environment/system'
+
+module Build::Environment::SystemSpec
+	class Rule
+		def initialize(process_name, type)
+			@process_name = process_name
+			@type = type
+		end
+		
+		attr :process_name
+		attr :type
+	end
+	
+	describe Build::Environment do
+		it "should not export rule" do
+			a = Build::Environment.new do
+				cflags "-fPIC"
+				
+				define Rule, "compile.foo" do
+				end
+			end
+			
+			expect(a).to include(:cflags)
+			expect(a).to include('compile.foo')
+			
+			exported = a.export
+			
+			expect(exported.size).to be == 1
+			expect(exported).to_not include('COMPILE.FOO')
+		end
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-environment
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-28 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,7 @@ files:
 - lib/build/environment/system.rb
 - lib/build/environment/version.rb
 - spec/build/environment/environment_spec.rb
+- spec/build/environment/system_spec.rb
 homepage: ''
 licenses:
 - MIT
@@ -100,3 +101,4 @@ specification_version: 4
 summary: A nested hash data structure for controlling build environments.
 test_files:
 - spec/build/environment/environment_spec.rb
+- spec/build/environment/system_spec.rb