tokenr 0.1.0 → 0.1.1

data/lib/tokenr/tokens.rb

@@ -8,7 +8,6 @@ class Tokens
 		@tokens_pattern = tokens_pattern
 		@writer = writer
 		@checker = checker
-		@globals = {}
 	end
 
 	def replace(path, default_environment='local')
@@ -20,16 +19,16 @@ class Tokens
 		puts
 		
 		find_master_files_in(path).each do |file|
-			@environments = {}
-			
-			read_tokens(file.gsub('.master' + File.extname(file), '.tokens.rb'))
-			master_environments = @environments.dup	
-			
 			read_tokens(@globals_file)
-			only_use_environments_in(master_environments)		
+			@globals = @environments.dup
+
+			read_tokens(file.gsub('.master' + File.extname(file), '.tokens.rb'))					
+			only_use_environments_defined_in_tokens_rb		
 			
 			@checker.check(@environments)
 
+			puts "Environments found - #{@environments.keys.join(', ')}"
+
 			if !@environments.has_key?(default_environment)
 				puts "Unable to find default environment #{default_environment}"
 				puts "Setting default environment to #{@environments.keys.first}"
@@ -38,11 +37,11 @@ class Tokens
 
 			@environments.each_pair do |environment, values| 
 				values[:Environment] = environment # Add the environment as a token
-				@writer.write_for(environment, file, values, @globals, true) 
+				@writer.write_for(environment, file, values, @globals[environment], true) 
 			end
 			
 			# Write out an App.config, or Web.config file (ie without the environment in the name)
-			@writer.write_for('', file, @environments[default_environment], @globals)
+			@writer.write_for('', file, @environments[default_environment], @globals[default_environment])
 		end
 	end
 
@@ -52,7 +51,9 @@ class Tokens
 		return Dir.glob("#{path}/**/#{@tokens_pattern}", File::FNM_CASEFOLD)
 	end
 
-	def read_tokens(path)	
+	def read_tokens(path)
+		@environments = Hash.new({})
+
 		if(File.exist?(path))
 			begin			
 				eval(File.read(path))
@@ -64,9 +65,9 @@ class Tokens
 		end	
 	end
 
-	def only_use_environments_in(master_environments)		
-		@environments.each_key do |key|
-			@environments.delete(key) if !master_environments.has_key?(key)
+	def only_use_environments_defined_in_tokens_rb()	
+		@globals.each_key do |key|
+			@globals.delete(key) if !@environments.has_key?(key)
 		end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tokenr
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -185,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1476521593813482787
+      hash: 3764011758071452566
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: