albacore 0.1.1 → 0.1.2

data/lib/rake/renametask.rb

@@ -1,20 +1,3 @@
-require 'rake/tasklib'
-
-def rename(name=:rename, *args, &block)
-  Albacore::RenameTask.new(name, *args, &block)
-end
-  
-module Albacore
-  class RenameTask < Albacore::AlbacoreTask
-    attr_accessor :actual_name, :target_name
-    
-    def execute(name, task_args)
-      @block.call(self, *task_args) unless @block.nil?
-      if (@actual_name.nil? || @target_name.nil?)
-        fail
-      else
-        File.rename(@actual_name, @target_name)
-      end
-    end
-  end
+create_task :rename, Renamer.new do |ren|
+  ren.rename
 end

data/lib/rake/sftptask.rb

@@ -1,16 +1,3 @@
-require 'rake/tasklib'
-
-def sftp(name=:sftp, *args, &block)
-  Albacore::SftpTask.new(name, *args, &block)
-end
-  
-module Albacore
-  class SftpTask < Albacore::AlbacoreTask
-    def execute(name, task_args)
-      @sftp = Sftp.new
-      @sftp.load_config_by_task_name(name)
-      @block.call(@sftp, *task_args) unless @block.nil?
-      @sftp.upload
-    end
-  end
-end
+create_task :sftp, Sftp.new do |cmd|
+  cmd.upload
+end

data/lib/rake/sqlcmdtask.rb

@@ -1,17 +1,3 @@
-require 'rake/tasklib'
-
-def sqlcmd(name=:sqlcmd, *args, &block)
-  Albacore::SQLCmdTask.new(name, *args, &block)
-end
-  
-module Albacore  
-  class SQLCmdTask < Albacore::AlbacoreTask
-    def execute(name, task_args)
-      @sqlcmd = SQLCmd.new
-      @sqlcmd.load_config_by_task_name(name)
-      @block.call(@sqlcmd, *task_args) unless @block.nil?
-      @sqlcmd.run
-      fail if @sqlcmd.failed
-    end  
-  end
+create_task :sqlcmd, SQLCmd.new do |cmd|
+  cmd.run
 end

data/lib/rake/sshtask.rb

@@ -1,16 +1,3 @@
-require 'rake/tasklib'
-
-def ssh(name=:ssh, *args, &block)
-  Albacore::SshTask.new(name, *args, &block)
-end
-  
-module Albacore
-  class SshTask < Albacore::AlbacoreTask
-    def execute(name, task_args)
-      @ssh = Ssh.new
-      @ssh.load_config_by_task_name(name)
-      @block.call(@ssh, *task_args) unless @block.nil?
-      @ssh.execute
-    end
-  end
+create_task :ssh, Ssh.new do |cmd|
+  cmd.execute
 end

data/lib/rake/support/albacoretask.rb

@@ -6,15 +6,25 @@ module Albacore
     
     def initialize(name, *args, &block)
       @block = block
-      @args = args.insert(0, name)
-      @name = name
-      define
+      args = args.insert(0, name)
+      define name, args
     end
     
-    def define
-      task *@args do |task, task_args|
-        execute @name.to_s, task_args
+    def define(name, args)
+      task *args do |task, task_args|
+      	@task_args = task_args
+        execute name.to_s
       end
     end
+    
+    def call_task_block(obj)
+      if !@block.nil?
+      	if @block.arity == 1
+      	  @block.call(obj)
+        else
+      	  @block.call(obj, @task_args)
+  	    end
+  	  end
+    end
   end
 end

data/lib/rake/support/createtask.rb

@@ -0,0 +1,20 @@
+def create_task(taskname, task_object, &execute_body)
+  taskclass = :"Albacore_TaskFor_#{taskname}"
+  taskmethod = taskname.to_s.downcase.to_sym
+
+  Object.class_eval(<<-EOF, __FILE__, __LINE__)
+    def #{taskmethod}(name=:#{taskname}, *args, &block)
+      Albacore.const_get("#{taskclass}").new(name, *args, &block)
+    end
+  EOF
+
+  Albacore.class_eval do
+    const_set(taskclass, Class.new(Albacore::AlbacoreTask) do
+      define_method :execute do |name|
+        task_object.load_config_by_task_name(name)
+        call_task_block(task_object)
+      	execute_body.call(task_object) unless execute_body.nil?
+      end
+    end)
+  end
+end

data/lib/rake/unziptask.rb

@@ -1,17 +1,3 @@
-require 'rake/tasklib'
-
-def unzip(name=:unzip, *args, &block)
-  Albacore::UnZipTask.new(name, *args, &block)
-end
-  
-module Albacore
-  class UnZipTask < Albacore::AlbacoreTask
-    def execute(name, task_args)
-      @zip = Unzip.new
-      @zip.load_config_by_task_name(name)
-      @block.call(@zip, *task_args) unless @block.nil?
-      @zip.unzip
-      fail if @zip.failed
-    end    
-  end
+create_task :unzip, Unzip.new do |zip|
+  zip.unzip
 end

data/lib/rake/xbuildtask.rb

@@ -1,22 +1,7 @@
-require 'rake/tasklib'
-
-def xbuild(name=:xbuild, *args, &block)
-  Albacore::XBuildTask.new(name, *args, &block)
+create_task :xbuild, XBuild.new do |xb|
+  xb.build
 end
 
-def mono(name=:mono, *args, &block)
-  Albacore::XBuildTask.new(name, *args, &block)
-end
-    
-module Albacore
-  class XBuildTask < Albacore::AlbacoreTask    
-    def execute(name, task_args)
-      @xbuild = XBuild.new
-      @xbuild.load_config_by_task_name(name)
-      @block.call(@xbuild, *task_args) unless @block.nil? 
-      @xbuild.build
-      fail if @xbuild.failed
-    end    
-  end
-  
+create_task :mono, XBuild.new do |xb|
+  xb.build
 end

data/lib/rake/xunittask.rb

@@ -1,17 +1,3 @@
-require 'rake/tasklib'
-
-def xunit(name=:xunit, *args, &block)
-  Albacore::XUnitTask.new(name, *args, &block)
-end
-  
-module Albacore
-  class XUnitTask < Albacore::AlbacoreTask
-    def execute(name, task_args)
-      @xunit = XUnitTestRunner.new
-      @xunit.load_config_by_task_name(name)
-      @block.call(@xunit, *task_args) unless @block.nil?
-      @xunit.execute
-      fail if @xunit.failed
-    end
-  end
+create_task :xunit, XUnitTestRunner.new do |x|
+  x.execute
 end

data/lib/rake/ziptask.rb

@@ -1,17 +1,3 @@
-require 'rake/tasklib'
-
-def zip(name=:zip, *args, &block)
-  Albacore::ZipTask.new(name, *args, &block)
-end
-  
-module Albacore
-  class ZipTask < Albacore::AlbacoreTask
-    def execute(name, task_args)
-      @zip = ZipDirectory.new
-      @zip.load_config_by_task_name(name)
-      @block.call(@zip, *task_args) unless @block.nil?
-      @zip.package
-      fail if @zip.failed
-    end    
-  end
+create_task :zip, ZipDirectory.new do |z|
+  z.package
 end

data/rakefile.rb

@@ -1,3 +1,5 @@
+require 'lib/albacore'
+
 task :default => ['albacore:sample']
 
 namespace :specs do
@@ -134,8 +136,6 @@ namespace :specs do
 end
 
 namespace :albacore do  
-  require 'lib/albacore'
-  
   #global configuration options
   Albacore::yaml_config_folder = "spec/support/yamlconfig"
   Albacore::log_level = :verbose
@@ -151,7 +151,7 @@ namespace :albacore do
                      'albacore:xunit']
   
   desc "Run a sample MSBuild with YAML autoconfig"
-  msbuild
+  msbuild :msbuild
   
   desc "Run a sample assembly info generator"
   assemblyinfo do |asm|
@@ -258,11 +258,11 @@ namespace :jeweler do
   require 'jeweler'  
   Jeweler::Tasks.new do |gs|
     gs.name = "albacore"
-    gs.summary = "A Suite of Rake Build Tasks For .Net Solutions"
-    gs.description = "Easily build your .NET solutions with rake, using this suite of rake tasks."
+    gs.summary = "Dolphin-Safe Rake Tasks For .NET Systems"
+    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", "Steven Harman"]
+    gs.authors = ["Derick Bailey", "Ben Hall"]
     gs.has_rdoc = false  
     gs.files.exclude("albacore.gemspec", ".gitignore", "spec/support/Tools")
 

data/spec/assemblyinfo_spec.rb

@@ -46,6 +46,8 @@ describe AssemblyInfo, "when generating an assembly info file without an output
   before :all do
     @tester = AssemblyInfoTester.new
     asm = AssemblyInfo.new
+    asm.extend(FailPatch)
+    
     strio = StringIO.new
     asm.log_device = strio
     

data/spec/assemblyinfotask_spec.rb

@@ -1,15 +1,15 @@
 require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
 require 'albacore/assemblyinfo'
 require 'rake/assemblyinfotask'
-require 'tasklib_patch'
+require 'fail_patch'
 
-describe Albacore::AssemblyInfoTask, "when running" do
+describe "when running" do
   before :all do
-    @task = Albacore::AssemblyInfoTask.new(:task) do |t|
-      @yielded_object = t
-    end
-    @task.extend(TasklibPatch)
-    Rake::Task["task"].invoke
+  	assemblyinfo :assemblyinfo do |asm|
+      asm.extend(FailPatch)    
+  	  @yielded_object = asm
+  	end
+    Rake::Task["assemblyinfo"].invoke
   end
   
   it "should yield the assembly info api" do
@@ -17,15 +17,16 @@ describe Albacore::AssemblyInfoTask, "when running" do
   end
 end
 
-describe Albacore::AssemblyInfoTask, "when execution fails" do
+describe "when execution fails" do
   before :all do
-    @task = Albacore::AssemblyInfoTask.new(:failingtask)
-    @task.extend(TasklibPatch)
-    @task.fail
+  	assemblyinfo :failingtask do |asm|
+  	  asm.extend(FailPatch)
+  	  asm.fail
+  	end
     Rake::Task["failingtask"].invoke
   end
   
   it "should fail the rake task" do
-    @task.task_failed.should == true
+    $task_failed.should == true
   end
 end

data/spec/createtask_spec.rb

@@ -0,0 +1,70 @@
+require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
+require 'albacore/support/albacore_helper'
+require 'fail_patch'
+
+class SampleObject
+  include Failure
+  include YAMLConfig
+end
+
+describe "when defining a task" do
+  before :all do
+    @sample_object = SampleObject.stub_instance()
+    @sample_object.stub_method(:load_config_by_task_name){ |name|
+    	@task_name = name
+    }
+    create_task :sampletask, @sample_object do |obj|
+      @task_obj = obj
+    end
+
+  	sampletask :sample do |x|
+      x.extend(FailPatch)
+  	  @config_obj = x
+  	end
+    Rake::Task[:sample].invoke
+  end
+  
+  it "should yield the object for configuration" do
+    @config_obj.should == @sample_object
+  end
+  
+  it "should yield the object for execution" do
+  	@task_obj.should == @sample_object
+  end
+  
+  it "should call the yaml configuration by task name" do
+  	@task_name.should == "sample"
+  end
+end
+
+describe "when execution fails" do
+  before :all do
+    create_task :failing_task, SampleObject.new
+
+  	failing_task :sample_fail do |x|
+  	  x.extend(FailPatch)
+  	  x.fail
+  	end
+    Rake::Task[:sample_fail].invoke
+  end
+  
+  it "should fail the rake task" do
+    $task_failed.should == true
+  end
+end
+
+describe "when task args are used" do
+  before :all do
+    create_task :task_with_args, SampleObject.new
+
+    task_with_args :sampletask_withargs, [:arg1] do |t, args|
+      t.extend(FailPatch)
+      @args = args
+    end
+    Rake::Task[:sampletask_withargs].invoke("test")
+  end
+  
+  it "should provide the task args" do
+    @args.arg1.should == "test"
+  end
+end

data/spec/docutask_spec.rb

@@ -1,19 +1,18 @@
 require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
 require 'albacore/docu'
 require 'rake/docutask'
-require 'tasklib_patch'
+require 'fail_patch'
+require 'system_patch'
 require 'docu_patch'
 
-describe Albacore::DocuTask, "when running" do
+describe "when running" do
   before :all do
-    task = Albacore::DocuTask.new(:successful_task) do |t|
-	  t.assemblies << 'test.dll'
-      t.command_result = true
-      @yielded_object = t
-    end
-    
-    task.extend(TasklibPatch)
-    Rake::Task[:successful_task].invoke
+  	docu :docu do |d|
+	  d.assemblies 'test.dll'
+      d.command_result = true
+      @yielded_object = d
+  	end
+    Rake::Task[:docu].invoke
   end
   
   it "should yield the docu api" do
@@ -21,19 +20,33 @@ describe Albacore::DocuTask, "when running" do
   end
 end
 
-describe Albacore::DocuTask, "when execution fails" do
+describe "when execution fails" do
   before :all do
-    @task = Albacore::DocuTask.new(:failing_task) do |t|
-	  t.command_result = false
-      t.assemblies << 'test.dll'
-    end
-
-    @task.extend(TasklibPatch)
-
-    Rake::Task[:failing_task].invoke
+  	docu :docu_fail do |d|
+  	  d.extend(FailPatch)
+	  d.assemblies 'test.dll'
+      d.command_result = true
+	  d.fail
+  	end
+    Rake::Task[:docu_fail].invoke
   end
   
   it "should fail the rake task" do
-    @task.task_failed.should == true
+    $task_failed.should be_true
   end
-end
+end
+
+describe "when task args are used" do
+  before :all do
+    docu :docutask_withargs, [:arg1] do |d, args|
+	  d.assemblies 'test.dll'
+      d.command_result = true
+      @args = args
+  	end
+    Rake::Task["docutask_withargs"].invoke("test")
+  end
+  
+  it "should provide the task args" do
+    @args.arg1.should == "test"
+  end
+end