git-cipher 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f65b15e499a669209962429243007bbdbbdaaeaa
-  data.tar.gz: 21f8abf07fbcb9ef6c7c55c75f78530b965c8815
+  metadata.gz: 3d52bb65c34660958a91e70fef43d596610bede9
+  data.tar.gz: 7d83c6b13437a4fa8c1d166b76fda86abdf9a990
 SHA512:
-  metadata.gz: 614dfcf2bb60ce0f183d20d3c23aa032f58b9b8e5b69bf6fa679c6bd3fd5a94625790099d327526fd7fe353f063fb95646bac1b71cae7ff9bc276005b49f244b
-  data.tar.gz: dc7c936e44505b66408eb91c9c19fa736cee2805c5a44e131547ba93382b6ffce0aaf11abe451e983d18b2642f1ce9ae502e9ba148b719627aa37c75d943417d
+  metadata.gz: 53dec9da0d8e7bed2874793c25bde8e9fad254059bdccee796dec7b131a7191a6a863ced6873e797007167236de4a5f25dfc562b33e01a7506d98da32d7872cb
+  data.tar.gz: e1c65440edaeb32687e7b124f6c497bd8e9413f4ef7c7f92a23d55d13ab29691a820eed6918ca819f6273e4308fb8c1a4d9cabd5939b4661da25ee785766e2f2

data/bin/git-cipher

@@ -4,13 +4,14 @@
 require 'fileutils'
 require 'pathname'
 require 'shellwords'
+require 'tempfile'
 
 class Cipher
   EXTENSION = 'encrypted'
   DEFAULT_GPG_USER  = 'greg@hurrell.net'
   DEFAULT_GPG_PRESET_COMMAND = '/usr/local/opt/gpg-agent/libexec/gpg-preset-passphrase'
   VALID_OPTIONS = %w[force help]
-  VALID_SUBCOMMANDS = %w[decrypt encrypt help preset forget]
+  VALID_SUBCOMMANDS = %w[decrypt encrypt help log preset forget]
 
   def run
     send @subcommand
@@ -69,14 +70,7 @@ private
   end
 
   def decrypt!(file)
-    unless ENV['GPG_AGENT_INFO']
-      die <<-MSG
-        GPG_AGENT_INFO not present in the environment.
-        Try running:
-          eval $(gpg-agent --daemon)
-          #{command_name} preset
-      MSG
-    end
+    require_agent
 
     pathname = Pathname.new(file)
     basename = pathname.basename.to_s
@@ -104,16 +98,7 @@ private
       puts red('[warning: plain-text newer than ciphertext; skipping]')
     else
       print green('[decrypting ...')
-      execute(%{
-        #{escape command_path('gpg')}
-          -q
-          --yes
-          --batch
-          --no-tty
-          --use-agent
-          -o #{escape outfile}
-          -d #{escape file}
-      })
+      gpg_decrypt(file, outfile)
       if $?.success?
         puts green(' done]')
 
@@ -219,6 +204,19 @@ private
     puts
   end
 
+  def gpg_decrypt(file, outfile)
+    execute(%{
+      #{escape command_path('gpg')}
+        -q
+        --yes
+        --batch
+        --no-tty
+        --use-agent
+        -o #{escape outfile}
+        -d #{escape file}
+    })
+  end
+
   def gpg_preset_command
     ENV['GPG_PRESET_COMMAND'] || get_config('presetcommand') || DEFAULT_GPG_PRESET_COMMAND
   end
@@ -248,6 +246,64 @@ private
     "\e[2K\e[0G"
   end
 
+  def log
+    if @files.empty?
+      # TODO: would be nice to interleave these instead of doing them serially.
+      puts 'No explicit paths supplied: logging all matching files'
+      Dir["**/.*.#{EXTENSION}"].each { |file| log!(file) }
+    else
+      @files.each { |file| log!(file) }
+    end
+  end
+
+  def log!(file)
+    require_agent
+
+    commits = execute(%{
+      #{escape command_path('git')} log
+      --pretty=format:%H -- #{escape file}
+    }).split
+
+    commits.each do |commit|
+      files = []
+      begin
+        # Get plaintext "post" image.
+        files.push(post = temp_write(show(file, commit)))
+        files.push(
+          post_plaintext = temp_write(gpg_decrypt(post.path, '-'))
+        )
+
+        # Get plaintext "pre" image.
+        files.push(pre = temp_write(show(file, "#{commit}~")))
+        files.push(pre_plaintext = temp_write(
+          pre.size.zero? ? '' : gpg_decrypt(pre.path, '-')
+        ))
+
+        # Print commit message.
+        puts execute(%{
+          #{escape command_path('git')} --no-pager log
+          --color=always -1 #{commit}
+        })
+        puts
+
+        # Print pre-to-post diff.
+        puts execute(%{
+          #{escape command_path('git')} --no-pager diff
+          --color=always
+          #{escape pre_plaintext.path}
+          #{escape post_plaintext.path}
+        })
+        puts
+
+      ensure
+        files.each do |tempfile|
+          tempfile.close
+          tempfile.unlink
+        end
+      end
+    end
+  end
+
   def normalize_option(option)
     normal = option.dup
 
@@ -295,12 +351,40 @@ private
     colorize(string, 31)
   end
 
+  def require_agent
+    unless ENV['GPG_AGENT_INFO']
+      die <<-MSG
+        GPG_AGENT_INFO not present in the environment.
+        Try running this before retrying `#{command_name} #{@subcommand}`:
+          eval $(gpg-agent --daemon)
+          #{command_name} preset
+      MSG
+    end
+  end
+
+  def show(file, commit)
+    # Redirect stderr to /dev/null because the file might not have existed prior
+    # to this commit.
+    execute(%{
+      #{escape command_path('git')} show
+      #{commit}:#{escape file} 2> /dev/null
+    })
+  end
+
   def strip_heredoc(doc)
     # based on method of same name from Rails
     indent = doc.scan(/^[ \t]*(?=\S)/).map(&:size).min || 0
     doc.gsub(/^[ \t]{#{indent}}/, '')
   end
 
+  def temp_write(contents)
+    file = Tempfile.new('git-cipher-')
+    file.chmod(0600)
+    file.write(contents)
+    file.flush
+    file
+  end
+
   # Print usage information and exit.
   def usage(subcommand)
     case subcommand
@@ -354,6 +438,15 @@ private
 
               #{command_name} forget
       USAGE
+    when 'log'
+      puts strip_heredoc(<<-USAGE)
+        #{command_name} log FILE
+
+          Shows the log message and decrypted diff for FILE
+          (analogous to `git log -p -- FILE`).
+
+              #{command_name} log foo
+      USAGE
     when 'preset'
       puts strip_heredoc(<<-USAGE)
         #{command_name} preset
@@ -369,6 +462,7 @@ private
             #{command_name} decrypt
             #{command_name} encrypt
             #{command_name} forget
+            #{command_name} log
             #{command_name} preset
       USAGE
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-cipher
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Greg Hurrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies: []
 description: "\n    Provides a convenient workflow for working with encrypted files
   in a public\n    Git repo. Delegates the underlying work of encryption/decryption