albacore 0.2.0.preview2 → 0.2.2

data/lib/albacore/support/runcommand.rb

@@ -1,43 +1,45 @@
 require 'albacore/support/attrmethods'
 
-module RunCommand
-  extend AttrMethods
-  
-  attr_accessor :command, :working_directory
-  attr_array :parameters
-  
-  def initialize
-    @working_directory = Dir.pwd
-    @parameters = []
-    super()
-  end
-  
-  def run_command(name="Command Line", parameters=nil)
-    begin
-      params = Array.new
-      params << parameters unless parameters.nil?
-      params << @parameters unless (@parameters.nil? || @parameters.length==0)
-      
-      cmd = get_command(params)
-      @logger.debug "Executing #{name}: #{cmd}"
-      
-      Dir.chdir(@working_directory) do
-        return system(cmd)
-      end
+module Albacore
+  module RunCommand
+    extend AttrMethods
+    
+    attr_accessor :command, :working_directory
+    attr_array :parameters
+    
+    def initialize
+      @working_directory = Dir.pwd
+      @parameters = []
+      super()
+    end
+    
+    def run_command(name="Command Line", parameters=nil)
+      begin
+        params = Array.new
+        params << parameters unless parameters.nil?
+        params << @parameters unless (@parameters.nil? || @parameters.length==0)
+        
+        cmd = get_command(params)
+        @logger.debug "Executing #{name}: #{cmd}"
+        
+        Dir.chdir(@working_directory) do
+          return system(cmd)
+        end
 
-    rescue Exception => e
-      puts "Error While Running Command Line Tool: #{e}"
-      raise
+      rescue Exception => e
+        puts "Error While Running Command Line Tool: #{e}"
+        raise
+      end
     end
-  end
 
-  def get_command(params)
-    executable = @command
-    unless command.nil?
-      executable = File.expand_path(@command) if File.exists?(@command)
+    def get_command(params)
+      executable = @command
+      unless command.nil?
+        executable = File.expand_path(@command) if File.exists?(@command)
+      end
+      cmd = "\"#{executable}\""
+      cmd +=" #{params.join(' ')}" if params.length > 0
+      cmd
     end
-    cmd = "\"#{executable}\""
-    cmd +=" #{params.join(' ')}" if params.length > 0
-    cmd
   end
 end

data/lib/albacore/unzip.rb

@@ -4,7 +4,7 @@ require 'zip/zipfilesystem'
 include Zip
 
 class Unzip
-  include AlbacoreTask
+  include Albacore::Task
   
   attr_accessor :destination, :file
 

data/lib/albacore/xbuild.rb

@@ -2,8 +2,8 @@ require 'albacore/albacoretask'
 
 class XBuild
   TaskName = [:xbuild, :mono]
-  include AlbacoreTask
-  include RunCommand
+  include Albacore::Task
+  include Albacore::RunCommand
   
   attr_accessor :solution, :verbosity
   attr_array :targets

data/lib/albacore/xunittestrunner.rb

@@ -2,8 +2,8 @@ require 'albacore/albacoretask'
 
 class XUnitTestRunner
   TaskName = :xunit
-  include AlbacoreTask
-  include RunCommand
+  include Albacore::Task
+  include Albacore::RunCommand
 
   attr_accessor :html_output
   attr_array :options,:assembly,:assemblies
@@ -47,6 +47,6 @@ class XUnitTestRunner
 
   def build_html_output			
     fail_with_message 'Directory is required for html_output' if !File.directory?(File.expand_path(@html_output))
-    "/html #{File.join(File.expand_path(@html_output),"%s.html")}" 	
+    "/html \"#{File.join(File.expand_path(@html_output),"%s.html")}\""
   end
 end

data/lib/albacore/zipdirectory.rb

@@ -5,7 +5,7 @@ include Zip
 
 class ZipDirectory
   TaskName = :zip
-  include AlbacoreTask
+  include Albacore::Task
   
   attr_accessor :output_path, :output_file
   attr_accessor :flatten_zip

data/rakefile.rb

@@ -1,3 +1,4 @@
+$: << './'
 require 'lib/albacore'
 
 task :default => ['albacore:sample']
@@ -238,11 +239,5 @@ namespace :jeweler do
 
     gs.add_dependency('rake', '>= 0.8.7')
     gs.add_dependency('rubyzip', '>= 0.9.4')
-
-    gs.add_development_dependency('rspec', '>= 1.3.0')
-    gs.add_development_dependency('jeweler', '>= 1.4.0')
-    gs.add_development_dependency('derickbailey-notamock', '>= 0.0.1')
-    gs.add_development_dependency('jekyll', '>= 0.5.7')
-    gs.add_development_dependency('watchr', '>= 0.6')
   end
 end

data/spec/albacoremodel_spec.rb

@@ -1,8 +1,8 @@
-require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
+require 'spec_helper'
 require 'albacore/albacoretask'
 
 class ModelTest
-  include AlbacoreTask
+  include Albacore::Task
   attr_accessor :foo, :bar
   attr_hash :a_hash
   attr_array :a_array
@@ -10,7 +10,7 @@ end
 
 class NamedTaskExample
   TaskName = [:namedtask, :anothername]
-  include AlbacoreTask
+  include Albacore::Task
 end
 
 describe "when updating object attributes with a valid set of hash keys" do

data/spec/assemblyinfo_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
+require 'spec_helper'
 require 'assemblyinfotester'
 require 'albacore/assemblyinfo'
 
@@ -15,7 +15,7 @@ describe AssemblyInfo, "when generating an assembly info file" do
   end
   
   it "should log the name of the output file" do
-    @log_data.should include(@tester.assemblyinfo_file)
+    @log_data.downcase.should include(@tester.assemblyinfo_file.downcase)
   end
 end
 
@@ -34,7 +34,7 @@ describe AssemblyInfo, "when generating an assembly info file in verbose mode" d
   end
   
   it "should log the name of the output file" do
-    @log_data.should include(@tester.assemblyinfo_file)
+    @log_data.downcase.should include(@tester.assemblyinfo_file.downcase)
   end
 end
 

data/spec/attrmethods_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
+require 'spec_helper'
 require 'albacore/support/attrmethods'
 
 describe "when setting an array attribute value without the equal sign" do
@@ -114,3 +114,23 @@ describe "when setting a hash attribute to an hash variable using the equal sign
     @test.test.length.should be(3)
   end
 end
+
+describe "when setting a hash attribute to a hash across multiple lines" do
+   before :each do
+    class TestClass
+      extend AttrMethods
+      attr_hash :test
+    end
+
+    @test = TestClass.new
+    @test.test( 
+      :a => "b", 
+      :c => "d", 
+      :e => "f"
+    )
+  end
+
+  it "should set the hash to the values" do
+    @test.test.length.should be(3)
+  end
+end 

data/spec/config_spec.rb

@@ -1,9 +1,9 @@
-require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
+require 'spec_helper'
 require 'albacore/albacoretask'
 require 'albacore/config/config'
 
 class ConfigTest
-  include AlbacoreTask
+  include Albacore::Task
 end
 
 module ConfigModuleTest

data/spec/createtask_spec.rb

@@ -1,9 +1,9 @@
-require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
+require 'spec_helper'
 require 'albacore/albacoretask'
 require 'fail_patch'
 
 class SampleObject
-  include AlbacoreTask
+  include Albacore::Task
 
   attr_array :array
   attr_hash :hash
@@ -21,8 +21,8 @@ class SampleObject
 end
 
 class RunCommandObject
-  include AlbacoreTask
-  include RunCommand
+  include Albacore::Task
+  include Albacore::RunCommand
 
   def execute
     result = run_command "Run Command Test Object"

data/spec/csc_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
+require 'spec_helper'
 require 'albacore/csc'
 
 Albacore.configure do |config|

data/spec/docu_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
+require 'spec_helper'
 require 'albacore/docu'
 require 'docu_patch'
 

data/spec/exec_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
+require 'spec_helper'
 require 'albacore/exec'
 
 describe Exec, "when executing a command with parameters" do

data/spec/msbuild_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
+require 'spec_helper'
 require 'albacore/msbuild'
 require 'albacore/config/msbuildconfig'
 require 'msbuildtestdata'

data/spec/mspec_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
+require 'spec_helper'
 require 'albacore/mspectestrunner'
 
 describe MSpecTestRunner, "when providing configuration" do

data/spec/nant_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
+require 'spec_helper'
 require 'albacore/nant'
 require 'nanttestdata'
 

data/spec/ncoverconsole_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
+require 'spec_helper'
 require 'albacore/ncoverconsole'
 require 'albacore/nunittestrunner'
 require 'albacore/mspectestrunner'
@@ -261,12 +261,8 @@ describe NCoverConsole, "when producing an xml coverage report with nunit" do
     @ncc.system_command.should include(File.expand_path(@testdata.ncoverpath))
   end
   
-  it "should execute with the specified working directory" do
-    @ncc.system_command.should include(@testdata.working_directory)
-  end
-  
   it "should execute the test runner from the specified path" do
-    @ncc.system_command.should include(@testdata.nunitpath)
+    @ncc.system_command.downcase.should include(@testdata.nunitpath.downcase)
   end
   
   it "should pass the specified assembly to the test runner" do
@@ -303,7 +299,6 @@ describe NCoverConsole, "when specifying an html report and an xml coverage repo
     ncc.testrunner = nunit
     ncc.execute
   end
-
   
   it "should produce the xml report" do
     File.exist?(@testdata.xml_coverage_output).should == true

data/spec/ncoverreport_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
+require 'spec_helper'
 require 'albacore/ncoverreport'
 require 'ncoverreporttestdata'
 
@@ -37,7 +37,7 @@ describe NCoverReport, "when running a full coverage report with a specified out
   end
   
   it "should tell ncover.reporting to produce a full coverage html report in the specified folder" do
-    @ncover.system_command.should include("//or FullCoverageReport:Html:\"#{NCoverReportTestData.output_folder}\"")
+    @ncover.system_command.downcase.should include("//or FullCoverageReport:Html:\"#{NCoverReportTestData.output_folder}\"".downcase)
   end
   
   it "should produce the report" do
@@ -68,7 +68,7 @@ describe NCoverReport, "when running a summary report with a specified output fo
   end
   
   it "should tell ncover.reporting to produce a summary html report in the specified folder" do
-    @ncover.system_command.should include("//or Summary:Html:\"#{NCoverReportTestData.summary_output_file}\"")
+    @ncover.system_command.downcase.should include("//or Summary:Html:\"#{NCoverReportTestData.summary_output_file}\"".downcase)
   end
   
   it "should produce the report" do
@@ -99,11 +99,11 @@ describe NCoverReport, "when running multiple ncover reports - a summary and a f
   end
 
   it "should tell ncover.reporting to produce a full coverage html report in the specified folder" do
-    @ncover.system_command.should include("//or FullCoverageReport:Html:\"#{@fullcoverage_output_folder}\"")
+    @ncover.system_command.downcase.should include("//or FullCoverageReport:Html:\"#{@fullcoverage_output_folder}\"".downcase)
   end
   
   it "should tell ncover.reporting to produce a summary html report in the specified folder" do
-    @ncover.system_command.should include("//or Summary:Html:\"#{NCoverReportTestData.summary_output_file}\"")
+    @ncover.system_command.downcase.should include("//or Summary:Html:\"#{NCoverReportTestData.summary_output_file}\"".downcase)
   end
 end
 

data/spec/ndepend_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
+require 'spec_helper'
 require 'albacore/ndepend'
 require 'albacore/msbuild'
 

data/spec/nunittestrunner_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
+require 'spec_helper'
 require 'albacore/nunittestrunner'
 
 shared_examples_for "nunit paths" do

data/spec/plink_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+require 'albacore/plink'
+
+describe PLink, 'when executing a command over plink' do
+  before :each do
+    @cmd = PLink.new
+    @cmd.extend(SystemPatch)
+    @cmd.extend(FailPatch)
+    @cmd.command ="C:\\plink.exe"
+    @cmd.host = "testhost"
+
+  end
+
+  it "should attempt to execute plink.exe" do
+    @cmd.run
+    @cmd.system_command.should include("plink.exe")
+  end
+
+  it "should attempt to connect to the test host on the default port (22)"  do
+    @cmd.run
+    @cmd.system_command.should include("@testhost")
+    @cmd.system_command.should include("-P 22")
+  end
+
+  it "should connect to the test host on a non default port 2200" do
+    @cmd.port = 2200
+    @cmd.run
+    @cmd.system_command.should include("-P 2200")
+  end
+
+  it "should connect to the host with a username" do
+    expected_user = "dummyuser"
+    @cmd.user = expected_user
+    @cmd.run
+    @cmd.system_command.should include("#{expected_user}@")
+  end
+
+  it "should run remote commands in batch mode" do
+    @cmd.run
+    @cmd.system_command.should include("-batch")
+  end
+
+  it "should run commands in verbose mode" do
+    @cmd.verbose = true
+    @cmd.run
+    @cmd.system_command.should include("-v")
+  end
+
+  it "should include the remote command" do
+    expected_remote_exe = "C:\ThisIsTheRemoteExe.exe"
+    @cmd.commands expected_remote_exe
+    @cmd.run
+    @cmd.system_command.should include(expected_remote_exe)
+  end
+
+  it "should include the remote command with parameters" do
+    expected_remote_exe = "C:\\ThisIsTheRemoteExe.exe --help -o -p"
+    @cmd.commands expected_remote_exe
+    @cmd.run
+    @cmd.system_command.should include(expected_remote_exe)
+  end
+end

data/spec/runcommand_spec.rb

@@ -1,10 +1,10 @@
-require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
+require 'spec_helper'
 require 'albacore/albacoretask'
 require 'system_patch'
 
 class RunCommandObject
-  include AlbacoreTask
-  include RunCommand
+  include Albacore::Task
+  include Albacore::RunCommand
 
   def execute
     result = run_command "Run Command Test Object"