albacore 2.1.2 → 2.2.0.pre.beta

data/lib/albacore/tools/restore_hint_paths.rb

@@ -1,82 +1,82 @@
-# -*- encoding: utf-8 -*-
-
-require 'nokogiri'
-require 'pathname'
-require 'rake'
-require 'albacore/logging'
-require 'albacore/project'
-require 'albacore/package'
-require 'albacore/package_repo'
-
-module Albacore::Tools
-
-  # a tuple of a package and a ref
-  class MatchedRef
-    attr_accessor :package, :ref
-    def initialize package, ref
-      @package, @ref = package, ref
-    end
-  end
-  
-  module RestoreHintPaths
-    class Config
-      attr_accessor :asmname_to_package
-      attr_accessor :lang
-      attr_accessor :projs, :dry_run
-      def initialize
-        @asmname_to_package = {}
-        @lang = 'fs'
-      end
-    end
-    class Task
-      include Logging
-      def initialize config
-        @config = config
-      end
-      def execute
-        ps = map_file_list(@config.projs) || find_projs_in_need(@config.lang)
-        ps.each do |proj|
-          info "fixing #{proj}"
-          fix_refs proj, @config.asmname_to_package
-          info "saving #{proj}"
-          proj.save unless @config.dry_run
-        end
-      end
-      
-      private
-      def find_projs_in_need ext
-        map_file_list FileList["./src/**/*.#{ext}proj"]
-      end
-      def map_file_list fl
-        return nil if fl.nil?
-        fl.collect{ |path| Project.new(path) }.
-           keep_if{ |fp| fp.has_faulty_refs? && fp.has_packages_config? }
-      end
-      def matched_refs refs, packages, asmname_to_package = {}
-        refs.collect { |ref| 
-          ref_include_id = asmname_to_package.fetch(ref['Include'].split(',')[0]) { |k| k }
-          found_pkg = packages[ref_include_id]
-          debug "ref[Include] = #{ref_include_id}, package: #{found_pkg}" unless found_pkg.nil?
-          debug "NOMATCH: #{ref_include_id}" if found_pkg.nil?
-          found_pkg.nil? ? nil : MatchedRef.new(found_pkg, ref)
-        }.keep_if { |match| not match.nil? }
-      end
-
-      def fix_refs p, asmname_to_package = {}
-        packages = Hash[p.find_packages.collect { |v| [v.id, v] }]
-        trace "packages: #{packages}"
-        matches = matched_refs p.faulty_refs, packages, asmname_to_package
-        trace "matches: #{matches}"
-        matches.each{ |match|
-          dll_path = Pathname.new match.package.path
-          proj_path = Pathname.new p.proj_path_base
-          hint_path = Nokogiri::XML::Node.new "HintPath", p.proj_xml_node
-          hint_path.content = dll_path.relative_path_from proj_path
-          match.ref << hint_path
-          debug "For #{p.asmname} => hint_path: #{hint_path}"
-        }
-        trace p.proj_xml_node
-      end
-    end
-  end
-end
+# -*- encoding: utf-8 -*-
+
+require 'nokogiri'
+require 'pathname'
+require 'rake'
+require 'albacore/logging'
+require 'albacore/project'
+require 'albacore/package'
+require 'albacore/package_repo'
+
+module Albacore::Tools
+
+  # a tuple of a package and a ref
+  class MatchedRef
+    attr_accessor :package, :ref
+    def initialize package, ref
+      @package, @ref = package, ref
+    end
+  end
+
+  module RestoreHintPaths
+    class Config
+      attr_accessor :asmname_to_package
+      attr_accessor :lang
+      attr_accessor :projs, :dry_run
+      def initialize
+        @asmname_to_package = {}
+        @lang = 'fs'
+      end
+    end
+    class Task
+      include Logging
+      def initialize config
+        @config = config
+      end
+      def execute
+        ps = map_file_list(@config.projs) || find_projs_in_need(@config.lang)
+        ps.each do |proj|
+          info "fixing #{proj}"
+          fix_refs proj, @config.asmname_to_package
+          info "saving #{proj}"
+          proj.save unless @config.dry_run
+        end
+      end
+
+      private
+      def find_projs_in_need ext
+        map_file_list FileList["./src/**/*.#{ext}proj"]
+      end
+      def map_file_list fl
+        return nil if fl.nil?
+        fl.collect{ |path| Project.new(path) }.
+           keep_if{ |fp| fp.has_faulty_refs? && fp.has_packages_config? }
+      end
+      def matched_refs refs, packages, asmname_to_package = {}
+        refs.collect { |ref| 
+          ref_include_id = asmname_to_package.fetch(ref['Include'].split(',')[0]) { |k| k }
+          found_pkg = packages[ref_include_id]
+          debug "ref[Include] = #{ref_include_id}, package: #{found_pkg}" unless found_pkg.nil?
+          debug "NOMATCH: #{ref_include_id}" if found_pkg.nil?
+          found_pkg.nil? ? nil : MatchedRef.new(found_pkg, ref)
+        }.keep_if { |match| not match.nil? }
+      end
+
+      def fix_refs p, asmname_to_package = {}
+        packages = Hash[p.find_packages.collect { |v| [v.id, v] }]
+        trace "packages: #{packages}"
+        matches = matched_refs p.faulty_refs, packages, asmname_to_package
+        trace "matches: #{matches}"
+        matches.each{ |match|
+          dll_path = Pathname.new match.package.path
+          proj_path = Pathname.new p.proj_path_base
+          hint_path = Nokogiri::XML::Node.new "HintPath", p.proj_xml_node
+          hint_path.content = dll_path.relative_path_from proj_path
+          match.ref << hint_path
+          debug "For #{p.asmname} => hint_path: #{hint_path}"
+        }
+        trace p.proj_xml_node
+      end
+    end
+  end
+end

data/lib/albacore/tools/zippy.rb

@@ -1,61 +1,61 @@
-# encoding: utf-8
-require 'zip'
-require "albacore"
-
-# https://github.com/aussiegeek/rubyzip/blob/master/samples/example_recursive.rb
-# This is a simple example which uses rubyzip to
-# recursively generate a zip file from the contents of
-# a specified directory. The directory itself is not
-# included in the archive, rather just its contents.
-#
-# Usage:
-# dir_to_zip = "/tmp/input"
-# out_file = "/tmp/out.zip"
-# zf = Zippy.new dir_to_zip, out_file
-# zf.write
-#
-# Or:
-# z = Zippy.new(directory_to_zip, output_file) { |f| f.include? 'html' }
-# z.write
-class Zippy
-
-  # Initialize with the directory to zip and the location of the output archive.
-  #
-  # @param [String] input_dir The location to zip as a file system relative or
-  #                           absolute path
-  #
-  # @param [String] out_file The path of the output zip file that is generated.
-  # @param [Block] filter An optional block with a filter that is to return true
-  #                       if the file is to be added.
-  def initialize input_dir, out_file, &filter
-    @input_dir = input_dir.
-      gsub(/[\/\\]$/, '').
-      gsub(/\\/, '/')
-    @out_file = out_file
-    @filter = block_given? ? filter : lambda { |f| true }
-  end
-
-  # Zips the input directory.
-  def write
-    FileUtils.rm @out_file if File.exists? @out_file
-    in_progress "Writing archive #{@out_file} from #{@input_dir}" do
-      Zip::File.open @out_file, Zip::File::CREATE do |zipfile|
-        Dir["#{@input_dir}/**/**"].reject{ |f| f == @out_file || !@filter.call(f) }.each do |file|
-          progress "deflating #{file}"
-          zipfile.add(file.sub(@input_dir + '/', ''), file)
-        end
-      end
-	end
-  end
-  
-  private
-  def in_progress msg, &block
-    Albacore.publish :start_progress, OpenStruct.new(:message => msg)
-    yield
-    Albacore.publish :finish_progress, OpenStruct.new(:message => msg)
-  end
-
-  def progress msg
-    Albacore.publish :progress, OpenStruct.new(:message => msg)
-  end
-end
+# encoding: utf-8
+require 'zip'
+require "albacore"
+
+# https://github.com/aussiegeek/rubyzip/blob/master/samples/example_recursive.rb
+# This is a simple example which uses rubyzip to
+# recursively generate a zip file from the contents of
+# a specified directory. The directory itself is not
+# included in the archive, rather just its contents.
+#
+# Usage:
+# dir_to_zip = "/tmp/input"
+# out_file = "/tmp/out.zip"
+# zf = Zippy.new dir_to_zip, out_file
+# zf.write
+#
+# Or:
+# z = Zippy.new(directory_to_zip, output_file) { |f| f.include? 'html' }
+# z.write
+class Zippy
+
+  # Initialize with the directory to zip and the location of the output archive.
+  #
+  # @param [String] input_dir The location to zip as a file system relative or
+  #                           absolute path
+  #
+  # @param [String] out_file The path of the output zip file that is generated.
+  # @param [Block] filter An optional block with a filter that is to return true
+  #                       if the file is to be added.
+  def initialize input_dir, out_file, &filter
+    @input_dir = input_dir.
+      gsub(/[\/\\]$/, '').
+      gsub(/\\/, '/')
+    @out_file = out_file
+    @filter = block_given? ? filter : lambda { |f| true }
+  end
+
+  # Zips the input directory.
+  def write
+    FileUtils.rm @out_file if File.exists? @out_file
+    in_progress "Writing archive #{@out_file} from #{@input_dir}" do
+      Zip::File.open @out_file, Zip::File::CREATE do |zipfile|
+        Dir["#{@input_dir}/**/**"].reject{ |f| f == @out_file || !@filter.call(f) }.each do |file|
+          progress "deflating #{file}"
+          zipfile.add(file.sub(@input_dir + '/', ''), file)
+        end
+      end
+  end
+  end
+
+  private
+  def in_progress msg, &block
+    Albacore.publish :start_progress, OpenStruct.new(:message => msg)
+    yield
+    Albacore.publish :finish_progress, OpenStruct.new(:message => msg)
+  end
+
+  def progress msg
+    Albacore.publish :progress, OpenStruct.new(:message => msg)
+  end
+end

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.1.2"
+  VERSION = "2.2.0-beta"
 end

data/spec/nugets_restore_spec.rb

@@ -14,6 +14,21 @@ shared_context 'cmd context' do
   subject { cmd.execute ; cmd.mono_parameters }
 end
 
+describe Albacore::NugetsRestore::Config, 'when setting #source' do
+  it 'should allow setting a string' do
+    subject.source = 'hello'
+    expect(subject.source).not_to be_a String
+    expect(subject.source).to be_a OpenStruct
+    expect(subject.source.name).to eq(Digest::MD5.hexdigest('hello'))
+  end
+  it 'should allow setting an OpenStruct' do
+    subject.source = OpenStruct.new :name => 'a', :uri => 'https://example.com/nugetfeed.svc'
+    expect(subject.source).not_to be_a String
+    expect(subject.source).to be_a OpenStruct
+    expect(subject.source.name).to eq 'a'
+    expect(subject.source.uri).to eq 'https://example.com/nugetfeed.svc'
+  end
+end
 
 describe Albacore::NugetsRestore::RemoveSourceCmd, 'when calling #execute should remove source' do
   let(:cmd) { Albacore::NugetsRestore::RemoveSourceCmd.new 'nuget.exe', hafsrc }
@@ -32,19 +47,18 @@ describe Albacore::NugetsRestore::AddSourceCmd, 'when calling #execute should re
 end
 
 describe Albacore::NugetsRestore::Cmd, 'when calling #execute with specific source' do
-  
-  let (:cmd) { 
+  let (:cmd) do
     cfg = Albacore::NugetsRestore::Config.new
     cfg.out = 'src/packages'
     cfg.add_parameter '-Source' 
     cfg.add_parameter 'http://localhost:8081'
 
     cmd = Albacore::NugetsRestore::Cmd.new nil, 'NuGet.exe', cfg.opts_for_pkgcfg('src/Proj/packages.config')
-  }
+  end
 
-  let (:path) {
+  let (:path) do
     Albacore::Paths.normalise_slashes('src/Proj/packages.config')
-  }
+  end
 
   include_context 'cmd context'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0.pre.beta
 platform: ruby
 authors:
 - Henrik Feldt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -162,6 +162,7 @@ files:
 - 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
@@ -382,9 +383,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.2.2