albacore 2.0.0.rc.12 → 2.0.0.rc.13

data/README.md

@@ -170,7 +170,7 @@ end
 
 ### Docs: nugets_pack
 
-```
+``` ruby
 nugets_pack :create_nugets do |p|
   p.files   = FileList['src/**/*.{csproj,fsproj,nuspec}'].
     exclude(/Tests/)
@@ -195,10 +195,11 @@ Cancel following of references between projects that cause nugets_pack to find a
 
 Enables nuget restore throughout the solution.
 
-```
+``` ruby
 nugets_restore :restore do |p|
-  p.out = 'src/packages'
-  p.exe = 'buildsupport/NuGet.exe'
+  p.out = 'src/packages'             # required
+  p.exe = 'buildsupport/NuGet.exe'   # required
+  p.list_spec = '**/packages.config' # optional
 end
 ```
 
@@ -219,9 +220,36 @@ asmver :asmver do |a|
 end
 ```
 
-### Docs: test_runner
+### Docs: asmver_files
 
 ```
+desc 'create assembly infos'
+asmver_files :assembly_info do |a|
+  a.files = FileList['**/*proj'] # optional, will find all projects recursively by default
+
+  # attributes are required:
+  a.attributes assembly_description: "My wonderful lib",
+               assembly_configuration: 'RELEASE',
+               assembly_company: 'Wonders Inc.',
+               assembly_copyright: "(c) #{Time.now.year} by John Doe",
+               assembly_version: ENV['LONG_VERSION'],
+               assembly_file_version: ENV['LONG_VERSION'],
+               assembly_informational_version: ENV['BUILD_VERSION']
+
+  # optional, not widely supported yet, as there's no way to read the attributes
+  # file an issue if you have a use-case
+  a.handle_config do |proj, conf|
+    # do something with configuration
+    # conf.attributes ...
+  end
+end
+```
+
+
+
+### Docs: test_runner
+
+``` ruby
 test_runner :tests do |tests|
   tests.files = FileList['**/*.Tests/bin/Release/*.Tests.dll'] # dll files with test
   tests.exe = 'src/packages/NUnit.Runners.2.5.3/tools/nunit-console.exe' # executable to run tests with
@@ -317,7 +345,7 @@ in the archive, rather just its contents.
 
 Usage:
 
-```
+``` ruby
 dir_to_zip = "/tmp/input"
 out_file = "/tmp/out.zip"
 zf = Zippy.new dir_to_zip, out_file
@@ -326,7 +354,7 @@ zf.write
 
 Or:
 
-```
+``` ruby
 z = Zippy.new(directory_to_zip, output_file) { |f| f.include? 'html' }
 z.write
 ```

data/lib/albacore/dsl.rb

@@ -19,6 +19,18 @@ module Albacore
       end
     end
 
+    def asmver_files *args, &block
+      Albacore.define_task *args do
+        c = Albacore::Asmver::MultipleFilesConfig.new
+        yield c
+
+        c.configurations.each do |conf|
+          trace { "generating asmver for #{conf}" }
+          Albacore::Asmver::Task.new(conf.opts).execute
+        end
+      end
+    end
+
     # a task for building sln or proj files - or just invoking something
     # with MsBuild
     def build *args, &block

data/lib/albacore/task_types/asmver.rb

@@ -1,79 +1,120 @@
-require 'set'
-require 'albacore/logging'
-require 'albacore/cross_platform_cmd'
-require 'albacore/cmd_config'
-require 'albacore/errors/unfilled_property_error'
-require 'albacore/task_types/asmver/cs'
-require 'albacore/task_types/asmver/vb'
-require 'albacore/task_types/asmver/cpp'
-require 'albacore/task_types/asmver/fs'
-require 'albacore/task_types/asmver/file_generator'
-
-module Albacore
-  module Asmver
-    class Config
-      include CmdConfig
-      self.extend ConfigDSL
-
-      # the file name to write the assembly info to
-      attr_path_accessor :file_path
-
-      # the namespace to output into the version file
-      attr_writer :namespace
-
-
-      # (optional) output stream
-      attr_writer :out
-
-      def initialize
-      end
-
-      # the hash of attributes to write to the assembly info file
-      def attributes attrs
-        @attributes = attrs
-      end
-      
-      def opts
-        raise Error, "#file_path 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
-        m
-      end
-
-      private
-      def lang_for path
-        mk = lambda { |lang| "Albacore::Asmver::#{lang}".split('::').inject(Object) { |o, c| o.const_get c }.new }
-        case File.extname path
-          when ".fs" then mk.call "Fs"
-          when ".cs" then mk.call "Cs"
-          when ".vb" then mk.call "Vb"
-          when ".cpp" then mk.call "Cpp"
-        end
-      end
-    end
-    class Task
-      include Logging
-      def initialize opts
-        @opts = opts
-      end
-      def execute
-        lang  = @opts.get :language
-        ns    = @opts.get :namespace
-        attrs = @opts.get :attributes
-        out   = @opts.get :out do
-          trace { "asmver being written at '#{@opts.get :file_path}' [asmver-task #execute]" }
-          File.open(@opts.get(:file_path), 'w')
-        end
-        ::Albacore::Asmver::FileGenerator.new(lang, ns, @opts).generate out, attrs
-        trace { "asmver was written at '#{@opts.get :file_path}' [asmver-task #execute]" }
-      ensure
-        out.close if out
-      end
-    end
-  end
-end
+require 'set'
+require 'albacore/logging'
+require 'albacore/cross_platform_cmd'
+require 'albacore/cmd_config'
+require 'albacore/errors/unfilled_property_error'
+require 'albacore/project'
+require 'albacore/task_types/asmver/cs'
+require 'albacore/task_types/asmver/vb'
+require 'albacore/task_types/asmver/cpp'
+require 'albacore/task_types/asmver/fs'
+require 'albacore/task_types/asmver/file_generator'
+
+module Albacore
+  module Asmver
+    class MultipleFilesConfig
+      include ::Albacore::Logging
+
+      # list of xxproj files to iterate over
+      attr_writer :files
+
+      def attributes attrs
+        @attributes = attrs
+      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
+        @handle_config = block
+      end
+
+      def configurations
+        @files ||= FileList['**/*.{fsproj,csproj,vbproj}']
+
+        debug { "generating config for files: #{@files}" }
+
+        @files.map { |proj|
+            proj =~ /(\w\w)proj$/
+            [ $1, Project.new(proj) ]
+          }.map { |ext, proj|
+            attrs = @attributes.clone
+            attrs[:assembly_title] = proj.name
+            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
+          }
+      end
+    end
+
+    class Config
+      include CmdConfig
+      self.extend ConfigDSL
+
+      # the file name to write the assembly info to
+      attr_path_accessor :file_path
+
+      # the namespace to output into the version file
+      attr_writer :namespace
+
+      # (optional) output stream
+      attr_writer :out
+
+      # 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
+      end
+
+      # the hash of attributes to write to the assembly info file
+      def attributes attrs
+        @attributes = attrs
+      end
+      
+      def opts
+        raise Error, "#file_path 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
+        m
+      end
+
+      def to_s
+        "AsmVer::Config[#{file_path}]"
+      end
+
+      private
+      def lang_for path
+        mk = lambda { |lang| "Albacore::Asmver::#{lang}".split('::').inject(Object) { |o, c| o.const_get c }.new }
+        case File.extname path
+          when ".fs" then mk.call "Fs"
+          when ".cs" then mk.call "Cs"
+          when ".vb" then mk.call "Vb"
+          when ".cpp" then mk.call "Cpp"
+        end
+      end
+    end
+    class Task
+      include Logging
+      def initialize opts
+        @opts = opts
+      end
+      def execute
+        lang  = @opts.get :language
+        ns    = @opts.get :namespace
+        attrs = @opts.get :attributes
+        out   = @opts.get :out do
+          trace { "asmver being written at '#{@opts.get :file_path}' [asmver-task #execute]" }
+          File.open(@opts.get(:file_path), 'w')
+        end
+        ::Albacore::Asmver::FileGenerator.new(lang, ns, @opts).generate out, attrs
+        trace { "asmver was written at '#{@opts.get :file_path}' [asmver-task #execute]" }
+      ensure
+        out.close if out
+      end
+    end
+  end
+end

data/lib/albacore/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc.12
+  version: 2.0.0.rc.13
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -317,7 +317,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 238623882763255620
+      hash: 799826362560465067
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: