albacore 0.1.5 → 0.2.0.preview1

data/lib/albacore/xbuild.rb

@@ -1,18 +1,19 @@
-require 'albacore/support/albacore_helper'
+require 'albacore/albacoremodel'
+require 'albacore/config/xbuildconfig'
 
 class XBuild
-  extend AttrMethods
+  include AlbacoreModel
   include RunCommand
-  include YAMLConfig
-  include Logging
+  include Configuration::XBuild
   
   attr_accessor :solution, :verbosity
   attr_array :targets
   attr_hash :properties
   
   def initialize
-    @path_to_command = 'xbuild'
+    @command = 'xbuild'
     super()
+    update_attributes xbuild.to_hash
   end
   
   def build

data/lib/albacore/xunittestrunner.rb

@@ -1,22 +1,24 @@
-require 'albacore/support/albacore_helper'
+require 'albacore/albacoremodel'
+require 'albacore/config/xunitconfig'
 
 class XUnitTestRunner
-  extend AttrMethods
+  include AlbacoreModel
   include RunCommand
-  include YAMLConfig
+  include Configuration::XUnit
 
   attr_accessor :html_output
   attr_array :options,:assembly,:assemblies
 
-  def initialize(path_to_command='')
-    @path_to_command = path_to_command
+  def initialize(command=nil)
     @options=[]
     super()
+    update_attributes xunit.to_hash
+    @command = command unless command.nil?
   end
 
   def get_command_line
     command_params = []
-    command_params << @path_to_command
+    command_params << @command
     command_params << get_command_parameters
     commandline = command_params.join(" ")
     @logger.debug "Build XUnit Test Runner Command Line: " + commandline

data/lib/albacore/zipdirectory.rb

@@ -1,12 +1,12 @@
-require 'albacore/support/albacore_helper'
+require 'albacore/albacoremodel'
+require 'albacore/config/zipconfig'
 require 'zip/zip'
 require 'zip/zipfilesystem'
 include Zip
 
 class ZipDirectory
-  extend AttrMethods
-  include YAMLConfig
-  include Failure
+  include AlbacoreModel
+  include Configuration::Zip
   
   attr_accessor :output_path, :output_file
   attr_accessor :flatten_zip
@@ -16,6 +16,7 @@ class ZipDirectory
     @flatten_zip = true
     @exclusions = []
     super()
+    update_attributes zip.to_hash
   end
     
   def package()
@@ -45,11 +46,31 @@ class ZipDirectory
   end
   
   def is_excluded(f)
-    @exclusions.any? do |e|
+    expanded_exclusions.any? do |e|
       return true if e.respond_to? '~' and f =~ e
       e == f
     end
   end
+
+  def expanded_exclusions
+    return @expanded_exclusions unless @expanded_exclusions.nil?
+
+    regexp_exclusions, string_exclusions = @exclusions.partition {|x| x.respond_to? '~' }
+    @expanded_exclusions = [].concat(regexp_exclusions)
+    
+    @directories_to_zip.each do |dir|
+      Dir.chdir(dir) do
+        string_exclusions.each do |ex|
+          exclusions = Dir.glob(ex)
+          exclusions = exclusions.map {|x| File.join(dir, x) } unless exclusions[0] == ex
+          exclusions << ex if exclusions.empty?
+          @expanded_exclusions += exclusions
+        end
+      end
+    end
+
+    @expanded_exclusions
+  end
   
   def zip_name()
     @output_path = set_output_path
@@ -82,4 +103,4 @@ class ZipDirectory
       zipfile.add(file_name, file_path)
     end
   end
-end
+end

data/lib/rake/csctask.rb

@@ -0,0 +1,3 @@
+create_task :csc, Proc.new { CSC.new } do |csharp|
+  csharp.execute
+end

data/lib/rake/specflowreporttask.rb

@@ -0,0 +1,3 @@
+create_task :specflowreport, Proc.new { SpecFlowReport.new } do |spec|
+  spec.execute
+end

data/lib/rake/unziptask.rb

@@ -1,3 +1,3 @@
 create_task :unzip, Proc.new { Unzip.new } do |zip|
-  zip.unzip
+  zip.execute
 end

data/rakefile.rb

@@ -22,6 +22,12 @@ namespace :specs do
     t.spec_opts << @spec_opts
   end
 
+  desc "CSharp compiler (csc.exe) specs" 
+  Spec::Rake::SpecTask.new :csc do |t|
+    t.spec_files = FileList['spec/csc*_spec.rb']
+    t.spec_opts << @spec_opts
+  end
+
   desc "Assembly info functional specs"
   Spec::Rake::SpecTask.new :assemblyinfo do |t|
     t.spec_files = FileList['spec/assemblyinfo*_spec.rb']
@@ -59,36 +65,12 @@ namespace :specs do
     t.spec_opts << @spec_opts
   end
 
-  desc "SSH functional specs"
-  Spec::Rake::SpecTask.new :ssh do |t|
-    t.spec_files = FileList['spec/ssh*_spec.rb']
-    t.spec_opts << @spec_opts
-  end  
-
-  desc "Plink functional specs"
-  Spec::Rake::SpecTask.new :plink do |t|
-    t.spec_files = FileList['spec/plink*_spec.rb']
-    t.spec_opts << @spec_opts
-  end
-
   desc "Ndepend functional specs"
   Spec::Rake::SpecTask.new :ndepend do |t|
     t.spec_files = FileList['spec/ndepend*_spec.rb']
     t.spec_opts << @spec_opts
   end
   
-  desc "SFTP functional specs"
-  Spec::Rake::SpecTask.new :sftp do |t|
-    t.spec_files = FileList['spec/sftp*_spec.rb']
-    t.spec_opts << @spec_opts
-  end
-
-  desc "Expand Templates functional specs"
-  Spec::Rake::SpecTask.new :templates do |t|
-    t.spec_files = FileList['spec/expandtemplates*_spec.rb']
-    t.spec_opts << @spec_opts
-    end
-
   desc "Zip functional specs"
   Spec::Rake::SpecTask.new :zip do |t|
     t.spec_files = FileList['spec/zip*_spec.rb']
@@ -119,12 +101,6 @@ namespace :specs do
     t.spec_opts << @spec_opts
   end
   
-  desc "Rename functional specs"
-  Spec::Rake::SpecTask.new :rename do |t|
-    t.spec_files = FileList['spec/rename*_spec.rb']
-    t.spec_opts << @spec_opts
-  end
-  
   desc "Docu functional specs"
   Spec::Rake::SpecTask.new :docu do |t|
     t.spec_files = FileList['spec/docu*_spec.rb']
@@ -139,16 +115,16 @@ namespace :specs do
 end
 
 namespace :albacore do  
-  #global configuration options
-  Albacore::yaml_config_folder = "spec/support/yamlconfig"
-  Albacore::log_level = :verbose
+  Albacore.configure do |config|
+    config.yaml_config_folder = "spec/support/yamlconfig"
+    config.log_level = :verbose
+  end
 
   desc "Run a complete Albacore build sample"
   task :sample => ['albacore:assemblyinfo',
                      'albacore:msbuild',
                      'albacore:ncoverconsole',
                      'albacore:ncoverreport',
-                     'albacore:rename',  
                      'albacore:mspec',
                      'albacore:nunit',
                      'albacore:xunit']
@@ -175,7 +151,7 @@ namespace :albacore do
     File.delete(@xml_coverage) if File.exist?(@xml_coverage)
     
     ncc.log_level = :verbose
-    ncc.path_to_command = "spec/support/Tools/NCover-v3.3/NCover.Console.exe"
+    ncc.command = "spec/support/Tools/NCover-v3.3/NCover.Console.exe"
     ncc.output :xml => @xml_coverage
     ncc.working_directory = "spec/support/CodeCoverage/nunit"
     
@@ -191,7 +167,7 @@ namespace :albacore do
   ncoverreport :ncoverreport => :ncoverconsole do |ncr|
     @xml_coverage = "spec/support/CodeCoverage/test-coverage.xml"
     
-    ncr.path_to_command = "spec/support/Tools/NCover-v3.3/NCover.Reporting.exe"
+    ncr.command = "spec/support/Tools/NCover-v3.3/NCover.Reporting.exe"
     ncr.coverage_files @xml_coverage
     
     fullcoveragereport = NCover::FullCoverageReport.new
@@ -204,14 +180,6 @@ namespace :albacore do
     )
   end
 
-  desc "Run the sample for renaming a File"
-  rename do |rename|
-    FileUtils.touch 'web.uat.config.example'
-     
-    rename.actual_name = 'web.uat.config.example'
-    rename.target_name = 'web.config.example'
-  end
-   
   desc "Run ZipDirectory example"
   zip do |zip|
     zip.output_path = File.dirname(__FILE__)
@@ -228,19 +196,19 @@ namespace :albacore do
    
   desc "MSpec Test Runner Example"
   mspec do |mspec|
-    mspec.path_to_command = "spec/support/Tools/Machine.Specification-v0.2/Machine.Specifications.ConsoleRunner.exe"
+    mspec.command = "spec/support/Tools/Machine.Specification-v0.2/Machine.Specifications.ConsoleRunner.exe"
     mspec.assemblies "spec/support/CodeCoverage/mspec/assemblies/TestSolution.MSpecTests.dll"
   end
 
   desc "NUnit Test Runner Example"
   nunit do |nunit|
-    nunit.path_to_command = "spec/support/Tools/NUnit-v2.5/nunit-console.exe"
+    nunit.command = "spec/support/Tools/NUnit-v2.5/nunit-console.exe"
     nunit.assemblies "spec/support/CodeCoverage/nunit/assemblies/TestSolution.Tests.dll"
   end
 
   desc "XUnit Test Runner Example"
   xunit do |xunit|
-    xunit.path_to_command = "spec/support/Tools/XUnit-v1.5/xunit.console.exe"
+    xunit.command = "spec/support/Tools/XUnit-v1.5/xunit.console.exe"
     xunit.assembly = "spec/support/CodeCoverage/xunit/assemblies/TestSolution.XUnitTests.dll"
   end   
   
@@ -265,18 +233,17 @@ namespace :jeweler do
     gs.description = "Easily build your .NET solutions with Ruby and Rake, using this suite of Rake tasks."
     gs.email = "derickbailey@gmail.com"
     gs.homepage = "http://albacorebuild.net"
-    gs.authors = ["Derick Bailey", "Ben Hall", "etc"]
+    gs.authors = ["Derick Bailey", "Ben Hall", "Steve Harman", "etc"]
     gs.has_rdoc = false  
     gs.files.exclude("albacore.gemspec", ".gitignore", "spec/support/Tools")
 
     gs.add_dependency('rake', '>= 0.8.7')
-    gs.add_dependency('net-ssh', '>= 2.0.15')
-    gs.add_dependency('net-sftp', '>= 2.0.2')
-    gs.add_dependency('rubyzip', '>= 0.9.1')
+    gs.add_dependency('rubyzip', '>= 0.9.4')
 
-    gs.add_development_dependency('rspec', '>= 1.2.8')
-    gs.add_development_dependency('jeweler', '>= 1.2.1')
+    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.4')
+    gs.add_development_dependency('jekyll', '>= 0.5.7')
+    gs.add_development_dependency('watchr', '>= 0.6')
   end
 end

data/spec/albacoremodel_spec.rb

@@ -0,0 +1,35 @@
+require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
+require 'albacore/albacoremodel'
+
+class ModelTest
+  include AlbacoreModel
+  attr_accessor :foo, :bar
+  attr_hash :a_hash
+  attr_array :a_array
+end
+
+describe "when updating object attributes with a valid set of hash keys" do
+  before :each do
+    @model = ModelTest.new
+    @model << {:foo => "test", :bar => "whatever"}
+  end
+
+  it "should set the attributes correctly" do
+    @model.foo.should == "test"
+    @model.bar.should == "whatever"
+  end
+end
+
+describe "when updating an object attributes with an invalid hash key" do
+  before :each do
+    @model = ModelTest.new
+    str = StringIO.new
+    @model.log_device = str
+    @model << {:something => "broken"}
+    @log = str.string
+  end
+
+  it "should warn about the attribute not being found" do
+    @log.should include("something is not a settable attribute on ModelTest")
+  end
+end

data/spec/assemblyinfo_spec.rb

@@ -475,3 +475,20 @@ describe AssemblyInfo, "when configuring the assembly info generator with a yaml
     @asm.company_name.should == "some company name"
   end
 end
+
+describe AssemblyInfo, "when assembly info configuration is provided" do
+  let :asm do
+    Albacore.configure do |config|
+      config.assemblyinfo do |asm|
+        asm.company_name = "foo"
+        asm.version = "bar"
+      end
+    end
+    asm = AssemblyInfo.new
+    asm
+  end
+  it "should use the supplied info" do
+    asm.company_name.should == "foo"
+    asm.version.should == "bar"
+  end
+end

data/spec/attrmethods_spec.rb

@@ -50,6 +50,22 @@ describe "when setting an array attribute to an array variable using the equal s
   end
 end
 
+describe "when setting an array attribute to an array without the equal sign" do
+  before :each do
+    class TestClass
+      extend AttrMethods
+      attr_array :test
+    end
+
+    @test = TestClass.new
+    @test.test [1, 2, 3, 4, 5, 6]
+  end
+
+  it "should set the array to the values specified" do
+    @test.test.length.should be(6)
+  end
+end
+
 describe "when setting a hash attribute value without the equal sign" do
   before :each do 
    class Test_Class
@@ -82,7 +98,7 @@ describe "when setting a hash attribute with a params list, using the equal sign
   end
 end
 
-describe "when setting a hash attribute to an array variable using the equal sign" do
+describe "when setting a hash attribute to an hash variable using the equal sign" do
   before :each do
     class TestClass
       extend AttrMethods

data/spec/config_spec.rb

@@ -0,0 +1,19 @@
+require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
+require 'albacore/albacoremodel'
+
+class ConfigTest
+  include AlbacoreModel
+end
+
+describe "when configuring log level to verbose" do
+  let :test do
+    Albacore.configure do |config|
+      config.log_level = :verbose
+    end
+    test = ConfigTest.new
+  end
+
+  it "should set the log level for any model" do
+    test.log_level.should == :verbose
+  end
+end

data/spec/createtask_spec.rb

@@ -1,11 +1,9 @@
 require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
-require 'albacore/support/albacore_helper'
+require 'albacore/albacoremodel'
 require 'fail_patch'
 
 class SampleObject
-  extend AttrMethods
-  include Failure
-  include YAMLConfig
+  include AlbacoreModel
 
   attr_array :array
   attr_hash :hash
@@ -19,6 +17,15 @@ class SampleObject
   end
 end
 
+class RunCommandObject
+  include AlbacoreModel
+  include RunCommand
+
+  def execute
+    result = run_command "Run Command Test Object"
+  end
+end
+
 describe "when defining a task" do
   before :all do
     @sample_object = SampleObject.stub_instance()
@@ -170,3 +177,37 @@ describe "when creating two tasks and executing them" do
     @instance_1.object_id.should_not == @instance_2.object_id
   end
 end
+
+describe "when running two instances of a command line task" do
+  before :all do
+    create_task :run_command_task, Proc.new { RunCommandObject.new } do |ex|
+      ex.execute
+    end
+
+  	run_command_task :one do |x|
+      x.extend(SystemPatch)
+      x.command = "set"
+      x.parameters "_albacore_test = test_one"
+      @one = x
+  	end
+
+    run_command_task :two do |x|
+      x.extend(SystemPatch)
+      x.command = "set"
+      x.parameters "_another_albacore_test = test_two"
+      @two = x
+    end
+    
+    Rake::Task[:one].invoke
+    Rake::Task[:two].invoke
+  end
+  
+  it "should only pass the parameters specified to the first command" do
+    @one.system_command.should == "\"set\" _albacore_test = test_one"
+  end
+  
+  it "should only pass the parameters specified to the second command" do
+    @two.system_command.should == "\"set\" _another_albacore_test = test_two"
+  end
+end
+