tokenr 0.1.2 → 0.1.3

data/lib/tokenr/tokens.rb

@@ -19,15 +19,18 @@ class Tokens
 		puts
 		
 		find_master_files_in(path).each do |file|
+			# Read global variables
 			read_tokens(@globals_file)
 			@globals = @environments.dup
 
+			# Read file variables
 			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(', ')}"
+			
+			# Check for duplicates
+			@checker.check(@environments)	
 
 			if !@environments.has_key?(default_environment)
 				puts "Unable to find default environment #{default_environment}"
@@ -35,12 +38,13 @@ class Tokens
 				default_environment = @environments.keys.first
 			end			
 
+			# Write out a file for each environment
 			@environments.each_pair do |environment, values| 
 				values[:Environment] = environment # Add the environment as a token
 				@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)
+			# Write out a file for the default environment
 			@writer.write_for('', file, @environments[default_environment], @globals[default_environment])
 		end
 	end

data/lib/tokenr/tokens_checker.rb

@@ -1,17 +1,17 @@
 
 class TokensChecker
 
-	def check(tokens)
-		starting_hash = tokens[tokens.keys.first]
+	def check(environments)
+		first_hash = environments[environments.keys.first]
 		
-		starting_hash.each_pair do |key, value|
-			tokens.keys.each do |environment|
+		first_hash.each_pair do |key, value|
+			environments.keys.each do |environment|
 				# Skip if what we're comparing is actually the first environment				
-				next if environment == tokens.keys.first
+				next if environment == environments.keys.first
 
-				break if tokens[environment][key] != value
+				break if environments[environment][key] != value
 				
-				if(environment == tokens.keys.last) 
+				if(environment == environments.keys.last) 
 				    puts "Unrequired token - all environments have the same value '#{value}' for key '#{key}'"
 				end	
 			end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tokenr
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-12-17 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: -2233012312709341266
+      hash: -2872688510888981153
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: