rake_gpg 0.8.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d31b03b13d2df23b40e74620d127e22fc5761ddda3042f6e1dfe85a6bd515e0a
-  data.tar.gz: 42725740b5fa19e324b93c4f7ad90ec1e3c5beb54f100a5a41c92c406cf11ec2
+  metadata.gz: c5b7a0a2ff824a044c8c167253fb105591b2513449a03b2db74fae54d1bfd43a
+  data.tar.gz: 7e6ab087c7b3735bf47fd47b668452b75fa27e08178847e64abd68474b2a5b18
 SHA512:
-  metadata.gz: ee66af1dda73a73b538a9970b7025bfc0a3714634822c9ca58060bea3c60b0cbc4b16ea4635ed67fe8ce730b82736717eab7eeba75c9098386c0d342e65d8b8b
-  data.tar.gz: bf3d36a55eb58b37fe22f7950b533dada89b2b6761a752d8be90074981c15c7783fad662d193da1f6cf2c6c339f06f621e1dd7f9a2b1abf98583a755937d0445
+  metadata.gz: 5836b6dd38360cf20074d1847c4a819a1765dfa6beb96c9554f088f1c7984852d7fc1b8fe9dce99dc418f4e5ae7dbfc12992143356c0e717ac2cc45b0b4efb4c
+  data.tar.gz: 8e163a7783db4b817fdbdb925ef726b8851bf58b007148b10add02eb8b3c1095ce7c1fc8e00b7858fad4222591f320deda1c8f510a9e59e1f8e52e6b0f91ecce

data/Gemfile.lock

@@ -1,45 +1,46 @@
 PATH
   remote: .
   specs:
-    rake_gpg (0.8.0)
+    rake_gpg (0.12.0)
       rake_factory (>= 0.23, < 1)
-      ruby_gpg2 (>= 0.2, < 1)
+      ruby_gpg2 (>= 0.6, < 1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3)
+    activesupport (6.1.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
-    docile (1.3.2)
-    excon (0.73.0)
-    fakefs (1.2.2)
-    faraday (1.0.1)
+    concurrent-ruby (1.1.7)
+    diff-lcs (1.4.4)
+    docile (1.3.3)
+    excon (0.78.1)
+    fakefs (1.3.0)
+    faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
-    gem-release (2.1.1)
+      ruby2_keywords
+    gem-release (2.2.0)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    i18n (1.8.2)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    lino (1.3.0)
+    lino (1.5.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
-    minitest (5.14.0)
+    minitest (5.14.2)
     multipart-post (2.1.1)
-    octokit (4.18.0)
+    octokit (4.19.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    public_suffix (4.0.4)
-    rake (13.0.1)
+    public_suffix (4.0.6)
+    rake (13.0.2)
     rake_circle_ci (0.7.0)
       colored2 (~> 3.1)
       excon (~> 0.72)
@@ -57,37 +58,41 @@ GEM
       colored2 (~> 3.1)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    ruby_gpg2 (0.2.0)
-      lino (= 1.3.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
+    ruby2_keywords (0.0.2)
+    ruby_gpg2 (0.6.0)
+      lino (>= 1.5)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     semantic (1.6.1)
-    simplecov (0.18.5)
+    simplecov (0.20.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     sshkey (2.0.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    zeitwerk (2.3.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
+  x86_64-darwin-19
+  x86_64-linux
 
 DEPENDENCIES
   activesupport (>= 5.2)
@@ -104,4 +109,4 @@ DEPENDENCIES
   simplecov (~> 0.16)
 
 BUNDLED WITH
-   2.1.4
+   2.2.2

data/Rakefile

@@ -73,8 +73,5 @@ task :release do
 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}"
 end

data/lib/rake_gpg/home.rb

@@ -0,0 +1,19 @@
+module RakeGPG
+  class Home
+    def initialize(work_directory, home_directory)
+      @work_directory = work_directory
+      @home_directory = home_directory
+    end
+
+    def with_resolved_directory
+      if @home_directory == :temporary
+        Dir.mktmpdir('home', @work_directory) do |home_directory|
+          yield home_directory
+        end
+      else
+        FileUtils.mkdir_p(@home_directory)
+        yield @home_directory
+      end
+    end
+  end
+end

data/lib/rake_gpg/tasks/encryption/decrypt.rb

@@ -1,6 +1,8 @@
 require 'rake_factory'
 require 'ruby_gpg2'
 
+require_relative '../../home'
+
 module RakeGPG
   module Tasks
     module Encryption
@@ -12,7 +14,7 @@ module RakeGPG
         parameter :input_file_path, required: true
         parameter :output_file_path, required: true
 
-        parameter :work_directory, default: 'build/gpg'
+        parameter :work_directory, default: '/tmp'
         parameter :home_directory, default: :temporary
 
         parameter :trust_mode, default: :always
@@ -20,34 +22,26 @@ module RakeGPG
 
         action do |t|
           mkdir_p(t.work_directory)
-          if t.home_directory == :temporary
-            Dir.mktmpdir(
-                'home', t.work_directory) do |home_directory|
-              do_decrypt(t, home_directory)
-            end
-          else
-            mkdir_p(t.home_directory)
-            do_decrypt(t, t.home_directory)
-          end
-        end
 
-        private
-
-        def do_decrypt(t, home_directory)
           puts "Decrypting #{t.input_file_path} with key #{t.key_file_path}..."
-          RubyGPG2.import(
-              key_file_paths: [t.key_file_path],
-              work_directory: t.work_directory,
-              home_directory: home_directory)
-
-          RubyGPG2.decrypt(
-              input_file_path: t.input_file_path,
-              output_file_path: t.output_file_path,
-              home_directory: home_directory,
-              trust_mode: t.trust_mode,
-              passphrase: t.passphrase,
-              pinentry_mode: t.passphrase ? :loopback : nil,
-              without_passphrase: !t.passphrase)
+          Home.new(t.work_directory, t.home_directory)
+              .with_resolved_directory do |home_directory|
+            RubyGPG2.import(
+                key_file_paths: [t.key_file_path],
+                work_directory: t.work_directory,
+                home_directory: home_directory)
+
+            mkdir_p(File.dirname(t.output_file_path))
+
+            RubyGPG2.decrypt(
+                input_file_path: t.input_file_path,
+                output_file_path: t.output_file_path,
+                home_directory: home_directory,
+                trust_mode: t.trust_mode,
+                passphrase: t.passphrase,
+                pinentry_mode: t.passphrase ? :loopback : nil,
+                without_passphrase: !t.passphrase)
+          end
           puts "Done."
         end
       end

data/lib/rake_gpg/tasks/encryption/encrypt.rb

@@ -1,6 +1,8 @@
 require 'rake_factory'
 require 'ruby_gpg2'
 
+require_relative '../../home'
+
 module RakeGPG
   module Tasks
     module Encryption
@@ -12,7 +14,7 @@ module RakeGPG
         parameter :input_file_path, required: true
         parameter :output_file_path, required: true
 
-        parameter :work_directory, default: 'build/gpg'
+        parameter :work_directory, default: '/tmp'
         parameter :home_directory, default: :temporary
 
         parameter :armor, default: true
@@ -20,40 +22,32 @@ module RakeGPG
 
         action do |t|
           mkdir_p(t.work_directory)
-          if t.home_directory == :temporary
-            Dir.mktmpdir(
-                'home', t.work_directory) do |home_directory|
-              do_encrypt(t, home_directory)
-            end
-          else
-            mkdir_p(t.home_directory)
-            do_encrypt(t, t.home_directory)
-          end
-        end
 
-        private
-
-        def do_encrypt(t, home_directory)
           puts "Encrypting #{t.input_file_path} for key #{t.key_file_path}..."
-          result = RubyGPG2.import(
-              key_file_paths: [t.key_file_path],
-              work_directory: t.work_directory,
-              home_directory: home_directory,
-              with_status: true)
-
-          key_fingerprint = result
-              .status
-              .filter_by_type(:import_ok)
-              .first_line
-              .key_fingerprint
-
-          RubyGPG2.encrypt(
-              recipient: key_fingerprint,
-              input_file_path: t.input_file_path,
-              output_file_path: t.output_file_path,
-              home_directory: home_directory,
-              armor: t.armor,
-              trust_mode: t.trust_mode)
+          Home.new(t.work_directory, t.home_directory)
+              .with_resolved_directory do |home_directory|
+            result = RubyGPG2.import(
+                key_file_paths: [t.key_file_path],
+                work_directory: t.work_directory,
+                home_directory: home_directory,
+                with_status: true)
+
+            key_fingerprint = result
+                .status
+                .filter_by_type(:import_ok)
+                .first_line
+                .key_fingerprint
+
+            mkdir_p(File.dirname(t.output_file_path))
+
+            RubyGPG2.encrypt(
+                recipient: key_fingerprint,
+                input_file_path: t.input_file_path,
+                output_file_path: t.output_file_path,
+                home_directory: home_directory,
+                armor: t.armor,
+                trust_mode: t.trust_mode)
+          end
           puts "Done."
         end
       end

data/lib/rake_gpg/tasks/keys/generate.rb

@@ -1,6 +1,8 @@
 require 'rake_factory'
 require 'ruby_gpg2'
 
+require_relative '../../home'
+
 module RakeGPG
   module Tasks
     module Keys
@@ -11,7 +13,7 @@ module RakeGPG
         parameter :name_prefix, default: 'gpg'
         parameter :armor, default: true
 
-        parameter :work_directory, default: 'build/gpg'
+        parameter :work_directory, default: '/tmp'
         parameter :home_directory, default: :temporary
         parameter :output_directory
 
@@ -29,62 +31,48 @@ module RakeGPG
 
         action do |t|
           mkdir_p(t.work_directory)
-          if t.home_directory == :temporary
-            Dir.mktmpdir(
-                'home', t.work_directory) do |home_directory|
-              do_generate_key(t, home_directory)
-            end
-          else
-            mkdir_p(t.home_directory)
-            do_generate_key(t, t.home_directory)
-          end
-        end
-
-        private
 
-        def do_generate_key(t, home_directory)
           puts "Generating GPG key for #{t.owner_name} <#{t.owner_email}>..."
+          Home.new(t.work_directory, t.home_directory)
+              .with_resolved_directory do |home_directory|
+            mkdir_p t.output_directory if t.output_directory
 
-          mkdir_p t.work_directory
-          mkdir_p t.output_directory if t.output_directory
-          mkdir_p home_directory if home_directory
-
-          result = RubyGPG2::ParameterFileContents
-              .new(t.parameter_values)
-              .in_temp_file(t.work_directory) do |f|
-            RubyGPG2.generate_key(
-                parameter_file_path: f.path,
-                home_directory: home_directory,
-                work_directory: t.work_directory,
-                without_passphrase: t.passphrase.nil?,
-                with_status: true)
-          end
+            result = RubyGPG2::ParameterFileContents
+                .new(t.parameter_values)
+                .in_temp_file(t.work_directory) do |f|
+              RubyGPG2.generate_key(
+                  parameter_file_path: f.path,
+                  home_directory: home_directory,
+                  work_directory: t.work_directory,
+                  without_passphrase: t.passphrase.nil?,
+                  with_status: true)
+            end
 
-          key_fingerprint = result
-              .status
-              .filter_by_type(:key_created)
-              .first_line
-              .key_fingerprint
+            key_fingerprint = result
+                .status
+                .filter_by_type(:key_created)
+                .first_line
+                .key_fingerprint
 
-          puts "Generated GPG key with fingerprint #{key_fingerprint}."
+            puts "Generated GPG key with fingerprint #{key_fingerprint}."
 
-          if t.output_directory
-            puts 'Export requested. ' +
-                "Exporting GPG key to #{t.output_directory}..."
-            RubyGPG2.export(
-                names: [key_fingerprint],
-                output_file_path:
-                    "#{t.output_directory}/#{t.name_prefix}.public",
-                armor: t.armor,
-                home_directory: home_directory)
-            RubyGPG2.export_secret_keys(
-                names: [key_fingerprint],
-                output_file_path:
-                    "#{t.output_directory}/#{t.name_prefix}.private",
-                armor: t.armor,
-                home_directory: home_directory)
+            if t.output_directory
+              puts 'Export requested. ' +
+                  "Exporting GPG key to #{t.output_directory}..."
+              RubyGPG2.export(
+                  names: [key_fingerprint],
+                  output_file_path:
+                      "#{t.output_directory}/#{t.name_prefix}.public",
+                  armor: t.armor,
+                  home_directory: home_directory)
+              RubyGPG2.export_secret_keys(
+                  names: [key_fingerprint],
+                  output_file_path:
+                      "#{t.output_directory}/#{t.name_prefix}.private",
+                  armor: t.armor,
+                  home_directory: home_directory)
+            end
           end
-
           puts "Done."
         end
       end

data/lib/rake_gpg/tasks/keys/import.rb

@@ -1,6 +1,8 @@
 require 'rake_factory'
 require 'ruby_gpg2'
 
+require_relative '../../home'
+
 module RakeGPG
   module Tasks
     module Keys
@@ -9,31 +11,20 @@ module RakeGPG
         default_description "Import a GPG key"
 
         parameter :key_file_path, required: true
-        parameter :work_directory, default: 'build/gpg'
+        parameter :work_directory, default: '/tmp'
         parameter :home_directory, default: :temporary
 
         action do |t|
           mkdir_p(t.work_directory)
-          if t.home_directory == :temporary
-            Dir.mktmpdir(
-                'home', t.work_directory) do |home_directory|
-              do_import_key(t, home_directory)
-            end
-          else
-            mkdir_p(t.home_directory)
-            do_import_key(t, t.home_directory)
-          end
-
-        end
-
-        private
 
-        def do_import_key(t, home_directory)
           puts "Importing GPG key from #{t.key_file_path} " +
               "into #{home_directory}..."
-          RubyGPG2.import(
-              key_file_paths: [t.key_file_path],
-              home_directory: home_directory)
+          Home.new(t.work_directory, t.home_directory)
+              .with_resolved_directory do |home_directory|
+            RubyGPG2.import(
+                key_file_paths: [t.key_file_path],
+                home_directory: home_directory)
+          end
           puts "Done."
         end
       end

data/lib/rake_gpg/version.rb

@@ -1,3 +1,3 @@
 module RakeGPG
-  VERSION = '0.8.0'
+  VERSION = '0.12.0'
 end

data/rake_gpg.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.6.0'
 
   spec.add_dependency 'rake_factory', '>= 0.23', '< 1'
-  spec.add_dependency 'ruby_gpg2', '>= 0.2', '< 1'
+  spec.add_dependency 'ruby_gpg2', '>= 0.6', '< 1'
 
   spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'rake', '~> 13.0'

data/scripts/ci/steps/prerelease.sh

@@ -10,6 +10,11 @@ PROJECT_DIR="$( cd "$SCRIPT_DIR/../../.." && pwd )"
 cd "$PROJECT_DIR"
 
 ./go version:bump[pre]
+
+bundle install
+LAST_MESSAGE="$(git log -1 --pretty=%B)"
+git commit -a --amend -m "${LAST_MESSAGE} [ci skip]"
+
 ./go release
 
 git status

data/scripts/ci/steps/release.sh

@@ -12,6 +12,11 @@ cd "$PROJECT_DIR"
 git pull
 
 ./go version:bump[minor]
+
+bundle install
+LAST_MESSAGE="$(git log -1 --pretty=%B)"
+git commit -a --amend -m "${LAST_MESSAGE} [ci skip]"
+
 ./go release
 
 git status

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_gpg
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-09 00:00:00.000000000 Z
+date: 2020-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake_factory
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.6'
     - - "<"
       - !ruby/object:Gem::Version
         version: '1'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.6'
     - - "<"
       - !ruby/object:Gem::Version
         version: '1'
@@ -241,6 +241,7 @@ files:
 - config/secrets/rubygems/credentials
 - go
 - lib/rake_gpg.rb
+- lib/rake_gpg/home.rb
 - lib/rake_gpg/tasks.rb
 - lib/rake_gpg/tasks/encryption.rb
 - lib/rake_gpg/tasks/encryption/decrypt.rb