arcanus 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0622bb6c08b521200c277db4f6e39f6efcc12d67
-  data.tar.gz: 89dcd338be1abb4bbbcba841b7f3df3f11ac13ba
+  metadata.gz: 8575f8a22c444666c7442acbdd8c57e7f6b69097
+  data.tar.gz: 275c2b13e0cd12e4ab752e16995b733eac412823
 SHA512:
-  metadata.gz: 4fdfbba87c123002c65861704d34a5be103af1c3df81c7cdf17abe9ac65eb8e5341b1b604822ed716cb850d9db7f62a9f0de12ecb2a9d6b2d85b0ad04caf5598
-  data.tar.gz: 9a92ac4f7892d688e23b64b3f257f0f950ffdbac05ae1f2510bc97b9c7d5ea3abcdf89149c0845f00d4885fa4f58455f996f5c47a7ec617f937d9c416c97a0e4
+  metadata.gz: fcf188423860de011f8baf0b51c0fd497c1a60a1121035000df44daade3300b673dbe7e33819dc9235e360ff683b3396a17bb47d67016244e6d82204b7c53082
+  data.tar.gz: 586375c09267f2b2c2339ef83f90f6f2f1593c6ef06d13cedc03f279d73f91766594ffe6464143f96a53c3b42c534278c964850e3ac3074c10875471e9cf1b03

data/lib/arcanus.rb

@@ -41,7 +41,6 @@ module Arcanus
       key = Arcanus::Key.from_file(@repo.unlocked_key_path)
     elsif ENV['ARCANUS_PASSWORD']
       key = Arcanus::Key.from_protected_file(@repo.locked_key_path, ENV['ARCANUS_PASSWORD'])
-      ENV.delete('ARCANUS_PASSWORD') # Scrub so child processes don't inherit
     else
       raise Errors::UsageError,
             'Arcanus key has not been unlocked. ' \

data/lib/arcanus/command/diff.rb

@@ -0,0 +1,35 @@
+require_relative 'shared/ensure_key'
+require 'diffy'
+require 'tempfile'
+
+module Arcanus::Command
+  class Diff < Base
+    include Shared::EnsureKey
+
+    description 'Shows what was changed in the chest'
+
+    def execute
+      ensure_key_unlocked
+
+      ref = arguments[1] || 'HEAD'
+
+      tempfile = ::Tempfile.new(['old-arcanus-chest', '.yaml']).tap do |file|
+        # This will gracefully return an empty string if it doesn't exist
+        old_content = `git show #{ref}:#{Arcanus::CHEST_FILE_PATH} 2>/dev/null`.strip
+
+        file.sync = true
+        if old_content.empty?
+          file.write({}.to_yaml)
+        else
+          file.write(old_content)
+        end
+      end
+
+      key = Arcanus::Key.from_file(repo.unlocked_key_path)
+      old = Arcanus::Chest.new(key: key, chest_file_path: tempfile).to_yaml
+      current = Arcanus::Chest.new(key: key, chest_file_path: repo.chest_file_path).to_yaml
+
+      ui.print(::Diffy::Diff.new(old, current, context: 1).to_s(:color), newline: false)
+    end
+  end
+end

data/lib/arcanus/command/show.rb

@@ -14,7 +14,12 @@ module Arcanus::Command
 
       if arguments.size > 1
         # Print specific key
-        ui.print chest.get(arguments[1])
+        value = chest.get(arguments[1])
+        if value.is_a?(Hash)
+          output_colored_hash(value)
+        else
+          ui.print value
+        end
       else
         # Print entire hash
         output_colored_hash(chest.to_hash)

data/lib/arcanus/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Arcanus
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.9.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arcanus
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.6
+- !ruby/object:Gem::Dependency
+  name: diffy
+  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: tty
   requirement: !ruby/object:Gem::Requirement
@@ -51,6 +65,7 @@ files:
 - lib/arcanus/chest.rb
 - lib/arcanus/cli.rb
 - lib/arcanus/command/base.rb
+- lib/arcanus/command/diff.rb
 - lib/arcanus/command/edit.rb
 - lib/arcanus/command/export.rb
 - lib/arcanus/command/help.rb