albacore 2.3.10 → 2.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17edbc6d61873f582e9d6444f4756371625b3d58
-  data.tar.gz: ee2a86b4312bfdded0b1d34c199877069e2d7544
+  metadata.gz: a5477545e0039f685becc960210d322ca80f7533
+  data.tar.gz: b84c0d215e55a4186da09026a78864c2c3ced25a
 SHA512:
-  metadata.gz: f7a9b1c50ddb9265d1111d6d4fc5796cc50836b747ffc831a55dd3260dfc19e5743c3a6bc5327ef6493b4f09a9d7a340e99579c6f162fecfbb9adfb8d5f50c4f
-  data.tar.gz: 076826fc099708ab887ea1bb01ac1722bacbcf7cf2229026ed5d7707276b411654082a506555a4e9272fca3719c1af27bee11ef1043e15193d50e9278008b08e
+  metadata.gz: e2a7b9b32e5e1c3dfe12fc624245e325871b26f5d0231387db4d08d97651bb1c64a0875409555dcff861950553ce8492d206064fcd2e6e650a8fd87776ca1275
+  data.tar.gz: a80530c23639b263f1a5ec5e0257e12492305bd6d55275439a2cb4668d350fe1bef058707ec1b6bd48a46cc0d6f759b578aaad80ccbacf68a9d2d815adad5409

data/lib/albacore/project.rb

@@ -54,6 +54,11 @@ module Albacore
       read_property 'AssemblyName'
     end
 
+    # Get the root namespace of the project
+    def namespace
+      read_property 'RootNamespace'
+    end
+
     # gets the version from the project file
     def version
       read_property 'Version'

data/lib/albacore/task_types/asmver.rb

@@ -18,10 +18,19 @@ module Albacore
       # list of xxproj files to iterate over
       attr_writer :files
 
+      def initialize
+        @usings = []
+      end
+
       def attributes attrs
         @attributes = attrs
       end
 
+      def using ns
+        debug { "adding namespace #{ns} [Asmver::MultipleFilesConfig using]" }
+        @usings << ns
+      end
+
       # block should have signature: Project -> AsmVer::Config -> AsmVer::Config
       # because you can use this block to change the configuration generated
       def handle_config &block
@@ -42,11 +51,16 @@ module Albacore
             file_path = "#{proj.proj_path_base}/AssemblyVersionInfo.#{ext}"
             cfg = Albacore::Asmver::Config.new file_path, proj.asmname, attrs
             cfg = @handle_config.call(proj, cfg) if @handle_config
+            cfg.usings = @usings.clone
             cfg
           }
       end
     end
 
+    # Raised when the configuration is missing where to write the file.
+    class MissingOutputError < StandardError
+    end
+
     class Config
       include CmdConfig
       self.extend ConfigDSL
@@ -58,11 +72,15 @@ module Albacore
       attr_accessor :namespace
 
       # (optional) output stream
-      attr_writer :out
+      attr_accessor :out
+
+      # the array-like thing of using namespaces
+      attr_accessor :usings
 
       # creates a new config with some pre-existing data
       def initialize file_path = nil, namespace = nil, attributes = nil
         @file_path, @namespace, @attributes = file_path, namespace, attributes
+        @usings = []
       end
 
       # Call with to get the opportunity to change the attributes hash
@@ -75,15 +93,21 @@ module Albacore
         @attributes = attrs
       end
 
+      def using ns
+        debug { "adding namespace #{ns} [Asmver::Config using]" }
+        usings << ns
+      end
+
       def opts
-        raise Error, "#file_path is not set" unless (file_path or out)
+        raise MissingOutputError, "#file_path or #out is not set" unless (file_path or out)
         ns   = @namespace || '' # defaults to empty namespace if not set.
         lang = lang_for file_path
         m = Map.new attributes: @attributes,
                     namespace: ns,
                     file_path: @file_path,
-                    language:  lang
-        m[:out] = @out if @out
+                    language:  lang,
+                    usings: usings
+        m[:out] = out if out
         m
       end
 

data/lib/albacore/task_types/asmver/file_generator.rb

@@ -30,8 +30,8 @@ System.Runtime.InteropServices|
         # after namespace My.Ns.Here
         out << "\n"
 
-        # open all namespaces to use .Net attributes
-        @opts.get(:usings) { DEFAULT_USINGS }.each do |ns|
+        # open all namespaces to use .Net attributes, concat with your custom attrs
+        [ DEFAULT_USINGS, (@opts.get(:usings) || [])].flatten.each do |ns|
           out << @engine.build_using_statement(ns)
           out << "\n"
         end

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.3.10"
+  VERSION = "2.3.11"
 end

data/spec/asmver_spec.rb

@@ -1,8 +1,36 @@
+require 'albacore/task_types/asmver'
 require 'albacore/task_types/asmver/engine'
 require 'albacore/task_types/asmver/file_generator'
 
 include Albacore::Asmver
 
+describe Albacore::Asmver::Config, 'when misconfigured' do
+  subject do
+    Albacore::Asmver::Config.new
+  end
+  it 'should throw MissingOutputError by default' do
+    expect(lambda { subject.opts }).to raise_error MissingOutputError
+  end
+end
+
+describe Albacore::Asmver::Config do
+  subject do
+    Albacore::Asmver::Config.new 'A.fs'
+  end
+
+  it 'should have a namespace that\' RW' do
+    subject.namespace = 'smirk'
+    subject.namespace = subject.namespace + 'smirk'
+    expect(subject.namespace).to eq 'smirksmirk'
+  end
+
+  it 'can add a #using' do
+    subject.out = StringIO.new
+    subject.using 'System'
+    expect(subject.opts.get(:usings)).to include('System')
+  end
+end
+
 %w|Fs Vb Cpp Cs|.each do |lang|
   require "albacore/task_types/asmver/#{lang.downcase}"
 
@@ -152,42 +180,82 @@ describe FileGenerator, 'when generating F# file' do
   let :generated do
     @out.string
   end
+
   it 'should include namespace' do
-    generated.should =~ /namespace My\.Fs\.Ns(\r\n?|\n)/
+    expect(generated).to match /namespace My\.Fs\.Ns(\r\n?|\n)/
   end
+
   it 'should open System.Reflection' do
-    generated.should =~ /open System\.Reflection/
+    expect(generated).to match /open System\.Reflection/
   end
+
   it 'should open System.Runtime.CompilerServices' do
-    generated.should =~ /open System\.Runtime\.CompilerServices/
+    expect(generated).to match /open System\.Runtime\.CompilerServices/
   end
+
   it 'should open System.Runtime.InteropServices' do
-    generated.should =~ /open System\.Runtime\.InteropServices/
+    expect(generated).to match /open System\.Runtime\.InteropServices/
   end
+
   it 'should generate the ComVisible attribute' do
-    generated.should include('[<assembly: ComVisible(false)>]')
+    expect(generated).to include('[<assembly: ComVisible(false)>]')
   end
+
   it 'should generate the AssemblyTitle attribute' do
-    generated.should include('[<assembly: AssemblyTitle("My.Ns")>]')
+    expect(generated).to include('[<assembly: AssemblyTitle("My.Ns")>]')
   end
+
   it 'should generate the AssemblyVersion attribute' do
-    generated.should include('[<assembly: AssemblyVersion("0.1.2")>]')
+    expect(generated).to include('[<assembly: AssemblyVersion("0.1.2")>]')
   end
+
   it 'should generate the CustomThing attribute' do
-    generated.should include('[<assembly: CustomThing("a", "b", "c")>]')
+    expect(generated).to include('[<assembly: CustomThing("a", "b", "c")>]')
   end
+
   it 'should generate the NamedThing attribute' do
-    generated.should include('[<assembly: NamedThing(b = 3, c = "hi")>]')
+    expect(generated).to include('[<assembly: NamedThing(b = 3, c = "hi")>]')
   end
+
   it 'should generate the CLSCompliant attribute' do
-    generated.should include('[<assembly: CLSCompliant(true)>]')
+    expect(generated).to include('[<assembly: CLSCompliant(true)>]')
   end
+
   it 'should end with ()\n' do
-    generated.should =~ /\(\)(\r\n?|\n)$/m
+    expect(generated).to match /\(\)(\r\n?|\n)$/m
   end
 end
 
-describe FileGenerator do
+describe FileGenerator, 'when given extra "usings"' do
+  before :all do
+    @out = StringIO.new
+    subject = FileGenerator.new Fs.new, '', usings: ['System']
+    subject.generate @out, assembly_title: 'My.Asm'
+  end
+
+  let :generated do
+    @out.string
+  end
+
+  it 'should open System' do
+    expect(generated).to match /open System/
+  end
+
+  it 'should open System.Reflection' do
+    expect(generated).to match /open System\.Reflection/
+  end
+
+  it 'should open System.Runtime.CompilerServices' do
+    expect(generated).to match /open System\.Runtime\.CompilerServices/
+  end
+
+  it 'should open System.Runtime.InteropServices' do
+    expect(generated).to match /open System\.Runtime\.InteropServices/
+  end
+
+end
+
+describe FileGenerator, 'when it should generate NO NAMESPACE' do
   before :all do
     @out = StringIO.new
     subject = FileGenerator.new(Cs.new, '', {})
@@ -202,6 +270,6 @@ describe FileGenerator do
     @out.string
   end
   it 'should not include \'namespace\'' do
-    generated.should_not include('namespace')
+    expect(generated).to_not include('namespace')
   end
 end

data/spec/project_spec.rb

@@ -70,25 +70,28 @@ describe Albacore::Project, "when reading project file" do
 
   describe 'public API' do
     it do
-      subject.should respond_to(:name)
+      expect(subject).to respond_to :name
     end
     it do
-      subject.should respond_to(:asmname)
+      expect(subject).to respond_to :asmname
     end
     it do
-      subject.should respond_to(:version)
+      expect(subject).to respond_to :namespace
     end
     it do
-      subject.should respond_to(:authors)
+      expect(subject).to respond_to :version
+    end
+    it do
+      expect(subject).to respond_to :authors
     end
     it 'should have five referenced assemblies' do
-      subject.find_refs.length.should eq(5)
+      expect(subject.find_refs.length).to eq 5
     end
     it 'knows about referenced packages' do
-      subject.should respond_to(:declared_packages)
+      expect(subject).to respond_to :declared_packages
     end
     it 'knows about referenced projects' do
-      subject.should respond_to(:declared_projects)
+      expect(subject).to respond_to :declared_projects
     end
     it 'should have three referenced packages' do
       expected = %w|Intelliplan.Util Newtonsoft.Json NLog|

metadata

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