albacore 2.0.0.rc.3 → 2.0.0.rc.4

data/README.md

@@ -80,6 +80,9 @@ nugets_pack :create_nugets => ['build/pkg', :versioning, :build] do |p|
     m.authors = 'Henrik'
     m.version = ENV['NUGET_VERSION']
   end
+  p.with_package do |p|
+    p.add_file 'file/relative/to/proj', 'lib/net40'
+  end
 end
 
 task :default => :create_nugets

data/lib/albacore/albacore_module.rb

@@ -55,7 +55,7 @@ module Albacore
     # Gets whether we're running under Windows.
     #
     def windows?
-      ::Rake::Win32.windows?
+      !!::Rake::Win32.windows?
     end
 
     Albacore.log_level = Logger::DEBUG if ENV["DEBUG"]

data/lib/albacore/nuget_model.rb

@@ -268,9 +268,17 @@ end})
       # data from passed instance
       def merge_with other
         m_next = @metadata.merge_with other.metadata
-        files_other = {}
-        other.files.each { |f| files_other[f.src] = f }
-        f_next = @files.collect { |f| files_other.fetch f.src, f }
+        files_res = {}
+
+        # my files
+        @files.each { |f| files_res[f.src] = f }
+
+        # overrides
+        other.files.each { |f| files_res[f.src] = f }
+
+        # result
+        f_next = files_res.collect { |k, v| v }
+
         Package.new m_next, f_next
       end
 

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.0.0.rc.3"
+  VERSION = "2.0.0.rc.4"
 end

data/spec/albacore_spec.rb

@@ -1,12 +1,19 @@
 require 'spec_helper'
 
 describe "pub sub" do
-  it {
+  it do
     @got_it = false
     Albacore.subscribe :pubsub do |obj| 
       @got_it = obj
     end
     Albacore.publish :pubsub, true
     @got_it.should be_true
-  }
+  end
+
+  it 'knows if it\'s Windows it\'s running on' do
+    (::Albacore.windows? === true || ::Albacore::windows? === false).should be_true
+  end
+  it 'should not be nil' do
+    ::Albacore.windows?.should_not be_nil
+  end
 end

data/spec/nuget_model_spec.rb

@@ -201,12 +201,13 @@ describe Albacore::NugetModel::Package, "overriding metadata" do
     p.add_file 'CodeFolder/*.fs', 'lib', 'AssemblyInfo.fs'
   end 
   let :p2 do
-    Albacore::NugetModel::Package.new.with_metadata do |m|
+    p = Albacore::NugetModel::Package.new.with_metadata do |m|
       m.id = 'A.B.C'
       m.add_dependency 'NLog', '2.3'
       m.add_dependency 'Castle.Core', '3.0.0'
       m.owners = 'Henrik Feldt'
     end
+    p.add_file 'CodeFolder/p2.fs', 'lib/CodeFolder/p2.fs'
   end
   subject do
     p1.merge_with p2
@@ -223,6 +224,7 @@ describe Albacore::NugetModel::Package, "overriding metadata" do
     has_dep 'Castle.Core', '3.0.0'
 
     has_file 'CodeFolder/A.cs', 'lib/CodeFolder/A.cs'
+    has_file 'CodeFolder/p2.fs', 'lib/CodeFolder/p2.fs'
     has_file 'CodeFolder/*.fs', 'lib', 'AssemblyInfo.fs'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc.3
+  version: 2.0.0.rc.4
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-15 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -322,7 +322,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 291644295006094685
+      hash: -205228917217279465
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: