secrets_cli 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41cffe43e06f96024a6b43e14fd0275356cae792
-  data.tar.gz: d39b1dc108e9f91b9caa8510aa63e55890bce4ee
+  metadata.gz: 16774bc319041eaa7626b8fa5d549e177fe32a7b
+  data.tar.gz: 9fe08ca8f65f426885b8c520f77b0eacb1384a9b
 SHA512:
-  metadata.gz: ac80e54dcc81d6d8686b103526c3af194c0e6f3b9046e1703367c7a475c93146de9c1fc23317923679329e132df4598b05aba08cff918b9473f12f38dc87ac6f
-  data.tar.gz: 41d68aaff94847923a925b202ac1f5806a315f502d7ab1361c23e5f129e041322b6174c1a567df1834a3bbf51e29d5b9c215c064028ae86baa4908d095161417
+  metadata.gz: 102a529eea123fae032c33f514ec6ac82acf1da7b26c093e488a2c7ec2bf40fdfda790db14d3dd197ac6e4e71d608b15dc227b69e19afe3761a09e6c837dc9e5
+  data.tar.gz: b2685901af34edf2ec657471648961b0b9034c9e27b75ccc291dcc4d07faad8d2d9697f905e0bdaed175204e3873e8993548e42d1316144895b3697346774896

data/exe/secrets

@@ -5,6 +5,8 @@ require 'rubygems'
 require 'commander/import'
 require 'secrets_cli'
 
+require 'pry' if ENV['SECRETS_ENV'] == 'dev'
+
 program :version, SecretsCli::VERSION
 program :description, 'CLI for vault'
 

data/lib/secrets_cli/helpers.rb

@@ -25,5 +25,17 @@ module SecretsCli
     def print_verbose(message)
       puts pastel.cyan(message)
     end
+
+    def pretty_diff(diff)
+      diff.each_line do |line|
+        case line[0]
+        when '+' then prompt.ok(line, newline: false)
+        when '-' then prompt.error(line, newline: false)
+        else
+          puts line
+        end
+      end
+      puts
+    end
   end
 end

data/lib/secrets_cli/vault/pull.rb

@@ -14,9 +14,22 @@ module SecretsCli
 
       def command
         secrets = super
+        compare(secrets)
+        write(secrets)
+        secrets
+      end
+
+      def compare(secrets)
+        diff = TTY::File.diff(secrets_file, secrets, verbose: false)
+        return if diff == ''
+        prompt.ok("There are some differences between #{secrets_file} and vault:")
+        pretty_diff(diff)
+        exit 0 unless prompt.yes?("Are you sure you want to override #{secrets_file}?")
+      end
+
+      def write(secrets)
         print_verbose("Writing to #{secrets_file}")
         File.open(File.join(secrets_dir, secrets_file), 'w') { |file| file.write(secrets) }
-        secrets
       end
     end
   end

data/lib/secrets_cli/vault/push.rb

@@ -13,6 +13,7 @@ module SecretsCli
 
       def call
         return if !options.without_prompt && !are_you_sure?
+        compare
         super
       end
 
@@ -23,8 +24,18 @@ module SecretsCli
         secrets
       end
 
+      def compare
+        secrets = ::Vault.logical.read(secrets_full_storage_key)
+        secrets = secrets.nil? ? ' ' : secrets.data[SECRETS_FIELD]
+        diff = TTY::File.diff(secrets, secrets_file, verbose: false)
+        return if diff == ''
+        prompt.ok("There are some differences between #{secrets_file} and vault:")
+        pretty_diff(diff)
+        exit 0 unless prompt.yes?("Are you sure you want to override #{secrets_full_storage_key}?")
+      end
+
       def are_you_sure?
-        prompt.yes?("Are you sure you want to write #{secrets_file} to #{secrets_full_storage_key}", default: 'Y')
+        prompt.yes?("Are you sure you want to write #{secrets_file} to #{secrets_full_storage_key}")
       end
     end
   end

data/lib/secrets_cli/vault/read.rb

@@ -13,8 +13,9 @@ module SecretsCli
       attr_reader :secrets_storage_key
 
       def command
-        secret = ::Vault.logical.read(secrets_full_storage_key)
-        secret.data[SECRETS_FIELD]
+        secrets = ::Vault.logical.read(secrets_full_storage_key)
+        error!("There are no secrets in #{secrets_full_storage_key}") if secrets.nil?
+        secrets.data[SECRETS_FIELD]
       end
     end
   end

data/lib/secrets_cli/version.rb

@@ -1,3 +1,3 @@
 module SecretsCli
-  VERSION = '1.3.3'
+  VERSION = '1.4.0'
 end

data/lib/secrets_cli.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'tty-prompt'
+require 'tty-file'
 require 'open3'
 require 'singleton'
 require 'vault'

data/secrets_cli.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry'
 
   spec.add_runtime_dependency 'commander'
-  spec.add_runtime_dependency 'tty-prompt', '~> 0.4.0'
+  spec.add_runtime_dependency 'tty-prompt'
+  spec.add_runtime_dependency 'tty-file'
   spec.add_runtime_dependency 'vault', '~> 0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: secrets_cli
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Stjepan Hadjic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2017-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,16 +84,30 @@ dependencies:
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tty-file
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: vault
   requirement: !ruby/object:Gem::Requirement