rake_dependencies 3.2.0.pre.3 → 3.2.0.pre.4

data/lib/rake_dependencies/task_sets/all.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 
 require_relative '../tasks/clean'
@@ -6,7 +8,6 @@ require_relative '../tasks/ensure'
 require_relative '../tasks/extract'
 require_relative '../tasks/fetch'
 
-
 module RakeDependencies
   module TaskSets
     class All < RakeFactory::TaskSet
@@ -42,30 +43,42 @@ module RakeDependencies
       parameter :fetch_task_name, default: :fetch
       parameter :ensure_task_name, default: :ensure
 
-      task Tasks::Clean, name: RakeFactory::DynamicValue.new { |ts|
-        ts.clean_task_name
-      }
-      task Tasks::Download, name: RakeFactory::DynamicValue.new { |ts|
-        ts.download_task_name
-      }
-      task Tasks::Extract, name: RakeFactory::DynamicValue.new { |ts|
-        ts.extract_task_name
-      }
-      task Tasks::Install, {
-          name: RakeFactory::DynamicValue.new { |ts|
-            ts.install_task_name
-          },
+      task(
+        Tasks::Clean, {
+          name: (RakeFactory::DynamicValue.new { |ts| ts.clean_task_name })
+        }
+      )
+      task(
+        Tasks::Download, {
+          name: (RakeFactory::DynamicValue.new { |ts| ts.download_task_name })
+        }
+      )
+      task(
+        Tasks::Extract, {
+          name: (RakeFactory::DynamicValue.new { |ts| ts.extract_task_name })
+        }
+      )
+      task(
+        Tasks::Fetch, {
+          name: (RakeFactory::DynamicValue.new { |ts| ts.fetch_task_name })
+        }
+      )
+      task(
+        Tasks::Ensure, {
+          name: (RakeFactory::DynamicValue.new { |ts| ts.ensure_task_name })
+        }
+      )
+      task(
+        Tasks::Install, {
+          name:
+            (RakeFactory::DynamicValue.new { |ts| ts.install_task_name }),
+          binary_name_template:
+            (RakeFactory::DynamicValue.new do |ts|
+              ts.target_binary_name_template || ts.dependency
+            end),
           define_if: ->(ts) { ts.installation_directory }
-      } do |ts, t|
-        t.binary_name_template =
-            ts.target_binary_name_template || ts.dependency
-      end
-      task Tasks::Fetch, name: RakeFactory::DynamicValue.new { |ts|
-        ts.fetch_task_name
-      }
-      task Tasks::Ensure, name: RakeFactory::DynamicValue.new { |ts|
-        ts.ensure_task_name
-      }
+        }
+      )
     end
   end
 end

data/lib/rake_dependencies/task_sets.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require_relative 'task_sets/all'
 
 module RakeDependencies
   module TaskSets
   end
-end
+end

data/lib/rake_dependencies/tasks/clean.rb

@@ -1,19 +1,21 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 
 module RakeDependencies
   module Tasks
     class Clean < RakeFactory::Task
       default_name :clean
-      default_description RakeFactory::DynamicValue.new { |t|
+      default_description(RakeFactory::DynamicValue.new do |t|
         "Clean vendored #{t.dependency}"
-      }
+      end)
 
-      parameter :dependency, :required => true
-      parameter :path, :required => true
+      parameter :dependency, required: true
+      parameter :path, required: true
 
       action do |t|
         rm_rf t.path
       end
     end
   end
-end
+end

data/lib/rake_dependencies/tasks/download.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
+require 'down'
 require 'rake_factory'
-require 'open-uri'
 require 'rubygems'
 
 require_relative '../template'
@@ -9,9 +11,9 @@ module RakeDependencies
   module Tasks
     class Download < RakeFactory::Task
       default_name :download
-      default_description RakeFactory::DynamicValue.new { |t|
+      default_description(RakeFactory::DynamicValue.new do |t|
         "Download #{t.dependency} distribution"
-      }
+      end)
 
       parameter :type, default: :zip
 
@@ -42,9 +44,10 @@ module RakeDependencies
                                      .with_parameters(parameters)
                                      .render
         download_file_directory = File.join(path, distribution_directory)
-        download_file_path = File.join(download_file_directory, download_file_name)
+        download_file_path = File.join(download_file_directory,
+                                       download_file_name)
 
-        temporary_file = URI.open(uri)
+        temporary_file = Down.download(uri)
 
         mkdir_p download_file_directory
         cp temporary_file.path, download_file_path
@@ -70,14 +73,10 @@ module RakeDependencies
 
       def ext
         case resolved_type
-        when :tar_gz then
-          '.tar.gz'
-        when :tgz then
-          '.tgz'
-        when :zip then
-          '.zip'
-        when :uncompressed then
-          ''
+        when :tar_gz then '.tar.gz'
+        when :tgz then '.tgz'
+        when :zip then '.zip'
+        when :uncompressed then ''
         else
           raise "Unknown type: #{type}"
         end

data/lib/rake_dependencies/tasks/ensure.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 
 module RakeDependencies
   module Tasks
     class Ensure < RakeFactory::Task
       default_name :ensure
-      default_description RakeFactory::DynamicValue.new { |t|
+      default_description(RakeFactory::DynamicValue.new do |t|
         "Ensure #{t.dependency} present"
-      }
+      end)
 
       parameter :dependency, required: true
       parameter :version
@@ -28,8 +30,8 @@ module RakeDependencies
 
         install_name = t.scope.path_with_task_name(t.install_task_name)
         install = if Rake::Task.task_defined?(install_name)
-          Rake::Task[install_name]
-        end
+                    Rake::Task[install_name]
+                  end
 
         if needs_fetch.call(t)
           [clean, download, extract, install].compact.map(&:invoke)

data/lib/rake_dependencies/tasks/extract.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 require 'zip'
 require 'rubygems'
@@ -9,9 +11,9 @@ module RakeDependencies
   module Tasks
     class Extract < RakeFactory::Task
       default_name :extract
-      default_description RakeFactory::DynamicValue.new { |t|
+      default_description(RakeFactory::DynamicValue.new do |t|
         "Extract #{t.dependency} archive"
-      }
+      end)
 
       parameter :type, default: :zip
 
@@ -19,10 +21,10 @@ module RakeDependencies
       parameter :platform_os_names, default: PlatformNames::OS
 
       parameter :extractors, default: {
-          zip: Extractors::ZipExtractor,
-          tar_gz: Extractors::TarGzExtractor,
-          tgz: Extractors::TarGzExtractor,
-          uncompressed: Extractors::UncompressedExtractor
+        zip: Extractors::ZipExtractor,
+        tar_gz: Extractors::TarGzExtractor,
+        tgz: Extractors::TarGzExtractor,
+        uncompressed: Extractors::UncompressedExtractor
       }
 
       parameter :distribution_directory, default: 'dist'
@@ -37,47 +39,69 @@ module RakeDependencies
       parameter :strip_path_template
 
       action do
-        parameters = {
-            version: version,
-            platform: platform,
-            platform_cpu_name: platform_cpu_name,
-            platform_os_name: platform_os_name,
-            ext: ext
-        }
-
-        distribution_file_name = Template.new(file_name_template)
-            .with_parameters(parameters)
-            .render
-        distribution_file_directory = File.join(path, distribution_directory)
+        distribution_file_name = interpolate_file_name_template(parameters)
+        distribution_file_directory = relative_to_path(distribution_directory)
         distribution_file_path = File.join(
-            distribution_file_directory, distribution_file_name)
+          distribution_file_directory, distribution_file_name
+        )
 
-        extraction_path = File.join(path, binary_directory)
+        extraction_path = relative_to_path(binary_directory)
 
         options = {}
         if strip_path_template
-          options[:strip_path] = Template.new(strip_path_template)
-              .with_parameters(parameters)
-              .render
+          options[:strip_path] = interpolate_strip_path_template(parameters)
         end
 
         if source_binary_name_template && target_binary_name_template
-          options[:rename_from] = Template.new(source_binary_name_template)
-              .with_parameters(parameters)
-              .render
-          options[:rename_to] = Template.new(target_binary_name_template)
-              .with_parameters(parameters)
-              .render
+          options[:rename_from] =
+            interpolate_source_binary_name_template(parameters)
+          options[:rename_to] =
+            interpolate_target_binary_name_template(parameters)
         end
 
         extractor = extractor_for_extension.new(
-            distribution_file_path,
-            extraction_path,
-            options)
+          distribution_file_path,
+          extraction_path,
+          options
+        )
         extractor.extract
       end
 
-      private
+      def parameters
+        {
+          version: version,
+          platform: platform,
+          platform_cpu_name: platform_cpu_name,
+          platform_os_name: platform_os_name,
+          ext: ext
+        }
+      end
+
+      def interpolate_template(template, parameters)
+        Template.new(template)
+                .with_parameters(parameters)
+                .render
+      end
+
+      def interpolate_file_name_template(parameters)
+        interpolate_template(file_name_template, parameters)
+      end
+
+      def interpolate_strip_path_template(parameters)
+        interpolate_template(strip_path_template, parameters)
+      end
+
+      def interpolate_source_binary_name_template(parameters)
+        interpolate_template(source_binary_name_template, parameters)
+      end
+
+      def interpolate_target_binary_name_template(parameters)
+        interpolate_template(target_binary_name_template, parameters)
+      end
+
+      def relative_to_path(other)
+        File.join(path, other)
+      end
 
       def extractor_for_extension
         extractors[resolved_type]
@@ -101,14 +125,10 @@ module RakeDependencies
 
       def ext
         case resolved_type
-        when :tar_gz then
-          '.tar.gz'
-        when :tgz then
-          '.tgz'
-        when :zip then
-          '.zip'
-        when :uncompressed then
-          ''
+        when :tar_gz then '.tar.gz'
+        when :tgz then '.tgz'
+        when :zip then '.zip'
+        when :uncompressed then ''
         else
           raise "Unknown type: #{type}"
         end

data/lib/rake_dependencies/tasks/fetch.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 
 module RakeDependencies
   module Tasks
     class Fetch < RakeFactory::Task
       default_name :fetch
-      default_description RakeFactory::DynamicValue.new { |t|
+      default_description(RakeFactory::DynamicValue.new do |t|
         "Fetch #{t.dependency}"
-      }
+      end)
 
       parameter :dependency, required: true
       parameter :download_task_name, default: :download
@@ -14,11 +16,9 @@ module RakeDependencies
 
       action do |t|
         [
-            Rake::Task[t.scope.path_with_task_name(t.download_task_name)],
-            Rake::Task[t.scope.path_with_task_name(t.extract_task_name)]
-        ].each do |task|
-          task.invoke
-        end
+          Rake::Task[t.scope.path_with_task_name(t.download_task_name)],
+          Rake::Task[t.scope.path_with_task_name(t.extract_task_name)]
+        ].each(&:invoke)
       end
     end
   end

data/lib/rake_dependencies/tasks/install.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 require 'rubygems'
 
@@ -7,9 +9,9 @@ module RakeDependencies
   module Tasks
     class Install < RakeFactory::Task
       default_name :install
-      default_description RakeFactory::DynamicValue.new { |t|
+      default_description(RakeFactory::DynamicValue.new do |t|
         "Install #{t.dependency}"
-      }
+      end)
 
       parameter :platform_cpu_names, default: PlatformNames::CPU
       parameter :platform_os_names, default: PlatformNames::OS
@@ -26,19 +28,20 @@ module RakeDependencies
 
       action do
         parameters = {
-            version: version,
-            platform: platform,
-            platform_cpu_name: platform_cpu_name,
-            platform_os_name: platform_os_name,
-            ext: ext
+          version: version,
+          platform: platform,
+          platform_cpu_name: platform_cpu_name,
+          platform_os_name: platform_os_name,
+          ext: ext
         }
 
         binary_file_name = Template.new(binary_name_template)
-            .with_parameters(parameters)
-            .render
+                                   .with_parameters(parameters)
+                                   .render
         binary_file_directory = File.join(path, binary_directory)
         binary_file_path = File.join(
-            binary_file_directory, binary_file_name)
+          binary_file_directory, binary_file_name
+        )
 
         mkdir_p installation_directory
         cp binary_file_path, installation_directory
@@ -64,14 +67,10 @@ module RakeDependencies
 
       def ext
         case resolved_type
-        when :tar_gz then
-          '.tar.gz'
-        when :tgz then
-          '.tgz'
-        when :zip then
-          '.zip'
-        when :uncompressed then
-          ''
+        when :tar_gz then '.tar.gz'
+        when :tgz then '.tgz'
+        when :zip then '.zip'
+        when :uncompressed then ''
         else
           raise "Unknown type: #{type}"
         end

data/lib/rake_dependencies/tasks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'tasks/clean'
 require_relative 'tasks/download'
 require_relative 'tasks/extract'

data/lib/rake_dependencies/template.rb

@@ -1,20 +1,23 @@
+# frozen_string_literal: true
+
 require 'hamster'
 require 'erb'
 
 module RakeDependencies
   class Template
     def initialize(
-        template,
-        parameters = {})
+      template,
+      parameters = {}
+    )
       @template = template
       @parameters = Hamster::Hash.new(parameters)
     end
 
-    def with_parameter key, value
+    def with_parameter(key, value)
       Template.new(@template, @parameters.put(key, value))
     end
 
-    def with_parameters pairs
+    def with_parameters(pairs)
       pairs.to_a.reduce(self) do |memo, parameter|
         memo.with_parameter(*parameter)
       end
@@ -29,4 +32,4 @@ module RakeDependencies
       ERB.new(@template).result(context_binding)
     end
   end
-end
+end

data/lib/rake_dependencies/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RakeDependencies
-  VERSION = "3.2.0.pre.3"
+  VERSION = '3.2.0.pre.4'
 end

data/lib/rake_dependencies.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_dependencies/tasks'
 require 'rake_dependencies/task_sets'
 require 'rake_dependencies/extractors'

data/rake_dependencies.gemspec

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'rake_dependencies/version'
+
+files = %w[
+  bin
+  lib
+  CODE_OF_CONDUCT.md
+  rake_dependencies.gemspec
+  Gemfile
+  LICENSE.txt
+  Rakefile
+  README.md
+]
+
+Gem::Specification.new do |spec|
+  spec.name = 'rake_dependencies'
+  spec.version = RakeDependencies::VERSION
+  spec.authors = ['InfraBlocks Maintainers']
+  spec.email = ['maintainers@infrablocks.io']
+
+  spec.summary = 'Rake tasks for managing build dependencies.'
+  spec.description = 'Provides rake tasks for downloading and extracting ' \
+                     'tools depended on for further build activities.'
+  spec.homepage = 'https://github.com/infrablocks/rake_dependencies'
+  spec.license = 'MIT'
+
+  spec.files = `git ls-files -z`.split("\x0").select do |f|
+    f.match(/^(#{files.map { |g| Regexp.escape(g) }.join('|')})/)
+  end
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.required_ruby_version = '>= 2.7'
+
+  spec.add_dependency 'down', '~> 5.3'
+  spec.add_dependency 'hamster', '~> 3.0'
+  spec.add_dependency 'minitar', '~> 0.9'
+  spec.add_dependency 'rake_factory', '~> 0.23'
+  spec.add_dependency 'rubyzip', '>= 1.3'
+
+  spec.add_development_dependency 'activesupport'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'fakefs'
+  spec.add_development_dependency 'gem-release'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rake_circle_ci'
+  spec.add_development_dependency 'rake_github'
+  spec.add_development_dependency 'rake_gpg'
+  spec.add_development_dependency 'rake_ssh'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'rubocop-rspec'
+  spec.add_development_dependency 'simplecov'
+
+  spec.metadata['rubygems_mfa_required'] = 'false'
+end