albacore 1.0.0.rc.1 → 1.0.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1e2e74b02e67eb95188c0877c91bdd4fccbe430
-  data.tar.gz: 3c0c9660d7c0dfde9a5295a55d91221a4510ba97
+  metadata.gz: ec14c60829d9a146ba63ab85739e4621794979f0
+  data.tar.gz: 8ee89bbe5ce64dd0c13119ec000fdd5e8d0fb443
 SHA512:
-  metadata.gz: 661046323ec3746f3dee00c77bde928889e9cbfee1b7b20b958bb35881ef08de37fd75f8653eb5ca840c051f6b808c16a9d62e6685d10cb6f4303a97801ceb9e
-  data.tar.gz: 67e05ef730f5b3fa0558ac0cdf514f71fe597807dfbc03d628c227a23491094f2b53a98ba1b963a50f36f5f34033de0e75b0fa57aff5c48e6d8e41b80451eb7e
+  metadata.gz: f859063fd41624d1519e5fb35db8aea6c99f47a4db03c822f20a659552d0f6722f54b7ecdd23064ad39ff831374be6fd4df16c5c0341a4c1cceef3b56574fa1d
+  data.tar.gz: b2f7193c93b87f62e3875937f68aa0ed50b91585d3204761ff3140176e61aebf98bac9e27cd80a8b1caf3e9f3b46f22b1c9afbdc02fba05e942426abedd60196

data/.travis.yml

@@ -1,15 +1,16 @@
-language: ruby
-rvm:
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - jruby
-script: "bundle exec rake specs:assemblyinfo specs:albacoremodel specs:attrmethods"
-branches:
-  only:
-    - dev
-#env:
-bundler_args: --without=wiki
-notifications:
-  email: false
-gemfile: Gemfile
+language: ruby
+rvm:
+- 1.9.3
+- 2.0.0
+- jruby
+script: bundle exec rake specs:assemblyinfo specs:albacoremodel specs:attrmethods
+bundler_args: --without=wiki
+notifications:
+  email: false
+gemfile: Gemfile
+deploy:
+  provider: rubygems
+  api_key:
+    secure: c8WYx8M7i68fZzucth/eI7kj0OX55f6te5Toz88HhDRYdycJ7xu6GJBErOGQBK+26cLnu2sfi//TJXOBayCm7mluTcNSoQMrYalm9s5+oCNyNKbMCZtRZ/kYqHZY4cvOobqKeTTrTJH5puD3PUFbCqat3s4HKrQUjCthfd6ZUeY=
+  on:
+    tags: true

data/README.md

@@ -37,7 +37,7 @@ require "albacore"
 
 Albacore has been tested against the following versions of Ruby for Windows and Linux. Use unsupported versions at your own risk!
 
-* MRI: `1.9.2`, `1.9.3`, `2.0.0`
+* MRI: `1.9.3`, `2.0.0`
 * JRuby: `HEAD`
 
 

data/albacore.gemspec

@@ -1,31 +1,31 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require "albacore/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "albacore"
-  spec.version       = Albacore::VERSION
-  spec.authors       = ["Henrik Feldt", "Anthony Mastrean"]
-  spec.email         = ["albacorebuild@gmail.com"]
-  spec.description   = %q{Albacore is a professional quality suite of Rake tasks for building .NET or Mono based systems.}
-  spec.summary       = %q{Dolphin-safe .NET and Mono rake tasks}
-  spec.homepage      = "http://albacorebuild.net"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "nokogiri", "~> 1.5"
-  spec.add_dependency "rake"
-  spec.add_dependency "rubyzip", "< 1.0.0"
-
-  spec.add_development_dependency "guard"
-  spec.add_development_dependency "guard-rspec"
-  spec.add_development_dependency "rspec"
-
-  spec.rubyforge_project = "albacore"
-end
+# coding: utf-8
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require "albacore/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "albacore"
+  spec.version       = Albacore::VERSION
+  spec.authors       = ["Henrik Feldt", "Anthony Mastrean"]
+  spec.email         = ["albacorebuild@gmail.com"]
+  spec.description   = %q{Albacore is a professional quality suite of Rake tasks for building .NET or Mono based systems.}
+  spec.summary       = %q{Dolphin-safe .NET and Mono rake tasks}
+  spec.homepage      = "http://albacorebuild.net"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "nokogiri", "~> 1.5"
+  spec.add_dependency "rake"
+  spec.add_dependency "rubyzip", "~> 1.0"
+
+  spec.add_development_dependency "guard"
+  spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "rspec"
+
+  spec.rubyforge_project = "albacore"
+end

data/lib/albacore/unzip.rb

@@ -1,34 +1,34 @@
-require 'albacore/albacoretask'
-require 'zip/zip'
-require 'zip/zipfilesystem'
-include Zip
-
-class Unzip
-  include Albacore::Task
-  
-  attr_accessor :destination, :file
-
-  def initialize
-    super()
-    update_attributes Albacore.configuration.unzip.to_hash
-  end
-    
-  def execute()
-    fail_with_message 'Zip File cannot be empty' if @file.nil?
-    return if @file.nil?
-  
-    Zip::ZipFile.open(@file) do |zip_f|
-      zip_f.each do |f|
-        out_path = File.join(@destination, f.name)
-        FileUtils.mkdir_p(File.dirname(out_path))
-
-        File.delete(out_path) if @force and File.file?(out_path)
-        zip_f.extract(f, out_path) unless File.exist?(out_path)
-      end
-    end
-  end
-  
-  def force
-    @force = true
-  end
-end
+require 'albacore/albacoretask'
+require 'zip'
+require 'zip/filesystem'
+include Zip
+
+class Unzip
+  include Albacore::Task
+  
+  attr_accessor :destination, :file
+
+  def initialize
+    super()
+    update_attributes Albacore.configuration.unzip.to_hash
+  end
+    
+  def execute()
+    fail_with_message 'Zip File cannot be empty' if @file.nil?
+    return if @file.nil?
+  
+    Zip::File.open(@file) do |zip_f|
+      zip_f.each do |f|
+        out_path = File.join(@destination, f.name)
+        FileUtils.mkdir_p(File.dirname(out_path))
+
+        File.delete(out_path) if @force and File.file?(out_path)
+        zip_f.extract(f, out_path) unless File.exist?(out_path)
+      end
+    end
+  end
+  
+  def force
+    @force = true
+  end
+end

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "1.0.0.rc.1"
+  VERSION = "1.0.0.rc.2"
 end

data/lib/albacore/zipdirectory.rb

@@ -1,108 +1,107 @@
-require 'albacore/albacoretask'
-require 'zip/zip'
-require 'zip/zipfilesystem'
-include Zip
-
-class ZipDirectory
-  TaskName = :zip
-  include Albacore::Task
-  
-  attr_accessor :output_path, :output_file
-  attr_reader :flatten_zip
-  attr_array :directories_to_zip, :additional_files, :exclusions
-
-  def initialize
-    @exclusions = []
-    super()
-    update_attributes Albacore.configuration.zip.to_hash
-  end
-    
-  def execute()
-    fail_with_message 'Output File cannot be empty' if @output_file.nil?
-    return if @output_file.nil?
-        
-    clean_directories_names
-    remove zip_name
-
-    ZipFile.open(zip_name, 'w')  do |zipfile|
-      zip_directory(zipfile)
-      zip_additional(zipfile)
-    end
-  end
-  
-  def flatten_zip
-    @flatten_zip = true
-  end
-  
-  def clean_directories_names
-    return if @directories_to_zip.nil?
-    @directories_to_zip.each { |d| d.sub!(%r[/$],'')}
-  end
-  
-  def remove(filename)
-    FileUtils.rm filename, :force=>true
-  end
-  
-  def reject_file(f)
-    f == zip_name || is_excluded(f)
-  end
-  
-  def is_excluded(f)
-    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
-    File.join(@output_path, @output_file)
-  end
-  
-  def set_output_path()
-    path = ''
-    path = @directories_to_zip.first unless @directories_to_zip.nil?
-    path = @output_path unless @output_path.nil?
-    return path
-  end
-    
-  
-  def zip_directory(zipfile)
-    return if @directories_to_zip.nil?
-    @directories_to_zip.each do |d|
-      Dir["#{d}/**/**"].reject{|f| reject_file(f)}.each do |file_path|
-        file_name = @flatten_zip ? file_path.sub(d + '/','') : file_path
-        zipfile.add(file_name, file_path)
-      end
-    end
-  end
-  
-  def zip_additional(zipfile)
-    return if @additional_files.nil?
-    @additional_files = Array.[](@additional_files).flatten
-    @additional_files.reject{|f| reject_file(f)}.each do |file_path|
-      file_name = @flatten_zip ? file_path.split('/').last : file_path
-      zipfile.add(file_name, file_path)
-    end
-  end
-end
+require 'albacore/albacoretask'
+require 'zip'
+require 'zip/filesystem'
+
+class ZipDirectory
+  TaskName = :zip
+  include Albacore::Task
+  
+  attr_accessor :output_path, :output_file
+  attr_reader :flatten_zip
+  attr_array :directories_to_zip, :additional_files, :exclusions
+
+  def initialize
+    @exclusions = []
+    super()
+    update_attributes Albacore.configuration.zip.to_hash
+  end
+    
+  def execute()
+    fail_with_message 'Output File cannot be empty' if @output_file.nil?
+    return if @output_file.nil?
+        
+    clean_directories_names
+    remove zip_name
+
+    Zip::File.open(zip_name, 'w')  do |zipfile|
+      zip_directory(zipfile)
+      zip_additional(zipfile)
+    end
+  end
+  
+  def flatten_zip
+    @flatten_zip = true
+  end
+  
+  def clean_directories_names
+    return if @directories_to_zip.nil?
+    @directories_to_zip.each { |d| d.sub!(%r[/$],'')}
+  end
+  
+  def remove(filename)
+    FileUtils.rm filename, :force=>true
+  end
+  
+  def reject_file(f)
+    f == zip_name || is_excluded(f)
+  end
+  
+  def is_excluded(f)
+    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
+    File.join(@output_path, @output_file)
+  end
+  
+  def set_output_path()
+    path = ''
+    path = @directories_to_zip.first unless @directories_to_zip.nil?
+    path = @output_path unless @output_path.nil?
+    return path
+  end
+    
+  
+  def zip_directory(zipfile)
+    return if @directories_to_zip.nil?
+    @directories_to_zip.each do |d|
+      Dir["#{d}/**/**"].reject{|f| reject_file(f)}.each do |file_path|
+        file_name = @flatten_zip ? file_path.sub(d + '/','') : file_path
+        zipfile.add(file_name, file_path)
+      end
+    end
+  end
+  
+  def zip_additional(zipfile)
+    return if @additional_files.nil?
+    @additional_files = Array.[](@additional_files).flatten
+    @additional_files.reject{|f| reject_file(f)}.each do |file_path|
+      file_name = @flatten_zip ? file_path.split('/').last : file_path
+      zipfile.add(file_name, file_path)
+    end
+  end
+end

data/spec/unzip_spec.rb

@@ -1,57 +1,57 @@
-require 'spec_helper'
-require 'albacore/unzip'
-
-describe Unzip, "when providing configuration" do
-  let :uz do
-    Albacore.configure do |config|
-      config.unzip.file = "configured"
-    end
-    uz = Unzip.new
-  end
-
-  it "should use the configured values" do
-    uz.file.should == "configured"
-  end
-
-  it "should not 'force' by default" do
-    uz.instance_variable_get(:@force).should be_nil
-  end
-  
-  it "should enable 'force' by calling the force() method" do
-    uz.force
-    uz.instance_variable_get(:@force).should be_true
-  end
-end
-
-describe Unzip, "when executing the task" do
-  let :uz do
-    zipped_file = mock('foo.txt')
-    zipped_file.stub(:name).and_return('foo.txt')
-
-    zip_file = mock('foo.zip')
-    zip_file.stub(:each).and_yield(zipped_file)
-    zip_file.stub(:extract)
-
-    Zip::ZipFile.stub!(:open).and_yield(zip_file)
-    FileUtils.stub(:mkdir_p)
-    File.stub!(:file?).and_return(true)
-
-    uz = Unzip.new
-    uz.file = 'foo.zip'
-    uz.destination = '/tmp'
-    uz
-  end
-
-  it "should delete the destinationfile if forced" do
-    File.should_receive(:delete).with('/tmp/foo.txt')
-
-    uz.force
-    uz.execute
-  end
-
-  it "should keep the destination file if not forced" do
-    File.should_not_receive(:delete)
-
-    uz.execute
-  end
-end
+require 'spec_helper'
+require 'albacore/unzip'
+
+describe Unzip, "when providing configuration" do
+  let :uz do
+    Albacore.configure do |config|
+      config.unzip.file = "configured"
+    end
+    uz = Unzip.new
+  end
+
+  it "should use the configured values" do
+    uz.file.should == "configured"
+  end
+
+  it "should not 'force' by default" do
+    uz.instance_variable_get(:@force).should be_nil
+  end
+  
+  it "should enable 'force' by calling the force() method" do
+    uz.force
+    uz.instance_variable_get(:@force).should be_true
+  end
+end
+
+describe Unzip, "when executing the task" do
+  let :uz do
+    zipped_file = mock('foo.txt')
+    zipped_file.stub(:name).and_return('foo.txt')
+
+    zip_file = mock('foo.zip')
+    zip_file.stub(:each).and_yield(zipped_file)
+    zip_file.stub(:extract)
+
+    Zip::File.stub!(:open).and_yield(zip_file)
+    FileUtils.stub(:mkdir_p)
+    File.stub!(:file?).and_return(true)
+
+    uz = Unzip.new
+    uz.file = 'foo.zip'
+    uz.destination = '/tmp'
+    uz
+  end
+
+  it "should delete the destinationfile if forced" do
+    File.should_receive(:delete).with('/tmp/foo.txt')
+
+    uz.force
+    uz.execute
+  end
+
+  it "should keep the destination file if not forced" do
+    File.should_not_receive(:delete)
+
+    uz.execute
+  end
+end

data/spec/zip_spec.rb

@@ -1,215 +1,221 @@
-require 'spec_helper'
-require 'albacore/zipdirectory'
-require 'albacore/unzip'
-require 'ziptestdata'
-
-describe ZipDirectory, 'when zipping a directory of files' do
-  before :each do
-    zip = ZipDirectory.new
-    zip.directories_to_zip ZipTestData.folder
-    zip.output_file = "test.zip"
-    zip.execute
-  end
-  
-  it "should produce a zip file" do
-    File.exist?(File.join(ZipTestData.folder, "test.zip")).should be_true
-  end
-end
-
-describe ZipDirectory, 'when zipping a directory with string exclusions' do
-  before :each do
-    zip = ZipDirectory.new
-    zip.directories_to_zip ZipTestData.folder
-    zip.output_file = 'test.zip'
-    zip.exclusions File.join(ZipTestData.folder, 'files', 'testfile.txt')
-    zip.execute
-    
-    unzip = Unzip.new
-    unzip.file = File.join(ZipTestData.folder, 'test.zip')
-    unzip.destination = ZipTestData.output_folder
-    unzip.execute
-  end
-  
-  after :each do
-    FileUtils.rm_rf ZipTestData.output_folder if File.exist? ZipTestData.output_folder
-  end
-  
-  it 'should not zip files with the same name as any exclusions' do
-    File.exist?(File.join(ZipTestData.output_folder, 'files', 'testfile.txt')).should be_false
-  end
-end
-
-describe ZipDirectory, 'when zipping a directory of files with regexp exclusions' do
-  before :each do
-    zip = ZipDirectory.new
-    zip.directories_to_zip ZipTestData.folder
-    zip.output_file = 'test.zip'
-    zip.exclusions /testfile/
-    zip.execute
-    
-    unzip = Unzip.new
-    unzip.file = File.join(ZipTestData.folder, 'test.zip')
-    unzip.destination = ZipTestData.output_folder
-    unzip.execute
-  end
-  
-  after :each do
-    FileUtils.rm_rf ZipTestData.output_folder if File.exist? ZipTestData.output_folder
-  end
-  
-  it 'should not zip files that match any of the exclusions regexps' do
-    File.exist?(File.join(ZipTestData.output_folder, 'files', 'testfile.txt')).should be_false
-  end
-end
-
-describe ZipDirectory, 'when zipping a directory of files with glob string exclusions' do
-  before :each do
-    zip = ZipDirectory.new
-    zip.directories_to_zip ZipTestData.folder
-    zip.output_file = 'test.zip'
-    zip.exclusions "**/subfolder/*"
-    zip.execute
-
-    unzip = Unzip.new
-    unzip.file = File.join(ZipTestData.folder, 'test.zip')
-    unzip.destination = ZipTestData.output_folder
-    unzip.execute
-  end
-
-  after :each do
-    FileUtils.rm_rf ZipTestData.output_folder if File.exists? ZipTestData.output_folder
-  end
-
-  it 'should not zip files that match the expanded globs' do
-    File.exist?(File.join(ZipTestData.output_folder, 'files', 'subfolder', 'sub file.txt')).should be_false
-  end
-
-  it 'should zip the files that don\'t match the globs' do
-    File.exist?(File.join(ZipTestData.output_folder, 'files', 'subfolder')).should be_true
-    File.exist?(File.join(ZipTestData.output_folder, 'files', 'testfile.txt')).should be_true
-  end
-end
-
-describe ZipDirectory, "when providing configuration" do
-  let :zip do
-    Albacore.configure do |config|
-      config.zip.output_file = "configured"
-    end
-    zip = ZipDirectory.new
-  end
-
-  it "should use the configured values" do
-    zip.output_file.should == "configured"
-  end
-end
-
-describe ZipDirectory, 'when zipping a directory of files with additional files' do
-  describe 'and additional file is given as an array' do
-    before :each do
-      zip = ZipDirectory.new
-      zip.directories_to_zip ZipTestData.folder
-      zip.output_file = 'test.zip'
-      zip.exclusions "**/subfolder/*"
-      zip.additional_files = [File.join(File.dirname(__FILE__), 'support', 'test.yml')]
-      zip.execute
-      
-      unzip = Unzip.new
-      unzip.file = File.join(ZipTestData.folder, 'test.zip')
-      unzip.destination = ZipTestData.output_folder
-      unzip.execute
-    end
-
-    after :each do
-      FileUtils.rm_rf ZipTestData.output_folder if File.exist? ZipTestData.output_folder
-    end
-
-    it "should add additional file" do
-      File.exist?(File.join(ZipTestData.folder, "test.zip")).should be_true
-      File.exist?(File.join(ZipTestData.output_folder, 'files', 'subfolder')).should be_true
-      File.exist?(File.join(ZipTestData.output_folder, 'files', 'testfile.txt')).should be_true
-      File.exist?(File.join(ZipTestData.output_folder, 'test.yml')).should be_true
-    end
-  end
-  
-  describe 'and additional file is given as a string' do
-    before :each do
-      zip = ZipDirectory.new
-      zip.directories_to_zip ZipTestData.folder
-      zip.output_file = 'test.zip'
-      zip.exclusions "**/subfolder/*"
-      zip.additional_files = File.join(File.dirname(__FILE__), 'support', 'test.yml')
-      zip.execute
-      
-      unzip = Unzip.new
-      unzip.file = File.join(ZipTestData.folder, 'test.zip')
-      unzip.destination = ZipTestData.output_folder
-      unzip.execute
-    end
-
-    after :each do
-      FileUtils.rm_rf ZipTestData.output_folder if File.exist? ZipTestData.output_folder
-    end
-    
-    it "should add additional file" do
-      File.exist?(File.join(ZipTestData.folder, "test.zip")).should be_true
-      File.exist?(File.join(ZipTestData.output_folder, 'files', 'subfolder')).should be_true
-      File.exist?(File.join(ZipTestData.output_folder, 'files', 'testfile.txt')).should be_true
-      File.exist?(File.join(ZipTestData.output_folder, 'test.yml')).should be_true
-    end
-  end
-end
-
-describe ZipDirectory, "without flatten_zip set" do
-    before :each do
-      zip = ZipDirectory.new
-      zip.directories_to_zip File.join('spec', 'support', 'yamlconfig')
-      zip.output_file = 'test.zip'
-      zip.output_path = ZipTestData.folder
-      zip.additional_files = [File.join('spec', 'support', 'test.yml'), File.join('spec', 'support', 'AssemblyInfo', 'assemblyinfo.yml')]
-      zip.execute
-
-      unzip = Unzip.new
-      unzip.file = File.join(ZipTestData.folder, 'test.zip')
-      unzip.destination = ZipTestData.output_folder
-      unzip.execute
-    end
-
-    after :each do
-      FileUtils.rm_rf ZipTestData.output_folder if File.exist? ZipTestData.output_folder
-    end
-
-    it "should add additional file" do
-      File.exist?(File.join(ZipTestData.folder, "test.zip")).should be_true
-      Dir.exist?(File.join(ZipTestData.output_folder, 'spec', 'support', 'yamlconfig')).should be_true
-      File.exist?(File.join(ZipTestData.output_folder, 'spec', 'support', 'yamlconfig', 'msbuild.yml')).should be_true
-      File.exist?(File.join(ZipTestData.output_folder, 'spec', 'support', 'test.yml')).should be_true
-    end
-end
-
-describe ZipDirectory, "with flatten_zip set" do
-    before :each do
-      zip = ZipDirectory.new
-      zip.flatten_zip
-      zip.directories_to_zip File.join('spec', 'support', 'yamlconfig')
-      zip.output_file = 'test.zip'
-      zip.output_path = ZipTestData.folder
-      zip.additional_files = [File.join('spec', 'support', 'test.yml'), File.join('spec', 'support', 'AssemblyInfo', 'assemblyinfo.yml')]
-      zip.execute
-
-      unzip = Unzip.new
-      unzip.file = File.join(ZipTestData.folder, 'test.zip')
-      unzip.destination = ZipTestData.output_folder
-      unzip.execute
-    end
-
-    after :each do
-      FileUtils.rm_rf ZipTestData.output_folder if File.exist? ZipTestData.output_folder
-    end
-
-    it "should add additional file" do
-      File.exist?(File.join(ZipTestData.folder, "test.zip")).should be_true
-      Dir.exist?(File.join(ZipTestData.output_folder, 'spec', 'support', 'yamlconfig')).should be_false
-      File.exist?(File.join(ZipTestData.output_folder, 'msbuild.yml')).should be_true
-      File.exist?(File.join(ZipTestData.output_folder, 'test.yml')).should be_true
-    end
-end
+require 'spec_helper'
+require 'albacore/zipdirectory'
+require 'albacore/unzip'
+require 'ziptestdata'
+
+describe ZipDirectory, 'when zipping a directory of files' do
+  before :each do
+    zip = ZipDirectory.new
+    zip.flatten_zip
+    zip.directories_to_zip ZipTestData.folder
+    zip.output_file = "test.zip"
+    zip.execute
+  end
+  
+  it "should produce a zip file" do
+    File.exist?(File.join(ZipTestData.folder, "test.zip")).should be_true
+  end
+end
+
+describe ZipDirectory, 'when zipping a directory with string exclusions' do
+  before :each do
+    zip = ZipDirectory.new
+    zip.flatten_zip
+    zip.directories_to_zip ZipTestData.folder
+    zip.output_file = 'test.zip'
+    zip.exclusions File.join(ZipTestData.folder, 'files', 'testfile.txt')
+    zip.execute
+    
+    unzip = Unzip.new
+    unzip.file = File.join(ZipTestData.folder, 'test.zip')
+    unzip.destination = ZipTestData.output_folder
+    unzip.execute
+  end
+  
+  after :each do
+    FileUtils.rm_rf ZipTestData.output_folder if File.exist? ZipTestData.output_folder
+  end
+  
+  it 'should not zip files with the same name as any exclusions' do
+    File.exist?(File.join(ZipTestData.output_folder, 'files', 'testfile.txt')).should be_false
+  end
+end
+
+describe ZipDirectory, 'when zipping a directory of files with regexp exclusions' do
+  before :each do
+    zip = ZipDirectory.new
+    zip.flatten_zip
+    zip.directories_to_zip ZipTestData.folder
+    zip.output_file = 'test.zip'
+    zip.exclusions /testfile/
+    zip.execute
+    
+    unzip = Unzip.new
+    unzip.file = File.join(ZipTestData.folder, 'test.zip')
+    unzip.destination = ZipTestData.output_folder
+    unzip.execute
+  end
+  
+  after :each do
+    FileUtils.rm_rf ZipTestData.output_folder if File.exist? ZipTestData.output_folder
+  end
+  
+  it 'should not zip files that match any of the exclusions regexps' do
+    File.exist?(File.join(ZipTestData.output_folder, 'files', 'testfile.txt')).should be_false
+  end
+end
+
+describe ZipDirectory, 'when zipping a directory of files with glob string exclusions' do
+  before :each do
+    zip = ZipDirectory.new
+    zip.flatten_zip
+    zip.directories_to_zip ZipTestData.folder
+    zip.output_file = 'test.zip'
+    zip.exclusions "**/subfolder/*"
+    zip.execute
+
+    unzip = Unzip.new
+    unzip.file = File.join(ZipTestData.folder, 'test.zip')
+    unzip.destination = ZipTestData.output_folder
+    unzip.execute
+  end
+
+  after :each do
+    FileUtils.rm_rf ZipTestData.output_folder if File.exists? ZipTestData.output_folder
+  end
+
+  it 'should not zip files that match the expanded globs' do
+    File.exist?(File.join(ZipTestData.output_folder, 'files', 'subfolder', 'sub file.txt')).should be_false
+  end
+
+  it 'should zip the files that don\'t match the globs' do
+    File.exist?(File.join(ZipTestData.output_folder, 'files', 'subfolder')).should be_true
+    File.exist?(File.join(ZipTestData.output_folder, 'files', 'testfile.txt')).should be_true
+  end
+end
+
+describe ZipDirectory, "when providing configuration" do
+  let :zip do
+    Albacore.configure do |config|
+      config.zip.output_file = "configured"
+    end
+    zip = ZipDirectory.new
+  end
+
+  it "should use the configured values" do
+    zip.output_file.should == "configured"
+  end
+end
+
+describe ZipDirectory, 'when zipping a directory of files with additional files' do
+  describe 'and additional file is given as an array' do
+    before :each do
+      zip = ZipDirectory.new
+      zip.flatten_zip
+      zip.directories_to_zip ZipTestData.folder
+      zip.output_file = 'test.zip'
+      zip.exclusions "**/subfolder/*"
+      zip.additional_files = [File.join(File.dirname(__FILE__), 'support', 'test.yml')]
+      zip.execute
+      
+      unzip = Unzip.new
+      unzip.file = File.join(ZipTestData.folder, 'test.zip')
+      unzip.destination = ZipTestData.output_folder
+      unzip.execute
+    end
+
+    after :each do
+      FileUtils.rm_rf ZipTestData.output_folder if File.exist? ZipTestData.output_folder
+    end
+
+    it "should add additional file" do
+      File.exist?(File.join(ZipTestData.folder, "test.zip")).should be_true
+      File.exist?(File.join(ZipTestData.output_folder, 'files', 'subfolder')).should be_true
+      File.exist?(File.join(ZipTestData.output_folder, 'files', 'testfile.txt')).should be_true
+      File.exist?(File.join(ZipTestData.output_folder, 'test.yml')).should be_true
+    end
+  end
+  
+  describe 'and additional file is given as a string' do
+    before :each do
+      zip = ZipDirectory.new
+      zip.flatten_zip
+      zip.directories_to_zip ZipTestData.folder
+      zip.output_file = 'test.zip'
+      zip.exclusions "**/subfolder/*"
+      zip.additional_files = File.join(File.dirname(__FILE__), 'support', 'test.yml')
+      zip.execute
+      
+      unzip = Unzip.new
+      unzip.file = File.join(ZipTestData.folder, 'test.zip')
+      unzip.destination = ZipTestData.output_folder
+      unzip.execute
+    end
+
+    after :each do
+      FileUtils.rm_rf ZipTestData.output_folder if File.exist? ZipTestData.output_folder
+    end
+    
+    it "should add additional file" do
+      File.exist?(File.join(ZipTestData.folder, "test.zip")).should be_true
+      File.exist?(File.join(ZipTestData.output_folder, 'files', 'subfolder')).should be_true
+      File.exist?(File.join(ZipTestData.output_folder, 'files', 'testfile.txt')).should be_true
+      File.exist?(File.join(ZipTestData.output_folder, 'test.yml')).should be_true
+    end
+  end
+end
+
+describe ZipDirectory, "without flatten_zip set" do
+    before :each do
+      zip = ZipDirectory.new
+      zip.directories_to_zip File.join('spec', 'support', 'yamlconfig')
+      zip.output_file = 'test.zip'
+      zip.output_path = ZipTestData.folder
+      zip.additional_files = [File.join('spec', 'support', 'test.yml'), File.join('spec', 'support', 'AssemblyInfo', 'assemblyinfo.yml')]
+      zip.execute
+
+      unzip = Unzip.new
+      unzip.file = File.join(ZipTestData.folder, 'test.zip')
+      unzip.destination = ZipTestData.output_folder
+      unzip.execute
+    end
+
+    after :each do
+      FileUtils.rm_rf ZipTestData.output_folder if File.exist? ZipTestData.output_folder
+    end
+
+    it "should add additional file" do
+      File.exist?(File.join(ZipTestData.folder, "test.zip")).should be_true
+      Dir.exist?(File.join(ZipTestData.output_folder, 'spec', 'support', 'yamlconfig')).should be_true
+      File.exist?(File.join(ZipTestData.output_folder, 'spec', 'support', 'yamlconfig', 'msbuild.yml')).should be_true
+      File.exist?(File.join(ZipTestData.output_folder, 'spec', 'support', 'test.yml')).should be_true
+    end
+end
+
+describe ZipDirectory, "with flatten_zip set" do
+    before :each do
+      zip = ZipDirectory.new
+      zip.flatten_zip
+      zip.directories_to_zip File.join('spec', 'support', 'yamlconfig')
+      zip.output_file = 'test.zip'
+      zip.output_path = ZipTestData.folder
+      zip.additional_files = [File.join('spec', 'support', 'test.yml'), File.join('spec', 'support', 'AssemblyInfo', 'assemblyinfo.yml')]
+      zip.execute
+
+      unzip = Unzip.new
+      unzip.file = File.join(ZipTestData.folder, 'test.zip')
+      unzip.destination = ZipTestData.output_folder
+      unzip.execute
+    end
+
+    after :each do
+      FileUtils.rm_rf ZipTestData.output_folder if File.exist? ZipTestData.output_folder
+    end
+
+    it "should add additional file" do
+      File.exist?(File.join(ZipTestData.folder, "test.zip")).should be_true
+      Dir.exist?(File.join(ZipTestData.output_folder, 'spec', 'support', 'yamlconfig')).should be_false
+      File.exist?(File.join(ZipTestData.output_folder, 'msbuild.yml')).should be_true
+      File.exist?(File.join(ZipTestData.output_folder, 'test.yml')).should be_true
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.1
+  version: 1.0.0.rc.2
 platform: ruby
 authors:
 - Henrik Feldt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -43,16 +43,16 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement