Mxx_ru 1.6.7.1 → 1.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b65c551e624ecad29a513d7af93989985acb4455
-  data.tar.gz: ce616be948582f09e650fa28feeb76dc54035914
+  metadata.gz: 73efa525294417a45416e080580599b7ddc46c74
+  data.tar.gz: e76fb9f6de5eeff271e0a6596fa8059cfcf45ac0
 SHA512:
-  metadata.gz: c454658a0f9b740e0da247913482674c2cc83f50b9179afc10274fc403c959b7b02192d7c9659be94dfb6f9251fd5654e72e4f4216c11b0e759c10fd819f04b8
-  data.tar.gz: fbedcdc011c11cfd9f244807ca3b7c7c76edd012c16146475a7a4febdc4a55a5a4e001160f37381d457b1d9139bba549611c74a120298fd40b6ac16d83bb59cb
+  metadata.gz: fd8d76c2e95b1feabb5905c9fea9b022c0260426d01c603a98bedd662831dbbc91ad64930361196378b63729e8d754f55b638ae098afd108a094bf3e96248a44
+  data.tar.gz: 443864dbe6a9927c2fda510dcd5aac15e67354f226ad1add2cf42cf290a02ac1739aebd8ef7c4f7a8dc52b24d289c6bab269d279acfecfba62f9b241b8901b55

data/Rakefile

@@ -10,11 +10,14 @@ require 'lib/mxx_ru/version'
 spec = Gem::Specification.new do |s|
   s.name = "Mxx_ru"
   s.version = MXX_RU_VERSION
+  s.licenses = ['NewBSD']
   s.author = "The Mxx_ru Project"
   s.email = "eao197@yahoo.com"
   s.homepage = "http://sourceforge.net/projects/mxxru"
   s.platform = Gem::Platform::RUBY
   s.summary = "Mxx_ru (Make++ on Ruby) is a cross-platform build tool"
+  s.description = "Mxx_ru is a cross-platform build tool primarily focused " +
+    "to C/C++ projects"
   s.files = FileList[ "{bin,tests,lib,docs,examples}/**/*" ].
       exclude( "rdoc" ).to_a + [ "THANKS" ]
   s.executables = 'mxxrugen'

data/lib/mxx_ru/externals.rb

@@ -1,10 +1,166 @@
 require 'rake'
 require 'rake/tasklib'
 
+require 'uri'
+require 'singleton'
+
+require 'digest'
+
 module MxxRu
 
 module Externals
 
+module Impl
+
+module Utils
+  # Return nil if tool not found.
+  # Return version if tool is found.
+  def Utils.external_tool_version_probe(cmd_line, version_re)
+    ver = nil
+    IO.popen(cmd_line, :err => [:child, :out]).grep(version_re) do |s|
+      ver = version_re.match(s)[1]
+    end
+    ver
+  rescue
+    nil
+  end
+end # module Utils
+
+module OptionsHolder
+  def option(*values)
+    make_options.push(*values)
+  end
+
+protected
+
+  def push_options_to(receiver)
+    receiver.push(*@options)
+  end
+
+private
+
+  def make_options
+    @options = [] unless @options
+    @options
+  end
+end # module OptionsHolder
+
+class CurlDownloder
+  include OptionsHolder
+
+  def CurlDownloder.check_presence
+    Utils.external_tool_version_probe('curl --version', /^curl\s(\S+)\s/)
+  end
+
+  def CurlDownloder.downloader_id
+    :curl
+  end
+
+  def initialize(options)
+    @options = options
+  end
+
+  def make_download_sh_args(uri, result_name)
+    push_options_to(['curl', '-L']).push('-o', result_name, uri)
+  end
+end
+
+class WgetDownloder
+  include OptionsHolder
+
+  def WgetDownloder.check_presence
+    Utils.external_tool_version_probe('wget --version', /^GNU Wget\s(\S+)\s/)
+  end
+
+  def WgetDownloder.downloader_id
+    :wget
+  end
+
+  def initialize(options)
+    @options = options
+  end
+
+  def make_download_sh_args(uri, result_name)
+    push_options_to(['wget']).push('-O', result_name, uri)
+  end
+end
+
+module WebDownloaderOptions
+  def downloader_option(downloader_id, *values)
+    downloader_option_storage()[downloader_id].push(*values)
+  end
+
+  def downloader_options_for(downloader_id)
+    downloader_option_storage()[downloader_id]
+  end
+
+  def all_downloader_options
+    downloader_option_storage
+  end
+
+private
+  def downloader_option_storage
+    @downloader_options = Hash.new{|h,k| h[k] = []} unless @downloader_options
+    @downloader_options
+  end
+end
+
+class WebDownloader
+  include Singleton
+  SUPPORTED_DOWNLOADERS = [WgetDownloder, CurlDownloder]
+  
+  @@preffered_downloaders = []
+  @@downloader_options = Hash.new{|h,k| h[k] = []}
+
+  def initialize
+    @downloader_type, @downloader_version = *detect_downloader_type
+
+    if Rake.verbose
+      puts "#{@downloader_type.downloader_id} v.#{@downloader_version} found"
+    end
+  end
+
+  def make_downloader(options_holder)
+    id = @downloader_type.downloader_id
+    @downloader_type.new(
+      merge_options(
+        options_holder.downloader_options_for(id),
+        @@downloader_options[id]))
+  end
+
+  def WebDownloader.preffered_downloader(downloader_id)
+    found = SUPPORTED_DOWNLOADERS.find do |klass|
+      downloader_id == klass.downloader_id ? klass : nil
+    end
+    raise "Unsupported downloader: #{downloader_id}" unless found
+
+    @@preffered_downloaders.push(found)
+  end
+
+  def WebDownloader.downloader_option(downloader_id, *values)
+    @@downloader_options[downloader_id].push(*values)
+  end
+
+private
+  def detect_downloader_type
+    r = search_downloader_in(@@preffered_downloaders)
+    r = search_downloader_in(SUPPORTED_DOWNLOADERS) unless r
+    raise "No web downloader found (curl, wget)" unless r
+    r
+  end
+
+  def search_downloader_in(sequence)
+    version = nil
+    downloader = sequence.find {|klass| version = klass.check_presence}
+    downloader ? [downloader, version] : nil
+  end
+
+  def merge_options(head, tail)
+    r = head.dup
+    r.push(*tail)
+  end
+end # class WebDownloader
+
 module ExternalBasics
   EXTERNALS_STORAGE_DIR = '.externals'
 
@@ -29,15 +185,11 @@ module ExternalBasics
   alias :map :map_dir
 
   def map_file(value)
-    raise "map() value must be a Hash" unless value.is_a?(Hash)
+    raise "map_file() value must be a Hash" unless value.is_a?(Hash)
 
     @files.merge!(value)
   end
 
-  def option(*values)
-    @options.push(*values)
-  end
-
 private
 
   def defaults(name)
@@ -46,7 +198,6 @@ private
     @reget_task_name = "#{@name}:reget"
     @paths = {}
     @files = {}
-    @options = []
     @verbose = Rake.verbose
   end
 
@@ -87,20 +238,17 @@ private
     "#{prefixes.join('.')}.#{Process.pid}.#{Thread.current.object_id}"
   end
 
-  def add_options(receiver)
-    receiver.push(*@options)
-  end
-
-  def define(src_type, &exporter)
+  def define(&exporter)
     ensure_basics_correctness(@name)
 
-    ext_prj_sources_dir, dir_subtargets, file_subtargets = define_basic_task(src_type, &exporter)
+    ext_prj_sources_dir, dir_subtargets, file_subtargets =
+        define_basic_task(&exporter)
 
     define_remove_task(ext_prj_sources_dir, dir_subtargets, file_subtargets)
     define_reget_task(ext_prj_sources_dir, dir_subtargets, file_subtargets)
   end
 
-  def define_basic_task(src_type, &exporter)
+  def define_basic_task(&exporter)
     ext_prj_sources_dir = subdir_name(@name.to_s)
 
     directory EXTERNALS_STORAGE_DIR
@@ -135,7 +283,7 @@ private
       rm_directories(dir_subtargets)
       rm_files(file_subtargets)
 
-      ext_prj_sources_tmp_dir = subdir_name(make_tmp_name src_type, @name)
+      ext_prj_sources_tmp_dir = subdir_name(make_tmp_name(@name))
       exporter.call(ext_prj_sources_tmp_dir)
       mv(ext_prj_sources_tmp_dir, ext_prj_sources_dir, fileop_options)
     end
@@ -167,8 +315,11 @@ private
   end
 end
 
+end # module Impl
+
 class Svn < Rake::TaskLib
-  include ExternalBasics
+  include Impl::ExternalBasics
+  include Impl::OptionsHolder
 
   def initialize(name)
     defaults(name)
@@ -176,12 +327,12 @@ class Svn < Rake::TaskLib
 
     yield self if block_given?
 
-    define 'svn' do |tmp_dir|
+    define do |tmp_dir|
       sh_args = [ 'svn', 'export' ]
 
       sh_args << '-r' << @rev.to_s if @rev
       sh_args << '--ignore-externals' unless @with_externals
-      add_options(sh_args)
+      push_options_to(sh_args)
 
       sh_args << @url << tmp_dir
 
@@ -199,7 +350,8 @@ class Svn < Rake::TaskLib
 end
 
 class Git < Rake::TaskLib
-  include ExternalBasics
+  include Impl::ExternalBasics
+  include Impl::OptionsHolder
 
   def initialize(name)
     defaults(name)
@@ -208,17 +360,34 @@ class Git < Rake::TaskLib
 
     yield self if block_given?
 
-    define 'git' do |tmp_dir|
-      sh_args = ['git', 'clone']
-
-      sh_args << '--branch' << @tag.to_s if @tag
-      sh_args << '--depth' << '1' unless @unlimited_depth
-      sh_args << '--recursive' if @recursive
-      add_options(sh_args)
-
-      sh_args << @url << tmp_dir
-
-      sh *sh_args
+    raise "#{name}: tag and commit cannot be specified together" if @tag and @commit
+
+    define do |tmp_dir|
+      if @commit.nil?
+        # No specific commit.
+        # Simple clone (probably with --depth 1) is enough.
+        sh_args = ['git', 'clone']
+
+        sh_args << '--branch' << @tag.to_s if @tag
+        sh_args << '--depth' << '1' unless @unlimited_depth
+        sh_args << '--recursive' if @recursive
+        push_options_to(sh_args)
+
+        sh_args << @url << tmp_dir
+
+        sh *sh_args
+      else
+        # To extract specific commit is necessary to do
+        # at least two commands: clone (without limitiation of depth) and
+        # checkout for specific commit.
+
+        # Do `clone repo tmp_dir` 
+        sh *(push_options_to(['git', 'clone']).push(@url).push(tmp_dir))
+        # Do `checkout commit` inside tmp_dir
+        cd tmp_dir do
+          sh 'git', 'checkout', @commit
+        end
+      end
     end
   end
 
@@ -233,21 +402,26 @@ class Git < Rake::TaskLib
   def recursive
     @recursive = true
   end
+
+  attr_reader :commit
+  def commit(v); @commit = v; end
+  alias :commit= :commit
 end
 
 class Hg < Rake::TaskLib
-  include ExternalBasics
+  include Impl::ExternalBasics
+  include Impl::OptionsHolder
 
   def initialize(name)
     defaults(name)
 
     yield self if block_given?
 
-    define 'hg' do |tmp_dir|
+    define do |tmp_dir|
       sh_args = ['hg', 'clone']
 
       sh_args << '--updaterev' << @tag.to_s if @tag
-      add_options(sh_args)
+      push_options_to(sh_args)
 
       sh_args << @url << tmp_dir
 
@@ -258,6 +432,185 @@ class Hg < Rake::TaskLib
   attr_reader :tag
   def tag(v); @tag = v; end
   alias :tag= :tag
+end # class Hg
+
+# Implementation of externals represented as downloadable
+# archive (like tar.gz, zip, rar or 7z).
+#
+class ArchiveAsExternals < Rake::TaskLib
+  include Impl::ExternalBasics
+  include Impl::WebDownloaderOptions
+
+  @@archive_handlers = {
+    :tar => proc {
+        ['tar', 'x'].push(*@unpaker_options).push('-f').push(archive_name)
+      },
+    :zip => proc {
+        ['unzip'].push(*@unpaker_options).push(archive_name)
+      },
+    :sevenzip => proc {
+        ['7z', 'x'].push(*@unpaker_options).push(archive_name)
+      }
+  }
+
+  @@archive_extensions = {
+    '.tar' => :tar,
+    '.tar.gz' => :tar,
+    '.tgz' => :tar,
+    '.taz' => :tar,
+    '.tar.Z' => :tar,
+    '.taZ' => :tar,
+    '.tar.bz2' => :tar,
+    '.tz2' => :tar,
+    '.tbz2' => :tar,
+    '.tar.lz' => :tar,
+    '.tar.lzma' => :tar,
+    '.tlz' => :tar,
+    '.tar.lzo' => :tar,
+    '.tar.xz' => :tar,
+    '.zip' => :zip,
+    '.7z' => :sevenzip
+  }
+
+  def initialize(name)
+    defaults(name)
+    @unpaker_options = []
+
+    yield self if block_given?
+
+    parse_uri
+    detect_archive_type
+
+    define do |tmp_dir|
+      # Temporary directory must be removed in a case of any error.
+      successful = false
+      begin
+        mkdir(tmp_dir, fileop_options) if !Dir.exists?(tmp_dir)
+
+        cd tmp_dir do
+          download_archive
+          unpack_archive
+        end
+
+        successful = true
+      ensure
+        rm_dir_if_exists(tmp_dir) unless successful
+      end
+    end
+  end
+
+  def md5(v)
+    @md5 = v
+  end
+
+  def sha1(v)
+    @sha1 = v
+  end
+
+  def sha256(v)
+    @sha256 = v
+  end
+
+  def sha512(v)
+    @sha512 = v
+  end
+
+  def unpacker_option(v)
+    @unpaker_options.push(v)
+  end
+
+private
+  def parse_uri
+    @parsed_uri = URI::split(@url)
+    @archive_name = File.split(uri_path).last
+  end
+
+  def uri_scheme
+    @parsed_uri[0]
+  end
+
+  def uri_path
+    @parsed_uri[5] # See doc for URI::split for description
+                   # of items in result vector.
+  end
+
+  attr_reader :archive_name
+
+  def detect_archive_type
+    ext = @@archive_extensions.keys.find {|k| @archive_name.end_with?(k)}
+    raise "#{name} unable to detect archive type for " +
+        "#{@archive_name}" unless ext
+
+    @archive_type = @@archive_extensions[ext]
+  end
+
+  def download_archive
+    if 'file' == uri_scheme
+      download_archive_via_cp
+    else
+      download_archive_from_web
+    end
+    check_digest_if_necessary(:MD5, @md5)
+    check_digest_if_necessary(:SHA1, @sha1)
+    check_digest_if_necessary(:SHA256, @sha256)
+    check_digest_if_necessary(:SHA512, @sha512)
+  end
+
+  def download_archive_from_web
+    web_downloader = Impl::WebDownloader.instance.make_downloader(self)
+    sh *(web_downloader.make_download_sh_args(@url, archive_name))
+  end
+
+  def download_archive_via_cp
+    # On Windows path can look like '/d:/...'.
+    # The leading slash must be removed.
+    path = uri_path.gsub(/^(\/)(\w:)(.+)$/, '\2\3')
+    cp(path, archive_name, fileop_options)
+  end
+
+  def unpack_archive
+    sh(*make_unpacker_args)
+    rm(archive_name, fileop_options)
+    names = Dir['*']
+    if 1 == names.size and Dir.exists?(names.first)
+      # This is the only folder in the distributive.
+      # Move all its contents one level up.
+      cd names.first do
+        # Files like '.gitignore' won't be found without FNM_DOTMATCH.
+        # But in that case '.' and '..' will be found too.
+        Dir.glob('*', File::FNM_DOTMATCH).each do |n|
+          mv(n, '..', fileop_options) if n != '.' && n != '..'
+        end
+      end
+      # This single directory no more needed.
+      rm_r(names.first, fileop_options)
+    end
+  end
+
+  def check_digest_if_necessary(digest_id, expected)
+    return unless expected
+
+    digest_klass = Digest(digest_id)
+    puts "#{archive_name} checking #{digest_id} checksum..." if @verbose
+    chsum = digest_klass.file(archive_name).hexdigest
+    if chsum != expected
+      raise "#{archive_name}: #{digest_id} checksum missmatch. " +
+        "actual: #{chsum}, expected: #{expected}"
+    end
+  end
+
+  def make_unpacker_args
+    handler = @@archive_handlers[@archive_type]
+    self.instance_eval &handler
+  end
+end # class ArchiveAsExternals
+
+def Externals::preffered_downloader(downloader_id)
+  Impl::WebDownloader.preffered_downloader(downloader_id)
+end
+
+def Externals::downloader_option(downloader_id, *values)
+  Impl::WebDownloader.downloader_option(downloader_id, *values)
 end
 
 end # module Externals
@@ -274,16 +627,25 @@ def MxxRu.hg_externals(name, &block)
   Externals::Hg.new(name, &block)
 end
 
+def MxxRu.arch_externals(name, &block)
+  Externals::ArchiveAsExternals.new(name, &block)
+end
+
 end # module MxxRu
 
 desc "Remove all external projects"
 task :remove do
-  d = MxxRu::Externals::ExternalBasics::EXTERNALS_STORAGE_DIR
+  d = MxxRu::Externals::Impl::ExternalBasics::EXTERNALS_STORAGE_DIR
   rm_r(d, :verbose => Rake.verbose) if Dir.exists?(d)
 end
 
 desc "Remove and get again all external projects"
 task :reget
 
+local_rc_file = File.join(Dir.getwd, '.externalsrc')
+if File.exists?(local_rc_file)
+  load local_rc_file
+end
+
 # vim:ts=2:sts=2:sw=2:expandtab
 

data/lib/mxx_ru/version.rb

@@ -34,4 +34,4 @@
 #
 #   puts 'Mxx_ru version is: ' + MXX_RU_VERSION
 #
-MXX_RU_VERSION = '1.6.7.1'
+MXX_RU_VERSION = '1.6.8'

data/tests/externals/check_tar.rb

@@ -0,0 +1,13 @@
+require 'mxx_ru/externals'
+
+MxxRu::arch_externals :asio_tgz do |e|
+	e.url 'https://github.com/chriskohlhoff/asio/archive/asio-1-11-0.tar.gz' 
+	e.sha1 '1be2489015a1e1c7b8666a5a803d984cdec4a12b'
+
+	e.map 'asio/src' => 'dev/asio_tgz'
+
+	e.downloader_option :wget, '--no-use-server-timestamps'
+	e.downloader_option :wget, '-T', '36'
+
+	e.downloader_option :curl, '--max-time', '3600'
+end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: Mxx_ru
 version: !ruby/object:Gem::Version
-  version: 1.6.7.1
+  version: 1.6.8
 platform: ruby
 authors:
 - The Mxx_ru Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies: []
-description: 
+description: Mxx_ru is a cross-platform build tool primarily focused to C/C++ projects
 email: eao197@yahoo.com
 executables:
 - mxxrugen
@@ -217,6 +217,7 @@ files:
 - tests/externals/check_git.rb
 - tests/externals/check_hg.rb
 - tests/externals/check_svn.rb
+- tests/externals/check_tar.rb
 - tests/mxx_ru/binary_library/tc_binary_library.rb
 - tests/mxx_ru/binary_library/tc_binary_target_lib_methods.rb
 - tests/mxx_ru/change_default_value/ignoring_by_build_root/build.rb
@@ -348,7 +349,8 @@ files:
 - tests/unix/lib_order/main.rb
 - tests/unix/lib_order/tc_normal_build.rb
 homepage: http://sourceforge.net/projects/mxxru
-licenses: []
+licenses:
+- NewBSD
 metadata: {}
 post_install_message: 
 rdoc_options: