gpgenv 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 017ba30f555fd557cc878944b5d0506b8b8d0ccf
-  data.tar.gz: 0f42e386012535c8a387b1fd31080dee5c717ce6
+  metadata.gz: a766f9fb2e19f31afb07dccee60a02b2a5223e56
+  data.tar.gz: e8491b464059bd169ec725760f64f80cad1f119c
 SHA512:
-  metadata.gz: ab81c8a64d35121baea8cb225b7a4598cec12ce6a5e30da6b1adc6340dbc5f81da9f4bb3e1fac60c9afb6d5de9015d8fa6691d56fbb5f6637fa684fc5254d24a
-  data.tar.gz: 75ffe58628a24a6bf6a3bbd4386b475ec3ae5a3fc96315c3a665104203eaef8bdf8e9bca956b75891714c3a093011532c717de3e52868f8324a43e881c4b63fb
+  metadata.gz: 3dfc1f23d9ad0d63f0402ca33d3ef69485cbe714f302443fa20aa3b6c0fd28982b53b33fad6eef9b1f6147948343ad2dc2647aa4bb795492507e32196919e031
+  data.tar.gz: d1cb7b8b2665462d61a4f72bc4e32fbaa637051780a3f1af497b7b718ad0779432844488ee29ba96f4fbe17bb996f320170cbb8fb10d328414eb6da1a1ebe50c

data/.gitignore

@@ -9,3 +9,5 @@
 /spec/reports/
 /tmp/
 *.gem
+.gpgenv/**/*
+.env

data/.pryrc

@@ -0,0 +1,2 @@
+$:<<'lib'
+require 'gpgenv'

data/bin/dotenv2gpg

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+require 'gpgenv/import_command'
+begin
+  Gpgenv::ImportCommand.run
+rescue StandardError => bang
+  raise if ENV['DEBUG'] == 'true'
+  puts bang.message
+  exit 1
+end
+
+
+

data/bin/gpg2dotenv

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+require 'gpgenv/export_command'
+begin
+  Gpgenv::ExportCommand.run
+rescue StandardError => bang
+  raise if ENV['DEBUG'] == 'true'
+  puts bang.message
+  exit 1
+end
+
+
+

data/bin/gpgedit

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+require 'gpgenv/edit_command'
+begin
+  Gpgenv::EditCommand.run
+rescue StandardError => bang
+  raise if ENV['DEBUG'] == 'true'
+  puts bang.message
+  exit 1
+end
+
+

data/bin/gpgenv

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
-require 'gpgenv/main_command'
+require 'gpgenv/exec_command'
 begin
-  Gpgenv::MainCommand.run
+  Gpgenv::ExecCommand.run
 rescue StandardError => bang
   raise if ENV['DEBUG'] == 'true'
   puts bang.message

data/bin/gpgset

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+require 'gpgenv/set_command'
+begin
+  Gpgenv::SetCommand.run
+rescue StandardError => bang
+  raise if ENV['DEBUG'] == 'true'
+  puts bang.message
+  exit 1
+end
+
+
+

data/bin/gpgshell

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+require 'gpgenv/shell_command'
+begin
+  Gpgenv::ShellCommand.run
+rescue StandardError => bang
+  raise if ENV['DEBUG'] == 'true'
+  puts bang.message
+  exit 1
+end
+
+
+

data/gpgenv.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "pry"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "simplecov"
 end

data/lib/gpgenv/edit_command.rb

@@ -0,0 +1,35 @@
+require 'fileutils'
+require 'clamp'
+require 'gpgenv'
+require 'tempfile'
+
+
+module Gpgenv
+  class EditCommand < Clamp::Command
+
+    def execute
+      env = Gpgenv.read_files
+      Tempfile.open('.env', ENV.fetch('TMPDIR', '/tmp')) do |f|
+        env.each do |k,v|
+          f.write("#{k}=#{v}\n")
+        end
+
+        f.close
+        system("#{ENV['EDITOR']} #{f.path}")
+        f.open
+
+        f.rewind
+        lines = f.read.split("\n")
+
+        ::FileUtils.mkdir_p(Gpgenv.dir)
+        lines.each do |line|
+          i = line.index('=')
+          key = line[0..i-1]
+          value = line[i+1..-1]
+          Gpgenv.set(key, value)
+        end
+      end
+    end
+
+  end
+end

data/lib/gpgenv/exec_command.rb

@@ -7,11 +7,7 @@ module Gpgenv
     parameter "ARGUMENTS ...", "arguments", :attribute_name => :args
 
     def execute
-      cmd = args.last
-      directories = args[0..-2]
-      hash = Gpgenv.read_files(directories)
-      hash.each{ |k,v| ENV[k]=v }
-      exec cmd
+      Gpgenv.exec_command args[0..-1].join(' ')
     end
 
   end

data/lib/gpgenv/export_command.rb

@@ -1,26 +1,22 @@
+require 'gpgenv'
+require 'shellwords'
 require 'clamp'
 
 module Gpgenv
-  class ExportCommand < Clamp::Command
-    parameter 'DIRS ...', 'dirs', :attribute_name => :directories
+  class ExportCommand  < Clamp::Command
 
-    option '--file', 'FILE', 'env file to read from', :default => '.env'
+    option ['-f', '--force'], :flag, "Force overwrite of existing .env file"
 
-    def full_dir
-      if ENV['GPGENV_HOME']
-        "#{ENV['GPGENV_HOME']}/#{dir}"
-      else
-        dir
+    def execute
+      if File.exist?('.env') && !force?
+        fail(".env file already exists. Use --force to overwrite it.")
       end
-    end
 
-    def execute
-      hash = Gpgenv.read_files(directories)
-      str = ''
-      hash.each do |k,v|
-        str << "#{k}=#{v}\n"
+      File.open('.env', 'w') do |f|
+        Gpgenv.read_files.each do |k, v|
+          f.write "#{k}=#{Shellwords.escape(v)}"
+        end
       end
-      File.write(file, str)
     end
 
   end

data/lib/gpgenv/import_command.rb

@@ -1,32 +1,26 @@
+require 'fileutils'
+require 'gpgenv'
+require 'shellwords'
 require 'clamp'
 
 module Gpgenv
-  class ImportCommand < Clamp::Command
-    option '--dir', 'DIRECTORY', 'directory, relative to $GPGENV_HOME, to store files in', :attribute_name => 'dir', :required => true
-    option '--file', 'FILE', 'env file to read from', :default => '.env'
+  class ImportCommand  < Clamp::Command
 
-    def full_dir
-      if ENV['GPGENV_HOME']
-        index = ENV['GPGENV_HOME'].index('.password-store')
-        prefix = ENV['GPGENV_HOME'][index+16..-1]
-        "#{prefix}/#{dir}"
-      else
-        dir
-      end
-    end
+    option ['-f', '--force'], :flag, "Force overwrite of existing .gpg directory, totally erases it."
 
     def execute
-      IO.foreach(file) do |line|
-        line = line.strip
+      if File.exist?(Gpgenv.dir) && !force?
+        fail("#{Gpgenv.dir} already exists. Use --force to overwrite it.")
+      end
+
+      ::FileUtils.mkdir_p(Gpgenv.dir)
+      File.open('.env', 'r').each_line do |line|
         i = line.index('=')
         key=line[0..i-1]
         value=line[i+1..-1]
-        value = value[1..-2] if value[0] == '"' && value[-1] == '"'
-        cmd="echo \"#{Shellwords.shellescape(value)}\" | pass insert -f -m #{full_dir}/#{key}"
-        puts cmd
-        system "echo \"#{Shellwords.shellescape(key)}\" | pass insert -f -m #{full_dir}/#{key}"
+        Gpgenv.set(key, value)
       end
     end
+
   end
 end
-

data/lib/gpgenv/set_command.rb

@@ -0,0 +1,21 @@
+require 'clamp'
+require 'gpgenv'
+
+module Gpgenv
+  class SetCommand < Clamp::Command
+
+    parameter "ARGUMENTS ...", "arguments", :attribute_name => :args
+
+    def execute
+      FileUtils.mkdir_p(Gpgenv.dir)
+      if args.size == 1
+        Gpgenv.set(args[0], STDIN.read)
+      elsif args.size == 2
+        Gpgenv.set(args.first, args.last)
+      else 
+        fail("Usage: gpgset KEY [VALUE]")
+      end
+    end
+
+  end
+end

data/lib/gpgenv/shell_command.rb

@@ -5,12 +5,8 @@ require 'clamp'
 module Gpgenv
   class ShellCommand  < Clamp::Command
 
-    parameter "DIRECTORIES ...", "directories", :attribute_name => :directories
-
     def execute
-      fail("You must specify at least one directory") unless directories.size >= 1
-      hash = Gpgenv.read_files(directories)
-      hash.each do |k, v|
+      Gpgenv.read_files.each do |k, v|
         puts "export #{k}=#{Shellwords.escape(v)}"
       end
     end

data/lib/gpgenv/version.rb

@@ -1,3 +1,3 @@
 module Gpgenv
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/gpgenv.rb

@@ -1,47 +1,39 @@
 require "gpgenv/version"
-require 'gpgenv/config'
 require 'gpgenv/error'
+require 'shellwords'
 
 module Gpgenv
-  def self.read_files(directories)
 
-    # Prefix relative paths that don't exist with gpgenv_home directory, if it is set.
-    if Config.gpgenv_home
-      directories = directories.map do |d|
-        if File.directory?(d)
-          d
-        else
-          gpgenv_dir = "#{Config.gpgenv_home}/#{d}"
-          if File.directory?(gpgenv_dir)
-            gpgenv_dir 
-          else
-            d
-          end
-        end
+  def self.read_files
+    hash = {}
+
+    Dir.glob("#{dir}/*.gpg").each do |f|
+      ext = File.extname(f)
+      var = File.basename(f, ext)
+      if ext == '.gpg' 
+        data = `gpg --batch --quiet --decrypt #{f}`
+        raise Error.new("Decrypting #{f} failed.") unless $?.success?
+      else
+        data = File.read(f)
       end
+      hash[var] = data.rstrip
     end
+    hash
+  end
 
-    # Validate existence of directories
-    directories.each do |d|
-      raise Error.new("#{d} does not exist.") unless File.exists?(d)
-      raise Error.new("#{d} is not a directory.") unless File.directory?(d)
-    end
+  def self.set(key, value)
+    system "echo #{Shellwords.shellescape(value)} | gpg --batch --yes -e -r #{key_id} -o #{dir}/#{key}.gpg"
+  end
 
-    hash = {}
-    directories.each do |dir|
-      Dir.glob("#{dir}/*").reject{|f| File.directory? f }.each do |f|
-        ext = File.extname(f)
-        var = File.basename(f, ext)
-        if ext == '.gpg' 
-          data = `gpg --batch --quiet --decrypt #{f}`
-          raise Error.new("Decrypting #{f} failed.") unless $?.success?
-        else
-          data = File.read(f)
-        end
-        hash[var] = data.rstrip
-      end
-    end
+  def self.exec_command(cmd)
+    exec(read_files, cmd)
+  end
 
-    hash
+  def self.dir
+    "#{Dir.pwd}/.gpgenv"
+  end
+
+  def self.key_id
+    ENV['GPGENV_KEY_ID'] || fail("GPGENV_KEY_ID must be set.")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gpgenv
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Michael Shea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -84,26 +98,38 @@ description: Plays nicely with passwordstore.org
 email:
 - michael.shea@heroku.com
 executables:
+- dotenv2gpg
+- gpg2dotenv
+- gpgedit
 - gpgenv
+- gpgset
+- gpgshell
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".pryrc"
 - ".rspec"
 - ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- bang
+- bin/dotenv2gpg
+- bin/gpg2dotenv
+- bin/gpgedit
 - bin/gpgenv
+- bin/gpgset
+- bin/gpgshell
 - gpgenv.gemspec
 - lib/gpgenv.rb
-- lib/gpgenv/config.rb
+- lib/gpgenv/edit_command.rb
 - lib/gpgenv/error.rb
 - lib/gpgenv/exec_command.rb
 - lib/gpgenv/export_command.rb
 - lib/gpgenv/import_command.rb
-- lib/gpgenv/main_command.rb
+- lib/gpgenv/set_command.rb
 - lib/gpgenv/shell_command.rb
 - lib/gpgenv/version.rb
 homepage: https://github.com/heroku/gpgenv

data/lib/gpgenv/config.rb

@@ -1,7 +0,0 @@
-module Gpgenv
-  module Config
-    def self.gpgenv_home
-      ENV['GPGENV_HOME'] 
-    end
-  end  
-end

data/lib/gpgenv/main_command.rb

@@ -1,18 +0,0 @@
-require 'clamp'
-require 'gpgenv/exec_command'
-require 'gpgenv/import_command'
-require 'gpgenv/export_command'
-require 'gpgenv/shell_command'
-
-module Gpgenv
-  class MainCommand < Clamp::Command
-    subcommand 'exec', 'Exec a command', Gpgenv::ExecCommand
-    subcommand 'import', 'Import from .env to gpgenv', ImportCommand
-    subcommand 'export', 'Export from gpgenv to .env', ExportCommand
-    subcommand 'shell', 'Print out "export" commands, for use with eval', ShellCommand
-
-    def execute
-      super
-    end
-  end
-end