albacore 2.0.0.rc.2 → 2.0.0.rc.3

data/lib/albacore/task_types/nugets_pack.rb

@@ -99,8 +99,11 @@ module Albacore
     #    p.files   = FileList['src/**/*.csproj']
     #    p.out     = 'build/pkg'
     #    p.exe     = 'buildsupport/NuGet.exe'
-    #    p.version = ENV['NUGET_VERSION']
+    #    p.with_metadata do |m|
+    #      m.version = ENV['NUGET_VERSION']
+    #    end
     #    p.gen_symbols
+    #    p.no_project_dependencies
     #  end
     class Config
       include CmdConfig
@@ -109,7 +112,7 @@ module Albacore
       # the output directory to place the newfangled nugets in
       attr_path :out
 
-      # the .net target (e.g. net40, mono2.0)
+      # the .net target (e.g. net40, mono20, mono3, etc)
       attr_writer :target
 
       # sets the files to search
@@ -123,6 +126,7 @@ module Albacore
         @package = Albacore::NugetModel::Package.new
         @target  = 'net40'
         @symbols = false
+        @project_dependencies = true
         fill_required
       end
 
@@ -141,6 +145,12 @@ module Albacore
         @symbols = true
       end
 
+      # call this if you want to cancel 'smart' scanning of the *proj
+      # file for its dependencies
+      def no_project_dependencies
+        @project_dependencies = false
+      end
+
       # gets the options specified for the task, used from the task
       def opts
         files = @files.respond_to?(:each) ? @files : [@files]
@@ -157,6 +167,7 @@ module Albacore
           :target        => @target,
           :files         => @files,
           :configuration => @configuration,
+          :project_dependencies => @project_dependencies,
           :original_path => FileUtils.pwd
         })
       end
@@ -247,14 +258,18 @@ module Albacore
 
       def create_nuspec proj, knowns
         version = @opts.get(:package).metadata.version
+        project_dependencies = @opts.get(:project_dependencies, true)
+        target = @opts.get :target
 
-        trace "creating NON-SYMBOL package for #{proj.name} [nugets pack: task]"
+        trace "creating NON-SYMBOL package for #{proj.name}, targeting #{target} [nugets pack: task]"
         nuspec = Albacore::NugetModel::Package.from_xxproj proj, 
           symbols:        false,
           verify_files:   true,
+          dotnet_version: target,
           known_projects: knowns,
           version:        version,
-          configuration:  (@opts.get(:configuration))
+          configuration:  (@opts.get(:configuration)),
+          project_dependencies: project_dependencies
 
         # take data from package as configured in Rakefile, choosing what is in
         # Rakefile over what is in projfile.
@@ -266,9 +281,11 @@ module Albacore
           nuspec_symbols = Albacore::NugetModel::Package.from_xxproj proj,
             symbols:        true,
             verify_files:   true,
+            dotnet_version: target,
             known_projects: knowns,
             version:        version,
-            configuration:  (@opts.get(:configuration))
+            configuration:  (@opts.get(:configuration)),
+            project_dependencies: project_dependencies
 
           nuspec_symbols = nuspec_symbols.merge_with @opts.get(:package)
           trace { "nuspec symbols: #{nuspec_symbols.to_s} [nugets pack: task]" }

data/lib/albacore/tasks/README.md

@@ -5,7 +5,9 @@ with tasks. Files should be named after the tasks they 'create'.
 
 For example, in a Rakefile, you can write:
 
-```ruby Albacore::Tasks::Versionizer.new :versioning ```
+``` ruby
+Albacore::Tasks::Versionizer.new :versioning
+```
 
 to create a new task, named `:versioning` that you can then depend on from other
 tasks.

data/lib/albacore/tools.rb

@@ -0,0 +1,4 @@
+require 'albacore'
+
+module Albacore::Tools
+end

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.0.0.rc.2"
+  VERSION = "2.0.0.rc.3"
 end

data/spec/asmver_spec.rb

@@ -100,9 +100,7 @@ on many lines}
   end
 end
 describe FileGenerator do
-  subject do
-    FileGenerator.new(Fs.new, 'MyNamespace.Here', {})
-  end
+  subject do FileGenerator.new(Fs.new, 'MyNamespace.Here', {}) end
   it do
     subject.should respond_to(:generate)
   end
@@ -111,16 +109,19 @@ describe FileGenerator do
   end
 end
 describe FileGenerator, 'when generating F# file' do
-  subject do
-    FileGenerator.new(Fs.new, 'My.Fs.Ns', {})
-  end
-  let :generated do
-    subject.generate com_visible: false,
+  before :all do
+    @out = StringIO.new
+    subject = FileGenerator.new(Fs.new, 'My.Fs.Ns', {})
+    subject.generate @out,
+      com_visible: false,
       assembly_title: 'My.Ns',
       assembly_version: '0.1.2',
       custom_thing: %w|a b c|,
       named_thing: { :b => 3, :c => 'hi' }
   end
+  let :generated do
+    @out.string
+  end
   it 'should include namespace' do
     generated.should =~ /namespace My\.Fs\.Ns(\r\n?|\n)/
   end
@@ -153,16 +154,19 @@ describe FileGenerator, 'when generating F# file' do
   end
 end
 describe FileGenerator do
-  subject do
-    FileGenerator.new(Cs.new, '', {})
-  end
-  let :generated do
-    subject.generate com_visible: false,
+  before :all do
+    @out = StringIO.new
+    subject = FileGenerator.new(Cs.new, '', {})
+    subject.generate @out,
+      com_visible: false,
       assembly_title: 'My.Asm',
       assembly_version: '0.1.2',
       custom_thing: %w|a b c|,
       named_thing: { :b => 3, :c => 'hi' }
   end
+  let :generated do
+    @out.string
+  end
   it 'should not include \'namespace\'' do
     generated.should_not include('namespace')
   end

data/spec/nuget_model_spec.rb

@@ -1,9 +1,10 @@
 require 'spec_helper'
+require 'shared_contexts'
 require 'albacore/paths'
 require 'albacore/nuget_model'
 
 describe Albacore::NugetModel::Metadata do
-  [:id, :version, :authors, :description, :language, :project_url, :license_url, :release_notes, :owners, :require_license_acceptance, :copyright, :tags, :dependencies, :framework_assemblies].each do |prop|
+  [:id, :version, :authors, :description, :summary, :language, :project_url, :license_url, :release_notes, :owners, :require_license_acceptance, :copyright, :tags, :dependencies, :framework_assemblies].each do |prop|
     it "responds to :#{prop}" do
       subject.should respond_to(prop)
     end
@@ -78,6 +79,7 @@ describe Albacore::NugetModel::Package, "from XML" do
     <owners>Ms.Example</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Example package</description>
+    <summary>Example package summary</summary>
     <releaseNotes>Used for specs</releaseNotes>
     <copyright>none</copyright>
     <tags>example spec</tags>
@@ -126,7 +128,7 @@ XML
   end
 
   # on Windows this fails due to replacement of path separators (by design)
-  unless ::Rake::Win32.windows?
+  unless ::Albacore.windows?
     it "should generate the same (semantic) XML as above" do
       Nokogiri::XML(subject.to_xml, &:noblanks).to_xml.should eq(Nokogiri::XML(StringIO.new(xml), &:noblanks).to_xml)
     end
@@ -150,63 +152,6 @@ XML
 end
 
 
-shared_context 'metadata_dsl' do
-  let :m do
-    subject.metadata
-  end
-
-  def self.has_value sym, e
-    it "should have overridden #{sym}, to be #{e}" do
-      m.send(sym).should eq e
-    end
-  end
-
-  def self.has_dep name, version
-    it "has dependency on '#{name}'" do
-      m.dependencies.has_key?(name).should be_true
-    end
-    it "overrode dependency on '#{name}'" do
-      m.dependencies[name].version.should eq version
-    end
-  end
-
-  def self.has_not_dep name
-    it "does not have a dependency on #{name}" do
-      m.dependencies.has_key?(name).should be_false
-    end
-  end
-
-  def self.has_file src, target, exclude = nil
-    src, target = norm(src), norm(target)
-    it "has file[#{src}] (should not be nil)" do
-      file = subject.files.find { |f| f.src == src }
-     #  puts "## ALL FILES ##"
-     #  subject.files.each do |f|
-     #    puts "subject.files: #{subject.files}, index of: #{subject.files.find_index { |f| f.src == src }}"
-     #    puts "#{f.inspect}"
-     #  end
-      file.should_not be_nil 
-    end
-
-    it "has file[#{src}].target == '#{target}'" do
-      file = subject.files.find { |f| f.src == src }
-      file.target.should eq target
-    end 
-  end
-
-  def self.has_not_file src
-    src = norm src
-    it "has not file[#{src}]" do
-      file = subject.files.find { |f| f.src == src }
-      file.should be_nil
-    end
-  end
-
-  def self.norm str
-    Albacore::Paths.normalise_slashes str
-  end  
-end
-
 describe "when reading xml from a fsproj file into Project/Metadata" do
   let :projfile do
     curr = File.dirname(__FILE__)
@@ -216,7 +161,7 @@ describe "when reading xml from a fsproj file into Project/Metadata" do
     Albacore::NugetModel::Package.from_xxproj_file projfile
   end
 
-  include_context 'metadata_dsl'
+  include_context 'package_metadata_dsl'
 
   it "should find Name element" do
     m.id.should eq 'Project'
@@ -267,7 +212,7 @@ describe Albacore::NugetModel::Package, "overriding metadata" do
     p1.merge_with p2
   end
 
-  include_context 'metadata_dsl'
+  include_context 'package_metadata_dsl'
 
   describe "when overriding:" do
     has_value :id, 'A.B.C'
@@ -296,7 +241,7 @@ describe "creating nuget (not symbols) from dependent proj file" do
       :configuration  => 'Debug'
   end
   
-  include_context 'metadata_dsl'
+  include_context 'package_metadata_dsl'
 
   # from fsproj
   has_dep 'Sample.Core', '2.3.0'
@@ -309,6 +254,17 @@ describe "creating nuget (not symbols) from dependent proj file" do
   # actual nuspec contents
   has_file 'bin/Debug/Sample.Commands.dll', 'lib/net40'
   has_file 'bin/Debug/Sample.Commands.xml', 'lib/net40'
+
+  describe 'when dotnet_version is set' do
+    subject do
+      Albacore::NugetModel::Package.from_xxproj_file projfile,
+        known_projects: %w[Sample.Core],
+        dotnet_version: 'mono32'
+    end
+    # actual nuspec contents
+    has_file 'bin/Debug/Sample.Commands.dll', 'lib/mono32'
+    has_file 'bin/Debug/Sample.Commands.xml', 'lib/mono32'
+  end
 end
 
 describe "creating nuget on dependent proj file" do
@@ -328,7 +284,7 @@ describe "creating nuget on dependent proj file" do
     Albacore::NugetModel::Package.from_xxproj_file projfile, opts
   end
   
-  include_context 'metadata_dsl'
+  include_context 'package_metadata_dsl'
 
   describe 'without project_dependencies' do
     # just as the opts in the main describe says...

data/spec/nugets_pack_spec.rb

@@ -1,12 +1,16 @@
 require 'spec_helper'
+require 'shared_contexts'
 require 'support/sh_interceptor'
 require 'albacore'
 require 'albacore/task_types/nugets_pack'
+require 'albacore/nuget_model'
+
+include ::Albacore::NugetsPack
 
 class ConfigFac
   def self.create id, curr, gen_symbols = true
     cfg = Albacore::NugetsPack::Config.new
-    cfg.target        = 'net40'
+    cfg.target        = 'mono32'
     cfg.configuration = 'Debug'
     cfg.files         = Dir.glob(File.join(curr, 'testdata', 'Project', '*.fsproj'))
     cfg.out           = 'spec/testdata/pkg'
@@ -60,12 +64,12 @@ end
 
 # testing the command for nuget
 
-describe Albacore::NugetsPack::Cmd, "when calling #execute" do
+describe Cmd, "when calling #execute" do
   
   include_context 'path testing'
 
   let :cmd do
-    Albacore::NugetsPack::Cmd.new 'NuGet.exe', config.opts()
+    Cmd.new 'NuGet.exe', config.opts()
   end
 
   subject do 
@@ -111,11 +115,11 @@ describe Albacore::NugetsPack::Cmd, "when calling #execute" do
   end
 end
 
-describe Albacore::NugetsPack::Cmd, 'when calling :get_nuget_path_of' do
+describe Cmd, 'when calling :get_nuget_path_of' do
   include_context 'pack_config'
 
   subject do
-    Albacore::NugetsPack::Cmd.new 'NuGet.exe', config.opts()
+    Cmd.new 'NuGet.exe', config.opts()
   end
 
   let :sample1 do
@@ -145,17 +149,18 @@ EXAMPLE_OUTPUT
   end
 end
 
+# testing nuspec task
 
-describe Albacore::NugetsPack::NuspecTask, "when testing public interface" do
+describe NuspecTask, "when testing public interface" do
   include_context 'pack_config'
   include_context 'path testing'
 
   it "accepts .nuspec files" do
-    Albacore::NugetsPack::NuspecTask.accept?('some.nuspec').should be_true
+    NuspecTask.accept?('some.nuspec').should be_true
   end
 
   let (:cmd) do
-    Albacore::NugetsPack::Cmd.new 'NuGet.exe', config.opts()
+    Cmd.new 'NuGet.exe', config.opts()
   end
 
   subject do
@@ -164,7 +169,7 @@ describe Albacore::NugetsPack::NuspecTask, "when testing public interface" do
 
   before do
     cmd.extend(ShInterceptor)
-    task = Albacore::NugetsPack::NuspecTask.new cmd, config, './spec/testdata/example.nuspec'
+    task = NuspecTask.new cmd, config, './spec/testdata/example.nuspec'
     task.execute
   end
 
@@ -176,24 +181,47 @@ describe Albacore::NugetsPack::NuspecTask, "when testing public interface" do
   end
 end
 
-describe Albacore::NugetsPack::ProjectTask, "when testing public interface" do
+# testing project task
+
+describe ProjectTask do
+  include_context 'pack_config no symbols'
+  include_context 'package_metadata_dsl'
+
+  it 'sanity: should have config with target=mono32' do
+    config.opts().get(:target).should eq('mono32')
+  end
+
+  let :projfile do
+    curr = File.dirname(__FILE__)
+    File.join curr, "testdata", "Project", "Project.fsproj"
+  end 
+
+  subject do
+    proj = Albacore::Project.new projfile
+    ProjectTask.new( config.opts() ).send(:create_nuspec, proj, [])[0] # index0 first nuspec Alabacore::Package
+  end 
+
+  has_file 'bin/Debug/Project.dll', 'lib/mono32'
+end
+
+describe ProjectTask, "when testing public interface" do
   let :projfile do
     curr = File.dirname(__FILE__)
     File.join curr, "testdata", "Project.fsproj"
   end
   it "can be created" do
-    Albacore::NugetsPack::ProjectTask.new(Map.new(:files => [projfile]))
+    ProjectTask.new(Map.new(:files => [projfile]))
   end
   it "rejects .nuspec files" do
-    Albacore::NugetsPack::ProjectTask.accept?('some.nuspec').should eq false
+    ProjectTask.accept?('some.nuspec').should eq false
   end
 end
 
-describe Albacore::NugetsPack::ProjectTask, "creating nuget from proj file" do
+describe ProjectTask, "creating nuget from proj file" do
   let(:cmdo) { Hash.new }
 
   subject do
-    Albacore::NugetsPack::ProjectTask.new(config.opts()) do |cmd|
+    ProjectTask.new(config.opts()) do |cmd|
       cmd.extend ShInterceptor
       cmdo[:cmd] = cmd
     end

data/spec/shared_contexts.rb

@@ -0,0 +1,59 @@
+require 'albacore/paths'
+
+shared_context 'package_metadata_dsl' do
+  let :m do
+    subject.metadata
+  end
+
+  def self.has_value sym, e
+    it "should have overridden #{sym}, to be #{e}" do
+      m.send(sym).should eq e
+    end
+  end
+
+  def self.has_dep name, version
+    it "has dependency on '#{name}'" do
+      m.dependencies.has_key?(name).should be_true
+    end
+    it "overrode dependency on '#{name}'" do
+      m.dependencies[name].version.should eq version
+    end
+  end
+
+  def self.has_not_dep name
+    it "does not have a dependency on #{name}" do
+      m.dependencies.has_key?(name).should be_false
+    end
+  end
+
+  def self.has_file src, target, exclude = nil
+    src, target = norm(src), norm(target)
+    it "has file[#{src}] (should not be nil)" do
+      file = subject.files.find { |f| f.src == src }
+     #  puts "## ALL FILES ##"
+     #  subject.files.each do |f|
+     #    puts "subject.files: #{subject.files}, index of: #{subject.files.find_index { |f| f.src == src }}"
+     #    puts "#{f.inspect}"
+     #  end
+      file.should_not be_nil 
+    end
+
+    it "has file[#{src}].target == '#{target}'" do
+      file = subject.files.find { |f| f.src == src }
+      file.target.should eq target
+    end 
+  end
+
+  def self.has_not_file src
+    src = norm src
+    it "has not file[#{src}]" do
+      file = subject.files.find { |f| f.src == src }
+      file.should be_nil
+    end
+  end
+
+  def self.norm str
+    Albacore::Paths.normalise_slashes str
+  end  
+end
+