albacore 2.3.18 → 2.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e06b9f000e88db0335e35ef43344434ba90b6494
-  data.tar.gz: 0d3d86344d1022e390ac7a798ce66c68ea5bc103
+  metadata.gz: 213aad93f873634ccf667794df884fb05e098a3b
+  data.tar.gz: d03f4c2cb7df5000f6e3d71a0a4c1f7011b2a0d8
 SHA512:
-  metadata.gz: bca976ada97fdd2357439dba8de263004f23ebce8d40e50b34eee0fd5fbd31076cda8e10dc1becb54050de67c1aee0e26d684e54703a241847b3e6fe08c8f69e
-  data.tar.gz: 57c45d09bb3adae1a9ca117fbcb8459474de1bfbbea4686d1c3545907e4bdf7efce046b2a0833b050770547e1c7905d9d39c89bb540fbcd6a792f6cba3af3219
+  metadata.gz: 528b4384789a80173a1dded15c329cf8876330c7101d5d38ab437fe1aa037bb67dbeaa94bb93f594ab39406c2189279ee0be54d65415efef5cc87fc6a707f57f
+  data.tar.gz: fa4b59de0db2dbeec2b7a4af8ac561f0e72310971293b606c92f98762a0481b060c8083d619c03998e6c5fa3af6ab77669a605b766c14e995dd5cab33f0aa8a7

data/lib/albacore/paket.rb

@@ -0,0 +1,22 @@
+require 'ostruct'
+require 'albacore/semver'
+
+module Albacore
+  module Paket
+    def parse_line line
+      if (m = line.match /^\s*(?<id>[\w\-\.]+) \((?<ver>[\.\d\w\-]+)\)$/i)
+        ver = Albacore::SemVer.parse(m[:ver], '%M.%m.%p', false)
+        OpenStruct.new(:id               => m[:id],
+                       :version          => m[:ver],
+                       :target_framework => 'net40',
+                       :semver           => ver)
+      end
+    end
+
+    def parse_paket_lock data
+      data.map { |line| parse_line line }.
+           compact.
+           map { |package| [package.id, package] }
+    end
+  end
+end

data/lib/albacore/project.rb

@@ -225,15 +225,7 @@ module Albacore
     def all_paket_deps
       return @all_paket_deps if @all_paket_deps
       arr = File.open('paket.lock', 'r') do |io|
-        io.readlines.map(&:chomp).map do |line|
-          if (m = line.match /^\s*(?<id>[\w\-\.]+) \((?<ver>[\.\d\w]+)\)$/i)
-            ver = Albacore::SemVer.parse(m[:ver], '%M.%m.%p', false)
-            OpenStruct.new(:id               => m[:id],
-                           :version          => m[:ver],
-                           :target_framework => 'net40',
-                           :semver           => ver)
-          end
-        end.compact.map { |package| [package.id, package] }
+        Albacore::Paket.parse_paket_lock(io.readlines.map(&:chomp))
       end
       @all_paket_deps = Hash[arr]
     end

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.3.18"
+  VERSION = "2.3.19"
 end

data/spec/paket_spec.rb

@@ -0,0 +1,35 @@
+require 'albacore/paket'
+
+describe Albacore::Paket do
+  include Albacore::Paket
+  let :file do
+    %{NUGET
+  remote: https://www.nuget.org/api/v2
+  specs:
+    Aether (6.0)
+    Chiron (1.0.1)
+      Aether (>= 6.0.0)
+      FParsec (>= 1.0.1)
+      FSharp.Core (>= 3.1.2.1)
+    FParsec (1.0.1)
+    FSharp.Core (3.1.2.1)
+    Fuchu (0.4.0.0)
+    Http.fs-prerelease (2.0.0-alpha1)
+      FSharp.Core (>= 3.1.2.1)
+    NodaTime (1.3.1)
+    NuGet.CommandLine (2.8.5)
+}
+  end
+  describe 'parsing paket.lock file' do
+    let :references do
+      Hash[parse_paket_lock(file.split(/\n|\r\n/))]
+    end
+    it 'has FParsec' do
+      expect(references['FParsec'].version).to eq '1.0.1'
+    end
+    it 'has Http.fs-prerelease' do
+      expect(references['Http.fs-prerelease']).to_not be_nil
+      expect(references['Http.fs-prerelease'].version).to eq '2.0.0-alpha1'
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.3.18
+  version: 2.3.19
 platform: ruby
 authors:
 - Henrik Feldt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -143,6 +143,7 @@ files:
 - lib/albacore/nuget_model.rb
 - lib/albacore/package.rb
 - lib/albacore/package_repo.rb
+- lib/albacore/paket.rb
 - lib/albacore/paths.rb
 - lib/albacore/project.rb
 - lib/albacore/rake_overrides.rb
@@ -189,6 +190,7 @@ files:
 - spec/nugets_restore_spec.rb
 - spec/package_repo_spec.rb
 - spec/package_spec.rb
+- spec/paket_spec.rb
 - spec/paths_spec.rb
 - spec/project_spec.rb
 - spec/projectlint/added_but_not_on_filesystem/aproject.csproj
@@ -426,6 +428,7 @@ test_files:
 - spec/nugets_restore_spec.rb
 - spec/package_repo_spec.rb
 - spec/package_spec.rb
+- spec/paket_spec.rb
 - spec/paths_spec.rb
 - spec/project_spec.rb
 - spec/projectlint/added_but_not_on_filesystem/aproject.csproj