tokenr 0.0.8 → 0.0.9

data/lib/tokenr/tokens.rb

@@ -16,14 +16,16 @@ class Tokens
 		find_master_files_in(path).each do |file|
 			@environments = {}
 			
-			read_tokens_for_master_file(file)
-			save_token_file_environments			
+			read_tokens(file.gsub('.master' + File.extname(file), '.tokens.rb'))
+			master_environments = @environments.dup	
 			
 			read_tokens(@globals_file)
-			remove_global_only_environments		
+			only_use_environments_in(master_environments)		
 
 			if !@environments.has_key?(default_environment)
-				raise InvalidEnvironment, "Environment #{default_environment} is not recognised. Possible environments are #{@environments.keys.join(', ')}".red
+				puts "Unable to find default environment #{default_environment}"
+				puts "Setting default environment to #{@environments.keys.first}"
+				default_environment = @environments.keys.first
 			end			
 
 			@environments.each_pair do |environment, values| 
@@ -32,23 +34,14 @@ class Tokens
 			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, false)
-			
-			puts
+			@writer.write_for('', file, @environments[default_environment], @globals)
 		end
 	end
 
 	private
 
 	def find_master_files_in(path)
-		files = Dir.glob("#{path}/**/#{@tokens_pattern}", File::FNM_CASEFOLD)
-		puts "#{files.length} config(s) found for tokenising", ''
-		files
-	end
-
-	def read_tokens_for_master_file(file)
-		read_tokens(file.gsub('.master.', '.tokens.').gsub(File.extname(file), '.rb'))
-		puts "Tokensing - #{file}", "Environments - #{@environments.keys.join(', ')}"
+		return Dir.glob("#{path}/**/#{@tokens_pattern}", File::FNM_CASEFOLD)
 	end
 
 	def read_tokens(path)	
@@ -63,16 +56,9 @@ class Tokens
 		end	
 	end
 
-	def save_token_file_environments
-		@temp_environments = @environments.dup
-	end
-
-	def remove_global_only_environments
+	def only_use_environments_in(master_environments)		
 		@environments.each_key do |key|
-			@environments.delete(key) if !@temp_environments.has_key?(key)
+			@environments.delete(key) if !master_environments.has_key?(key)
 		end
 	end
 end
-
-class InvalidEnvironment < StandardError  
-end

data/lib/tokenr/tokens_writer.rb

@@ -1,16 +1,15 @@
 
 class TokensWriter
 
-	def write_for(environment, master_file, tokens, globals, check_usage)		
-		@master_file = master_file
+	def write_for(environment, master_file, tokens, globals, check_usage=false)		
 		@environment = environment
 
-		output_file = @master_file.gsub('.master', environment.empty? ? '' : ".#{environment}")
-		text = File.read(@master_file)
+		output_file = master_file.gsub('.master', environment.empty? ? '' : ".#{environment}")
+		text = File.read(master_file)
 		
 		check_if_tokens_are_used(text, tokens) if check_usage
-		text = replace_tokens(text, tokens)
-		text = replace_tokens(text, globals)
+		replace_tokens(text, tokens)
+		replace_tokens(text, globals)
 
 		write_to_file(output_file, text)        
 
@@ -24,8 +23,7 @@ class TokensWriter
 	private
 	
 	def replace_tokens(text, tokens)		
-		tokens.each_pair { |key, value|	text.gsub!(/\$#{key}\$/, value.to_s) }		
-		text
+		tokens.each_pair { |key, value|	text.gsub!(/\$#{key}\$/, value.to_s) }
 	end
 
 	def check_if_tokens_are_used(text, tokens)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tokenr
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-31 00:00:00.000000000Z
+date: 2013-03-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17048860 !ruby/object:Gem::Requirement
+  requirement: &16114800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *17048860
+  version_requirements: *16114800
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &17047680 !ruby/object:Gem::Requirement
+  requirement: &16114080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *17047680
+  version_requirements: *16114080
 - !ruby/object:Gem::Dependency
   name: logger
-  requirement: &17046940 !ruby/object:Gem::Requirement
+  requirement: &16113240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *17046940
+  version_requirements: *16113240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17046320 !ruby/object:Gem::Requirement
+  requirement: &16112640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *17046320
+  version_requirements: *16112640
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &17045740 !ruby/object:Gem::Requirement
+  requirement: &16112020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 0.10.5
   type: :development
   prerelease: false
-  version_requirements: *17045740
+  version_requirements: *16112020
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &17041180 !ruby/object:Gem::Requirement
+  requirement: &16111180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *17041180
+  version_requirements: *16111180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &17040400 !ruby/object:Gem::Requirement
+  requirement: &16110500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,10 +87,10 @@ dependencies:
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *17040400
+  version_requirements: *16110500
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &17039520 !ruby/object:Gem::Requirement
+  requirement: &16109800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +98,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *17039520
+  version_requirements: *16109800
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &17038880 !ruby/object:Gem::Requirement
+  requirement: &16109060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17038880
+  version_requirements: *16109060
 description: Find and tokenise files!
 email: robertbeal@gmail.com
 executables: []
@@ -139,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2226007694087505093
+      hash: -2197494065915391049
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: