albacore 0.3.1 → 0.3.2

data/lib/albacore/msbuild.rb

@@ -8,7 +8,7 @@ class MSBuild
   
   attr_accessor :solution, :verbosity, :loggermodule, :max_cpu_count
   attr_array :targets
-  attr_hash :properties
+  attr_hash :properties, :other_switches
   
   def initialize
     super()
@@ -33,6 +33,7 @@ class MSBuild
     command_parameters << "\"/maxcpucount:#{@max_cpu_count}\"" if @max_cpu_count != nil
     command_parameters << "\"/nologo\"" if @nologo
     command_parameters << build_properties if @properties != nil
+    command_parameters << build_switches if @other_switches != nil
     command_parameters << "\"/target:#{build_targets}\"" if @targets != nil
     
     result = run_command "MSBuild", command_parameters.join(" ")
@@ -40,7 +41,7 @@ class MSBuild
     failure_message = 'MSBuild Failed. See Build Log For Detail'
     fail_with_message failure_message if !result
   end
-  
+
   def check_solution(file)
     return if file
     msg = 'solution cannot be nil'
@@ -58,4 +59,20 @@ class MSBuild
     end
     option_text.join(" ")
   end
+
+  def build_switches
+    switch_text = []
+    @other_switches.each do |key, value|
+      switch_text << print_switch(key, value)
+    end
+    switch_text.join(" ")
+  end
+
+  def print_switch(key, value)
+    pure_switch?(value) ? "/#{key}" : "/#{key}:\"#{value}\""
+  end
+
+  def pure_switch?(value)
+    value.is_a?(TrueClass) || value == :true
+  end
 end

data/lib/albacore/msdeploy.rb

@@ -18,7 +18,6 @@ class MSDeploy
   end
     
   def execute
-    
     if(@command.nil?)
       @command = get_msdeploy_path
     end
@@ -38,27 +37,30 @@ class MSDeploy
   
     failure_msg = 'MSDeploy Failed.  See build log for details'
     fail_with_message failure_msg if !result
-    end
+  end
   
   def get_msdeploy_path
-    
-    #check path directory
-    ENV['PATH'].split(';').each do |folder| 
-      if(File.exists?(folder+'/msdeploy.exe'))
-        return folder+'/msdeploy.exe'
-      end      
-    end    
+    #check the environment paths
+    ENV['PATH'].split(';').each do |path|
+      msdeploy_path = File.join(path, 'msdeploy.exe')
+      return msdeploy_path if File.exists?(msdeploy_path)
+    end
+
+    #check the environment variables
+    if ENV['MSDeployPath']
+      msdeploy_path = File.join(ENV['MSDeployPath'], 'msdeploy.exe')
+      return msdeploy_path if File.exists?(msdeploy_path)
+    end
+
     #check if it's in registry
-    msdeploy_path = ENV['MSDeployPath']    
-    if(msdeploy_path == nil || !File.exist?("#{msdeploy_path}msdeploy.exe"))      
-      Win32::Registry::HKEY_LOCAL_MACHINE.open('SOFTWARE\Microsoft\IIS Extensions\MSDeploy\2') do |reg|
-          reg_typ, reg_val = reg.read('InstallPath') # no checking for x86 here.
-          msdeploy_path = reg_val
-        end     
-   end
-   fail_with_message 'MSDeploy could not be found is it installed?' if !File.exist?("#{msdeploy_path}msdeploy.exe")
-   return "#{msdeploy_path}msdeploy.exe"    
- end
+    Win32::Registry::HKEY_LOCAL_MACHINE.open('SOFTWARE\Microsoft\IIS Extensions\MSDeploy\2') do |reg|
+      reg_typ, reg_val = reg.read('InstallPath') # no checking for x86 here.
+      msdeploy_path = reg_val
+      return msdeploy_path if File.exists?(msdeploy_path)
+    end
+
+    fail_with_message 'MSDeploy could not be found is it installed?'
+  end
  
  def get_package
    #is it a direct file

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/spec/msbuild_spec.rb

@@ -3,7 +3,6 @@ require 'albacore/msbuild'
 require 'albacore/config/msbuildconfig'
 require 'msbuildtestdata'
 
-
 shared_context "prepping msbuild" do
   before :all do
     @testdata = MSBuildTestData.new
@@ -11,6 +10,7 @@ shared_context "prepping msbuild" do
     @strio = StringIO.new
     @msbuild.log_device = @strio
     @msbuild.log_level = :diagnostic
+    @msbuild.properties :platform => 'Any CPU'
  end
 end
 
@@ -28,7 +28,7 @@ describe MSBuild, "when building a solution with verbose logging turned on" do
   end
 
   it "should log the msbuild command line being called" do
- com = @log_data.downcase().should include("Executing MSBuild: \"C:/Windows/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe\"".downcase())
+    com = @log_data.downcase().should include("Executing MSBuild: \"C:/Windows/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe\"".downcase())
   end
 end
 
@@ -130,8 +130,8 @@ describe MSBuild, "when building a visual studio solution for a specified config
   before :all do
     @testdata= MSBuildTestData.new("Release")
     @msbuild = @testdata.msbuild
-    
-    @msbuild.properties :configuration => :Release
+
+    @msbuild.properties :configuration => :Release, :platform => 'Any CPU'
     @msbuild.solution = @testdata.solution_path
     @msbuild.execute
   end
@@ -181,7 +181,7 @@ describe MSBuild, "when specifying multiple configuration properties" do
     File.delete(@testdata.output_path) if File.exist?(@testdata.output_path)
     
     @msbuild.targets :Clean, :Build
-    @msbuild.properties :configuration => :Debug, :DebugSymbols => true 
+    @msbuild.properties :configuration => :Debug, :DebugSymbols => true, :platform => 'Any CPU'
     @msbuild.solution = @testdata.solution_path
     @msbuild.execute
   end
@@ -244,3 +244,44 @@ describe MSBuild, "when specifying max cpu count" do
   end
 end
 
+describe MSBuild, "when including a TrueClass switch" do
+  include_context "prepping msbuild"
+
+  before :all do
+    @msbuild.other_switches :noconsolelogger => true
+    @msbuild.solution = @testdata.solution_path
+    @msbuild.execute
+  end
+
+  it 'should call msbuild with the noconsolelogger switch' do
+    @msbuild.system_command.should include('/noconsolelogger')
+  end
+end
+
+describe MSBuild, "when including a true symbol switch" do
+  include_context "prepping msbuild"
+
+  before :all do
+    @msbuild.other_switches :noconsolelogger => :true
+    @msbuild.solution = @testdata.solution_path
+    @msbuild.execute
+  end
+
+  it 'should call msbuild with the noconsolelogger switch' do
+    @msbuild.system_command.should include('/noconsolelogger')
+  end
+end
+
+describe MSBuild, "when including a switch with value" do
+  include_context "prepping msbuild"
+
+  before :all do
+    @msbuild.other_switches :toolsVersion => 3.5
+    @msbuild.solution = @testdata.solution_path
+    @msbuild.execute
+  end
+
+  it 'should call msbuild with the noconsolelogger switch' do
+    @msbuild.system_command.should include("/toolsVersion:\"3.5\"")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000Z
+date: 2012-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &22238760 !ruby/object:Gem::Requirement
+  requirement: &2985840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22238760
+  version_requirements: *2985840
 description: Easily build your .Net or Mono project using this collection of Rake
   tasks.
 email: henrik@haf.se
@@ -692,7 +692,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 16372145
+      hash: -36994097
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -701,10 +701,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 16372145
+      hash: -36994097
 requirements: []
 rubyforge_project: albacore
-rubygems_version: 1.7.2
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Dolphin-safe and awesome Mono and .Net Rake-tasks