albacore 0.1.2 → 0.1.3

data/README.markdown

@@ -1,77 +1,83 @@
-# Welcome to the Albacore project.
+# Welcome to the albacore project.
 
-Albacore is intended to be a professional quality suite of Rake tasks to help automate the process of building a .NET based system. All tasks are built using a test-first approach through rspec, and all tests are included in the Albacore gem.
+albacore is a professional quality suite of Rake tasks to help automate the process of building a .NET based system. 
 
-## How To Install Albacore From Gemcutter Gems:
+## How To Install albacore From Gemcutter Gems:
 
-If you would like to install the current, stable release of Albacore, you can do so easily through the Gemcutter gem server. Follow these simple instructions and you will be good to go.
+If you would like to install the current, stable release of albacore, you can do so easily through the standard RubyGems.org server. Follow these simple instructions and you will be good to go.
 
-**Step 1:** Setup Gemcutter as a gem source
+**Step 1:** Install the albacore gem
 
-> gem source -a http://gemcutter.org
+> gem install albacore
 
-(note: you only need to do this once for any given computer that is going to install gems from gemcutter.)
+That's it! You're now equiped with everything you need to get up and running with albacore!
 
-**Step 2:** Install the Albacore gem
+## How To Manually Build And Install The albacore Gem
 
-> gem install albacore
+If you would like to install the latest source code for albacore, and get all the new features and functionality (possibly in an unstable form), you can manually build and install the albacore gem. Follow these simple instructions and you will be good to go.
+
+**Step 1:** Clone albacore
 
-(note: as of v0.0.7, the "albacore" gem is spelled with a lowercase "a".)
+Use your Github account to fork albacore, or clone it directly from my public clone URL.
 
-## How To Manually Build And Install The Albacore Gem
+> git clone git://github.com/derickbailey/albacore.git albacore
 
-If you would like to install the latest source code for Albacore, and get all the new features and functionality (possibly in an unstable form), you can manually build and install the Albacore gem. Follow these simple instructions and you will be good to go.
+**Step 2:** Install Required Dependencies
 
-**Step 1:** Clone Albacore
+In your local clone of albacore, run the "install_dependencies.rb" script:
 
-Use your Github account to fork Albacore, or clone it directly from my public clone URL.
+> ruby install_dependencies.rb
 
-> git clone git://github.com/derickbailey/Albacore.git Albacore
+This will install all of the gem dependencies that you need, to build the albacore gem.
 
-**Step 2:** Build the gem
+**Step 3:** Build the gem
 
-In your local clone of Albacore, use the jeweler rake tasks to build the latest version of the Albacore code into a gem.
+In your local clone of albacore, use the jeweler rake tasks to build the latest version of the albacore code into a gem.
 
 > rake jeweler:gemspec
 >
 > rake jeweler:build
 
-this will produce an 'albacore-#.#.#.gem' file in the 'pkg' folder, where '#.#.#' is the version number. For example 'albacore-0.0.7.gem'.
+this will produce an 'albacore-#.#.#.gem' file in the 'pkg' folder, where '#.#.#' is the version number. For example 'albacore-0.1.2.gem'.
 
-**Step 3:** Install the gem
+**Step 4:** Install the gem
 
 After building the gem, you can install it from your local file system.
 
 > gem install -l pkg/albacore-#.#.#.gem
 
-where '#.#.#' is the version number of the gem. For example 'albacore-0.0.7.gem'
+where '#.#.#' is the version number of the gem. For example 'albacore-0.1.2.gem'
+
+## How To Use albacore
+
+On systems do not have the "RUBYOPT" environment variable set to automatically include rubygems, you will also need to add
 
-## How To Use Albacore
+    require 'rubygems'
 
-After installing Albacore, you only need to
+to the top of your rakefile. Then, you can add
 
     require 'albacore'
 
-in your rakefile. This will allow you to use the tasks that Albacore includes. 
+to your rakefile. This will allow you to use the tasks that albacore includes.  
 
     desc "Run a sample build using the MSBuildTask"
-    msbuildtask do |msb|
-        msb.properties = {:configuration => :Debug}
-        msb.targets [:Clean, :Build]
+    msbuild do |msb|
+        msb.properties :configuration => :Debug
+        msb.targets :Clean, :Build
         msb.solution = "spec/support/TestSolution/TestSolution.sln"
     end
 
-Beyond the simple example, check out the [Albacore Wiki](http://wiki.github.com/derickbailey/Albacore) for detailed instructions on how to use the built in tasks and their options.
+Beyond the simple example, check out the [albacore Wiki](http://wiki.github.com/derickbailey/albacore) for detailed instructions on how to use the built in tasks and their options.
 
 ## How To Contribute, Collaborate, Communicate
 
-If you'd like to get involved with the Albacore framework, we have a discussion group over at google: **[AlbacoreDev](http://groups.google.com/group/albacoredev)**
+If you'd like to get involved with the albacore framework, we have a discussion group over at google: **[AlbacoreDev](http://groups.google.com/group/albacoredev)**
 
-Anyone can fork the main repository and submit patches, as well. And lastly, the [wiki](http://wiki.github.com/derickbailey/Albacore) and [issues list](http://github.com/derickbailey/Albacore/issues) are also open for additions, edits, and discussion.
+Anyone can fork the main repository and submit patches, as well. And lastly, the [wiki](http://wiki.github.com/derickbailey/albacore) and [issues list](http://github.com/derickbailey/albacore/issues) are also open for additions, edits, and discussion.
 
 ## Contributors
 
-Many thanks for contributions to Albacore are due (in alphabetical order):
+Many thanks for contributions to albacore are due (in alphabetical order):
 
 * [Andreone](http://github.com/Andreone): Significant Wiki contributions, questions and contributions on the google group
 * [Ben Hall](http://github.com/benhall): Primary contributor. SSH, SFTP, ZipDirectory, Rename, YAML auto config, Wiki pages, and many other great additions

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/install_dependencies.rb

@@ -3,7 +3,7 @@ require 'rubygems/gem_runner'
 require 'rubygems/exceptions'
 
 #http://gist.github.com/236148
-required_version = Gem::Requirement.new "> 1.8.3"
+required_version = Gem::Requirement.new "> 1.8.5"
 
 unless required_version.satisfied_by? Gem.ruby_version then
   abort "Expected Ruby Version #{required_version}, was #{Gem.ruby_version}"
@@ -22,20 +22,7 @@ def install(lib)
   end
 end
 
-def add_source(url)
-  begin
-    if Gem.sources.include?(url)
-      puts "Found #{url} gem source = skipping"
-    else
-      puts "Adding #{url} gem source."
-    Gem::GemRunner.new.run ['sources', '-a', url]
-  end
-  rescue Gem::SystemExitException => e
-  end
-end
-
 puts "Installing required dependencies"
-add_source 'http://gemcutter.org'
 install 'rake'
 install 'net-ssh'
 install 'net-sftp'

data/lib/albacore/exec.rb

@@ -4,15 +4,9 @@ class Exec
   include RunCommand
   include YAMLConfig
   include Logging
-  
-  def initialize
-    @path_to_command=''
-    @parameters = []
-    super()
-  end
     
   def execute
-    result = run_command "Exec", @parameters.join(" ")
+    result = run_command "Exec"
     
     failure_message = 'Exec Failed. See Build Log For Detail'
     fail_with_message failure_message if !result

data/lib/albacore/ncoverconsole.rb

@@ -6,14 +6,15 @@ class NCoverConsole
   include YAMLConfig
   
   attr_accessor :testrunner, :working_directory
-  attr_array :cover_assemblies, :ignore_assemblies, :coverage
+  attr_array :cover_assemblies, :exclude_assemblies, :coverage, :exclude_attributes
   attr_hash :output
   
   def initialize
     @register_dll = true
     @output = {}
     @cover_assemblies = []
-    @ignore_assemblies = []
+    @exclude_assemblies = []
+    @exclude_attributes = []
     @coverage = []
     super()
   end
@@ -33,8 +34,9 @@ class NCoverConsole
     command_parameters << "//reg" if @register_dll
     command_parameters << build_output_options(@output) unless @output.nil?
     command_parameters << @working_directory unless @working_directory.nil?
-    command_parameters << build_assembly_list("assemblies", @cover_assemblies) unless @cover_assemblies.empty?
-    command_parameters << build_assembly_list("exclude-assemblies", @ignore_assemblies) unless @ignore_assemblies.empty?
+    command_parameters << build_parameter_list("assemblies", @cover_assemblies) unless @cover_assemblies.empty?
+    command_parameters << build_parameter_list("exclude-assemblies", @exclude_assemblies) unless @exclude_assemblies.empty?
+    command_parameters << build_parameter_list("exclude-attributes", @exclude_attributes) unless @exclude_attributes.empty?
     command_parameters << build_coverage_list(@coverage) unless @coverage.empty?
     command_parameters << @testrunner.get_command_line
     
@@ -60,9 +62,9 @@ class NCoverConsole
     options.join(" ")
   end
   
-  def build_assembly_list(param_name, list)
-    assembly_list = list.map{|asm| "\"#{asm}\""}.join(';')
-    "//#{param_name} #{assembly_list}"
+  def build_parameter_list(param_name, list)
+    list = list.map{|asm| "\"#{asm}\""}.join(';')
+    "//#{param_name} #{list}"
   end
   
   def build_coverage_list(coverage)

data/lib/albacore/support/attrmethods.rb

@@ -3,7 +3,11 @@ module AttrMethods
   def attr_array(*names)
     names.each do |n|
       self.send :define_method, n do |*value|
-        instance_variable_set "@#{n}", value
+        if value.nil? || value.empty?
+          return instance_variable_get "@#{n}"
+        else
+          instance_variable_set "@#{n}", value
+        end
       end
       self.send :define_method, "#{n}=" do |value|
         instance_variable_set "@#{n}", value
@@ -14,7 +18,11 @@ module AttrMethods
   def attr_hash(*names)
   	names.each do |n|
       self.send :define_method, n do |value|
-        instance_variable_set "@#{n}", value
+        if value.nil? || value.empty?
+          instance_variable_get "@#{n}"
+        else
+          instance_variable_set "@#{n}", value
+        end
       end
       self.send :define_method, "#{n}=" do |value|
         instance_variable_set "@#{n}", value

data/lib/albacore/support/runcommand.rb

@@ -14,14 +14,14 @@ module RunCommand
     super()
   end
   
-  def run_command(command_name="Command Line", command_parameters="")
+  def run_command(command_name="Command Line", command_parameters=nil)
     if @require_valid_command
       return false unless valid_command_exists
     end
 
-    command_parameters = command_parameters + " #{@parameters.join(' ')}"
+	@parameters = @parameters.push(command_parameters) unless command_parameters.nil?
     
-    command = "\"#{@path_to_command}\" #{command_parameters}"
+    command = "\"#{@path_to_command}\" #{@parameters.join(' ')}"
     @logger.debug "Executing #{command_name}: #{command}"
     
     set_working_directory    

data/spec/attrmethods_spec.rb

@@ -0,0 +1,100 @@
+require File.join(File.dirname(__FILE__), 'support', 'spec_helper')
+require 'albacore/support/attrmethods'
+
+describe "when setting an array attribute value without the equal sign" do
+  before :each do 
+   class Test_Class
+     extend AttrMethods
+     attr_array :test
+   end 
+
+   @test = Test_Class.new
+   @test.test 1, 2, 3, 4
+  end
+
+  it "should set the array to the specified values" do
+    @test.test.length.should be(4)
+  end
+end
+
+describe "when setting an array attribute with a params list, using the equal sign" do
+  before :each do
+    class Test_Class
+      extend AttrMethods
+      attr_array :test
+    end
+
+    @test = Test_Class.new
+    @test.test = 1, 2, 3, 4
+  end
+
+  it "should set the array to the specified values" do
+    @test.test.length.should be(4)
+  end
+end
+
+describe "when setting an array attribute to an array variable using the equal sign" do
+  before :each do
+    class TestClass
+      extend AttrMethods
+      attr_array :test
+    end
+
+    test_values = [1, 2, 3, 4, 5]
+    @test = TestClass.new
+    @test.test = test_values 
+  end
+
+  it "should set the array to the values contained in the variable" do
+    @test.test.length.should be(5)
+  end
+end
+
+describe "when setting a hash attribute value without the equal sign" do
+  before :each do 
+   class Test_Class
+     extend AttrMethods
+     attr_hash :test
+   end 
+
+   @test = Test_Class.new
+   @test.test "a" => "b", "c" => "d"
+  end
+
+  it "should set the hash to the specified values" do
+    @test.test.length.should be(2)
+  end
+end
+
+describe "when setting a hash attribute with a params list, using the equal sign" do
+  before :each do
+    class Test_Class
+      extend AttrMethods
+      attr_hash :test
+    end
+
+    @test = Test_Class.new
+    @test.test = {"a" => "b", "c" => "d"}
+  end
+
+  it "should set the hash to the specified values" do
+    @test.test.length.should be(2)
+  end
+end
+
+describe "when setting a hash attribute to an array variable using the equal sign" do
+  before :each do
+    class TestClass
+      extend AttrMethods
+      attr_hash :test
+    end
+
+    test_values = {"a" => "b", "c" => "d", "e" => "f"}
+    @test = TestClass.new
+    @test.test = test_values 
+  end
+
+  it "should set the hash to the values contained in the variable" do
+    @test.test.length.should be(3)
+  end
+end

data/spec/createtask_spec.rb

@@ -67,4 +67,56 @@ describe "when task args are used" do
   it "should provide the task args" do
     @args.arg1.should == "test"
   end
-end
+end
+
+describe "when calling a task method without providing a task name" do
+  before :all do
+    create_task :task_without_name, SampleObject.new
+
+    task_without_name do |t|
+      @task_without_name_called = true
+    end
+    
+    Rake::Task[:task_without_name].invoke
+  end
+  
+  it "should create the the task by the task method's name" do
+    @task_without_name_called = true
+  end
+end
+
+describe "when calling a task method without providing a task parameter" do
+  before :all do
+    create_task :task_without_param, SampleObject.new
+
+    task_without_param do
+      @task_without_param_called = true
+    end
+    
+    Rake::Task[:task_without_param].invoke
+  end
+  
+  it "should execute the task with no parameter provided" do
+    @task_without_param_called = true
+  end
+end
+
+describe "when calling a task without a task definition block" do
+	
+  before :all do
+    create_task :task_without_body, SampleObject.new
+    
+    task_without_body
+    
+    begin
+      Rake::Task[:task_without_body].invoke
+      @failed = false
+    rescue
+      @failed = true
+    end
+  end		
+	
+  it "should execute the task" do
+  	@failed.should be_false
+  end
+end

data/spec/exec_spec.rb

@@ -18,7 +18,13 @@ describe Exec, "when executing a command with parameters" do
     @cmd.system_command.should include("\"#{@@nunit}\" --help")
   end
   
+  it "should specify the parameters only once" do
+  	@cmd.system_command.scan(/--help/).length.should be(1)
+  end
+  
   it "should not fail" do
     $task_failed.should be_false
   end
 end
+
+

data/spec/msbuild_spec.rb

@@ -181,5 +181,4 @@ describe MSBuild, "when specifying multiple configuration properties" do
   it "should output the solution's binaries" do
     File.exist?(@testdata.output_path).should == true
   end
-
 end

data/spec/ncoverconsole_spec.rb

@@ -71,7 +71,7 @@ describe NCoverConsole, "when specifying assemblies to ignore" do
     @ncc.path_to_command = @testdata.ncoverpath
     @ncc.output :xml => @testdata.xml_coverage_output
     @ncc.working_directory = @testdata.working_directory
-    @ncc.ignore_assemblies "TestSolution.*"
+    @ncc.exclude_assemblies "TestSolution.*"
     
     nunit = NUnitTestRunner.new(@testdata.nunitpath)
     nunit.assemblies @testdata.test_assembly
@@ -86,6 +86,33 @@ describe NCoverConsole, "when specifying assemblies to ignore" do
   end
 end
 
+describe NCoverConsole, "when specifying attributes to exclude" do
+  before :all do
+  	@testdata = NCoverConsoleTestData.new
+    File.delete(@testdata.xml_coverage_output) if File.exist?(@testdata.xml_coverage_output)
+
+    @ncc = NCoverConsole.new()
+
+    @ncc.extend(SystemPatch)
+    @ncc.log_level = :verbose
+    @ncc.path_to_command = @testdata.ncoverpath
+    @ncc.output :xml => @testdata.xml_coverage_output
+    @ncc.working_directory = @testdata.working_directory
+    @ncc.exclude_attributes "excludeme", "excludeme_too"
+
+    nunit = NUnitTestRunner.new(@testdata.nunitpath)
+    nunit.assemblies @testdata.test_assembly
+    nunit.options '/noshadow'
+
+    @ncc.testrunner = nunit
+    @ncc.run
+  end
+
+  it "should not provide coverage for the excluded attributes" do
+    @ncc.system_command.should include("//exclude-attributes \"excludeme\";\"excludeme_too\"")
+  end
+end
+
 describe NCoverConsole, "when running with the defaults" do
   before :all do
   	@testdata = NCoverConsoleTestData.new

data/spec/support/spec_helper.rb

@@ -5,6 +5,8 @@ $: << File.join(@root_dir, "spec")
 $: << File.join(@root_dir, "spec/patches")
 $: << File.join(@root_dir, "spec/support")
 
+require 'rubygems'
+require 'spec'
 require 'rake/tasklib'
 require 'lib/rake/support/albacoretask.rb'
 require 'lib/rake/support/createtask.rb'

data/spec/support/yamlconfig/msbuild.yml

@@ -1,3 +1,5 @@
-properties: {:configuration: :release, :platform: 'Any CPU'}
+properties: 
+  :configuration: :release
+  :platform: 'Any CPU'
 targets: [:clean, :build]
 solution: "spec/support/TestSolution/TestSolution.sln"

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: albacore
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Derick Bailey
@@ -10,89 +15,121 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-17 00:00:00 -06:00
+date: 2010-04-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: net-ssh
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 15
         version: 2.0.15
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: net-sftp
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 2
         version: 2.0.2
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rubyzip
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 1
         version: 0.9.1
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 8
         version: 1.2.8
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 1
         version: 1.2.1
-    version: 
+  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: derickbailey-notamock
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 1
         version: 0.0.1
-    version: 
+  type: :development
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: jekyll
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 4
         version: 0.5.4
-    version: 
+  type: :development
+  version_requirements: *id008
 description: Easily build your .NET solutions with Ruby and Rake, using this suite of Rake tasks.
 email: derickbailey@gmail.com
 executables: []
@@ -174,6 +211,7 @@ files:
 - rakefile.rb
 - spec/assemblyinfo_spec.rb
 - spec/assemblyinfotask_spec.rb
+- spec/attrmethods_spec.rb
 - spec/createtask_spec.rb
 - spec/docu_spec.rb
 - spec/docutask_spec.rb
@@ -286,24 +324,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Dolphin-Safe Rake Tasks For .NET Systems
 test_files: 
 - spec/assemblyinfotask_spec.rb
 - spec/assemblyinfo_spec.rb
+- spec/attrmethods_spec.rb
 - spec/createtask_spec.rb
 - spec/docutask_spec.rb
 - spec/docu_spec.rb