albacore 2.5.6 → 2.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07faec03f515851ac25f361b7bbb0d6ac7401901
-  data.tar.gz: 1883a7acca5de06cd16389ce5a9760ff379786b6
+  metadata.gz: 7cea9701e83877d8f6a6a0ff1b03cf6edb323339
+  data.tar.gz: 80a334c78c0f56b9b5538fed415b217a39cfb15a
 SHA512:
-  metadata.gz: 37f2ce80f96aa0f8ec7a4a1da9df2cdda9aa69c7ef3ab599bd2d579872016f9fa6b9890d94f9e34d80fba163b1324d359db82beedaf1ade873eca971ff68291d
-  data.tar.gz: c39261f7f74713222d0c88865220a728a52081b39af7fa6cc5a3e75890f3e1774e9fae3cd7dcdf9944acbcbcc6e282e89f74220ed18e8db3ffcd812ad18ef58c
+  metadata.gz: 71a0b5d41a28ed32c2fd5b1aabffb284af293168bdac97d14b285f6d60b1c3399cf70d616b48d6e8e7079b63a179d9baaa8798a949adf507c2d1cb7ac568e4b6
+  data.tar.gz: 2f547c0645ac83afa2c09c727959709381a0dded7b28612372d933ad6b47697868bb66b8a2057ca0d4dcc18057ae029ebddc8e10f2b72b926dce9096833b1ac8

data/lib/albacore/tasks/release.rb

@@ -1,5 +1,6 @@
 require 'rake'
 require 'albacore/dsl'
+require 'albacore/nuget_model'
 require 'albacore/tasks/versionizer'
 require 'map'
 
@@ -34,7 +35,7 @@ module Albacore
       include ::Rake::DSL
       include ::Albacore::DSL
 
-      def initialize name = :release, opts = {}
+      def initialize name = :release, opts = {}, &block
         @name = name
         @opts = Map.new(opts).apply \
           pkg_dir:      'build/pkg',
@@ -44,6 +45,7 @@ module Albacore
           depend_on:    :versioning,
           semver:       nil
         semver = @opts.get :semver
+        @block = block if block_given?
 
         unless semver
           ::Albacore.subscribe :build_version do |data|
@@ -98,11 +100,11 @@ module Albacore
 
       def nuget_push package
         exe     = @opts.get :nuget_exe
-        api_key = @opts.get :api_key
-        params = %W|push #{package}|
+        api_key = package[:api_key]
+        params = %W|push #{package[:path]}|
         params << api_key if api_key
-        params << %W|-Source #{@opts.get :nuget_source}|
-        system exe, params, clr_command: @opts.get(:clr_command)
+        params << %W|-Source #{package[:nuget_source]}|
+        system exe, params, clr_command: package[:clr_command]
       end
 
       def git_push
@@ -126,7 +128,7 @@ module Albacore
       end
 
       def guard_clean
-        clean? && committed? or raise("There are files that need to be committed first.")
+        committed? or raise("There are files that need to be committed first.")
       end
 
       def guard_pkg
@@ -134,15 +136,10 @@ module Albacore
         (! packages.empty?) or \
           raise("You must have built your packages for version #{nuget_version}, use 'depend_on: :nuget_pkg'")
         (File.exists?(exe)) or raise("You don't have a NuGet.exe file to push with, expected path: #{exe}")
-
-      end
-
-      def clean?
-        run('git diff --exit-code', silent: true)[1] == 0
       end
 
       def committed?
-        run('git diff-index --quiet --cached HEAD', silent: true)[1] == 0
+        run('git status --porcelain', silent: true)[0] == ""
       end
 
       def tag_version
@@ -167,7 +164,19 @@ module Albacore
         # only read packages once
         path = "#{@opts.get :pkg_dir}/*.#{nuget_version}.nupkg"
         debug { "[release] looking for packages in #{path}, version #{@semver}" }
-        @packages ||= Dir.glob path
+
+        @packages ||= Dir.glob(path).map do |f|
+          id = /(?<id>.*)\.#{nuget_version}/.match(File.basename(f, '.nupkg'))[:id]
+          package = {
+            path: f,
+            id_version: Albacore::NugetModel::IdVersion.new(id, nuget_version),
+            nuget_source: @opts.get(:nuget_source),
+            api_key: @opts.get(:api_key),
+            clr_command: @opts.get(:clr_command)
+          }
+          @block.call(package) if @block
+          package
+        end
         @packages
       end
 

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.5.6"
+  VERSION = "2.5.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.5.6
+  version: 2.5.8
 platform: ruby
 authors:
 - Henrik Feldt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -120,74 +120,64 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- "./lib/albacore.rb"
+- "./lib/albacore/albacore_module.rb"
+- "./lib/albacore/app_spec.rb"
+- "./lib/albacore/app_spec/README.md"
+- "./lib/albacore/app_spec/defaults.rb"
+- "./lib/albacore/app_spec/iis_site.rb"
+- "./lib/albacore/application.rb"
+- "./lib/albacore/cli.rb"
+- "./lib/albacore/cli_dsl.rb"
+- "./lib/albacore/cmd_config.rb"
+- "./lib/albacore/config_dsl.rb"
+- "./lib/albacore/cpack_app_spec.rb"
+- "./lib/albacore/cross_platform_cmd.rb"
+- "./lib/albacore/dsl.rb"
+- "./lib/albacore/errors/command_failed_error.rb"
+- "./lib/albacore/errors/command_not_found_error.rb"
+- "./lib/albacore/errors/invalid_app_spec_error.rb"
+- "./lib/albacore/errors/unfilled_property_error.rb"
+- "./lib/albacore/ext/README.md"
+- "./lib/albacore/ext/teamcity.rb"
+- "./lib/albacore/facts.rb"
+- "./lib/albacore/fpm_app_spec.rb"
+- "./lib/albacore/logging.rb"
+- "./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"
+- "./lib/albacore/semver.rb"
+- "./lib/albacore/task_types/asmver.rb"
+- "./lib/albacore/task_types/asmver/cpp.rb"
+- "./lib/albacore/task_types/asmver/cs.rb"
+- "./lib/albacore/task_types/asmver/engine.rb"
+- "./lib/albacore/task_types/asmver/file_generator.rb"
+- "./lib/albacore/task_types/asmver/fs.rb"
+- "./lib/albacore/task_types/asmver/vb.rb"
+- "./lib/albacore/task_types/build.rb"
+- "./lib/albacore/task_types/find_msbuild_versions.rb"
+- "./lib/albacore/task_types/nugets.rb"
+- "./lib/albacore/task_types/nugets_authentication.rb"
+- "./lib/albacore/task_types/nugets_pack.rb"
+- "./lib/albacore/task_types/nugets_restore.rb"
+- "./lib/albacore/task_types/test_runner.rb"
+- "./lib/albacore/tasks/README.md"
+- "./lib/albacore/tasks/albasemver.rb"
+- "./lib/albacore/tasks/projectlint.rb"
+- "./lib/albacore/tasks/release.rb"
+- "./lib/albacore/tasks/versionizer.rb"
+- "./lib/albacore/tools.rb"
+- "./lib/albacore/tools/fluent_migrator.rb"
+- "./lib/albacore/tools/restore_hint_paths.rb"
+- "./lib/albacore/tools/zippy.rb"
+- "./lib/albacore/version.rb"
 - "./resources/chocolateyInstall.ps1"
 - "./resources/installSite.ps1"
-- ".gitattributes"
-- ".gitignore"
-- ".travis.yml"
-- Gemfile
-- Guardfile
-- README.md
-- Rakefile
-- albacore.gemspec
 - bin/albacore
-- lib/albacore.rb
-- lib/albacore/albacore_module.rb
-- lib/albacore/app_spec.rb
-- lib/albacore/app_spec/README.md
-- lib/albacore/app_spec/defaults.rb
-- lib/albacore/app_spec/iis_site.rb
-- lib/albacore/application.rb
-- lib/albacore/cli.rb
-- lib/albacore/cli_dsl.rb
-- lib/albacore/cmd_config.rb
-- lib/albacore/config_dsl.rb
-- lib/albacore/cpack_app_spec.rb
-- lib/albacore/cross_platform_cmd.rb
-- lib/albacore/dsl.rb
-- lib/albacore/errors/command_failed_error.rb
-- lib/albacore/errors/command_not_found_error.rb
-- lib/albacore/errors/invalid_app_spec_error.rb
-- lib/albacore/errors/unfilled_property_error.rb
-- lib/albacore/ext/README.md
-- lib/albacore/ext/teamcity.rb
-- lib/albacore/facts.rb
-- lib/albacore/fpm_app_spec.rb
-- lib/albacore/logging.rb
-- 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
-- lib/albacore/semver.rb
-- lib/albacore/task_types/asmver.rb
-- lib/albacore/task_types/asmver/cpp.rb
-- lib/albacore/task_types/asmver/cs.rb
-- lib/albacore/task_types/asmver/engine.rb
-- lib/albacore/task_types/asmver/file_generator.rb
-- lib/albacore/task_types/asmver/fs.rb
-- lib/albacore/task_types/asmver/vb.rb
-- lib/albacore/task_types/build.rb
-- lib/albacore/task_types/find_msbuild_versions.rb
-- lib/albacore/task_types/nugets.rb
-- lib/albacore/task_types/nugets_authentication.rb
-- lib/albacore/task_types/nugets_pack.rb
-- lib/albacore/task_types/nugets_restore.rb
-- lib/albacore/task_types/test_runner.rb
-- lib/albacore/tasks/README.md
-- lib/albacore/tasks/albasemver.rb
-- lib/albacore/tasks/projectlint.rb
-- lib/albacore/tasks/release.rb
-- lib/albacore/tasks/versionizer.rb
-- lib/albacore/tools.rb
-- lib/albacore/tools/fluent_migrator.rb
-- lib/albacore/tools/restore_hint_paths.rb
-- lib/albacore/tools/zippy.rb
-- lib/albacore/version.rb
-- resources/chocolateyInstall.ps1
-- resources/installSite.ps1
 - spec/Rakefile
 - spec/albacore_spec.rb
 - spec/app_spec_spec.rb

data/.gitattributes

@@ -1,4 +0,0 @@
- text eol=lf
-
-*.csproj false
-*.fsproj false

data/.gitignore

@@ -1,10 +0,0 @@
-Gemfile.lock
-tmp/
-*.swp
-pkg/
-.DS_Store
-spec/testdata/TestingDependencies/Sample.Commands/Sample.Commands.nuspec
-spec/testdata/Project/Sample.Nuget.nuspec
-spec/testdata/TestingDependencies/Sample.Core/Sample.Core.nuspec
-
-*.userprefs

data/.travis.yml

@@ -1,37 +0,0 @@
-# kisses and hugs to https://raw.github.com/NancyFx/Nancy/master/.travis.yml
-
-language: ruby
-
-install:
-  - travis_retry sudo bash -c "echo deb http://badgerports.org lucid main >> /etc/apt/sources.list"
-  - travis_retry sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0E1FAD0C
-  - travis_retry sudo apt-get update
-  - travis_retry sudo apt-get install mono-devel mono-gmcs mono-vbnc
-  - travis_retry sudo apt-get install gettext
-  - travis_retry sudo wget -q -P "/opt"  "http://samples.nancyfx.org/content/mono-3.0.12-x64-bin.tar.bz2"
-  - travis_retry bundle install
-  - echo set -e >> ./travis.sh
-  - echo set -o pipefail >> ./travis.sh
-  - echo echo Running on Mono 3.x >> ./travis.sh
-  - echo sudo tar xk -C "/opt" -f /opt/mono-3.0.12-x64-bin.tar.bz2 >> ./travis.sh
-  - echo export PATH="/opt/mono/bin:$PATH" >> ./travis.sh
-  - echo export LD_LIBRARY_PATH="/opt/mono/bin" >> ./travis.sh
-  - echo bundle exec rake spec >> ./travis.sh
-  - chmod +x ./travis.sh
-
-script: ./travis.sh
-
-rvm:
-  - 1.9.3
-# 2.0 seems to be experiencing issues with subclasses not saying that they respond_to(:baseclass_method)
-# so that's for another day to fix
-#  - 2.0.0
-#  - jruby
-
-branches:
-  only: master
-
-notifications:
-  email: henrik@haf.se
-
-gemfile: Gemfile

data/Gemfile

@@ -1,11 +0,0 @@
-source 'https://rubygems.org'
-
-# Windows Rubies (RubyInstaller)
-platforms :mswin, :mingw do
-  gem 'wdm' # for listening to Windows Directory Notifications
-end
-
-# needed to do development and read the version of albacore
-gem 'nokogiri', '~>1.5'
-
-gemspec

data/Guardfile

@@ -1,7 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-guard 'rspec', cmd: "bundle exec RAISE_DEPRECATED=true" do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-end
-

data/README.md

@@ -1,203 +0,0 @@
-# Albacore v2.0
-[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/Albacore/albacore?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
-[![Version     ](https://img.shields.io/gem/v/albacore.svg?style=flat)](https://rubygems.org/gems/albacore)
-[![Build Status](http://img.shields.io/travis/Albacore/albacore/master.svg?style=flat)](http://travis-ci.org/Albacore/albacore)
-[![Gittip      ](http://img.shields.io/gittip/haf.svg?style=flat)](http://gittip.com/haf)
-[![Code Climate](https://img.shields.io/codeclimate/github/Albacore/albacore.svg?style=flat)](https://codeclimate.com/github/albacore/albacore)
-
-Albacore is a suite of tools for the professional .Net or mono developer that
-make their life easier.
-
-    gem install albacore
-
-## Main Features
-
- - Runs .Net and mono builds on OS X, Windows and Linux quick and painless
- - Manage xbuild/msbuild transparently
- - NuGet restore without intrusive .nuget target files in your project files,
-   authentication supported
- - NuGet pack task types for packaging your code, supports packaging
-   symbols/source and custom nuspecs, getting metadata from context
- - Declarative Rake syntax makes it easy to read Rakefiles
- - Most tasks, including the NuGet tasks accept an array of csproj- or fsproj-
-   files and act on all those projects, discovering metadata from their XML.
- - An improved set APIs for calling operating system processes and managing them
-   from the build script (see DSL below)
- - Quick and easy to turn on debugging, just set the DEBUG env var
- - Assembly version generation in C#, F#, C++ and VB
- - A copy-local test-runner for those of you with Parallels/Fusion needing to
-   shadow-copy assemblies from a 'network drive'
- - An innovative `.appspec` file lets you construct IIS Site-packages with
-   Chocolatey on Windows, Topshelf services with Chocolatey on Windows and RPM
-   and DEB services on Linux with three lines of code - become the DevOps GOD of
-   your company!
- - Transparent publish of artifacts to TeamCity with the TC extension
- - Unit tested, high quality Ruby code
- - Actively developed by [@haf](https://github.com/haf)
-
-The [wiki](https://github.com/Albacore/albacore/wiki) is the main reference for
-the above task types, but there's also [very
-extensive](http://rubydoc.info/gems/albacore/2.0.0/frames) documentation in the
-code, as well as hundreds of unit tests written in a easy-to-read rspec syntax.
-
-## Quickstart TLDR; SHOW ME THE CODE!
-
-    gem install albacore
-    albacore init
-
-Now you have the initial setup and can run `bundle exec rake`. ([nokogiri error?](#error)) But please read
-below:
-
-## Getting Started
-
-Follow along for a quick intro, but if on Windows, see the section 'Installing
-Ruby' first. Albacore works on both Ruby 1.9.3 and 2.x.
-
-First create `Gemfile` with these contents:
-
-    source 'https://rubygems.org'
-    gem 'albacore', '~> 2.0.0'
-
-When setting up your build you need to ensure it is reproducible.  Bundler
-allows you to lock down the few gems that Albacore depend on to their specific
-versions, ensuring that your peers can re-run the same build script you just
-built and that it works well on your continous integration server.
-
-Now you can bundle the dependencies, effectively freezing all gem dependencies
-that your build depends on.
-
-    bundle
-    git add Gemfile*
-    git commit -m 'Installed Albacore'
-
-Now you are ready to continue reading below for your first Rakefile.
-
-### Installing Ruby on Windows
-
-First install Ruby **32 bits** from http://rubyinstaller.org/downloads/ - e.g. [v2.1.5
-32-bits](http://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.1.5.exe?direct)
-which is the latest version, at time of writing.
-
-Second, install Ruby DevKit, or you won't be able to install nokogiri. Download
-it [lower down on the same
-page](http://cdn.rubyinstaller.org/archives/devkits/DevKit-mingw64-32-4.7.2-20130224-1151-sfx.exe),
-open a console:
-
-``` bash
-cd \DevKit
-ruby dk.rb init
-ruby dk.rb install
-```
-
-Now close that console and open a new console, and run:
-
-    gem install bundler
-
-This gives you a working ruby installation. Continue below with your first
-Rakefile.
-
-You can also try chocolatey [`ruby`](https://chocolatey.org/packages/ruby) and [`ruby2.devkit`](https://chocolatey.org/packages/ruby2.devkit) packages.
-
-### Installing Ruby on OS X
-
-``` bash
-brew install rbenv ruby-build
-rbenv install 2.2.0
-gem install bundler
-```
-
-Done. Ensure `brew doctor` is clean enough and that `ruby --version` outputs the
-expected version.
-
-## Creating Your First Rakefile
-
-In order to build your project, you need to create a `Rakefile`, with contents
-like these:
-
-``` ruby
-require 'bundler/setup'
-
-require 'albacore'
-require 'albacore/tasks/versionizer'
-require 'albacore/ext/teamcity'
-
-Albacore::Tasks::Versionizer.new :versioning
-
-desc 'Perform fast build (warn: doesn\'t d/l deps)'
-build :quick_build do |b|
-  b.logging = 'detailed'
-  b.sln     = 'src/MyProj.sln'
-end
-
-desc 'restore all nugets as per the packages.config files'
-nugets_restore :restore do |p|
-  p.out = 'src/packages'
-  p.exe = 'tools/NuGet.exe'
-end
-
-desc 'Perform full build'
-build :build => [:versioning, :restore] do |b|
-  b.sln = 'src/MyProj.sln'
-  # alt: b.file = 'src/MyProj.sln'
-end
-
-directory 'build/pkg'
-
-desc 'package nugets - finds all projects and package them'
-nugets_pack :create_nugets => ['build/pkg', :versioning, :build] do |p|
-  p.files   = FileList['src/**/*.{csproj,fsproj,nuspec}'].
-    exclude(/Tests/)
-  p.out     = 'build/pkg'
-  p.exe     = 'tools/NuGet.exe'
-  p.with_metadata do |m|
-    m.description = 'A cool nuget'
-    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
-```
-
-You can now run:
-
-    bundle exec rake
-
-You can continue reading about the available task-types in [the wiki][wiki].
-
-If you're upgrading from v1.0, there's an article [there for you][upgrade-v1.0]
-
-## Contributing
-
- 1. Create a feature branch with your change:
-    a. With unit test
-    b. With feature
- 1. Send a PR with that feature branch to this branch
-    a. Make sure TravisCI is OK with it
-    b. Describe your PR in English.
-
-## Writing Code
-
- 1. Add a rspec spec in specs/
- 1. Run `bundle exec rspec spec` to verify test fails
- 1. Implement feature you want
- 1. Run the tests again, have them pass
- 1. Make a PR from your feature branch against `master`
-
-Document your code with
-[YARD](http://rubydoc.info/gems/yard/file/docs/GettingStarted.md) as you're
-writing it: it's much easier to write the documentation together with the code
-than afterwards.
-
- [wiki]: https://github.com/Albacore/albacore/wiki
- [upgrade-v1.0]: https://github.com/Albacore/albacore/wiki/Upgrading-from-v1.0
-
-### Error
-
-#### CentOS 6/7
-
-If you get a problem installing nokogiri, you have two choices: `yum install epel-release && yum install ruby rubygems-nokogiri && gem install albacore` which loads nokogiri from epel, or you could do: `yum install ruby gcc ruby-devel zlib-devel  libxslt-devel libxml2-devel && gem install nokogiri` which lets rubygems compile nokogiri.

data/Rakefile

@@ -1,10 +0,0 @@
-require 'bundler/setup'
-require 'rubygems/tasks'
-Gem::Tasks.new
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |c|
-  c.rspec_opts = ['--color', '--format=doc']
-end
-
-task :default => :build

data/albacore.gemspec

@@ -1,37 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-$:.push File.expand_path("../lib", __FILE__)
-require 'albacore/version'
-
-Gem::Specification.new do |s|
-  s.name        = 'albacore'
-  s.version     = Albacore::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Henrik Feldt', 'Anthony Mastrean']
-  s.email       = 'henrik@haf.se'
-  s.homepage    = 'http://albacorebuild.net'
-  s.summary     = 'Dolphin-safe and awesome Mono and .Net Rake-tasks'
-  s.license     = 'MIT'
-  s.description = <<-EOF
-    Easily build your .Net or Mono project using this collection of Rake tasks.
-    Albacore assist you in creating nugets, managing nugets, building your projects,
-    handling the .Net compilers while making it very easy to integrate your ruby-code
-    with existing dev-ops tools, such as Puppet, Chef, Capistrano or Vagrant/VirtualBox.
-EOF
-
-  s.rubyforge_project = 'albacore'
-
-  s.add_dependency 'rake', '~> 10' # this gem builds on rake
-  s.add_dependency 'map', '~> 6.5' # https://github.com/ahoward/map for options handling
-  s.add_dependency 'nokogiri', '~> 1.5' # used to manipulate and read *proj files
-  s.add_dependency 'semver2', '~> 3.4'
-	
-  s.add_development_dependency 'rubygems-tasks', '~>0.2'
-  s.add_development_dependency 'rspec', '~> 3.00'
-  s.add_development_dependency 'nuget', '~> 2.8'
-
-  s.files         = `git ls-files`.split("\n").concat(Dir.glob('./resources/**'))
-  s.test_files    = `git ls-files -- spec/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename f }
-  s.require_paths = %w|bin lib|
-end