asdf.txt lib/parameters/array_append_strategy.rb lib/parameters/array_repeat_strategy.rb lib/parameters/boolean_extender.rb lib/parameters/boolean_parameter.rb lib/parameters/hash_append_strategy.rb lib/parameters/hash_extender.rb lib/parameters/hash_parameter.rb lib/parameters/string_parameter_factory.rb pkg/Rubicant-0.0.7.gem rubicant-0.0.7.gem spec/array_append_strategy_spec.rb spec/array_repeat_strategy_spec.rb spec/hash_append_strategy_spec.rb spec/hash_extender_spec.rb spec/hash_parameter_spec.rb spec/parameter_specs/array_append_strategy_spec.rb spec/parameter_specs/array_extender_spec.rb spec/parameter_specs/array_parameter_spec.rb spec/parameter_specs/array_repeat_strategy_spec.rb spec/parameter_specs/boolean_extender_spec.rb spec/parameter_specs/boolean_parameter_spec.rb spec/parameter_specs/hash_append_strategy_spec.rb spec/parameter_specs/hash_extender_spec.rb spec/parameter_specs/hash_parameter_spec.rb spec/parameter_specs/string_extender_spec.rb spec/parameter_specs/string_parameter_factory_spec.rb spec/parameter_specs/string_parameter_spec.rb spec/runner_specs/mbunit_runner_spec.rb spec/runner_specs/msbuild_spec.rb spec/string_parameter_builder_spec.rb spec/string_parameter_factory_spec.rb @@ -3,9 +3,6 @@ module ArrayParameter attr_accessor :join_strategy def build_parameter(name) - self.each do |param| - @join_strategy.include(param) - end - @join_strategy.join(name) + @join_strategy.join(name, self) end end \ No newline at end of file lib/parameters/array_parameter.rb @@ -3,6 +3,6 @@ module StringParameter attr_accessor :prefix, :separator def build_parameter(name) - "#{@prefix}paramname#{@separator}#{self}" + "#{@prefix}#{name}#{@separator}#{self}" end end \ No newline at end of file lib/parameters/string_parameter.rb @@ -2,75 +2,35 @@ require 'rake' require 'rake/tasklib' require File.dirname(__FILE__) + '/../facades' require File.dirname(__FILE__) + '/../dotnet/framework' +require File.dirname(__FILE__) + '/../parameters/boolean_extender' +require File.dirname(__FILE__) + '/../parameters/string_extender' +require File.dirname(__FILE__) + '/../parameters/array_extender' +require File.dirname(__FILE__) + '/../parameters/array_append_strategy' +require File.dirname(__FILE__) + '/../parameters/hash_extender' +require File.dirname(__FILE__) + '/../parameters/hash_append_strategy' +require File.dirname(__FILE__) + '/../parameters/string_parameter_factory' + module Rubicant::Runners - class MsBuildRunner + class MsBuild - attr_accessor :settings - attr_reader :rsp_file + attr_accessor :settings, :project_file + attr_reader :default_extenders - def initialize(settings = {}) + def initialize(project_file, settings = {}) @settings = settings - @rsp_file = "#{ENV['TEMP']}/msbuild.rsp" + @project_file = project_file + @default_extenders = [ArrayExtender.new(ArrayAppendStrategy.new("/", ":", ";")), + HashExtender.new(HashAppendStrategy.new("/", ":", "=", ";")), + BooleanExtender.new("/"), + StringExtender.new("/",":")] @msbuild = "#{Rubicant::DotNet::Frameworks.get_framework.framework_dir}\\msbuild.exe" + end def run - fail 'no_autoresponse must be true or nil' unless @settings[:no_autoresponse].nil? || @settings[:no_autoresponse] == true - fail 'no_console_logger must be true or nil' unless @settings[:no_console_logger].nil? || @settings[:no_console_logger] == true - fail 'file_logger must be true or nil' unless @settings[:file_logger].nil? || @settings[:file_logger] == true - fail 'distributed_file_logger must be true or nil' unless @settings[:distributed_file_logger].nil? || @settings[:distributed_file_logger] == true - fail 'properties must be a hash' unless @settings[:properties].kind_of?(Hash) || @settings[:properties].nil? - fail 'file_logger_parameters must be a hash' unless @settings[:file_logger_parameters].kind_of?(Hash) || @settings[:file_logger_parameters].nil? - - Rubicant::Runner.run "#{build_command}" - end - -private - def build_command - build_rsp - command = "#{@msbuild} @#{@rsp_file}" - command - end - - def build_rsp - file = File.new("#{@rsp_file}", "w") - file.puts " /nologo" - file.puts " /noautoresponse" unless @settings[:no_autoresponse].nil? - file.puts " /target:#{@settings[:targets].join(';')}" unless @settings[:targets].nil? - file.puts " /logger:#{@settings[:logger]}" unless @settings[:logger].nil? - file.puts " /distributedlogger:#{@settings[:distributed_logger]}" unless @settings[:distributed_logger].nil? - file.puts " /consoleloggerparameters:#{@settings[:console_logger_parameters]}" unless @settings[:console_logger_parameters].nil? - file.puts " /validate" if @settings[:validate] == true - file.puts " /validate:#{@settings[:validate]}" if @settings[:validate] != nil && @settings[:validate] != true - file.puts " /verbosity:#{@settings[:verbosity]}" unless @settings[:verbosity].nil? - file.puts " /noconsolelogger" if @settings[:no_console_logger] == true - file.puts " /maxcpucount:#{@settings[:max_cpu_count]}" unless @settings[:max_cpu_count].nil? - file.puts " /ignoreprojectextensions:#{@settings[:ignore_project_extensions].join(';')}" unless @settings[:ignore_project_extensions].nil? - file.puts " /filelogger" if @settings[:file_logger] == true - file.puts " /distributedfilelogger" if @settings[:distributed_file_logger] == true - file.puts " /nodereuse:true" if @settings[:node_reuse] == true - file.puts " /nodereuse:false" if @settings[:node_reuse] == false - file.puts " #{@settings[:project_file]}" unless @settings[:project_file].nil? - - unless (@settings[:properties].nil?) - properties_strings = [] - @settings[:properties].sort.each do |key, value| - properties_strings << "#{key}=#{value}" - end - file.puts(" /property:#{properties_strings.join(';')}") unless properties_strings.length == 0 - end - - unless (@settings[:file_logger_parameters].nil?) - file_logger_parameters_strings = [] - @settings[:file_logger_parameters].sort.each do |key, value| - file_logger_parameters_strings << "#{key}=#{value}" - end - file.puts(" /fileloggerparameters:#{file_logger_parameters_strings.join(';')}") unless file_logger_parameters_strings.length == 0 - end - - file.close - + parameters = StringParameterFactory.new(@default_extenders, {}).build_parameters(@settings) + Rubicant::Runner.run("#{@msbuild} #{parameters} #{@project_file}") end end -end \ No newline at end of file +end lib/runners/build_runners.rb @@ -1,45 +1,46 @@ require 'rake' -require 'rake/tasklib' require File.dirname(__FILE__) + '/../facades' +require File.dirname(__FILE__) + '/../parameters/string_parameter_factory' +require File.dirname(__FILE__) + '/../parameters/array_extender' +require File.dirname(__FILE__) + '/../parameters/string_extender' +require File.dirname(__FILE__) + '/../parameters/array_repeat_strategy' module Rubicant::Runners - class MbUnitRunner - attr_reader :settings - - def initialize(settings = {}) + class MbUnit + attr_reader :settings, :default_extenders, :overrides + + def initialize(mbunit_dir, test_files, settings = {}) @settings = settings + @mbunit_dir = mbunit_dir + @test_files = test_files if test_files.kind_of?(Array) + @test_files = [test_files] + @default_extenders = [ArrayExtender.new(ArrayRepeatStrategy.new("/", ":")), + StringExtender.new("/",":")] + @overrides = {:sr => StringExtender.new("/", ""), + :v => StringExtender.new("/", ""), + :sc => StringExtender.new("/", "")} + end def run - fail ('mbunit_dir must be set') if (@settings[:mbunit_dir].nil?) - fail ('test_files must be set') if (@settings[:test_files].nil?) - - @settings[:mbunit_dir] = "./" if @settings[:mbunit_dir].length == 0 - @settings[:mbunit_dir] = File.expand_path(@settings[:mbunit_dir]) - - exec_opts = {:working_dir => @settings[:mbunit_dir]} - - exec_args = [] - exec_args << "/ap:#{@settings[:assembly_path].to_a.join(' /ap:')}" unless @settings[:assembly_path].nil? - exec_args << "/rf:#{@settings[:report_folder]}" unless @settings[:report_folder].nil? - exec_args << "/rnf:#{@settings[:report_name_format]}" unless @settings[:report_name_format].nil? - exec_args << "/rt:#{@settings[:report_type]}" unless @settings[:report_type].nil? - exec_args << "/sr#{@settings[:show_reports]}" unless @settings[:show_reports].nil? - exec_args << "/tr:#{@settings[:transform]}" unless @settings[:transform].nil? - exec_args << "/fc:#{@settings[:filter_category]}" unless @settings[:filter_category].nil? - exec_args << "/ec:#{@settings[:exclude_category]}" unless @settings[:exclude_category].nil? - exec_args << "/fa:#{@settings[:filter_author]}" unless @settings[:filter_author].nil? - exec_args << "/ft:#{@settings[:filter_type]}" unless @settings[:filter_type].nil? - exec_args << "/fn:#{@settings[:filter_namespace]}" unless @settings[:filter_namespace].nil? - exec_args << "/v#{@settings[:verbose]}" unless @settings[:verbose].nil? - exec_args << "/sc#{@settings[:shadow_copy]}" unless @settings[:shadow_copy].nil? - - @settings[:test_files] = [@settings[:test_files]] if @settings[:test_files].class == String - exec_args << @settings[:test_files].join(' ') + fail ('mbunit_dir must be set') if (@mbunit_dir.nil?) + fail ('test_files must be set') if (@test_files.nil?) + + @mbunit_dir = "./" if @mbunit_dir.length == 0 + @mbunit_dir = File.expand_path(@mbunit_dir) + + exec_opts = {:working_dir => @mbunit_dir} + + exec_args = [StringParameterFactory.new(@default_extenders, @overrides).build_parameters(@settings)] + exec_args << @test_files.join(' ') exec_opts.merge!({:args => exec_args}) - Rubicant::Runner.exec(File.join(@settings[:mbunit_dir], "MbUnit.Cons.exe"), exec_opts) + Rubicant::Runner.exec(File.join(@mbunit_dir, "MbUnit.Cons.exe"), exec_opts) end + + private + + end end lib/runners/test_runners.rb pkg/Rubicant-0.0.1.gem pkg/Rubicant-0.0.4.gem pkg/Rubicant-0.0.5.gem @@ -4,15 +4,21 @@ require 'rake/testtask' require 'rake/rdoctask' require 'lib/rubicant' require 'rake/gempackagetask' +require 'spec/rake/spectask' -task :test do +task :test => :specs do require 'rake/runtest' Rake.run_tests 'test/**/*.rb' end +desc "Generate HTML report for failing examples" +Spec::Rake::SpecTask.new(:specs) do |t| + t.spec_files = FileList['spec/**/*.rb'] +end + spec = Gem::Specification.new do |s| s.name = "Rubicant" - s.version = "0.0.6" + s.version = "0.0.7" s.author = "mendicant" s.email = "mendicant@beigesunshine.com" s.homepage = "http://blog.beigesunshine.com" rakefile.rb @@ -1,33 +1,13 @@ Gem::Specification.new do |s| s.name = "rubicant" - s.version = "0.0.6" + s.version = "0.0.7" s.author = "mendicant" s.email = "mendicant@beigesunshine.com" s.homepage = "http://blog.beigesunshine.com" s.summary = ".Net Build Framework in Ruby" - s.files = ["lib/facades.rb", - "lib/dotnet", - "lib/dotnet/frameworks.yml", - "lib/dotnet/framework.rb", - "lib/runners", - "lib/runners/test_runners.rb", - "lib/runners/compiler_runners.rb", - "lib/runners/build_runners.rb", - "lib/runners/file_tasks.rb", - "lib/rubicant.rb", - "rubicant.gemspec", - "rakefile.rb"] + s.files = Dir["lib/**/*.rb"] + Dir["lib/dotnet/frameworks.yml"] s.require_path = "lib" - s.test_files = ["test/unit", - "test/unit/dotnet", - "test/unit/dotnet/when_creating_new_framework.rb", - "test/unit/dotnet/when_getting_framework_information.rb", - "test/unit/runners", - "test/unit/runners/when_calling_csc_runner.rb", - "test/unit/runners/when_calling_mb_unit_runner.rb", - "test/unit/runners/when_calling_copyfiles_task.rb", - "test/unit/runners/when_calling_ms_build_runner.rb", - "test/unit/runners/when_calling_ms_build_runner_with_incorrect_parameters.rb"] + s.test_files = Dir["test/**/when*.rb"] s.has_rdoc = false s.add_dependency("rake", ">= 0.8.3") rubicant.gemspec spec/array_extender_spec.rb @@ -3,11 +3,9 @@ require File.dirname(__FILE__) + '/../lib/parameters/array_parameter' describe ArrayParameter, "when building parameters for an extended array" do before do - @first = "1" - @second = "2" @param_name = "param name" - @array = [@first, @second] + @array = [] @join_strategy = mock('join strategy') @@ -15,17 +13,9 @@ describe ArrayParameter, "when building parameters for an extended array" do @array.join_strategy = @join_strategy end - it "join strategy should include all items in the array" do - @join_strategy.should_receive(:include).with(@first) - @join_strategy.should_receive(:include).with(@second) - @join_strategy.should_receive(:join) - @array.build_parameter(@param_name) - end - - it "should return the joined values" do + it "should join the array and return the joined values" do return_val = "return val" - @join_strategy.should_receive(:include).twice - @join_strategy.should_receive(:join).with(@param_name).and_return(return_val) + @join_strategy.should_receive(:join).with(@param_name, @array).and_return(return_val) @array.build_parameter(@param_name).should == return_val end end spec/array_parameter_spec.rb @@ -1,34 +1,34 @@ -require File.dirname(__FILE__) + '/../lib/parameters/string_extender' - -describe StringExtender, "when extending a string" do - - before do - @prefix = "--" - @separator = " " - @string = '' - sut = StringExtender.new(@prefix, @separator) - sut.do_extension(@string) - end - - it "should set the prefix on the extended string" do - @string.prefix.should == @prefix - end - - it "should set the separating character on the extended string" do - @string.separator.should == @separator - end - -end - -describe StringExtender, "when extending something that is not a string" do - - before do - @object = mock() - StringExtender.new('', '').do_extension(@object) - end - - it "should not extend the object" do - @object.should_not_receive(:extend) - end - -end +require File.dirname(__FILE__) + '/../lib/parameters/string_extender' + +describe StringExtender, "when extending a string" do + + before do + @prefix = "--" + @separator = " " + @string = '' + sut = StringExtender.new(@prefix, @separator) + sut.do_extension(@string) + end + + it "should set the prefix on the extended string" do + @string.prefix.should == @prefix + end + + it "should set the separating character on the extended string" do + @string.separator.should == @separator + end + +end + +describe StringExtender, "when extending something that is not a string" do + + before do + @object = mock() + StringExtender.new('', '').do_extension(@object) + end + + it "should not extend the object" do + @object.should_not_receive(:extend) + end + +end spec/string_extender_spec.rb spec/string_parameter_spec.rb test/unit/runners/when_calling_mb_unit_runner.rb test/unit/runners/when_calling_ms_build_runner.rb test/unit/runners/when_calling_ms_build_runner_with_incorrect_parameters.rb 81704919c28a417b132a0b0f9f54edfc47e2b15a mendicantx mendicant@beigesunshine.com http://github.com/mendicantx/rubicant/commit/4933ab69f4d57e1edd104b9cddf95a0a606a9322 4933ab69f4d57e1edd104b9cddf95a0a606a9322 2009-09-30T06:35:50-07:00 2009-09-30T06:35:50-07:00 Finally commit. Apparently I had a hook preventing commits. acc7f06115e4ee75d3ae7f230cd8f44335a28207 mendicantx mendicant@beigesunshine.com