albacore 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab4259ac72f44a242c23d1451a737051b85d5614
-  data.tar.gz: 7e8c10bdc394b660b41af760b148fdb39328296d
+  metadata.gz: 636b34273ba679dfc811c86b1208f0ff3e4813db
+  data.tar.gz: 1339fe8c9b9022e29f4eb13ee0c727f9d32ee7f9
 SHA512:
-  metadata.gz: f2b5814a9886957b05939037231cee9dc2eaf9ab61600707615180f274c31bb7b735ae02a4b06b14e247985f6b5a4c1bd8df974d2a0017134f203c97d67fedd6
-  data.tar.gz: e5a394f19408934e9f33344a1b225cffbaff8ae5fafb61596558751d44c69e6b71b62b9d2408829e1690916b2579c5dd955585aafc0c2b3049ded60e9109cc62
+  metadata.gz: 5cb3b3b0c1f1faac2bbdf2bf7f00bbe865432ab2b26ae39fea051b2bfcf95c4583c52332094e8196ca4a86575dc869ff5dba23495f2d321c5baed85f203e1a62
+  data.tar.gz: c5f0128d0d3af334102449d2223d66be96f437698287506dcaa5f8c9d517ea4360839dcb406e2974195564fbb12e07bb899e55e90fbbb6e2ca3b29b969cb638f

data/lib/albacore/dsl.rb

@@ -41,8 +41,11 @@ module Albacore
         yield c, own_args
 
         fail "unable to find MsBuild or XBuild" unless c.exe
-        command = Albacore::Build::Cmd.new(c.work_dir, c.exe, c.parameters)
-        Albacore::Build::Task.new(command).execute
+
+        c.files.each do |f|
+          command = Albacore::Build::Cmd.new(c.work_dir, c.exe, c.params_for_file(f))
+          Albacore::Build::Task.new(command).execute
+        end
       end
     end
 
@@ -53,7 +56,7 @@ module Albacore
         c = Albacore::NugetsRestore::Config.new
         yield c, own_args
 
-        c.ensure_authentication! 
+        c.ensure_authentication!
 
         c.packages.each do |p|
           command = Albacore::NugetsRestore::Cmd.new(c.work_dir, c.exe, c.opts_for_pkgcfg(p))

data/lib/albacore/solution.rb

@@ -0,0 +1,47 @@
+require 'albacore/logging'
+require 'albacore/project'
+
+module Albacore
+  # a solution encapsulates the properties from a sln file.
+  class Solution
+    include Logging
+
+    attr_reader :path_base, :filename, :content
+
+    def initialize path
+      raise ArgumentError, 'solution path does not exist' unless File.exists? path.to_s
+      path = path.to_s unless path.is_a? String
+      @content = open(path)
+      @path_base, @filename = File.split path
+    end
+
+    def projects
+      project_paths.map { |path| File.join(@path_base, path) }
+                   .select { |path| File.file?(path) }
+                   .map {|path| Albacore::Project.new(File.absolute_path(path)) }
+    end
+
+    def project_paths
+      project_matches.map { |matches| matches[:location] }
+                     .select { |path| File.extname(path).end_with? 'proj' }
+
+    end
+
+    # get the path of the solution file
+    def path
+      File.join @path_base, @filename
+    end
+
+    # Gets the path of the solution file
+    def to_s
+      path
+    end
+
+    private
+
+    def project_matches
+      project_regexp = /^\s*Project\(.+\) = "(?<name>.+?)", "(?<location>.+?)", "(?<guid>.+?)"/
+      @content.map { |line| project_regexp.match(line) }.reject(&:nil?)
+    end
+  end
+end

data/lib/albacore/task_types/build.rb

@@ -42,6 +42,8 @@ module Albacore
 
         w = lambda { |e| CrossPlatformCmd.which(e) ? e : nil }
 
+        @files = []
+
         @exe = w.call( "xbuild" )  ||
                w.call( "msbuild" ) ||
                heuristic_executable
@@ -54,9 +56,11 @@ module Albacore
                       'minimal')
       end
 
+      attr_accessor :files
+
       # this is the solution file to build (or the project files themselves)
       attr_path_accessor :sln, :file do |val|
-        @parameters.add val
+        @files.concat [*val]
       end
 
       # Call for each target that you want to add, or pass an array or
@@ -100,7 +104,6 @@ module Albacore
         set_logging mode
       end
 
-
       #  Gets or sets a target .NET Framework version to build the project with, which
       #  enables an MSBuild task to build a project that targets a different version of
       #  the .NET Framework than the one specified in the project. Valid values are 2.0,
@@ -145,6 +148,11 @@ module Albacore
         @parameters.add "/nologo"
       end
 
+      def params_for_file file
+        update_file file
+        @parameters
+      end
+
       private
       def set_logging mode
         modes = %w{quiet minimal normal detailed diagnostic}.collect{ |m| "/verbosity:#{m}" }
@@ -169,6 +177,12 @@ module Albacore
         @parameters.add "/#{prop_name}:#{callable_prop_val.call}"
       end
 
+      # There can be only one
+      def update_file val
+        @parameters.delete_if { |param| File.file? param }
+        @parameters.add ::Albacore::Paths.normalise_slashes val
+      end
+
       def make_target
         @targets.join(';')
       end
@@ -195,7 +209,6 @@ module Albacore
         end
     	  CrossPlatformCmd.which(msb) ? msb : nil
       end
-
     end
     class Task
       def initialize command_line

data/lib/albacore/task_types/nugets_pack.rb

@@ -40,6 +40,7 @@ module Albacore
 
         pars = original_pars.dup
         pars << nuspec_file
+        pars << '-NoPackageAnalysis' unless @opts.get :package_analysis
         pkg = get_nuget_path_of do
           system @executable, pars, :work_dir => @work_dir
         end
@@ -49,9 +50,9 @@ module Albacore
         # if the symbols flag is set and there's a symbols file specified
         # then run NuGet.exe to generate the .symbols.nupkg file
         if nuspec_symbols_file
-          pars = original_pars.dup 
-          pars << '-Symbols' 
-          pars << nuspec_symbols_file 
+          pars = original_pars.dup
+          pars << '-Symbols'
+          pars << nuspec_symbols_file
           spkg = with_subterfuge pkg do
             get_nuget_path_of do
               system @executable, pars, :work_dir => @work_dir
@@ -103,7 +104,7 @@ and report a bug to albacore with the full output. Here's the nuget process outp
         res
       end
     end
-    
+
     # This tasktype allows you to quickly package project files to nuget
     # packages.
     #
@@ -135,7 +136,7 @@ and report a bug to albacore with the full output. Here's the nuget process outp
       attr_writer :files
 
       # sets the nuspec file
-      attr_writer :nuspec      
+      attr_writer :nuspec
 
 
       # sets the MsBuild configuration that is used to produce the output into
@@ -148,6 +149,7 @@ and report a bug to albacore with the full output. Here's the nuget process outp
         @symbols = false
         @project_dependencies = true
         @nuget_dependencies = true
+        @package_analysis = true
         @leave_nuspec = false
         fill_required
       end
@@ -185,6 +187,12 @@ and report a bug to albacore with the full output. Here's the nuget process outp
         @nuget_dependencies = false
       end
 
+      # call this if you want to disable NuGet's package analysis
+      # when creating the nupkg file
+      def no_package_analysis
+        @package_analysis = false
+      end
+
       def nuget_gem_exe
         @exe = Albacore::Nugets::find_nuget_gem_exe
       end
@@ -195,7 +203,7 @@ and report a bug to albacore with the full output. Here's the nuget process outp
 
         unless @nuspec
           [:authors, :description, :version].each do |required|
-            warn "metadata##{required} is missing from nugets_pack [nugets pack: config]" if @package.metadata.send(required) == 'MISSING' 
+            warn "metadata##{required} is missing from nugets_pack [nugets pack: config]" if @package.metadata.send(required) == 'MISSING'
           end
         end
 
@@ -210,6 +218,7 @@ and report a bug to albacore with the full output. Here's the nuget process outp
           :configuration => @configuration,
           :project_dependencies => @project_dependencies,
           :nuget_dependencies => @nuget_dependencies,
+          :package_analysis => @package_analysis,
           :original_path => FileUtils.pwd,
           :leave_nuspec  => @leave_nuspec
         })
@@ -230,7 +239,7 @@ and report a bug to albacore with the full output. Here's the nuget process outp
       include Logging
 
       def initialize opts, &before_execute
-        
+
         unless opts.get(:nuspec)
           raise ArgumentError, 'opts is not a map' unless opts.is_a? Map
           raise ArgumentError, 'no files given' unless opts.get(:files).length > 0
@@ -316,7 +325,7 @@ and report a bug to albacore with the full output. Here's the nuget process outp
         target = @opts.get :target
 
         trace "creating NON-SYMBOL package for '#{proj.name}', targeting '#{target}' [nugets pack: task]"
-        nuspec = Albacore::NugetModel::Package.from_xxproj proj, 
+        nuspec = Albacore::NugetModel::Package.from_xxproj proj,
           symbols:        false,
           verify_files:   true,
           dotnet_version: target,
@@ -368,10 +377,12 @@ and report a bug to albacore with the full output. Here's the nuget process outp
         out = path_to(@opts.get(:out), cwd)
         nuspec = path_to nuspec, cwd
         nuspec_symbols = path_to nuspec_symbols, cwd if nuspec_symbols
-        
+
         cmd = Albacore::NugetsPack::Cmd.new exe,
-                work_dir: cwd,
-                out:      out
+                work_dir:         cwd,
+                out:              out,
+                package_analysis: @opts.get(:package_analysis)
+
 
         # run any concerns that modify the command
         @before_execute.call cmd if @before_execute
@@ -398,14 +409,14 @@ and report a bug to albacore with the full output. Here's the nuget process outp
           :nuspec   => nuspec,
           :nupkg    => nuget,
           :location => nuget
-        ) 
+        )
       end
 
       def self.accept? f
         File.extname(f).downcase != '.nuspec'
       end
     end
-    
+
     # generate a nuget from a nuspec
     class NuspecTask
       include Logging
@@ -451,4 +462,4 @@ and report a bug to albacore with the full output. Here's the nuget process outp
       end
     end
   end
-end
+end

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.6.1"
+  VERSION = "2.6.2"
 end

data/spec/build_spec.rb

@@ -7,7 +7,7 @@ describe 'build config' do
   subject do
     Albacore::Build::Config.new
   end
-  %w[file= sln= target target= logging logging= prop cores cores= tools_version tools_version=].each do |writer|
+  %w[files= file= sln= target target= logging logging= prop cores cores= tools_version tools_version=].each do |writer|
     it "should respond to :#{writer}" do
       expect(subject).to respond_to(:"#{writer}")
     end
@@ -42,6 +42,7 @@ describe 'when running with sln' do
 
   before do
     cfg.sln = 'src/HelloWorld.sln'
+    cfg.params_for_file cfg.sln
     cfg.target = %w|Clean Build|
     cmd.execute
   end
@@ -60,4 +61,3 @@ describe 'when running with sln' do
     expect(subject.is_mono_command?).to be false
   end
 end
-

data/spec/solution_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+require 'albacore/solution'
+require 'albacore/project'
+
+describe Albacore::Solution, "when reading solution file" do
+  def solution_path
+    File.expand_path('../testdata/Project/Project.sln', __FILE__)
+  end
+  subject do
+    Albacore::Solution.new solution_path
+  end
+
+  it "should contain Project path in project_paths" do
+    expect(subject.project_paths).to include 'Project.fsproj'
+  end
+
+  it "should contain Project in projects" do
+    project_path = File.expand_path('../testdata/Project/Project.fsproj', __FILE__)
+    project = Albacore::Project.new project_path
+    expect(subject.projects.map { |p| p.id }).to include project.id
+  end
+
+  describe 'public API' do
+    it do
+      expect(subject).to respond_to :projects
+    end
+    it do
+      expect(subject).to respond_to :project_paths
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
 platform: ruby
 authors:
 - Henrik Feldt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -151,6 +151,7 @@ files:
 - "./lib/albacore/project.rb"
 - "./lib/albacore/rake_overrides.rb"
 - "./lib/albacore/semver.rb"
+- "./lib/albacore/solution.rb"
 - "./lib/albacore/task_types/asmver.rb"
 - "./lib/albacore/task_types/asmver/cpp.rb"
 - "./lib/albacore/task_types/asmver/cs.rb"
@@ -219,6 +220,7 @@ files:
 - spec/shared_contexts.rb
 - spec/smoke_require_spec.rb
 - spec/smoke_spec.rb
+- spec/solution_spec.rb
 - spec/spec_helper.rb
 - spec/sql_cmd_spec.rb
 - spec/sql_package_spec.rb
@@ -418,7 +420,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: albacore
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Dolphin-safe and awesome Mono and .Net Rake-tasks
@@ -461,6 +463,7 @@ test_files:
 - spec/shared_contexts.rb
 - spec/smoke_require_spec.rb
 - spec/smoke_spec.rb
+- spec/solution_spec.rb
 - spec/spec_helper.rb
 - spec/sql_cmd_spec.rb
 - spec/sql_package_spec.rb