rake_dependencies 3.2.0.pre.2 → 3.2.0.pre.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0421253c9f9dbb90fd54610903486198e735f0687e25686e5b5fe0fafd431bf8
-  data.tar.gz: a34b1b32ffc6f3e35bf4d3960a16f852468013fde45b8609315e145c7b359054
+  metadata.gz: 757407e0986e5ef552712f15c3060c672d12b55fe2f60b3c23417ebaac373320
+  data.tar.gz: 78fae21e30f8857010798a4faa855fcf3d329dfd21dc1d6b16594823cdd38652
 SHA512:
-  metadata.gz: 2b2179116752c49232f3a7e5f2fa374467d6ad885d8ab8a17a463db90ac44eee35180eb14304a1e4f242ea3baa4af5f525a3b822195720df57ad83355aac8202
-  data.tar.gz: 43a43e831cc896fa01da28702cb9b2e8affb2a8ab5300cf24385a5dc496812bc70744ea64a6df5017abd9144b980d339c5dcd4147a64905ce5ec7be2bcddbdad
+  metadata.gz: 7ff3eaab77eb0ebbe3e71b102dd696500e984a7e26e2349a10d85abd19f6cc8766f45124d08d0abb51f4eb34105d06ee8315a256fbb501734bf4741a57d5cfd0
+  data.tar.gz: 6d9098a8c1fd59d0bbfa5a0c03253fd2fe79032d67ed2f6c8e1464e2b76d02be7fcd1ea006a18b12623dea2daee1cf89d0e6207fcf24032c5799ed0ab56806a0

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rake_dependencies.gemspec

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    rake_dependencies (3.2.0.pre.2)
+    rake_dependencies (3.2.0.pre.5)
+      down (~> 5.3)
       hamster (~> 3.0)
       minitar (~> 0.9)
       rake_factory (~> 0.23)
@@ -10,19 +11,22 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.2.3)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    excon (0.92.0)
-    fakefs (1.4.1)
+    down (5.3.1)
+      addressable (~> 2.8)
+    excon (0.92.2)
+    fakefs (1.8.0)
     faraday (1.10.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -61,7 +65,11 @@ GEM
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
+    parallel (1.22.1)
+    parser (3.1.2.0)
+      ast (~> 2.4.1)
     public_suffix (4.0.6)
+    rainbow (3.1.1)
     rake (13.0.6)
     rake_circle_ci (0.9.0)
       colored2 (~> 3.1)
@@ -83,6 +91,8 @@ GEM
       colored2 (~> 3.1)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
+    regexp_parser (2.5.0)
+    rexml (3.2.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
@@ -92,10 +102,26 @@ GEM
     rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
+    rubocop (1.30.1)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.11.1)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     ruby_gpg2 (0.8.0)
       lino (>= 1.5)
@@ -112,10 +138,10 @@ GEM
     sshkey (2.0.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
-  x86_64-darwin-19
 
 DEPENDENCIES
   activesupport
@@ -129,7 +155,10 @@ DEPENDENCIES
   rake_gpg
   rake_ssh
   rspec
+  rubocop
+  rubocop-rake
+  rubocop-rspec
   simplecov
 
 BUNDLED WITH
-   2.3.9
+   2.3.17

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'rake_circle_ci'
 require 'rake_github'
@@ -5,17 +7,20 @@ require 'rake_ssh'
 require 'rake_gpg'
 require 'securerandom'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
-task :default => :spec
-
-RSpec::Core::RakeTask.new(:spec)
+task default: %i[
+  library:fix
+  test:unit
+]
 
 namespace :encryption do
   namespace :passphrase do
+    desc 'Generate encryption passphrase for CI GPG key'
     task :generate do
-      File.open('config/secrets/ci/encryption.passphrase', 'w') do |f|
-        f.write(SecureRandom.base64(36))
-      end
+      FileUtils.mkdir_p('config/secrets/ci/')
+      File.write('config/secrets/ci/encryption.passphrase',
+                 SecureRandom.base64(36))
     end
   end
 end
@@ -23,85 +28,102 @@ end
 namespace :keys do
   namespace :deploy do
     RakeSSH.define_key_tasks(
-        path: 'config/secrets/ci/',
-        comment: 'maintainers@infrablocks.io')
+      path: 'config/secrets/ci/',
+      comment: 'maintainers@infrablocks.io'
+    )
   end
 
   namespace :gpg do
     RakeGPG.define_generate_key_task(
-        output_directory: 'config/secrets/ci',
-        name_prefix: 'gpg',
-        owner_name: 'InfraBlocks Maintainers',
-        owner_email: 'maintainers@infrablocks.io',
-        owner_comment: 'rake_dependencies CI Key')
+      output_directory: 'config/secrets/ci',
+      name_prefix: 'gpg',
+      owner_name: 'InfraBlocks Maintainers',
+      owner_email: 'maintainers@infrablocks.io',
+      owner_comment: 'rake_dependencies CI Key'
+    )
   end
 end
 
+RuboCop::RakeTask.new
+
+namespace :library do
+  desc 'Run all checks of the library'
+  task check: [:rubocop]
+
+  desc 'Attempt to automatically fix issues with the library'
+  task fix: [:'rubocop:auto_correct']
+end
+
+namespace :test do
+  RSpec::Core::RakeTask.new(:unit)
+end
+
 RakeCircleCI.define_project_tasks(
-    namespace: :circle_ci,
-    project_slug: 'github/infrablocks/rake_dependencies'
+  namespace: :circle_ci,
+  project_slug: 'github/infrablocks/rake_dependencies'
 ) do |t|
   circle_ci_config =
-      YAML.load_file('config/secrets/circle_ci/config.yaml')
+    YAML.load_file('config/secrets/circle_ci/config.yaml')
 
-  t.api_token = circle_ci_config["circle_ci_api_token"]
+  t.api_token = circle_ci_config['circle_ci_api_token']
   t.environment_variables = {
-      ENCRYPTION_PASSPHRASE:
-          File.read('config/secrets/ci/encryption.passphrase')
-              .chomp
+    ENCRYPTION_PASSPHRASE:
+        File.read('config/secrets/ci/encryption.passphrase')
+            .chomp
   }
   t.checkout_keys = []
   t.ssh_keys = [
-      {
-          hostname: "github.com",
-          private_key: File.read('config/secrets/ci/ssh.private')
-      }
+    {
+      hostname: 'github.com',
+      private_key: File.read('config/secrets/ci/ssh.private')
+    }
   ]
 end
 
 RakeGithub.define_repository_tasks(
-    namespace: :github,
-    repository: 'infrablocks/rake_dependencies',
+  namespace: :github,
+  repository: 'infrablocks/rake_dependencies'
 ) do |t, args|
   github_config =
-      YAML.load_file('config/secrets/github/config.yaml')
+    YAML.load_file('config/secrets/github/config.yaml')
 
-  t.access_token = github_config["github_personal_access_token"]
+  t.access_token = github_config['github_personal_access_token']
   t.deploy_keys = [
-      {
-          title: 'CircleCI',
-          public_key: File.read('config/secrets/ci/ssh.public')
-      }
+    {
+      title: 'CircleCI',
+      public_key: File.read('config/secrets/ci/ssh.public')
+    }
   ]
   t.branch_name = args.branch_name
   t.commit_message = args.commit_message
 end
 
 namespace :pipeline do
-  task :prepare => [
-      :'circle_ci:project:follow',
-      :'circle_ci:env_vars:ensure',
-      :'circle_ci:checkout_keys:ensure',
-      :'circle_ci:ssh_keys:ensure',
-      :'github:deploy_keys:ensure'
+  desc 'Prepare CircleCI Pipeline'
+  task prepare: %i[
+    circle_ci:project:follow
+    circle_ci:env_vars:ensure
+    circle_ci:checkout_keys:ensure
+    circle_ci:ssh_keys:ensure
+    github:deploy_keys:ensure
   ]
 end
 
 namespace :version do
-  desc "Bump version for specified type (pre, major, minor, patch)"
+  desc 'Bump version for specified type (pre, major, minor, patch)'
   task :bump, [:type] do |_, args|
     bump_version_for(args.type)
   end
 end
 
-desc "Release gem"
+desc 'Release gem'
 task :release do
-  sh "gem release --tag --push"
+  sh 'gem release --tag --push'
 end
 
 def bump_version_for(version_type)
-  sh "gem bump --version #{version_type} " +
-      "&& bundle install " +
-      "&& export LAST_MESSAGE=\"$(git log -1 --pretty=%B)\" " +
-      "&& git commit -a --amend -m \"${LAST_MESSAGE} [ci skip]\""
+  sh "gem bump --version #{version_type} " \
+     '&& bundle install ' \
+     '&& export LAST_MESSAGE="$(git log -1 --pretty=%B)" ' \
+     '&& git commit -a --amend -m "${LAST_MESSAGE} [ci skip]"'
 end

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "rake_dependencies"
+require 'bundler/setup'
+require 'rake_dependencies'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "rake_dependencies"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/rake_dependencies/extractors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'zip'
 require 'zlib'
 require 'pathname'
@@ -6,6 +8,8 @@ require 'archive/tar/minitar'
 module RakeDependencies
   module Extractors
     class ZipExtractor
+      attr_reader :file_path, :extract_path, :options
+
       def initialize(file_path, extract_path, options = {})
         @file_path = file_path
         @extract_path = extract_path
@@ -13,30 +17,92 @@ module RakeDependencies
       end
 
       def extract
-        FileUtils.mkdir_p(@extract_path)
-        Zip::File.open(@file_path) do |zip_file_entries|
-          zip_file_entries.restore_permissions = true
-          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)
+        create_extract_directory
+        extract_files
+
+        return unless requires_rename?
+
+        rename(
+          relative_to_extract_directory(rename_from),
+          relative_to_extract_directory(rename_to)
+        )
+      end
 
-            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)
+      private
+
+      def extract_files
+        Zip::File.open(file_path) do |zip_file_entries|
+          zip_file_entries.each do |entry|
+            process_zip_file_entry(zip_file_entries, entry)
           end
         end
-        if @options[:rename_from] && @options[:rename_to]
-          FileUtils.mkdir_p(
-              File.dirname(File.join(@extract_path, @options[:rename_to])))
-          FileUtils.mv(
-              File.join(@extract_path, @options[:rename_from]),
-              File.join(@extract_path, @options[:rename_to]))
-        end
+      end
+
+      def process_zip_file_entry(zip_file_entries, entry)
+        target_path = relative_to_extract_directory(target_pathname(entry))
+        create_base_directory(target_path)
+        extract_file_if_needed(zip_file_entries, entry, target_path)
+      end
+
+      def extract_file_if_needed(zip_file_entries, entry, target_path)
+        return if File.exist?(target_path)
+
+        zip_file_entries.extract(entry, target_path)
+      end
+
+      def requires_rename?
+        rename_from && rename_to
+      end
+
+      def relative_to_extract_directory(path)
+        File.join(extract_path, path)
+      end
+
+      def create_base_directory(path)
+        FileUtils.mkdir_p(File.dirname(path))
+      end
+
+      def create_extract_directory
+        FileUtils.mkdir_p(extract_path)
+      end
+
+      def move(from, to)
+        FileUtils.mv(from, to)
+      end
+
+      def rename(from, to)
+        create_base_directory(to)
+        move(from, to)
+      end
+
+      def target_pathname(entry)
+        entry_pathname(entry).relative_path_from(strip_pathname)
+      end
+
+      def strip_pathname
+        Pathname.new(strip_path)
+      end
+
+      def entry_pathname(entry)
+        Pathname.new(entry.name)
+      end
+
+      def rename_to
+        options[:rename_to]
+      end
+
+      def rename_from
+        options[:rename_from]
+      end
+
+      def strip_path
+        options[:strip_path] || ''
       end
     end
 
     class TarGzExtractor
+      attr_reader :file_path, :extract_path, :options
+
       def initialize(file_path, extract_path, options = {})
         @file_path = file_path
         @extract_path = extract_path
@@ -44,33 +110,94 @@ module RakeDependencies
       end
 
       def extract
-        FileUtils.mkdir_p(@extract_path)
-        Zlib::GzipReader.open(@file_path) do |tar_file|
+        create_extract_directory
+        extract_files
+
+        return unless requires_rename?
+
+        rename(
+          relative_to_extract_directory(rename_from),
+          relative_to_extract_directory(rename_to)
+        )
+      end
+
+      private
+
+      def extract_files
+        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
+            tar_file_entries.each(&method(:process_tar_file_entry))
           end
         end
-        if @options[:rename_from] && @options[:rename_to]
-          FileUtils.mkdir_p(
-              File.dirname(File.join(@extract_path, @options[:rename_to])))
-          FileUtils.mv(
-              File.join(@extract_path, @options[:rename_from]),
-              File.join(@extract_path, @options[:rename_to]))
+      end
+
+      def process_tar_file_entry(entry)
+        target_path = relative_to_extract_directory(target_pathname(entry))
+        create_base_directory(target_path)
+        extract_file_if_needed(entry, target_path)
+      end
+
+      def extract_file_if_needed(entry, target_path)
+        return unless entry.file? && !File.exist?(target_path)
+
+        File.open(target_path, 'w', entry.mode) do |f|
+          f.write(entry.read)
         end
       end
+
+      def requires_rename?
+        rename_from && rename_to
+      end
+
+      def relative_to_extract_directory(path)
+        File.join(extract_path, path)
+      end
+
+      def create_base_directory(path)
+        FileUtils.mkdir_p(File.dirname(path))
+      end
+
+      def create_extract_directory
+        FileUtils.mkdir_p(extract_path)
+      end
+
+      def move(from, to)
+        FileUtils.mv(from, to)
+      end
+
+      def rename(from, to)
+        create_base_directory(to)
+        move(from, to)
+      end
+
+      def target_pathname(entry)
+        entry_pathname(entry).relative_path_from(strip_pathname)
+      end
+
+      def strip_pathname
+        Pathname.new(strip_path)
+      end
+
+      def entry_pathname(entry)
+        Pathname.new(entry.name)
+      end
+
+      def rename_to
+        options[:rename_to]
+      end
+
+      def rename_from
+        options[:rename_from]
+      end
+
+      def strip_path
+        options[:strip_path] || ''
+      end
     end
 
     class UncompressedExtractor
+      attr_reader :file_path, :extract_path, :options
+
       def initialize(file_path, extract_path, options = {})
         @file_path = file_path
         @extract_path = extract_path
@@ -78,13 +205,39 @@ module RakeDependencies
       end
 
       def extract
-        target_name = @options[:rename_to] || File.basename(@file_path)
-        source = @file_path
-        destination = File.join(@extract_path, target_name)
+        target_name = rename_to || file_name
+        source_path = file_path
+        target_path = relative_to_extract_directory(target_name)
+
+        create_extract_directory
+        move(source_path, target_path)
+        fix_permissions(target_path)
+      end
+
+      private
+
+      def file_name
+        File.basename(file_path)
+      end
+
+      def fix_permissions(target_path)
+        FileUtils.chmod(0o755, target_path)
+      end
+
+      def move(source_path, target_path)
+        FileUtils.cp(source_path, target_path)
+      end
+
+      def relative_to_extract_directory(path)
+        File.join(extract_path, path)
+      end
+
+      def create_extract_directory
+        FileUtils.mkdir_p(extract_path)
+      end
 
-        FileUtils.mkdir_p(@extract_path)
-        FileUtils.cp(source, destination)
-        FileUtils.chmod(0755, destination)
+      def rename_to
+        options[:rename_to]
       end
     end
   end

data/lib/rake_dependencies/kernel_extensions.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'rake_factory/kernel_extensions'

data/lib/rake_dependencies/platform_names.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module RakeDependencies
+  # rubocop:disable Naming/VariableNumber
   module PlatformNames
     CPU = {
       x86_64: 'amd64',
@@ -6,12 +9,13 @@ module RakeDependencies
       x86: '386',
       arm: 'arm',
       arm64: 'arm64'
-    }
+    }.freeze
     OS = {
       darwin: 'darwin',
       linux: 'linux',
       mswin32: 'windows',
       mswin64: 'windows'
-    }
+    }.freeze
   end
+  # rubocop:enable Naming/VariableNumber
 end