albacore 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e04dea1b9112b314a0adc8a9f29ffac34dba7923
-  data.tar.gz: 5bbba017bf1790a51017552d5159af5117358835
+  metadata.gz: 2f8ea4557ba73f072a3025c1d2ae0d8b6c385a54
+  data.tar.gz: 0c6dd38724e36bcec4847aed670d5f462cb1b0be
 SHA512:
-  metadata.gz: a3e0376ec4a8dd0c7c445da18c105c9b4754b72bb7eb883fac2fec8ad41f43748f7c89a7aa0262a7c170f5d3d05c511b6d9a535c1d9d2d060111e8625646fc69
-  data.tar.gz: e3fd9fad84a4553ebe7ff628d308e7755d7300e72d6bf68137cceff6cbc08a7b8bf236d9e50195d6283b14a392754e511d3d9562e05bde45c4604e56f31d4432
+  metadata.gz: 808709c3627004c15972283d4486b1831bd8780f65d63ec48e122627b77fb23eb5d4d460ecaa8af3e9bdb7cb8a1ffc0efc0eec5bf46cdfc3459a51d7f6cf1541
+  data.tar.gz: 58008d2c4c90f3e59c5831761d797c143d0fe7bf3f1cd8af46226296619c317aa46860045c9f0c72507c60627d9ba336cd4c071d8d3c1e9db2ef2b2d3a4702e7

data/lib/albacore/tasks/versionizer.rb

@@ -24,7 +24,7 @@ module Albacore
         ver = XSemVer::SemVer.find
         ver.patch = (ENV['BUILD_NUMBER'] || ver.patch).to_i
         version_data = versions(ver, &method(:commit_data))
-        
+
         Albacore.subscribe :build_version do |data|
           ENV['BUILD_VERSION']  = data.build_version
           ENV['NUGET_VERSION']  = data.nuget_version
@@ -52,11 +52,19 @@ module Albacore
           # extensible number w/ git hash
           :build_version  => semver.format("%M.%m.%p%s") + ".#{yield[0]}",
 
-          # nuget (not full semver 2.0.0-rc.1 support) see http://nuget.codeplex.com/workitem/1796
-          :nuget_version  => semver.format("%M.%m.%p%s")
+          # nuget (not full semver 2.0.0 support) see http://nuget.codeplex.com/workitem/1796
+          :nuget_version  => format_nuget(semver)
         }
       end
 
+      def self.format_nuget semver
+        if semver.prerelease
+          "#{semver.major}.#{semver.minor}.#{semver.patch}-#{semver.prerelease.gsub(/\W/, '')}"
+        else
+          semver.format '%M.%m.%p'
+        end
+      end
+
       # load the commit data
       # returns: [short-commit :: String, date :: DateTime]
       #

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.0.5"
+  VERSION = "2.0.6"
 end

data/spec/tasks/versionizer_spec.rb

@@ -54,11 +54,30 @@ describe 'finding build versions' do
   end
 
   it 'should return a nuget_version' do
-    subject[:nuget_version].should_not be_nil
+    expect(subject[:nuget_version]).to_not be nil
   end
 
   it 'should return a proper semver nuget version' do
-    subject[:nuget_version].should eq('1.2.3-deadbeef')
+    expect(subject[:nuget_version]).to eq '1.2.3-deadbeef'
   end
 end
 
+
+
+describe 'finding build versions' do
+  subject do
+    ver = XSemVer::SemVer.new(1, 2, 3, 'alpha.1-wasabi')
+    ::Albacore::Tasks::Versionizer.versions ver do
+      ['123456', '2014-02-27 16:55:55']
+    end
+  end
+
+  it 'should return a nuget_version' do
+    expect(subject[:nuget_version]).to_not be nil
+  end
+
+  it 'should not return the proper semver 2.0 format' do
+    # nuget doesn't support semver 2.0
+    expect(subject[:nuget_version]).to eq '1.2.3-alpha1wasabi'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Henrik Feldt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake