rake-dependencies 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a29504c7126477c50bb2533eba80580e5b364944
-  data.tar.gz: 505641763ac6cdc8022a2eb1854946b24a618150
+  metadata.gz: 45861c4eab7c2655457e418b6f48e48501fec707
+  data.tar.gz: a9dfa04cadea1ad2c60545986ce80371d54dd207
 SHA512:
-  metadata.gz: 2da47a12c56d46598dbe06e5ca049aab9771da7d4dcca60147a1e1e9a8b330ab5c881e3e08905db47306385c8c2421eb047eb936c1dbaa622cce0c04fe30260c
-  data.tar.gz: 93cb56ac3c1e9c566801f909df296b53d7800b94c5edc17df4104bdfdc2732aec39ed25676f6cf86216d1803391eee253c5099cafea962b4d540c054e5ab1750
+  metadata.gz: 6a7eaa0cc76abe234b96ebb904b68b6132db2a5883093288ce5ff50ec2a19ca2b5c956dc6ff2f8f603dd4995c876056bffa87651c378d67242fb11672da1457e
+  data.tar.gz: e2870b3217fea5b4dcbec4f96624a6ae6deec1a5b394a50c208be7e3afe912aebf8a487df854d0cd687334621797dc50d8f18274d95890a5bb737f11b9854745

data/.gitignore

@@ -17,6 +17,7 @@
 /_yardoc/
 /doc/
 /rdoc/
+/coverage/
 
 ## Environment normalization:
 /.bundle/

data/Gemfile.lock

@@ -1,8 +1,10 @@
 PATH
   remote: .
   specs:
-    rake-dependencies (0.5.0)
+    rake-dependencies (0.6.0)
       hamster (~> 3.0)
+      minitar (~> 0.6)
+      rubyzip (~> 1.2)
 
 GEM
   remote: https://rubygems.org/
@@ -13,16 +15,18 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.4)
     diff-lcs (1.3)
+    docile (1.1.5)
     fakefs (0.10.2)
     gem-release (0.7.4)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
     i18n (0.8.0)
     json (1.8.6)
+    minitar (0.6.1)
     minitest (5.10.1)
-    rake (10.5.0)
+    rake (11.2.2)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -36,6 +40,12 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
+    rubyzip (1.2.1)
+    simplecov (0.13.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -48,9 +58,10 @@ DEPENDENCIES
   bundler (~> 1.14)
   fakefs (~> 0.10)
   gem-release (~> 0.7)
-  rake (~> 10.0)
+  rake (~> 11.0)
   rake-dependencies!
   rspec (~> 3.0)
+  simplecov (~> 0.13)
 
 BUNDLED WITH
    1.14.3

data/lib/rake_dependencies.rb

@@ -1,4 +1,5 @@
 require 'rake_dependencies/tasks'
+require 'rake_dependencies/extractors'
 require 'rake_dependencies/template'
 require 'rake_dependencies/version'
 

data/lib/rake_dependencies/extractors.rb

@@ -0,0 +1,57 @@
+require 'zip'
+require 'zlib'
+require 'archive/tar/minitar'
+
+module RakeDependencies
+  module Extractors
+    class ZipExtractor
+      def initialize(file_path, extract_path, options = {})
+        @file_path = file_path
+        @extract_path = extract_path
+        @options = options
+      end
+
+      def extract
+        FileUtils.mkdir_p(@extract_path)
+        Zip::File.open(@file_path) do |zip_file_entries|
+          zip_file_entries.each do |entry|
+            entry_pathname = Pathname.new(entry.name)
+            strip_pathname = Pathname.new(@options[:strip_path] || '')
+            target_pathname = entry_pathname.relative_path_from(strip_pathname)
+
+            file_path = File.join(@extract_path, target_pathname)
+            FileUtils.mkdir_p(File.dirname(file_path))
+            zip_file_entries.extract(entry, file_path) unless File.exist?(file_path)
+          end
+        end
+      end
+    end
+
+    class TarGzExtractor
+      def initialize(file_path, extract_path, options = {})
+        @file_path = file_path
+        @extract_path = extract_path
+        @options = options
+      end
+
+      def extract
+        FileUtils.mkdir_p(@extract_path)
+        Zlib::GzipReader.open(@file_path) do |tar_file|
+          Archive::Tar::Minitar.open(tar_file) do |tar_file_entries|
+            tar_file_entries.each do |entry|
+              entry_pathname = Pathname.new(entry.name)
+              strip_pathname = Pathname.new(@options[:strip_path] || '')
+              target_pathname = entry_pathname.relative_path_from(strip_pathname)
+
+              file_path = File.join(@extract_path, target_pathname)
+              FileUtils.mkdir_p(File.dirname(file_path))
+              if entry.file? && !File.exist?(file_path)
+                File.open(file_path, 'w', entry.mode) { |f| f.write(entry.read) }
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rake_dependencies/tasks.rb

@@ -1,2 +1,3 @@
 require_relative 'tasks/clean'
-require_relative 'tasks/download'
+require_relative 'tasks/download'
+require_relative 'tasks/extract'

data/lib/rake_dependencies/tasks/download.rb

@@ -10,7 +10,7 @@ module RakeDependencies
       parameter :name, default: :download
       parameter :type, default: :zip
       parameter :os_ids, default: {mac: 'mac', linux: 'linux'}
-      parameter :directory, default: 'dist'
+      parameter :distribution_directory, default: 'dist'
       parameter :version
       parameter :path, required: true
       parameter :dependency, required: true
@@ -38,7 +38,7 @@ module RakeDependencies
           download_file_name = Template.new(file_name_template)
             .with_parameters(parameters)
             .render
-          download_file_directory = File.join(path, directory)
+          download_file_directory = File.join(path, distribution_directory)
           download_file_path = File.join(download_file_directory, download_file_name)
 
           temporary_file = open(uri)
@@ -58,8 +58,11 @@ module RakeDependencies
         RUBY_PLATFORM =~ /darwin/ ? :mac : :linux
       end
 
+      def resolved_type
+        type.is_a?(Hash) ? type[platform].to_sym : type.to_sym
+      end
+
       def ext
-        resolved_type = type.is_a?(Hash) ? type[platform].to_sym : type.to_sym
         case resolved_type
           when :tar_gz then '.tar.gz'
           when :tgz then '.tgz'

data/lib/rake_dependencies/tasks/extract.rb

@@ -0,0 +1,100 @@
+require 'zip'
+require_relative '../tasklib'
+require_relative '../template'
+require_relative '../extractors'
+
+module RakeDependencies
+  module Tasks
+    class Extract < TaskLib
+      parameter :name, default: :extract
+
+      parameter :type, default: :zip
+      parameter :os_ids, default: {
+          mac: 'mac',
+          linux: 'linux'
+      }
+      parameter :extractors, default: {
+          zip: Extractors::ZipExtractor,
+          tar_gz: Extractors::TarGzExtractor,
+          tgz: Extractors::TarGzExtractor
+      }
+
+      parameter :distribution_directory, default: 'dist'
+      parameter :binary_directory, default: 'bin'
+
+      parameter :dependency, required: true
+      parameter :version
+      parameter :path, required: true
+      parameter :file_name_template, required: true
+      parameter :strip_path_template
+
+      def process_arguments args
+        super(args)
+        self.name = args[0] if args[0]
+      end
+
+      def define
+        desc "Extract #{dependency} archive"
+        task name do
+          parameters = {
+              version: version,
+              platform: platform,
+              os_id: os_id,
+              ext: ext
+          }
+
+          distribution_file_name = Template.new(file_name_template)
+             .with_parameters(parameters)
+             .render
+          distribution_file_directory = File.join(path, distribution_directory)
+          distribution_file_path = File.join(
+              distribution_file_directory, distribution_file_name)
+
+          extraction_path = File.join(path, binary_directory)
+
+          options = {}
+          if strip_path_template
+            options[:strip_path] = Template.new(strip_path_template)
+               .with_parameters(parameters)
+               .render
+          end
+
+          extractor = extractor_for_extension.new(
+              distribution_file_path,
+              extraction_path,
+              options)
+          extractor.extract
+        end
+      end
+
+      private
+
+      def extractor_for_extension
+        extractors[resolved_type]
+      end
+
+      def os_id
+        os_ids[platform]
+      end
+
+      def platform
+        RUBY_PLATFORM =~ /darwin/ ? :mac : :linux
+      end
+
+      def resolved_type
+        type.is_a?(Hash) ? type[platform].to_sym : type.to_sym
+      end
+
+      def ext
+        case resolved_type
+          when :tar_gz then '.tar.gz'
+          when :tgz then '.tgz'
+          when :zip then '.zip'
+          when :uncompressed then ''
+          else
+            raise "Unknown type: #{type}"
+        end
+      end
+    end
+  end
+end

data/lib/rake_dependencies/version.rb

@@ -1,3 +1,3 @@
 module RakeDependencies
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/rake_dependencies.gemspec

@@ -25,11 +25,14 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0'
 
   spec.add_dependency 'hamster', '~> 3.0'
+  spec.add_dependency 'rubyzip', '~> 1.2'
+  spec.add_dependency 'minitar', '~> 0.6'
 
   spec.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 11.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'gem-release', '~> 0.7'
   spec.add_development_dependency 'activesupport', '~> 4.2'
   spec.add_development_dependency 'fakefs', '~> 0.10'
+  spec.add_development_dependency 'simplecov', '~> 0.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Toby Clemson
@@ -24,6 +24,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: minitar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +72,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +136,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.13'
 description: Provides rake tasks for downloading and extracting tools depended on
   for further build activities.
 email:
@@ -129,10 +171,12 @@ files:
 - bin/setup
 - lib/rake_dependencies.rb
 - lib/rake_dependencies/exceptions.rb
+- lib/rake_dependencies/extractors.rb
 - lib/rake_dependencies/tasklib.rb
 - lib/rake_dependencies/tasks.rb
 - lib/rake_dependencies/tasks/clean.rb
 - lib/rake_dependencies/tasks/download.rb
+- lib/rake_dependencies/tasks/extract.rb
 - lib/rake_dependencies/template.rb
 - lib/rake_dependencies/version.rb
 - rake_dependencies.gemspec