boxafe 0.1.4 → 0.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODMyZGQyNWI3ZDQyMTI2MzNkMjlhNGM4MTc3YzliMzhkZTlhNTM0Mg==
+    NmRhNGVkMDIxZjM2MjUyYTVhYTcxZDU5NDUwNzJhMWY3YjcxZTcxYw==
   data.tar.gz: !binary |-
-    ZTkyMWRmY2M4NjU1MTAyNDQwMWU4YjEyNWZhYzAzNzgwYmUzNTZkOA==
-!binary "U0hBNTEy":
+    MGUzZWM0OWE1NThjN2U0ZmJlNzNkM2RkMDQ3MDU3YzU0N2RhMTBmNQ==
+SHA512:
   metadata.gz: !binary |-
-    Y2UzNjNmMTg3NzY4MGNlN2I1MjZiNmU2MzNmNTZlMDNiNjdhYzVjNzNhMjdi
-    ZmI2YWFhZjQ3MjY3MGI1Nzg1Y2ZiYzRmOGI0ZjBmYTBmOTY5NjNmZThmZTRj
-    YjhkOGVjMjg4ZDIzZWIxODU0NTAwOWFiNGVhMmRlNzgwY2IxZGM=
+    MGY5MTBjNDBmOTRmMTQ3NGM3NDAwMzQ1NDUyMzg1ODI3ODNiZTM5MjI5MTc3
+    ZWRkYzI5ZTNiMGVmOTFmMzI5ZTU1NjUyMjMwY2EwNTBmYjMzNzNhZjNmZGY1
+    MDAwNWQ4MGUzOTgzZTVkNDZlZDljNjg3YzI2NzAxZGVjNWMzZTY=
   data.tar.gz: !binary |-
-    ZjI2NWNhNmYzMjNjOGVkYWQ2ZWY5OTJkYjQ1ZjEwMWE3ZTNmMDAzNzgxNDVm
-    MTE3NzlmMzIxMWE2ODA3OGZkNjNlMWNmMWE4YjFiNjdkOTRlMTQ1NjcyNzZh
-    MDBjZDBmYzI3NDRhZTRhMTY0MzNhYmUzNWRjZjQ1ODk5YzZjOWU=
+    ZTc0ODMyYWQzYTU3Zjc5Mzg4OWI3YmY3NTQ4YWM3OGU1YjU5OTIxMzQ4NDI2
+    ZTk2ODVjM2JiMjgyNjllMzI5ZjY3Yzc5ZWY1YmRhZDNhNmU1YjMxYzI5MDE3
+    OWVjMjkwYTg4NDYzNjM2ZTllMWJlZWE5ODNlMzdiZGE4YjI4OWY=

data/Gemfile

@@ -25,4 +25,5 @@ group :development do
   gem 'gem-release'
   gem 'rake-version'
   gem 'simplecov'
+  gem 'fakefs', require: 'fakefs/safe'
 end

data/README.md

@@ -5,7 +5,7 @@
 [![Build Status](https://secure.travis-ci.org/AlphaHydrae/boxafe.png)](http://travis-ci.org/AlphaHydrae/boxafe)
 
 Boxafe mounts EncFS filesystems or "boxes" that you define in a configuration file with a friendly DSL.
-It can also mount them on startup.
+It can also mount them on startup. [EncFS](http://www.arg0.net/encfs) must be installed separately.
 
 **Note: Currently supports OS X. Partial Linux support.**
 
@@ -27,6 +27,14 @@ end
 # this command is run:
 # encfs "/secure/abox" "/Volumes/abox" -- -ovolname="A box"
 
+# get the password from a file
+box do
+  name 'Password file box'
+  root '/secure/password-file-box'
+  mount '/Volumes/password-file-box'
+  password_file '/secret/password'
+end
+
 # get the password from the OS X keychain
 box do
   name 'Keychain box'
@@ -117,7 +125,7 @@ This is the list of planned features/changes:
 
 * Complete test suite.
 * Growl/OS X notifications.
-* Get password from a file.
+* "Repair" feature to un-quarantine files on OS X.
 * Cron scheduling with [whenever](https://github.com/javan/whenever).
 
 ## Meta

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/boxafe/box.rb

@@ -3,7 +3,7 @@ require 'fileutils'
 
 class Boxafe::Box
 
-  OPTION_KEYS = [ :name, :root, :mount, :volume, :encfs_config, :keychain ]
+  OPTION_KEYS = [ :name, :root, :mount, :volume, :encfs_config, :keychain, :password_file ]
 
   def initialize options = {}
 
@@ -60,7 +60,11 @@ class Boxafe::Box
       end
 
       s << "\nVolume Name: #{opts[:volume]}"
-      s << "\nKeychain Password: #{opts[:keychain]}" if opts[:keychain]
+      if opts[:password_file]
+        s << "\nPassword File: #{opts[:password_file]}"
+      elsif opts[:keychain]
+        s << "\nKeychain Password: #{opts[:keychain]}"
+      end
       s << "\nEncFS Config: #{opts[:encfs_config]}" if opts[:encfs_config]
 
       s << "\nCommand: #{Paint[encfs.command, :yellow]}" if verbose
@@ -85,11 +89,18 @@ class Boxafe::Box
 
   def options
     @options.tap do |opts|
+
       opts[:root] = File.expand_path opts[:root] || "~/Dropbox/#{opts[:name]}"
       opts[:mount] = File.expand_path opts[:mount] || "/Volumes/#{opts[:name]}"
       opts[:encfs_config] = File.expand_path opts[:encfs_config] if opts[:encfs_config]
       opts[:volume] ||= opts[:name]
-      opts[:keychain] = opts[:name] if opts[:keychain] == true
+
+      if opts[:password_file]
+        opts[:password_file] = File.expand_path opts[:password_file]
+        opts.delete :keychain
+      elsif opts[:keychain] == true
+        opts[:keychain] = opts[:name]
+      end
     end
   end
 

data/lib/boxafe/config.rb

@@ -2,6 +2,7 @@
 class Boxafe::Config
 
   # TODO: document unmount_delay
+  # TODO: add option to chdir, boxes relative to home dir by default
   OPTION_KEYS = [ :encfs, :umount, :umount_delay, :notify ]
 
   attr_reader :boxes, :options

data/lib/boxafe/encfs.rb

@@ -8,18 +8,36 @@ class Boxafe::Encfs
   end
 
   def command
-    # TODO: use shellwords for binary, test escaping
-    [ encfs_config, @options[:encfs], Shellwords.escape(@options[:root]), Shellwords.escape(@options[:mount]), extpass, '--', volname ].compact.join ' '
+    [
+      encfs_config,
+      Shellwords.escape(@options[:encfs]),
+      Shellwords.escape(absolute_root_dir),
+      Shellwords.escape(absolute_mount_dir),
+      extpass,
+      '--',
+      volname
+    ].compact.join ' '
   end
 
   private
 
+  def absolute_root_dir
+    # TODO: remove Dir.pwd once fakefs is fixed (multiple occurrences in this file)
+    File.expand_path @options[:root], Dir.pwd
+  end
+
+  def absolute_mount_dir
+    File.expand_path @options[:mount], Dir.pwd
+  end
+
   def volname
     %/-ovolname=#{Shellwords.escape @options[:volume]}/
   end
 
   def extpass
-    if @options[:keychain]
+    if @options[:password_file]
+      %|--extpass="head -n 1 #{Shellwords.escape @options[:password_file]}"|
+    elsif @options[:keychain]
       %*--extpass="security 2>&1 >/dev/null find-generic-password -gl '#{@options[:keychain]}' |grep password|cut -d \\\\\\" -f 2"*
     else
       nil
@@ -27,6 +45,6 @@ class Boxafe::Encfs
   end
 
   def encfs_config
-    @options[:encfs_config] ? %/ENCFS6_CONFIG=#{Shellwords.escape File.expand_path(@options[:encfs_config])}/ : nil
+    @options[:encfs_config] ? %/ENCFS6_CONFIG=#{Shellwords.escape File.expand_path(@options[:encfs_config], Dir.pwd)}/ : nil
   end
 end

data/lib/boxafe.rb

@@ -4,7 +4,7 @@ require 'dotenv'
 require 'mutaconf'
 
 module Boxafe
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 
   # TODO: add detailed error description for non-trace mode
   class Error < StandardError

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boxafe
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - AlphaHydrae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paint
@@ -234,6 +234,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  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'
 description: Boxafe encrypts and auto-mounts a folder with encfs and whenever.
 email: hydrae.alpha@gmail.com
 executables:
@@ -280,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Secure your Dropbox with encfs.