rake_ssh 0.1.0.pre.4 → 0.5.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e94e07148acd5e4b2bd86110babd8a06784bb31ba35b7ba22936c4c0b59944f
-  data.tar.gz: e60dbdd86fc58fa74c8c29b562037623ef9509bc406e888bcea002d1637d0a0d
+  metadata.gz: 2f0867ef2cae7f1b45a7ed84ac3700450bd8cd2ba94d6ef44df582acb4453853
+  data.tar.gz: 1e2e962a832e6271f93e7c4cbe508f4b1fd31fafaed1c6d38ad9e5eb2c2ea5cf
 SHA512:
-  metadata.gz: 29a52f6c790e8e69453ae60742e2c429ab40db10fe11c513d071bb0d35761009e0e4c81b81a36851781508bdb3be53de58adda315304f4252fbec2892b58ea5c
-  data.tar.gz: def63f178f9b720d7acc875d90c9b9d07e60f7d462435a4042afd436b308d0f49a0b980f2fc79c9bab9833e689af0386138d1c396015ca92428378b8b637bbaa
+  metadata.gz: c98f87657a81fade9438f06f1799b2b13935eabdbdf53eaa308f53fe7cebe488023ed158ca95551483e6fa3d62da7c49b25ce5dc73e8a1b2dcd633f78ac0c014
+  data.tar.gz: 910e665fafce847cf75e36f2a7cea6cf83f642c1ffa8be63685ebbeeaa396667b8301923b6fe146f18d47bd891ef946714c77bcbe863bf0cb57c7d0ca34ce059

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake_ssh (0.1.0.pre.4)
+    rake_ssh (0.5.0.pre.1)
       colored2 (~> 3.1)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
@@ -9,7 +9,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.1)
+    activesupport (5.2.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -20,29 +20,29 @@ GEM
     concurrent-ruby (1.1.6)
     diff-lcs (1.3)
     docile (1.3.2)
-    excon (0.72.0)
-    faraday (1.0.0)
+    excon (0.73.0)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     gem-release (2.1.1)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     memfs (1.0.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
     multipart-post (2.1.1)
-    octokit (4.17.0)
+    octokit (4.18.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    public_suffix (4.0.3)
+    public_suffix (4.0.5)
     rake (13.0.1)
-    rake_circle_ci (0.3.0)
+    rake_circle_ci (0.7.0)
       colored2 (~> 3.1)
       excon (~> 0.72)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
-    rake_factory (0.25.0)
+    rake_factory (0.27.0)
       activesupport (>= 4)
       rake (~> 13.0)
-    rake_github (0.2.0.pre.6)
+    rake_github (0.5.0)
       colored2 (~> 3.1)
       octokit (~> 4.16)
       rake_factory (~> 0.23)
@@ -51,15 +51,15 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
@@ -69,7 +69,7 @@ GEM
     simplecov-html (0.12.2)
     sshkey (2.0.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -82,7 +82,7 @@ DEPENDENCIES
   memfs (~> 1.0)
   rake (~> 13.0)
   rake_circle_ci (~> 0.3)
-  rake_github (= 0.2.0.pre.6)
+  rake_github (~> 0.3)
   rake_ssh!
   rspec (~> 3.9)
   simplecov (~> 0.16)

data/Rakefile

@@ -1,11 +1,18 @@
 require 'yaml'
 require 'rake_circle_ci'
 require 'rake_github'
-require "rspec/core/rake_task"
+require 'rake_ssh'
+require 'rspec/core/rake_task'
+
+task :default => :spec
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+RakeSSH.define_key_tasks(
+    namespace: :deploy_key,
+    path: 'config/secrets/ci/',
+    comment: 'maintainers@infrablocks.io'
+)
 
 RakeCircleCI.define_project_tasks(
     namespace: :circle_ci,
@@ -22,37 +29,38 @@ RakeCircleCI.define_project_tasks(
   }
   t.ssh_keys = [
       {
-          private_key: File.read('config/secrets/ci/ssh.private'),
-          hostname: "github.com"
+          hostname: "github.com",
+          private_key: File.read('config/secrets/ci/ssh.private')
       }
   ]
 end
 
-namespace :github do
-  namespace :deploy_key do
-    RakeGithub.define_deploy_key_tasks(
-        repository: 'infrablocks/rake_ssh',
-        title: 'CircleCI'
-    ) do |t|
-      github_config =
-          YAML.load_file('config/secrets/github/config.yaml')
+RakeGithub.define_repository_tasks(
+    namespace: :github,
+    repository: 'infrablocks/rake_ssh',
+) do |t|
+  github_config =
+      YAML.load_file('config/secrets/github/config.yaml')
 
-      t.access_token = github_config["github_personal_access_token"]
-      t.public_key = File.read('config/secrets/ci/ssh.public')
-    end
-  end
+  t.access_token = github_config["github_personal_access_token"]
+  t.deploy_keys = [
+      {
+          title: 'CircleCI',
+          public_key: File.read('config/secrets/ci/ssh.public')
+      }
+  ]
 end
 
 namespace :pipeline do
   task :prepare => [
       :'circle_ci:env_vars:ensure',
       :'circle_ci:ssh_keys:ensure',
-      :'github:deploy_key: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

data/lib/rake_ssh.rb

@@ -1,5 +1,9 @@
 require 'rake_ssh/version'
 require 'rake_ssh/tasks'
+require 'rake_ssh/task_sets'
 
 module RakeSSH
+  def self.define_key_tasks(opts = {}, &block)
+    RakeSSH::TaskSets::Key.define(opts, &block)
+  end
 end

data/lib/rake_ssh/task_sets.rb

@@ -0,0 +1 @@
+require_relative 'task_sets/key'

data/lib/rake_ssh/task_sets/key.rb

@@ -0,0 +1,25 @@
+require 'rake_factory'
+
+require_relative '../tasks'
+
+module RakeSSH
+  module TaskSets
+    class Key < RakeFactory::TaskSet
+      prepend RakeFactory::Namespaceable
+
+      parameter :path, required: true
+      parameter :name_prefix, default: 'ssh'
+      parameter :type, default: "RSA"
+      parameter :bits, default: 4096
+      parameter :comment
+      parameter :passphrase
+
+      parameter :generate_task_name, default: :generate
+
+      task Tasks::Key::Generate,
+          name: RakeFactory::DynamicValue.new { |ts|
+            ts.generate_task_name
+          }
+    end
+  end
+end

data/lib/rake_ssh/version.rb

@@ -1,3 +1,3 @@
 module RakeSSH
-  VERSION = '0.1.0.pre.4'
+  VERSION = '0.5.0.pre.1'
 end

data/rake_ssh.gemspec

@@ -30,7 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rake_circle_ci', '~> 0.3'
-  spec.add_development_dependency 'rake_github', '0.2.0.pre.6'
+  spec.add_development_dependency 'rake_github', '~> 0.3'
+  spec.add_development_dependency 'rake_ssh', '~> 0.2'
   spec.add_development_dependency 'rspec', '~> 3.9'
   spec.add_development_dependency 'gem-release', '~> 2.0'
   spec.add_development_dependency 'activesupport', '~> 5.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_ssh
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.4
+  version: 0.5.0.pre.1
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake_factory
@@ -98,16 +98,30 @@ dependencies:
   name: rake_github
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre.6
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: rake_ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre.6
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -213,6 +227,8 @@ files:
 - config/secrets/rubygems/credentials
 - go
 - lib/rake_ssh.rb
+- lib/rake_ssh/task_sets.rb
+- lib/rake_ssh/task_sets/key.rb
 - lib/rake_ssh/tasks.rb
 - lib/rake_ssh/tasks/key.rb
 - lib/rake_ssh/tasks/key/generate.rb