rakeoff 0.0.2 → 0.0.3

data/lib/rakeoff.rb

@@ -1,7 +1,7 @@
 root_dir = File.expand_path(File.dirname(__FILE__))
 $: << root_dir
 $: << File.join(root_dir, 'rakeoff')
+$: << File.join(root_dir, 'rakeoff', 'tasks')
 $: << File.join(root_dir, 'rakeoff', 'support')
 
-Dir.glob(File.join(root_dir, 'rakeoff/*.rb')).each {|file| require file }
-
+Dir.glob(File.join(root_dir, '**/*.rb')).each {|file| require file }

data/lib/rakeoff/clean.rb

@@ -1,15 +1,15 @@
 
 class Clean
 
-    def initialize(session)
-        @session = session
+    def initialize(output_dir)
+        @output_dir = output_dir
     end
 
 	def execute()
 		print_heading 'Clean'
 
-		puts "Removing and recreating #{@session.output_dir}"
-		FileUtils.rm_rf @session.output_dir
-		FileUtils.mkdir_p @session.output_dir + '/release'
+		puts "Removing and recreating #{@output_dir}"
+		FileUtils.rm_rf @output_dir
+		FileUtils.mkdir_p @output_dir + '/release'
 	end
 end

data/lib/rakeoff/robocopy.rb

@@ -2,14 +2,14 @@ require 'terminal'
 
 class Robocopy
 
-	def initialize(session)
-		@session = session
+	def initialize(tools_dir)
+		@tools_dir = tools_dir
 	end
 
     def execute(source, destination, parameters='/MIR /R:5 /W:5 /NP /NFL /NDL')
 	    print_heading 'Copying'
 		
-		status = run_command("#{@session.tools_dir}/robocopy.exe #{source} #{destination} /XD .svn #{parameters}")
+		status = run_command("#{@tools_dir}/robocopy.exe #{source} #{destination} /XD .svn #{parameters}")
 		failed = check_status(status)
 
 		if failed

data/lib/rakeoff/session.rb

@@ -6,13 +6,13 @@ require 'yaml'
 class Session
 	include Logging
 	
-	# .net build options
+	# build options
     attr_accessor :agent_name, :is_build_agent, :framework_version, :configuration
 
 	# directories
 	attr_accessor :working_dir, :tools_dir, :output_dir
 
-	attr_accessor :solution, :globals, :tokens_pattern
+	attr_accessor :solution, :globals_file, :tokens_pattern
 
 	def set_values
 		print_heading 'Build Info'
@@ -37,8 +37,8 @@ class Session
         @tools_dir = File.join(@working_dir, '../tools')
         @output_dir = File.join(@working_dir + '/_output')
 		
-		@globals = './Globals.config'
-		@tokens_pattern = '*.master.config'
+		@globals_file = './Globals.config'
+		@tokens_pattern = '*.master.{^cs}'
     end
 
 	def override_defaults_from_yaml
@@ -64,14 +64,13 @@ class Session
 	end
 
     def print_session_info
-        puts "Current Environemnt = #{@environment}"
 		puts "Agent               = #{@agent_name}"
 		puts ''
 
 		puts "Build Framework     = #{@framework_version}"		
 		puts "Build Configuration = #{@configuration}"
 		puts "Token File Pattern  = #{@tokens_pattern}"
-		puts "Global Tokens File  = #{@globals}"
+		puts "Global Tokens File  = #{@globals_file}"
 		puts ''
 
 		puts "Output Directory    = #{@output_dir}"

data/lib/rakeoff/tasks.rb

@@ -0,0 +1,15 @@
+
+class Tasks
+	def initialize
+		AspnetCompileTask.new(:aspnetcompile)
+		CleanTask.new(:clean)
+		TokensTask.new(:tokens)
+
+		CompileTask.new(:compile, '')    
+		CompileTask.new(:publish, "/property:OutDir=#{SESSION.output_dir}/publish/")    
+
+		TestsTask.new(:unit_tests, '.Unit.Tests')
+		TestsTask.new(:integration_tests, '.Integration.Tests')
+		TestsTask.new(:acceptance_tests, '.Acceptance.Tests')  
+	end
+end

data/lib/rakeoff/{clean_task.rb → tasks/clean_task.rb}

@@ -4,7 +4,7 @@ require 'clean'
 class CleanTask
 	def initialize(name, options='', *args)
 		body = proc {
-			task = Clean.new(SESSION)
+			task = Clean.new(SESSION.output_dir)
 			task.execute
 		}
 

data/lib/rakeoff/tasks/off_task.rb

@@ -0,0 +1,13 @@
+require 'support/task_helper'
+require 'session'
+require 'tasks'
+
+task :off do
+	LOGGING_LEVEL = Logger::ERROR
+
+	SESSION = Session.new
+	SESSION.set_values
+	SESSION.load_solution
+
+	Tasks.new
+end

data/lib/rakeoff/{robocopy_task.rb → tasks/robocopy_task.rb}

@@ -4,7 +4,7 @@ require 'robocopy'
 class RobocopyTask
 	def initialize(name, source, destination, parameters='', *args)
 		body = proc {
-			task = Robocopy.new(SESSION)
+			task = Robocopy.new(SESSION.tools_dir)
 			task.execute(source, destination, parameters)
 		}
 	

data/lib/rakeoff/{tokens_task.rb → tasks/tokens_task.rb}

@@ -4,7 +4,7 @@ require 'tokens'
 class TokensTask
 	def initialize(name, *args)
 		body = proc {
-			task = Tokens.new(SESSION, TokensWriter.new)
+			task = Tokens.new(SESSION.globals_file, SESSION.tokens_pattern, TokensWriter.new)
 			task.find_and_replace(SESSION.working_dir)
 		}
 	

data/lib/rakeoff/tests.rb

@@ -12,14 +12,19 @@ class NUnit
     def execute(pattern)
 		print_heading("Tests - #{pattern}")
 		
-		if(there_are_test_projects(pattern))
-    		sh "#{@session.tools_dir}/nunit/nunit-console.exe #{assemblies} /xml=#{@session.output_dir}/test-reports/nunit.xml"		
+		if(there_are_test_projects_for(pattern))
+			if(ENV["NUNIT_RUNNER"].nil?)
+				mkdir_p "#{@session.output_dir}/test-reports"
+			    sh "#{@session.tools_dir}/nunit/nunit-console.exe #{assemblies} /xml=#{@session.output_dir}/test-reports/nunit.xml"
+			else
+			    sh "#{ENV["NUNIT_RUNNER"]} v4.0 x86 NUnit-2.5.3 #{assemblies}"
+			end	
         end
     end    
 
 	private
 
-    def there_are_test_projects(pattern)
+    def there_are_test_projects_for(pattern)
         projects = @session.solution.get_projects(pattern)		
 
         if(projects.length == 0)
@@ -27,7 +32,6 @@ class NUnit
 			return false
 		end
         
-		mkdir_p "#{@session.output_dir}/test-reports"
         get_assemblies(projects)
         
 		return true		
@@ -36,6 +40,6 @@ class NUnit
     def get_assemblies(projects)
 		files = []
 		projects.each { |project| files << project.dll_path(@session.configuration) + ' ' }
-		@assemblies = files.join
+		@assemblies = files.join.strip
     end 
 end

data/lib/rakeoff/tokens.rb

@@ -2,8 +2,9 @@ require 'terminal'
 
 class Tokens
 
-	def initialize(session, writer)
-		@session = session
+	def initialize(globals_file, tokens_pattern, writer)
+		@globals_file = globals_file
+		@tokens_pattern = tokens_pattern
 		@writer = writer
 		@globals = {}
 	end
@@ -11,9 +12,9 @@ class Tokens
 	def find_and_replace(path)
 		print_heading 'Tokenising'
 		
-		read_tokens_file(@session.globals)
+		read_tokens_file(@globals_file)
 
-		@files = Dir.glob("#{path}/**/#{@session.tokens_pattern}")
+		@files = Dir.glob("#{path}/**/#{@tokens_pattern}")
 		puts "#{@files.length} config(s) found for tokenising"
 		puts ''
 

data/lib/rakeoff/tokens_writer.rb

@@ -5,7 +5,7 @@ class TokensWriter
 		@master_file = master_file
 		@environment = environment
 
-		output_file = @master_file.gsub('.master', environment.empty? ? '' : "._#{environment}")
+		output_file = @master_file.gsub('.master', environment.empty? ? '' : ".#{environment}")
 		text = File.read(@master_file)
 		
 		check_if_tokens_are_used(text, tokens) if check_usage

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rakeoff
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,155 +9,110 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-04-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &25612880 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.2.2
+  version_requirements: *25612880
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &25612320 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.9.6.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.6.1
+  version_requirements: *25612320
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &25611760 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.7
+  version_requirements: *25611760
 - !ruby/object:Gem::Dependency
   name: logger
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &25611220 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.2.8
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.8
+  version_requirements: *25611220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &25610700 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.9.0
+  version_requirements: *25610700
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &25610160 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.10.5
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.10.5
+  version_requirements: *25610160
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &25609640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '3.12'
+  version_requirements: *25609640
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &25609120 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.3
+  version_requirements: *25609120
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &25608600 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.3
+  version_requirements: *25608600
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &25603940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,12 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *25603940
 description: A common set of build tasks typically used when creating projects in
   .Net
 email: robertbeal@gmail.com
@@ -182,24 +132,25 @@ extra_rdoc_files:
 files:
 - lib/rakeoff.rb
 - lib/rakeoff/aspnetcompile.rb
-- lib/rakeoff/aspnetcompile_task.rb
 - lib/rakeoff/clean.rb
-- lib/rakeoff/clean_task.rb
 - lib/rakeoff/compile.rb
-- lib/rakeoff/compile_task.rb
-- lib/rakeoff/logging.rb
 - lib/rakeoff/project.rb
 - lib/rakeoff/robocopy.rb
-- lib/rakeoff/robocopy_task.rb
 - lib/rakeoff/session.rb
-- lib/rakeoff/setup.rb
 - lib/rakeoff/solution.rb
+- lib/rakeoff/support/logging.rb
 - lib/rakeoff/support/task_helper.rb
+- lib/rakeoff/tasks.rb
+- lib/rakeoff/tasks/aspnetcompile_task.rb
+- lib/rakeoff/tasks/clean_task.rb
+- lib/rakeoff/tasks/compile_task.rb
+- lib/rakeoff/tasks/off_task.rb
+- lib/rakeoff/tasks/robocopy_task.rb
+- lib/rakeoff/tasks/tests_task.rb
+- lib/rakeoff/tasks/tokens_task.rb
 - lib/rakeoff/terminal.rb
 - lib/rakeoff/tests.rb
-- lib/rakeoff/tests_task.rb
 - lib/rakeoff/tokens.rb
-- lib/rakeoff/tokens_task.rb
 - lib/rakeoff/tokens_writer.rb
 - LICENSE.txt
 - README.rdoc
@@ -218,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 424452616281254389
+      hash: 2105016353616213847
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -227,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Build tasks for .Net projects

data/lib/rakeoff/setup.rb

@@ -1,25 +0,0 @@
-Dir.glob(File.join(File.expand_path(File.dirname(__FILE__)), '*.rb')).each {|file| require file }
-
-desc 'Setup this must be run!'
-task :off do  
-	LOGGING_LEVEL = Logger::ERROR
-	
-	SESSION = Session.new
-	SESSION.set_values
-	SESSION.load_solution
-    
-    create_tasks
-end
-
-def create_tasks
-	#AspnetCompileTask.new(:aspnetcompile)
-	CleanTask.new(:clean)
-	TokensTask.new(:tokens)
-
-    CompileTask.new(:compile, '')    
-    CompileTask.new(:publish, "/property:OutDir=#{SESSION.output_dir}/publish/")    
-
-    TestsTask.new(:unit_tests, '.Unit.Tests')
-    TestsTask.new(:integration_tests, '.Integration.Tests')
-    TestsTask.new(:acceptance_tests, '.Acceptance.Tests')  
-end