capistrano-ejson 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c508f0f64861473322c5f44bb0ba0b325d7cf8e9
-  data.tar.gz: 8c1ceb4a0594e5291fb669d77e56de4021f37a6f
+SHA256:
+  metadata.gz: 961237d6e1239b05819dca1fd6cbfed446728613a6bee4e6cca13af7438a6d47
+  data.tar.gz: f39cd5ec5ebff741c54dca5e446ac128e075711279a264252184ae288c1bceca
 SHA512:
-  metadata.gz: 19c8a6b8bc027c0d067bd7fe5d2f29e95b700eef11f3c566e4d1267717b9163fadb0b2f5d0c297312177978c06f7586b95771129e787044121c9c8eb2057e4a3
-  data.tar.gz: 906aa68770018c0b2ea96ecee2dbd6a8ba45de95c4cc40d09b391799acdf2a509d1f4a7caed9874a6e8ed73f87737905084d40eceecc524fd44376f975f49d98
+  metadata.gz: 814787e35197eff42a3de0788c01027cab0e6e5f474ee6b69b97029c368c0fe13cf69905caa430e209b1e2caff886483f17c6e7053781135c2038e40d917da25
+  data.tar.gz: df5547b41b166850fb78f2ab126949b7c63871c0c3cf5f909f89299a3bab1f2d6c51c7de9827620ca06f37febd40fb4a67e3a89dcf3779c175424a84bf6dd7c8

data/capistrano-ejson.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "capistrano-ejson"
-  spec.version       = "1.0.1"
+  spec.version       = "1.1.0"
   spec.authors       = ["Bouke van der Bijl"]
   spec.email         = ["bouke@shopify.com"]
   spec.description = spec.summary = %q{Automatic EJSON decryption for Capistrano}
@@ -19,6 +19,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'capistrano', '~> 3.1'
   spec.add_dependency 'ejson', '~> 1.0', '>= 1.0.0'
 
-  spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 end

data/lib/capistrano/tasks/ejson.cap

@@ -8,23 +8,22 @@ namespace :ejson do
     ejson_file_mode = fetch(:ejson_file_mode)
     ejson_output_file = fetch(:ejson_output_file)
     ejson_deploy_mode = fetch(:ejson_deploy_mode)
+    ejson_keydir = fetch(:ejson_keydir)
 
     case ejson_deploy_mode
     when :local
-      Open3.popen3('bundle', 'exec', 'ejson', 'decrypt', ejson_file) do |stdin, stdout, stderr, wait_thr|
-        if wait_thr.value == 0
-          contents = stdout.read
-          on release_roles(:all) do
-            upload! StringIO.new(contents), File.join(release_path, ejson_output_file), mode: ejson_file_mode
-          end
-        else
-          raise "Failed to decrypt file #{stderr.read}"
+      out, err, status = Open3.capture3('bundle', 'exec', 'ejson', '--keydir', ejson_keydir, 'decrypt', ejson_file)
+      if status.exitstatus == 0
+        on release_roles(:all) do
+          upload! StringIO.new(out), File.join(release_path, ejson_output_file), mode: ejson_file_mode
         end
+      else
+        raise "Failed to decrypt file #{err}"
       end
     when :remote
       on release_roles(:all) do
         within release_path do
-          execute :ejson, :decrypt, "-o", ejson_output_file, ejson_file
+          execute :ejson, "--keydir", ejson_keydir, :decrypt, "-o", ejson_output_file, ejson_file
         end
       end
     else
@@ -41,5 +40,6 @@ namespace :load do
     set :ejson_file_mode, nil
     set :ejson_output_file, 'config/secrets.json'
     set :ejson_deploy_mode, :local
+    set :ejson_keydir, '/opt/ejson/keys'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-ejson
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Bouke van der Bijl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2019-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -28,36 +28,22 @@ dependencies:
   name: ejson
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -107,8 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Automatic EJSON decryption for Capistrano