revenc 0.1.3 → 0.2.1

data/.gemfiles

@@ -0,0 +1,53 @@
+.gemfiles
+.gitattributes
+.gitignore
+Gemfile
+Gemfile.lock
+HISTORY.markdown
+LICENSE
+README.markdown
+Rakefile
+TODO.markdown
+VERSION
+bin/revenc
+config/cucumber.yml
+examples/rsync/encrypted_data/key/encfs6.xml
+examples/rsync/revenc.conf
+examples/rsync/scripts/passphrase
+examples/rsync/unencrypted_data/test_file1.txt
+examples/rsync/unencrypted_data/test_file2.txt
+examples/simple/encfs6.xml
+examples/simple/passphrase
+examples/simple/unencrypted_data/test_file1.txt
+examples/simple/unencrypted_data/test_file2.txt
+features/app.feature
+features/bin.feature
+features/configuration.feature
+features/copy.feature
+features/generator.feature
+features/mount.feature
+features/settings.feature
+features/step_definitions/.gitignore
+features/step_definitions/revenc_steps.rb
+features/support/aruba.rb
+features/support/env.rb
+features/support/hooks.rb
+features/unmount.feature
+lib/revenc.rb
+lib/revenc/app.rb
+lib/revenc/core/array.rb
+lib/revenc/core/hash.rb
+lib/revenc/encfs_wrapper.rb
+lib/revenc/errors.rb
+lib/revenc/io.rb
+lib/revenc/settings.rb
+revenc.gemspec
+spec/aruba_helper.rb
+spec/basic_app/array_spec.rb
+spec/basic_gem/aruba_helper_spec.rb
+spec/basic_gem/basic_gem_spec.rb
+spec/basic_gem/gemspec_spec.rb
+spec/revenc/error_spec.rb
+spec/revenc/io_spec.rb
+spec/spec_helper.rb
+spec/watchr.rb

data/.gitignore

@@ -1,10 +1,6 @@
-pkg/*
-*.gem
-.bundle
-coverage
-rdoc
-.yardoc
+/pkg/
+/.bundle/
+/rdoc/
 rerun.txt
 tags
-tmp/fixtures
-tmp/aruba
+/tmp/

data/Gemfile.lock

@@ -1,54 +1,59 @@
 PATH
   remote: .
   specs:
-    revenc (0.1.3)
-      configatron (>= 2.5.1)
+    revenc (0.2.1)
       mutagem (>= 0.1.3)
       term-ansicolor (>= 1.0.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    aruba (0.2.3)
-      background_process
-      cucumber (~> 0.9.0)
-    background_process (1.2)
-    builder (2.1.2)
-    configatron (2.6.3)
-      yamler (>= 0.1.0)
-    cucumber (0.9.0)
-      builder (~> 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.2)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
+    aruba (0.4.5)
+      bcat (>= 0.6.1)
+      childprocess (>= 0.1.9)
+      cucumber (>= 0.10.7)
+      rdiscount (>= 1.6.8)
+      rspec (>= 2.6.0)
+    bcat (0.6.1)
+      rack (~> 1.0)
+    builder (3.0.0)
+    childprocess (0.2.0)
+      ffi (~> 1.0.6)
+    cucumber (1.0.2)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.5)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
     diff-lcs (1.1.2)
-    gherkin (2.2.4)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-      trollop (~> 1.16.2)
-    json (1.4.6)
-    mutagem (0.1.3)
-    rake (0.8.7)
-    rdiscount (1.6.5)
-    rspec (1.3.0)
-    term-ansicolor (1.0.5)
-    trollop (1.16.2)
-    yamler (0.1.0)
-    yard (0.6.1)
+    ffi (1.0.9)
+    gherkin (2.4.5)
+      json (>= 1.4.6)
+    json (2.1.0)
+    mutagem (0.2.3)
+    rack (1.3.1)
+    rake (0.9.2)
+    rdiscount (1.6.8)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    term-ansicolor (1.0.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba (>= 0.2.0)
-  bundler (>= 1.0.0)
-  configatron (>= 2.5.1)
-  cucumber (>= 0.6)
-  mutagem (>= 0.1.3)
+  aruba (~> 0.4.2)
+  bundler (>= 1.0.14)
+  cucumber (~> 1.0)
   rake (>= 0.8.7)
-  rdiscount (>= 1.6.5)
   revenc!
-  rspec (>= 1.2.9)
-  term-ansicolor (>= 1.0.4)
-  yard (>= 0.6.1)
+  rspec (>= 2.6.0)
+
+BUNDLED WITH
+   1.16.0

data/HISTORY.markdown

@@ -2,13 +2,20 @@ History
 =======
 Most recent changes are at the top
 
-
 Changes
 -------
 
+### 0.2.1 - 12/21/2017 ###
+
+* Update and remove dependencies with known security issues
+
+### 0.2.0 - 08/02/2011 ###
+
+* Merge upstream updates from [BasicApp](http://github.com/robertwahler/basic_app)
+
 ### 0.1.3 - 10/05/2010 ###
 
-* Using [mutagem](http://github.com/robertwahler/mutagem) for file locking based mutexes
+* Using [Mutagem](http://github.com/robertwahler/mutagem) for file locking based mutexes
 
 
 ### 0.1.2 - 03/12/2010 ###

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 GearheadForHire, LLC
+Copyright (c) 2010-2017 GearheadForHire, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -1,32 +1,35 @@
 Revenc
 ======
 
-Mount an unencrypted folder as encrypted using EncFS and copy/synchronize the 
+Mount an unencrypted folder as encrypted using EncFS and copy/synchronize the
 encrypted files to untrusted destinations using rsync/cp
 
 Background
 ----------
 
-EncFS in reverse mode facilitates mounting an encrypted file system 
-from an unencrypted source folder.  This allows keeping your files unencrypted 
-in a trusted environment while gaining the ability to encrypt on demand 
+EncFS in reverse mode facilitates mounting an encrypted file system
+from an unencrypted source folder.  This allows keeping your files unencrypted
+in a trusted environment while gaining the ability to encrypt on demand
 i.e. when you want to rsync encrypted files off-site to an untrusted system.
 
+Revenc was jump-started by cloning from
+[BasicApp](https://github.com/robertwahler/basic_app).
+
 Why Revenc?
 -----------
 
-Revenc facilitates scripting EncFS reverse mounting and synchronizing by 
-providing a configuration framework and validating mounts before running tools 
+Revenc facilitates scripting EncFS reverse mounting and synchronizing by
+providing a configuration framework and validating mounts before running tools
 like rsync.
 
-Benefits 
+Benefits
 --------
 
 * Provides conventions for EncFS reverse mounting
-* Validates mountpoints before copying to prevent "rsync --delete" commands 
-  from trying to sync empty folders 
-* Mount, unmount, and copy actions are protected by a mutex to prevent 
-  recursion on long running copy/sync operations.  (mount, unmount and 
+* Validates mountpoints before copying to prevent "rsync --delete" commands
+  from trying to sync empty folders
+* Mount, unmount, and copy actions are protected by a mutex to prevent
+  recursion on long running copy/sync operations.  (mount, unmount and
   copy actions will fail if another instance of revenc is blocking)
 * Allow short, easy to remember command lines when used with configuration files.
   i.e. revenc mount, revenc unmount, revenc copy
@@ -36,7 +39,6 @@ Installation
 
 gem install revenc
 
-
 Usage
 -----
 
@@ -61,7 +63,7 @@ This calls the executable "encfs" with the following by default:
 
 Unmount using EncFS. Mountpoint is required when specified by revenc.conf.
 
-    Unmount: revenc unmount <mountpoint> 
+    Unmount: revenc unmount <mountpoint>
 
 This calls the executable "fusermount" with the following by default:
 
@@ -95,7 +97,7 @@ The following is a walk through of the steps used to create the example project
 ### Create the EncFS passphrase file ###
 
 You must supply EncFS with a passphrase in plain text. The passphrase is piped in on the command line
-to EncFS.  This file can be stored anywhere on your trusted system.  Revenc expects it in the 
+to EncFS.  This file can be stored anywhere on your trusted system.  Revenc expects it in the
 current folder, use revenc.conf to supply a different location.
 
     echo "my_super_secret_PassPHRase" > passphrase
@@ -103,12 +105,12 @@ current folder, use revenc.conf to supply a different location.
 
 ### Generate the EncFS key file ###
 
-Generation of your key file is done once.  The same key is used for each mount action on the same 
+Generation of your key file is done once.  The same key is used for each mount action on the same
 unencrypted source folder.  You need to keep a copy of your key available in order to restore encrypted files.
-EncFS doesn't supply a method to fully automate the generation of the key file with so it needs 
-to be done manually. 
+EncFS doesn't supply a method to fully automate the generation of the key file with so it needs
+to be done manually.
 
-NOTE: The ENCFS6_CONFIG var is needed to control where the key file is created.  The "${PWD}" is 
+NOTE: The ENCFS6_CONFIG var is needed to control where the key file is created.  The "${PWD}" is
 used because EncFS expects full paths from the root folder.
 
     ENCFS6_CONFIG=./encfs6.xml encfs --reverse ${PWD}/unencrypted_data  ${PWD}/encrypted_mountpoint -- -o ro
@@ -118,17 +120,17 @@ command prompt.  You can complete the key generation any way you like.  The foll
 used to generate the sample key.  Note the I opted to store filenames in plain text for clarity.
 
 EncFS command prompt responses:
-    
+
     x                              # expert mode
     1                              # AES
     128                            # key size
     1024                           # block size
-    2                              # Null => no encryption of filenames 
+    2                              # Null => no encryption of filenames
     my_super_secret_PassPHRase     # passphrase we stored in the step above
     my_super_secret_PassPHRase     # confirm passphrase
 
 
-EncFS should generate encfs6.xml, mount the folder and return you to the command prompt. You can 
+EncFS should generate encfs6.xml, mount the folder and return you to the command prompt. You can
 now work with your encrypted files.
 
     ls encrypted_mountpoint
@@ -137,7 +139,7 @@ now work with your encrypted files.
 
     revenc unmount encrypted_mountpoint
     ls encrypted_mountpoint
-       
+
         <no files here>
 
     revenc mount unencrypted_data encrypted_mountpoint
@@ -166,39 +168,32 @@ you can ommit action parameters. For example:
     revenc unmount
 
 The configuration file is YAML http://www.yaml.org/ format with ERB processing. You must
-escape ERB in the action commands.  These need to be lazy loaded by Revenc. Unescaped 
+escape ERB in the action commands.  These need to be lazy loaded by Revenc. Unescaped
 ERB is evaluated as the configuration file is read but before Revenc parses the commands.
 See the example configuration file examples/rsync/revenc.conf.
 
 The file features/configuration.feature has more details.
 
-
-System Requirements 
+System Requirements
 -------------------
 
-* POSIX system
-* EncFS http://www.arg0.net/encfs 
-
+* EncFS http://www.arg0.net/encfs  (tested on versions: 1.5, 1.6)
 
-Run-time dependencies 
+Run-time dependencies
 ---------------------
-The following gems are required by default in applications cloned from BasicApp.
 
 * Term-ansicolor for optional color output <http://github.com/flori/term-ansicolor>
-* Configatron for configuration support <http://github.com/markbates/configatron>
-
+* Mutagem for mutex support <http://github.com/robertwahler/mutagem>
 
 Development dependencies
 ------------------------
 
 * Bundler for dependency management <http://github.com/carlhuda/bundler>
-* Rspec for unit testing <http://github.com/dchelimsky/rspec>
-* Cucumber for functional testing <http://github.com/aslakhellesoy/cucumber>
-* Aruba for CLI testing <http://github.com/aslakhellesoy/aruba>
-* YARD for documentation generation <http://github.com/lsegal/yard>
-
+* Rspec for unit testing <http://github.com/rspec/rspec>
+* Cucumber for functional testing <http://github.com/cucumber/cucumber>
+* Aruba for CLI testing <http://github.com/cucumber/aruba>
 
 Copyright
 ---------
 
-Copyright (c) 2010 GearheadForHire, LLC. See [LICENSE](LICENSE) for details.
+Copyright (c) 2010-2017 GearheadForHire, LLC. See [LICENSE](LICENSE) for details.

data/Rakefile

@@ -1,25 +1,15 @@
 # encoding: utf-8
 
-# bundler/setup is managing $LOAD_PATH, any gem needed by this Rakefile must 
-# be listed as a development dependency in the gemspec
-
-require 'rubygems'
-require 'bundler/setup' 
-
-Bundler::GemHelper.install_tasks
-
-def gemspec
-  @gemspec ||= begin
-    file = File.expand_path('../revenc.gemspec', __FILE__)
-    eval(File.read(file), binding, file)
-  end
-end
-
-require 'spec'
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+# Bundler is managing $LOAD_PATH, any gem needed by this Rakefile must be
+# listed as a development dependency in the gemspec
+require 'bundler/setup'
+require 'bundler/gem_tasks'
+
+require 'rspec/core/rake_task'
+desc "Run RSpec"
+RSpec::Core::RakeTask.new do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rspec_opts = ['--color', '--format nested']
 end
 
 require 'cucumber'
@@ -33,23 +23,23 @@ task :test => [:spec, :features]
 
 task :default => :test
 
-namespace :doc do
-  project_root = File.expand_path(File.dirname(__FILE__))
-  doc_destination = File.join(project_root, 'rdoc')
+# put the gemfiles task in the :build dependency chain
+task :build => [:gemfiles]
 
-  require 'yard'
-  require 'yard/rake/yardoc_task'
+desc "Generate .gemfiles via 'git ls-files'"
+task :gemfiles do
+  files = `git ls-files`
 
-  YARD::Rake::YardocTask.new(:generate) do |yt|
-    yt.options = ['--markup-provider', 'rdiscount', 
-                  '--output-dir', doc_destination
-                 ] +
-                 gemspec.rdoc_options - ['--line-numbers', '--inline-source']
-  end
+  filename  = File.join(File.dirname(__FILE__), '.gemfiles')
+  cached_files = File.exists?(filename) ? File.open(filename, "r") {|f| f.read} : nil
+
+  # maintain EOL
+  files.gsub!(/\n/, "\r\n") if cached_files && cached_files.match("\r\n")
 
-  desc "Remove generated documenation"
-  task :clean do
-    rm_r doc_destination if File.exists?(doc_destination)
+  if cached_files != files
+    puts "Updating .gemfiles"
+    File.open(filename, 'wb') {|f| f.write(files)}
   end
 
+  raise "unable to process gemfiles" unless files
 end

data/TODO.markdown

@@ -1,3 +1,6 @@
 TODO
 ====
 
+* revenc.conf file paths should be relative to the config file location,
+  not cwd
+* add alias 'umount' for 'unmount' action

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.1

data/bin/revenc

@@ -2,6 +2,7 @@
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
+require 'rubygems'
 require 'revenc'
 require 'optparse'
 require 'term/ansicolor'
@@ -18,28 +19,29 @@ banner << "\nActions: #{available_actions.join(' ')}\n" unless available_actions
 help = banner
 help += <<HELP
   Mount: revenc mount <unencrypted source> <empty mountpoint>
-Unmount: revenc unmount <mounted encypted folder> 
+Unmount: revenc unmount <mounted encypted folder>
    Copy: revenc copy <encrypted source>  <destination>
          Note: Copying is normally done via rsync
 
 Options:
- 
+
 HELP
 
 options = {}
 OptionParser.new do |opts|
   opts.banner = help
 
-  # set defaults
-  options[:verbose] = false
-  options[:coloring] = true
-
   opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
     options[:verbose] = v
   end
 
-  opts.on("-c", "--[no-]coloring", "Ansi color in output") do |c|
-    options[:coloring] = c
+  opts.on("-c", "--[no-]coloring [MODE]", "ANSI color in output. MODE=AUTO (default) or ALWAYS") do |c|
+    options[:coloring] = c.nil? ? "AUTO" : c
+    options[:coloring].upcase! if options[:coloring]
+    unless [nil, false, "AUTO", "ALWAYS"].include?(options[:coloring])
+      puts "revenc, invalid color option: #{options[:coloring]}"
+      exit 1
+    end
   end
 
   opts.on("--version", "Display current version") do
@@ -52,7 +54,7 @@ OptionParser.new do |opts|
   end
 
   opts.on("--config FILE", "Load configuration options from FILE") do |file|
-    options[:config] = file 
+    options[:config] = file
   end
 
   # no argument, shows at tail.  This will print an options summary.
@@ -60,7 +62,7 @@ OptionParser.new do |opts|
     puts opts
     exit 0
   end
-  
+
   begin
     opts.parse!
   rescue OptionParser::InvalidOption => e
@@ -71,11 +73,26 @@ OptionParser.new do |opts|
 
 end
 
-if STDOUT.isatty
+# options from config file, if it exists, will not overwrite command line
+options = Revenc::Settings.new(FileUtils.pwd, options).options
+
+if STDOUT.isatty || (options[:coloring] == 'ALWAYS')
   Term::ANSIColor::coloring = options[:coloring]
+
+  if options[:coloring] && Revenc::WINDOWS
+    unless ENV['ANSICON']
+      begin
+        require 'Win32/Console/ANSI'
+      rescue LoadError
+        Term::ANSIColor::coloring = false
+        STDERR.puts 'WARNING: You must "gem install win32console" (1.2.0 or higher) or use the ANSICON driver (https://github.com/adoxa/ansicon) to get color output on MRI/Windows'
+      end
+    end
+  end
+
 else
   Term::ANSIColor::coloring = false
 end
 
-app = Revenc::App.new(FileUtils.pwd, options)
-app.run
+app = Revenc::App.new(FileUtils.pwd, ARGV.dup, options)
+app.execute