rake_ssh 0.7.0.pre.6 → 0.7.0.pre.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdab481e136bb9876915a04339a62a02a5c5de5a435ecab6ef4bcc1f9e548391
-  data.tar.gz: 8cd1dff0b82431144b4e99695282dfbd9b70bca19032ec692ae0552ae7351306
+  metadata.gz: ee17b90bceb1fb3a6bc9f88e8238af250fdfafa6e56c84eccc9f2d7c16282016
+  data.tar.gz: eb25edf3bd730d8c95ef478919fd80a4b725a249d36d5398693bc24feac4cda4
 SHA512:
-  metadata.gz: 710e0fdba8e8abaf5b1a112408a65c9e12253cc39245804686b71606e1be956c2246e77a77946cb2f3e071a8ba35dd053640768633626fdc77bc8cf1209f473f
-  data.tar.gz: 33059fb26a43a959e8062cc16fc9aa0e1e3dc529f3394a136654e3dc036672f985bf0fb818752174f2c7cce302f069d24469681eff7ff6ce50c55a60f8956ce5
+  metadata.gz: 7da275fa1738adf26a5cdcc7533e61f9cf742eaacfdeacccf16334ce50a1ebee8dbebd929ae5f2e6d8b2032fe349f8caedf6a5d13cc6c1baa6395e759feba22a
+  data.tar.gz: e3c666e1e70717f344bc1810d2341a91d920e7705caef62a51076dc25a2f8101ad225925f27739595d36408fe6d5e21c111df96907473a4334680446e30a7808

data/Gemfile

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake_ssh (0.7.0.pre.6)
+    rake_ssh (0.7.0.pre.7)
       colored2 (~> 3.1)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
@@ -16,6 +16,7 @@ GEM
       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)
     diff-lcs (1.5.0)
@@ -59,7 +60,11 @@ GEM
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
+    parallel (1.22.1)
+    parser (3.1.1.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)
@@ -77,6 +82,8 @@ GEM
     rake_gpg (0.16.0)
       rake_factory (>= 0.23, < 1)
       ruby_gpg2 (>= 0.6, < 1)
+    regexp_parser (2.2.1)
+    rexml (3.2.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
@@ -90,6 +97,22 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
+    rubocop (1.27.0)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.16.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.9.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     ruby_gpg2 (0.8.0)
       lino (>= 1.5)
@@ -105,6 +128,7 @@ GEM
     sshkey (2.0.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
@@ -120,7 +144,10 @@ DEPENDENCIES
   rake_gpg
   rake_ssh!
   rspec
+  rubocop
+  rubocop-rake
+  rubocop-rspec
   simplecov
 
 BUNDLED WITH
-   2.3.9
+   2.3.11

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_ssh CI Key')
+      output_directory: 'config/secrets/ci',
+      name_prefix: 'gpg',
+      owner_name: 'InfraBlocks Maintainers',
+      owner_email: 'maintainers@infrablocks.io',
+      owner_comment: 'rake_ssh 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_ssh'
+  namespace: :circle_ci,
+  project_slug: 'github/infrablocks/rake_ssh'
 ) 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_ssh',
+  namespace: :github,
+  repository: 'infrablocks/rake_ssh'
 ) 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_ssh"
+require 'bundler/setup'
+require 'rake_ssh'
 
 # 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_ssh"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/rake_ssh/task_sets/key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 
 require_relative '../tasks'
@@ -9,7 +11,7 @@ module RakeSSH
 
       parameter :path, required: true
       parameter :name_prefix, default: 'ssh'
-      parameter :type, default: "RSA"
+      parameter :type, default: 'RSA'
       parameter :bits, default: 4096
       parameter :comment
       parameter :passphrase
@@ -17,9 +19,9 @@ module RakeSSH
       parameter :generate_task_name, default: :generate
 
       task Tasks::Key::Generate,
-          name: RakeFactory::DynamicValue.new { |ts|
-            ts.generate_task_name
-          }
+           name: RakeFactory::DynamicValue.new { |ts|
+             ts.generate_task_name
+           }
     end
   end
 end

data/lib/rake_ssh/task_sets.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require_relative 'task_sets/key'

data/lib/rake_ssh/tasks/key/generate.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 require 'sshkey'
 
@@ -6,24 +8,27 @@ module RakeSSH
     module Key
       class Generate < RakeFactory::Task
         default_name :generate
-        default_description RakeFactory::DynamicValue.new { |t|
+        default_description(RakeFactory::DynamicValue.new do |t|
           "Generates an SSH key pair in #{t.path}"
-        }
+        end)
 
         parameter :path, required: true
         parameter :name_prefix, default: 'ssh'
-        parameter :type, default: "RSA"
+        parameter :type, default: 'RSA'
         parameter :bits, default: 4096
         parameter :comment
         parameter :passphrase
 
         action do |t|
-          print "Generating SSH key '#{t.name_prefix}' in '#{t.path}'... "
+          $stdout.print(
+            "Generating SSH key '#{t.name_prefix}' in '#{t.path}'..."
+          )
           key = SSHKey.generate(
-              type: t.type,
-              bits: t.bits,
-              comment: t.comment,
-              passphrase: t.passphrase)
+            type: t.type,
+            bits: t.bits,
+            comment: t.comment,
+            passphrase: t.passphrase
+          )
           verbose(false) do
             mkdir_p(t.path)
           end
@@ -33,7 +38,9 @@ module RakeSSH
           File.open("#{t.path}/#{t.name_prefix}.public", 'w') do |f|
             f.write(key.ssh_public_key)
           end
-          puts "Done."
+          puts 'Done.'
+
+          $stdout.puts 'Done.'
         end
       end
     end

data/lib/rake_ssh/tasks/key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'key/generate'
 
 module RakeSSH

data/lib/rake_ssh/tasks.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require_relative 'tasks/key'
 
 module RakeSSH
   module Tasks
   end
-end
+end

data/lib/rake_ssh/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RakeSSH
-  VERSION = '0.7.0.pre.6'
+  VERSION = '0.7.0.pre.7'
 end

data/lib/rake_ssh.rb

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

data/rake_ssh.gemspec

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'rake_ssh/version'
+
+files = %w[
+  bin
+  lib
+  CODE_OF_CONDUCT.md
+  rake_ssh.gemspec
+  Gemfile
+  LICENSE.txt
+  Rakefile
+  README.md
+]
+
+Gem::Specification.new do |spec|
+  spec.name = 'rake_ssh'
+  spec.version = RakeSSH::VERSION
+  spec.authors = ['InfraBlocks Maintainers']
+  spec.email = ['maintainers@infrablocks.io']
+
+  spec.summary = 'Rake tasks for managing SSH keys.'
+  spec.description = 'Allows generation of SSH keys.'
+  spec.homepage = 'https://github.com/infrablocks/rake_ssh'
+  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 'colored2', '~> 3.1'
+  spec.add_dependency 'rake_factory', '~> 0.23'
+  spec.add_dependency 'sshkey', '~> 2.0'
+
+  spec.add_development_dependency 'activesupport'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'gem-release'
+  spec.add_development_dependency 'memfs'
+  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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rake_ssh
 version: !ruby/object:Gem::Version
-  version: 0.7.0.pre.6
+  version: 0.7.0.pre.7
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-04-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: colored2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rake_factory
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: colored2
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: memfs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake_ssh
+  name: rake_gpg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake_gpg
+  name: rake_ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: gem-release
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: memfs
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -228,10 +270,12 @@ files:
 - lib/rake_ssh/tasks/key.rb
 - lib/rake_ssh/tasks/key/generate.rb
 - lib/rake_ssh/version.rb
+- rake_ssh.gemspec
 homepage: https://github.com/infrablocks/rake_ssh
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'false'
 post_install_message: 
 rdoc_options: []
 require_paths: