revenc 0.1.2 → 0.1.3

data/features/mount.feature

@@ -16,7 +16,7 @@ Feature: Reverse mount encrypted folder using encfs
       test
       """
     When I run "revenc mount unencrypted_source_folder encrypted_destination_folder"
-    Then I should not see "For more information, see the man page encfs(1)"
+    Then the output should not contain "For more information, see the man page encfs(1)"
     And the exit status should be 0
 
   Scenario: Successful mount dry run
@@ -35,7 +35,7 @@ Feature: Reverse mount encrypted folder using encfs
   Scenario: Source folder not specified
     When I run "revenc mount"
     Then the exit status should be 1
-    And I should see:
+    And the output should contain:
       """
       source folder not specified
       """
@@ -43,7 +43,7 @@ Feature: Reverse mount encrypted folder using encfs
   Scenario: Destination mount point not specified
     When I run "revenc mount unencrypted_source_folder"
     Then the exit status should be 1
-    And I should see:
+    And the output should contain:
       """
       mountpoint not specified
       """
@@ -52,7 +52,7 @@ Feature: Reverse mount encrypted folder using encfs
     Given a directory named "encrypted_destination_folder"
     When I run "revenc mount unencrypted_source_folder encrypted_destination_folder"
     Then the exit status should be 1
-    And I should see:
+    And the output should contain:
       """
       source folder not found
       """
@@ -62,7 +62,7 @@ Feature: Reverse mount encrypted folder using encfs
     Given an empty file named "unencrypted_source_folder/test_data.txt"
     When I run "revenc mount unencrypted_source_folder encrypted_destination_folder"
     Then the exit status should be 1
-    And I should see:
+    And the output should contain:
       """
       mount point not found
       """
@@ -74,7 +74,7 @@ Feature: Reverse mount encrypted folder using encfs
     Given an empty file named "encrypted_destination_folder/should_not_be_here.txt"
     When I run "revenc mount unencrypted_source_folder encrypted_destination_folder"
     Then the exit status should be 1
-    And I should see:
+    And the output should contain:
       """
       mount point is not empty
       """
@@ -85,7 +85,7 @@ Feature: Reverse mount encrypted folder using encfs
     Given a directory named "encrypted_destination_folder"
     When I run "revenc mount unencrypted_source_folder encrypted_destination_folder"
     Then the exit status should be 1
-    And I should see:
+    And the output should contain:
       """
       mount point passphrase file not found
       """
@@ -97,7 +97,7 @@ Feature: Reverse mount encrypted folder using encfs
     Given an empty file named "passphrase"
     When I run "revenc mount unencrypted_source_folder encrypted_destination_folder"
     Then the exit status should be 1
-    And I should see:
+    And the output should contain:
       """
       mount point passphrase file is empty
       """
@@ -105,7 +105,7 @@ Feature: Reverse mount encrypted folder using encfs
   Scenario: Key file not found
     When I run "revenc mount unencrypted_source_folder encrypted_destination_folder"
     Then the exit status should be 1
-    And I should see:
+    And the output should contain:
       """
       key file not found
       """
@@ -114,7 +114,7 @@ Feature: Reverse mount encrypted folder using encfs
     Given an empty file named "encfs6.xml"
     When I run "revenc mount unencrypted_source_folder encrypted_destination_folder"
     Then the exit status should be 1
-    And I should see:
+    And the output should contain:
       """
       key file is empty
       """
@@ -127,7 +127,7 @@ Feature: Reverse mount encrypted folder using encfs
       """
     When I run "revenc mount unencrypted_source_folder encrypted_destination_folder"
     Then the exit status should be 1
-    And I should see:
+    And the output should contain:
       """
       executable not found
       """

data/features/step_definitions/revenc_steps.rb

@@ -1,3 +1,4 @@
+require 'mutagem'
 require 'revenc/io'
 
 Given /^a valid encfs keyfile named "([^\"]*)"$/ do |filename|
@@ -45,8 +46,8 @@ end
 
 When /^I run with a lock file present "(.*)"$/ do |cmd|
   lockfile = File.join(current_dir, 'revenc.lck')
-  Revenc::Mutex.new(lockfile).execute do
-    run(unescape(cmd))
+  Mutagem::Mutex.new(lockfile).execute do
+    run(unescape(cmd), false)
   end
 end
 

data/features/support/aruba.rb

@@ -9,13 +9,13 @@ module Aruba
    alias_method :old_run, :run
 
     # override aruba 
-    def run(cmd)
+    def run(cmd, fail_on_error=true)
       
       # run development version in verbose mode
       cmd = cmd.gsub(/^revenc/, "#{APP_BIN_PATH} --verbose")
 
       # run original aruba 'run' 
-      old_run(cmd)
+      old_run(cmd, fail_on_error)
     end
   end
 end

data/features/unmount.feature

@@ -30,7 +30,7 @@ Feature: Unmounting a reverse mounted encrypted folder using encfs
   Scenario: Unmount folder not specified
     When I run "revenc unmount"
     Then the exit status should be 1
-    And I should see:
+    And the output should contain:
       """
       mountpoint not specified
       """
@@ -39,7 +39,7 @@ Feature: Unmounting a reverse mounted encrypted folder using encfs
     Given a directory named "encrypted_destination_folder"
     When I run "revenc unmount unencrypted_source_folder"
     Then the exit status should be 1
-    And I should see:
+    And the output should contain:
       """
       folder not found
       """
@@ -52,7 +52,7 @@ Feature: Unmounting a reverse mounted encrypted folder using encfs
       """
     When I run "revenc unmount unencrypted_source_folder"
     Then the exit status should be 1
-    And I should see:
+    And the output should contain:
       """
       executable not found
       """

data/lib/revenc/io.rb

@@ -1,3 +1,5 @@
+require 'mutagem'
+
 module Revenc
 
   class BasicAction
@@ -180,7 +182,7 @@ module Revenc
       result = false
       
       # protect command from recursion
-      mutex = Revenc::Mutex.new
+      mutex = Mutagem::Mutex.new('revenc.lck')
       lock_sucessful = mutex.execute do
         result = system_cmd(cmd)
       end

data/lib/revenc.rb

@@ -1,22 +1,24 @@
-$:.unshift File.dirname(__FILE__) # For use/testing when no gem is installed
-
+# require all files here
 require 'rubygems'
+require 'revenc/app'
+require 'revenc/io'
+require 'revenc/errors'
+require 'revenc/encfs_wrapper'
 
+# Master namespace
 module Revenc
 
-  # return the contents of the VERSION file
-  # VERSION format: 0.0.0
+  # Contents of the VERSION file
+  #
+  # Example format: 0.0.1
+  #
+  # @return [String] the contents of the version file in #.#.# format
   def self.version
     version_info_file = File.join(File.dirname(__FILE__), *%w[.. VERSION])
     File.open(version_info_file, "r") do |f|
       f.read
-    end 
+    end
   end
-  
+ 
 end
 
-require 'revenc/app'
-require 'revenc/io'
-require 'revenc/errors'
-require 'revenc/lockfile'
-require 'revenc/encfs_wrapper'

data/revenc.gemspec

@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+#
+#
+
+Gem::Specification.new do |s|
+  s.name        = "revenc"
+  s.version     = File.open(File.join(File.dirname(__FILE__), *%w[VERSION]), "r") { |f| f.read } 
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Robert Wahler"]
+  s.email       = ["robert@gearheadforhire.com"]
+  s.homepage    = "http://rubygems.org/gems/revenc"
+  s.summary     = "Wrapper for EncFS reverse mounting and folder syncing"
+  s.description = "Reverse Mount, unmount, and copy/synchronize encrypted files to untrusted destinations using EncFS and rsync"
+
+  s.required_rubygems_version = ">= 1.3.6"
+  s.rubyforge_project         = "revenc"
+
+  s.add_dependency 'mutagem', '>= 0.1.3'
+  s.add_dependency 'term-ansicolor', '>= 1.0.4'
+  s.add_dependency 'configatron', '>= 2.5.1'
+
+  s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency "rspec", ">= 1.2.9"
+  s.add_development_dependency "cucumber", ">= 0.6"
+  s.add_development_dependency "aruba", ">= 0.2.0"
+  s.add_development_dependency "rake", ">= 0.8.7"
+  s.add_development_dependency "yard", ">= 0.6.1"
+  s.add_development_dependency "rdiscount", ">= 1.6.5"
+
+  s.files        = `git ls-files`.split("\n")
+  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.test_files   = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_path = 'lib'
+
+  s.has_rdoc = 'yard'
+  s.rdoc_options     = [ 
+                         '--title', 'Revenc Documentation', 
+                         '--main', 'README.markdown', 
+                         '--line-numbers',
+                         '--inline-source' 
+                       ]
+end

data/spec/basic_gem/basic_gem_spec.rb

@@ -0,0 +1,13 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Revenc do
+  
+  describe 'version' do
+
+    it "should return a string formatted '#.#.#'" do
+      Revenc::version.should match(/(^[\d]+\.[\d]+\.[\d]+$)/)
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,12 +1,15 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift File.expand_path('..', __FILE__) unless
+  $LOAD_PATH.include? File.expand_path('..', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__) unless
+  $LOAD_PATH.include? File.expand_path('../../lib', __FILE__)
+
+require 'rubygems'
 require 'revenc'
 require 'spec'
 require 'spec/autorun'
 require 'aruba/api'
 
-# aruba helper, returns to full path to files
-# in the aruba tmp folder
+# aruba helper, returns full path to files in the aruba tmp folder
 def fullpath(filename)
   File.expand_path(File.join(current_dir, filename))
 end

data/spec/watchr.rb

@@ -1,5 +1,7 @@
 # Watchr: Autotest like functionality
 #
+# gem install watchr
+#
 # Run me with:
 #
 #   $ watchr spec/watchr.rb
@@ -26,7 +28,7 @@ def all_feature_files
 end
 
 def all_spec_files
-  files = Dir['spec/revenc/*.rb']
+  files = Dir['spec/**/*_spec\.rb']
 end
 
 def run(cmd)
@@ -103,7 +105,6 @@ prompt
 # --------------------------------------------------
 # Watchr Rules
 # --------------------------------------------------
-#watch( '^features/(.*)\.feature'   )   { |m| run_feature(m[0]) }
 watch( '^features/(.*)\.feature'   )   { run_default_cucumber }
 
 watch( '^bin/(.*)'   )   { run_default_cucumber }
@@ -113,9 +114,11 @@ watch( '^features/step_definitions/(.*)\.rb' )   { run_default_cucumber }
 watch( '^features/support/(.*)\.rb' )   { run_default_cucumber }
 
 watch( '^spec/(.*)_spec\.rb'   )   { |m| run_spec(m[0]) }
-# watch( '^lib/revenc/io.rb'   )   { run_default_spec }
-watch( '^lib/revenc/errors.rb'   )   { run_default_spec }
-watch( '^lib/revenc/lockfile.rb'   )   { run_default_spec }
+# specify just the lib files that have specs
+# TODO: This can be determined automatically from the spec file naming convention
+watch( '^lib/revenc.rb'   )   { run_default_spec }
+watch( '^lib/errors.rb'   )   { run_default_spec }
+watch( '^lib/io.rb'   )   { run_default_spec }
 
 # --------------------------------------------------
 # Signal Handling

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: revenc
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Robert Wahler
@@ -14,97 +15,188 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-12 00:00:00 -05:00
-default_executable: revenc
+date: 2010-10-05 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: term-ansicolor
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 1
+        - 3
+        version: 0.1.3
+  type: :runtime
+  name: mutagem
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 0
         - 4
         version: 1.0.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: configatron
+  name: term-ansicolor
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 2
         - 5
         - 1
         version: 2.5.1
   type: :runtime
-  version_requirements: *id002
+  name: configatron
+  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 0
         - 6
         version: "0.6"
   type: :development
-  version_requirements: *id004
+  name: cucumber
+  prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 2
+        - 0
+        version: 0.2.0
+  type: :development
   name: aruba
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 0
-        - 1
+        - 8
         - 7
-        version: 0.1.7
+        version: 0.8.7
   type: :development
-  version_requirements: *id005
-description: |-
-  Mount, unmount, and copy/synchronize encrypted files to 
-                           untrusted destinations using EncFS and rsync
-email: robert@gearheadforhire.com
+  name: rake
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
+        version: 0.6.1
+  type: :development
+  name: yard
+  prerelease: false
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 6
+        - 5
+        version: 1.6.5
+  type: :development
+  name: rdiscount
+  prerelease: false
+  version_requirements: *id010
+description: Reverse Mount, unmount, and copy/synchronize encrypted files to untrusted destinations using EncFS and rsync
+email: 
+- robert@gearheadforhire.com
 executables: 
 - revenc
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- .document
 - .gitattributes
 - .gitignore
-- CLONING.rdoc
+- .yardopts
+- Gemfile
+- Gemfile.lock
+- HISTORY.markdown
 - LICENSE
-- README.rdoc
+- README.markdown
 - Rakefile
+- TODO.markdown
 - VERSION
 - bin/revenc
 - config/cucumber.yml
@@ -134,46 +226,53 @@ files:
 - lib/revenc/encfs_wrapper.rb
 - lib/revenc/errors.rb
 - lib/revenc/io.rb
-- lib/revenc/lockfile.rb
+- revenc.gemspec
+- spec/basic_gem/basic_gem_spec.rb
 - spec/revenc/error_spec.rb
 - spec/revenc/io_spec.rb
-- spec/revenc/lockfile_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/watchr.rb
-has_rdoc: true
-homepage: http://github.com/robertwahler/revenc
+has_rdoc: yard
+homepage: http://rubygems.org/gems/revenc
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --charset=UTF-8
+- --title
+- Revenc Documentation
+- --main
+- README.markdown
+- --line-numbers
+- --inline-source
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.6
+rubyforge_project: revenc
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Helper for reverse mounting encrypted file systems
-test_files: 
-- spec/spec_helper.rb
-- spec/watchr.rb
-- spec/revenc/lockfile_spec.rb
-- spec/revenc/io_spec.rb
-- spec/revenc/error_spec.rb
+summary: Wrapper for EncFS reverse mounting and folder syncing
+test_files: []
+

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE