albacore 2.8.0 → 3.0.0.pre.alpha

data/spec/testdata/console-core-argu/paket.references

@@ -0,0 +1,2 @@
+FSharp.Core
+Argu

data/spec/testdata/console-core-argu/paket.template

@@ -0,0 +1 @@
+type project

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 3.0.0.pre.alpha
 platform: ruby
 authors:
 - Henrik Feldt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -122,7 +122,6 @@ 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"
@@ -131,7 +130,6 @@ files:
 - "./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/csharp_project.rb"
 - "./lib/albacore/dsl.rb"
@@ -164,10 +162,8 @@ files:
 - "./lib/albacore/task_types/build.rb"
 - "./lib/albacore/task_types/find_msbuild_versions.rb"
 - "./lib/albacore/task_types/is_package.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/sql_cmd.rb"
 - "./lib/albacore/task_types/sql_package.rb"
 - "./lib/albacore/tasks/README.md"
@@ -186,7 +182,6 @@ files:
 - bin/albacore
 - spec/Rakefile
 - spec/albacore_spec.rb
-- spec/app_spec_spec.rb
 - spec/asmver_spec.rb
 - spec/asmver_task_spec.rb
 - spec/build_spec.rb
@@ -196,12 +191,9 @@ files:
 - spec/dsl_spec.rb
 - spec/ext_teamcity_spec.rb
 - spec/facts_spec.rb
-- spec/fpm_app_spec_spec.rb
 - spec/is_package_spec.rb
 - spec/nuget_model_spec.rb
-- spec/nugets_find_gem_exe_spec.rb
 - spec/nugets_pack_spec.rb
-- spec/nugets_restore_spec.rb
 - spec/package_repo_spec.rb
 - spec/package_spec.rb
 - spec/paket_spec.rb
@@ -395,6 +387,17 @@ files:
 - spec/testdata/TestingDependencies/vendor/FSharp.Core.optdata
 - spec/testdata/TestingDependencies/vendor/FSharp.Core.sigdata
 - spec/testdata/TestingDependencies/vendor/FSharp.Core.xml
+- spec/testdata/console-core-argu/.gitignore
+- spec/testdata/console-core-argu/.paket/Paket.Restore.targets
+- spec/testdata/console-core-argu/.paket/paket.exe
+- spec/testdata/console-core-argu/.paket/paket.targets
+- spec/testdata/console-core-argu/ConsoleArgu.fsproj
+- spec/testdata/console-core-argu/Library.fs
+- spec/testdata/console-core-argu/build.sh
+- spec/testdata/console-core-argu/paket.dependencies
+- spec/testdata/console-core-argu/paket.lock
+- spec/testdata/console-core-argu/paket.references
+- spec/testdata/console-core-argu/paket.template
 - spec/testdata/csharp/Exemplar/Exemplar.sln
 - spec/testdata/csharp/Exemplar/Exemplar/Class1.cs
 - spec/testdata/csharp/Exemplar/Exemplar/Exemplar.csproj
@@ -427,9 +430,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: albacore
 rubygems_version: 2.5.1
@@ -439,7 +442,6 @@ summary: Dolphin-safe and awesome Mono and .Net Rake-tasks
 test_files:
 - spec/Rakefile
 - spec/albacore_spec.rb
-- spec/app_spec_spec.rb
 - spec/asmver_spec.rb
 - spec/asmver_task_spec.rb
 - spec/build_spec.rb
@@ -449,12 +451,9 @@ test_files:
 - spec/dsl_spec.rb
 - spec/ext_teamcity_spec.rb
 - spec/facts_spec.rb
-- spec/fpm_app_spec_spec.rb
 - spec/is_package_spec.rb
 - spec/nuget_model_spec.rb
-- spec/nugets_find_gem_exe_spec.rb
 - spec/nugets_pack_spec.rb
-- spec/nugets_restore_spec.rb
 - spec/package_repo_spec.rb
 - spec/package_spec.rb
 - spec/paket_spec.rb
@@ -648,6 +647,17 @@ test_files:
 - spec/testdata/TestingDependencies/vendor/FSharp.Core.optdata
 - spec/testdata/TestingDependencies/vendor/FSharp.Core.sigdata
 - spec/testdata/TestingDependencies/vendor/FSharp.Core.xml
+- spec/testdata/console-core-argu/.gitignore
+- spec/testdata/console-core-argu/.paket/Paket.Restore.targets
+- spec/testdata/console-core-argu/.paket/paket.exe
+- spec/testdata/console-core-argu/.paket/paket.targets
+- spec/testdata/console-core-argu/ConsoleArgu.fsproj
+- spec/testdata/console-core-argu/Library.fs
+- spec/testdata/console-core-argu/build.sh
+- spec/testdata/console-core-argu/paket.dependencies
+- spec/testdata/console-core-argu/paket.lock
+- spec/testdata/console-core-argu/paket.references
+- spec/testdata/console-core-argu/paket.template
 - spec/testdata/csharp/Exemplar/Exemplar.sln
 - spec/testdata/csharp/Exemplar/Exemplar/Class1.cs
 - spec/testdata/csharp/Exemplar/Exemplar/Exemplar.csproj

data/lib/albacore/app_spec.rb

@@ -1,229 +0,0 @@
-require 'yaml'
-require 'albacore/logging'
-require 'albacore/project'
-require 'xsemver'
-
-module Albacore
-  # a spec object
-  class AppSpec
-    include ::Albacore::Logging
-
-    # Create a new app spec from yaml data; will use heuristics to let the
-    # developer avoid as much typing and definition mongering as possible; for
-    # details see the unit tests and the documentation for this class.
-    #
-    # @descriptor_path [String] The location of the descriptor file (the .appspec)
-    # @data [String] A yaml-containing string
-    # @semver [::XSemVer] An optional semver instance that can be queried for what
-    #   version the package has.
-    def initialize descriptor_path, data, semver = nil
-      raise ArgumentError, 'data is nil' unless data
-      @path = descriptor_path
-      @conf = YAML.load(data) || Hash.new
-
-      project_path = resolve_project descriptor_path, @conf
-      raise ArgumentError, "couldn't find project, descriptor_path: #{descriptor_path.inspect}" unless valid_path project_path
-
-      @proj = Project.new project_path
-      @semver = semver
-    end
-
-    # Gets the path that the .appspec file was read from when it was initialised.
-    #
-    def path
-      @path
-    end
-
-    # Gets the executable name if this service has one -- defaults to the
-    # assembly name of the corresponding project, plus 'exe', which is how the
-    # compilers name the executables.
-    #
-    def exe
-      conf['exe'] || "#{proj.asmname}.exe"
-    end
-
-    # Resolves the project file given an optional descriptor path or a
-    # configuration hash or both. One of the other of the parameters need to
-    # exist, or an error will be thrown.
-    #
-    # @param descriptor_path May be nil
-    # @param conf [#[]] A hash or something indexable
-    def resolve_project descriptor_path, conf
-      trace { "trying to resolve project, descriptor_path: #{descriptor_path.inspect}, conf: #{conf.inspect} [AppSpec#resolve_path]" }
-
-      project_path = conf['project_path']
-      return File.join File.dirname(descriptor_path), project_path if project_path and valid_path descriptor_path
-
-      trace { 'didn\'t have both a project_path and a descriptor_path that was valid [AppSpec#resolve_project]' }
-      return project_path if project_path
-      find_first_project descriptor_path
-    end
-
-    # Given a descriptor path, tries to find the first matching project file. If
-    # you have multiple project files, the order of which {Dir#glob} returns
-    # values will determine which is chosen
-    def find_first_project descriptor_path
-      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')).sort.first
-    end
-
-    # path of the *.appspec
-    attr_reader :path
-
-    # the loaded configuration in that appspec
-    attr_reader :conf
-
-    # the project the spec applies to
-    attr_reader :proj
-
-    # gets the fully qualified path of the directory where the appspec file is
-    def dir_path
-      File.expand_path(File.dirname(@path))
-    end
-
-    # title for puppet, title for app, title for process running on server
-    def title
-      title_raw.downcase
-    end
-
-    # the title as-is without any downcasing
-    def title_raw
-      conf['title'] || proj.title
-    end
-
-    alias_method :id, :title_raw
-
-    # the description that is used when installing and reading about the package in the
-    # package manager
-    def description
-      conf['description'] || proj.description
-    end
-
-    # gets the uri source of the project
-    def uri
-      conf['uri'] || git_source
-    end
-
-    # gets the category this package is in, both for the RPM and for puppet and
-    # for possibly assigning to a work-stealing cluster or to start the app in
-    # the correct node-cluster if you have that implemented
-    def category
-      conf['category'] || 'apps'
-    end
-
-    # gets the license that the app is licensed under
-    def license
-      conf['license'] || proj.license
-    end
-
-    # gets the version with the following priorities:
-    #  - semver version passed in c'tor
-    #  - ENV['FORMAL_VERSION']
-    #  - .appspec's version
-    #  - .xxproj's version
-    #  - semver from disk
-    #  - if all above fails; use '1.0.0'
-    def version
-      semver_version || ENV['FORMAL_VERSION'] || conf['version'] || proj.version || semver_disk_version || '1.0.0'
-    end
-
-    # gets the binary folder, first from .appspec then from proj given a
-    # configuration mode (default: Release)
-    def bin_folder configuration = 'Release'
-      conf['bin'] || proj.output_path(configuration)
-    end
-
-    # gets the folder that is used to keep configuration that defaults to the
-    # current (.) directory
-    def conf_folder
-      conf['conf_folder'] || '.'
-    end
-
-    # gets an enumerable list of paths that are the 'main' contents of the
-    # package
-    #
-    def contents
-      conf['contents'] || []
-    end
-
-    # gets the provider to use to calculate the directory paths to construct
-    # inside the nuget
-    #
-    # defaults to the 'defaults' provider which can be found in
-    # 'albacore/app_spec/defaults.rb'
-    def provider
-      conf['provider'] || 'defaults'
-    end
-
-    # Gets the configured port to bind the site to
-    #
-    def port
-      conf['port'] || '80'
-    end
-
-    # Gets the host header to use for the binding in IIS - defaults to *, i.e.
-    # binding to all hosts
-    #
-    def host_header
-      conf['host_header'] || '*'
-    end
-
-    # TODO: support a few of these:
-    # https://github.com/bernd/fpm-cookery/wiki/Recipe-Specification
-
-    # load the App Spec from a descriptor path
-    def self.load descriptor_path
-      raise ArgumentError, 'missing parameter descriptor_path' unless descriptor_path
-      raise ArgumentError, 'descriptor_path does not exist' unless File.exists? descriptor_path
-      AppSpec.new(descriptor_path, File.read(descriptor_path))
-    end
-
-    # Customizing the to_s implementation to make the spec more amenable for printing
-    def to_s
-      "AppSpec[#{title}], #{@conf.keys.length} keys]"
-    end
-
-    private
-    # determines whether the passed path is valid and existing
-    def valid_path path
-      path and File.exists? path
-    end
-
-    # gets the source from the current git repository: finds the first remote and uses
-    # that as the source of the RPM
-    def git_source
-      `git remote -v`.
-        split(/\n/).
-        map(&:chomp).
-        map { |s| s.split(/\t/)[1].split(/ /)[0] }.
-        first
-    end
-
-    # Gets the semver version in %M.%m.%p form or nil if a semver isn't given
-    # in the c'tor of this class. If we have gotten an explicit version in the constructor,
-    # let's assume that version should be used in front of anything else and that the calling
-    # libraries know what they are doing.
-    def semver_version
-      return @semver.format '%M.%m.%p' if @semver
-      nil
-    end
-
-    # if everything else fails, return the semver from disk
-    def semver_disk_version
-      v = XSemVer::SemVer.find
-      v.format '%M.%m.%p' if v
-    rescue SemVerMissingError
-      nil
-    end
-
-    # Listen to all 'getters'
-    #
-    def method_missing name, *args, &block
-      unless name =~ /\w=$/
-        @conf.send(:'[]', *[name.to_s, args].flatten, &block)
-      end
-    end
-  end
-end

data/lib/albacore/cpack_app_spec.rb

@@ -1,135 +0,0 @@
-require 'albacore/tools'
-require 'albacore/app_spec'
-require 'albacore/errors/invalid_app_spec_error'
-require 'map'
-
-module Albacore
-  class CpackAppSpec
-  end
-
-  class CpackAppSpec::Config
-    # create a new configuration for multiple xxproj-s to be packed with fpm into .deb/.rpm
-    def initialize
-      @files         = []
-      @out           = '.'
-      @configuration = 'Release'
-    end
-
-    # set the output path, defaults to '.'
-    def out= out
-      @out = out
-    end
-
-    # give the configuration a list of files to match
-    def files= files
-      @files = files
-    end
-
-    def configuration= conf
-      @configuration = conf
-    end
-
-    def opts
-      Map.new bundler: @bundler,
-              files: @files,
-              out: @out,
-              configuration: @configuration
-    end
-  end
-
-  class CpackAppSpec::Task
-    include ::Albacore::Logging
-    include ::Albacore::CrossPlatformCmd
-
-    # create a new task instance with the given opts
-    def initialize opts
-      raise ArgumentError, 'opts is nil' if opts.nil?
-      @opts = opts
-    end
-
-    def execute
-      warn 'executing cpack app spec task, but there are no input files [cpack_app_spec::task#execute]' if
-        @opts.get(:files).empty?
-
-      cpack_package @opts.get(:out),
-                    @opts.get(:files),
-                    @opts.get(:configuration)
-    end
-
-    private
-    def cpack_package out, appspecs, configuration
-      appspecs.
-        map { |path| Albacore::AppSpec.load path }.
-        each do |spec|
-          nuspec = create_nuspec spec
-          debug { nuspec }
-          create_cpack out, spec, nuspec, configuration
-      end
-    end
-
-    def create_nuspec app_spec
-      require 'albacore/nuget_model'
-      p = Albacore::NugetModel::Package.new
-      p.with_metadata do |m|
-        m.id            = app_spec.id
-        m.title         = app_spec.title_raw
-        m.version       = app_spec.version
-        m.authors       = app_spec.authors
-        m.owners        = app_spec.owners
-        m.description   = app_spec.description || app_spec.title_raw
-        m.release_notes = app_spec.release_notes || Albacore::Tools.git_release_notes
-        m.summary       = app_spec.summary
-        m.language      = app_spec.language
-        m.project_url   = app_spec.project_url || 'https://haf.se'
-        m.icon_url      = app_spec.icon_url || 'https://haf.se/spacer.gif'
-        m.license_url   = app_spec.license_url || 'https://haf.se'
-        m.copyright     = app_spec.copyright || 'See Authors'
-        m.tags          = app_spec.tags
-      end
-      p.to_xml
-    end
-
-    def create_cpack out, app_spec, nuspec_xml, configuration
-      provider = find_provider app_spec
-
-      target = "#{out}/#{app_spec.id}"
-      contents = "#{target}/#{provider.nuget_contents}/"
-
-      debug { 'create target [cpack_app_spec#create_cpack]' }
-      FileUtils.mkdir_p target
-
-      debug { 'write nuspec [cpack_app_spec#create_cpack]' }
-      File.open("#{target}/#{app_spec.id}.nuspec", 'w+') { |io| io.write nuspec_xml }
-
-      debug { 'write tools/chocolateyInstall.ps1 [cpack_app_spec#create_cpack]' }
-      provider.install_script out, app_spec
-
-      debug { 'copy contents of package [cpack_app_spec#create_cpack]' }
-      FileUtils.cp_r provider.source_dir(app_spec, configuration),
-                     contents,
-                     :verbose => true
-
-      # package it
-      Dir.chdir target do
-        system 'cpack'
-      end
-
-      # publish it
-      Albacore.publish :artifact, OpenStruct.new(
-        :location => "#{target}/#{app_spec.id}.#{app_spec.version}.nupkg"
-      )
-    end
-
-    def find_provider app_spec
-      require "albacore/app_spec/#{app_spec.provider}"
-      case app_spec.provider
-      when 'defaults'
-        AppSpec::Defaults.new
-      when 'iis_site'
-        AppSpec::IisSite.new
-      else
-        raise ArgumentError, "unknown app_spec.provider: #{app_spec.provider}"
-      end
-    end
-  end
-end