albacore 2.3.5 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 901e30922303f765f41f212911ce9eebd2bd37dc
-  data.tar.gz: b89dbbfc09371b22ce7f1c79dbbba0a291b0cf84
+  metadata.gz: ed4fdb27d392bf16eca6d48d8a1d98e2380316c7
+  data.tar.gz: b576fd55285d187a6ebe73e7503c41ff65cac2c6
 SHA512:
-  metadata.gz: 69e554a5c31ea4d26551fcb15e09397c54f122808ba1e10119d73c348075fbe5f434ec9917d1fdbff003f23f8ae11bfa4975dc2f1413de14cb54f93e8e9bc5ed
-  data.tar.gz: 9e0be39b88850f9b6f41431c4c10aa1a831960e89b0cbf9598d8b383ad8724ffc04fbb49506ef8b89ac22c73bd566cd3b568ea371b64aa74ca08a9962081e2b0
+  metadata.gz: 52de081a6d2011cf23a3074e92965e0a665be7ca538bc947a978a19be7207dc83aa933d2d4e82da1c465541b7cb03ebbe2109b369e20e721841699448959d99f
+  data.tar.gz: 01eae97ffbda667f1fe71c7abcd486bcae34537063a998d9b522db72bd99e33eb07b28cf78ffe29b688c95d3f158ffb1a5510494f0ab985f21731245ca68f2fd

data/lib/albacore/app_spec.rb

@@ -66,7 +66,7 @@ module Albacore
       trace { "didn't have a valid project_path, trying to find first project at #{descriptor_path.inspect}" }
       dir = File.dirname descriptor_path
       abs_dir = File.expand_path dir
-      Dir.glob(File.join(abs_dir, '*proj')).first
+      Dir.glob(File.join(abs_dir, '*proj')).sort.first
     end
 
     # path of the *.appspec

data/lib/albacore/project.rb

@@ -221,7 +221,7 @@ module Albacore
       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)
+          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],
@@ -235,24 +235,21 @@ module Albacore
 
     def paket_packages
       return nil unless has_paket_deps? || has_paket_refs?
-      info { "extracting paket dependencies from '#{to_s}' and 'paket.{dependencies,references}' in its folder" }
-
+      info { "extracting paket dependencies from '#{to_s}' and 'paket.{dependencies,references}' in its folder [project: paket_package]" }
       all_refs = []
 
       if has_paket_refs?
         File.open paket_refs, 'r' do |io|
-          io.readlines.map(&:chomp).each do |line|
-            debug { "found referenced package '#{line}' [project paket_packages]" }
-            all_refs << all_paket_deps[line]
+          io.readlines.map(&:chomp).compact.each do |line|
+            paket_package_by_id! line, all_refs, 'referenced'
           end
         end
       end
 
       if has_paket_deps?
         File.open paket_deps, 'r' do |io|
-          io.readlines.map(&:chomp).each do |line|
-            debug { "found dependent package '#{line}' [project paket_packages]" }
-            all_refs << all_paket_deps[line]
+          io.readlines.map(&:chomp).compact.each do |line|
+            paket_package_by_id! line, all_refs, 'dependent'
           end
         end
       end
@@ -260,6 +257,16 @@ module Albacore
       all_refs
     end
 
+    def paket_package_by_id! id, arr, ref_type
+      pkg = all_paket_deps[id]
+      if pkg
+        debug { "found #{ref_type} package '#{id}' [project: paket_packages]" }
+        arr << pkg
+      else
+        warn { "found #{ref_type} package '#{id}' not in paket.lock [project: paket_packages]" }
+      end
+    end
+
     def sanity_checks
       warn { "project '#{@proj_filename}' has no name" } unless name
     end

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.3.5"
+  VERSION = "2.3.6"
 end

data/spec/app_spec_spec.rb

@@ -119,7 +119,6 @@ project_path: path/not/existent/proj.fsproj}, nil
 title: my.project}, nil
     }.to raise_error(ArgumentError)
   end
-  
 end
 
 describe ::Albacore::AppSpec, 'when fetching ALL data from Project.fsproj' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.6
 platform: ruby
 authors:
 - Henrik Feldt