tokenr 0.1.4 → 0.1.5

data/lib/tokenr/tokens.rb

@@ -19,38 +19,49 @@ 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'))					
+			read_global_variables
+			read_file_variables(file)		
 			only_use_environments_defined_in_tokens_rb		
 			
-			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}"
-				puts "Setting default environment to #{@environments.keys.first}"
-				default_environment = @environments.keys.first
-			end			
+			@checker.check_for_duplicates(@environments)
+			default = set_default_environment(default_environment)
+			@environments.each_pair { |environment, values| values[:Environment] = environment }
 
 			# 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) 
+			if(@environments.keys.length > 1)
+				@environments.each_pair do |environment, values| 
+					@writer.write_for(environment, file, values, @globals[environment], true) 
+				end
 			end
 			
 			# Write out a file for the default environment
-			@writer.write_for('', file, @environments[default_environment], @globals[default_environment])
+			@writer.write_for('', file, @environments[default], @globals[default])
 		end
 	end
 
 	private
 
+	def read_global_variables
+		read_tokens(@globals_file)
+		@globals = @environments.dup	
+	end
+
+	def read_file_variables(file)
+		read_tokens(file.gsub('.master' + File.extname(file), '.tokens.rb'))	
+	end
+
+	def set_default_environment(environment)
+		default = environment
+
+		if !@environments.has_key?(environment)
+			puts "Unable to find default environment #{environment}"
+			puts "Setting default environment to #{@environments.keys.first}"
+			default = @environments.keys.first.to_s
+		end
+		
+		return default		
+	end
+
 	def find_master_files_in(path)
 		return Dir.glob("#{path}/**/#{@tokens_pattern}", File::FNM_CASEFOLD)
 	end
@@ -73,5 +84,7 @@ class Tokens
 		@globals.each_key do |key|
 			@globals.delete(key) if !@environments.has_key?(key)
 		end
+		
+		puts "Environments found - #{@environments.keys.join(', ')}"
 	end
 end

data/lib/tokenr/tokens_checker.rb

@@ -1,7 +1,7 @@
 
 class TokensChecker
 
-	def check(environments)
+	def check_for_duplicates(environments)
 		first_hash = environments[environments.keys.first]
 		
 		first_hash.each_pair do |key, value|

metadata

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