lenc 1.1.3 → 1.2.0

data/lib/lenc/tools.rb

@@ -678,6 +678,7 @@ end
 def simple_str(s)
   if s.encoding.name != 'ASCII-8BIT' && s.encoding.name != 'UTF-8'
     pr("string [%s]\n encoding is %s,\n expected ASCII-8BIT\n",s,s.encoding.name)
+    pr("ruby version = #{RUBY_VERSION}\n")
     assert!(false)
   end
 end
@@ -703,6 +704,27 @@ def windows?
   $__windows__
 end
 
+# Make a system call
+#
+# @param cmd command to execute
+# @param abort_if_problem if return code is nonzero, aborts
+# @return [captured output, return code]
+#
+def scall(cmd, abort_if_problem = true)
+#    printf("...(making system call:  #{cmd} )...\n")
+  
+  res = `#{cmd} 2>&1`
+  succ = $?.success?
+  if !succ && abort_if_problem
+    puts("Failed system call '#{cmd}':\n\n#{res}")
+    exit
+  end
+  
+  [res, succ]
+end
+
+
+
 # Mark all constants ending with '_' as private constants
 #
 # @param entity the class to examine

data/test/test.rb

@@ -4,13 +4,17 @@ require_relative '../lib/lenc/tools.rb'
 req('repo lencrypt')
 
 
-#SINGLETEST = "test_101_update_repo_with_verify"
+#SINGLETEST = "test_121_update_repo_with_lencrypt_program"
 if defined? SINGLETEST
   if main?(__FILE__)
     ARGV.concat("-n  #{SINGLETEST}".split)
   end
 end
 
+# Enable to display verbose output
+#ARGV.concat("-v")
+
+
 class RepoTest < MyTestSuite
 
   include LEnc
@@ -32,6 +36,7 @@ class RepoTest < MyTestSuite
     mkdir(@@testDir)
       
     @@sourceDir = File.join(@@testDir,"__source__")
+    @@sourceDir2 = File.join(@@testDir,"ip")
     @@encryptDir = File.join(@@testDir,"__encrypted__")
     @@recoverDir = File.join(@@testDir,"__recovered__")
     @@repoFile = File.join(@@sourceDir,Repo::LENC_REPO_FILENAME)
@@ -41,7 +46,7 @@ class RepoTest < MyTestSuite
     if !File.directory?(@@sourceDir)
       create_source_tree()
     end
-    
+
     clean()
     
     # Construct a list of the source subdirectories, since some of them have
@@ -144,18 +149,18 @@ class RepoTest < MyTestSuite
       pluto|
 SCR
       
-      # Script of predetermined file lengths:
+    # Script of predetermined file lengths:
     cs = RepoInternal::CHUNK_SIZE_ENCR
     hs = RepoInternal::CHUNK_HEADER_SIZE
     flens = [0, cs - 1, cs, cs + 1, cs + hs - 1, cs + hs, cs + hs + 1,
-             (2 * cs) - 1, 2 * cs, 2 * cs + 1, 2 * (cs + hs) - 1, 2 * (cs + hs), 2 * (cs + hs) + 1]
+      (2 * cs) - 1, 2 * cs, 2 * cs + 1, 2 * (cs + hs) - 1, 2 * (cs + hs), 2 * (cs + hs) + 1]
     fNum = 0
-    
+
     srand(1983)
-    
-    dr = @@sourceDir 
+
+    dr = @@sourceDir
     mkdir(dr)
-    
+
     dirStack = []
     k = 0
     k0 = k
@@ -163,29 +168,36 @@ SCR
       c = scr[k]
       k += 1
       next if !"|/^".index(c)
-      
+
       nm = scr[k0...k-1].strip
-      
+
       k0 = k
-      
-      if c == '|'  
+
+      if c == '|'
         # create a file; use our predetermined lengths, if we still have some;
         # otherwise, choose a random file length
         if fNum < flens.size
           j = flens[fNum]
-        else  
+        else
           j = (rand() * rand() * 130000).to_i + 3
         end
+
+        # Make the length end with a particular sequence of digits so we can quickly determine whether
+        # file has been encrypted or decrypted
+        q = (j - 11) % 100
+        j -= q
+        j += 100 if j <= 0
+
         fNum += 1
         makeFile(File.join(dr, nm), j)
       elsif c == '/'
-          dirStack.push(dr)
-          dr = File.join(dr,nm)
-          mkdir(dr)
-elsif c == '^'
-          dr = dirStack.pop
-end
-end
+        dirStack.push(dr)
+        dr = File.join(dr,nm)
+        mkdir(dr)
+      elsif c == '^'
+        dr = dirStack.pop
+      end
+    end
 
       # Store some .lencignore files
     dr = @@sourceDir
@@ -199,6 +211,18 @@ end
   end
 
 
+  # Create in-place source tree as copy of normal source tree
+  def create_source_tree2
+    if !File.exist?(@@sourceDir2)
+      remove_file_or_dir(@@sourceDir2)
+      FileUtils.cp_r(@@sourceDir,@@sourceDir2)
+    end
+    remove_file_or_dir(File.join(@@sourceDir2,".lenc"))
+  end
+  
+
+  
+  
   def writeIgnore(dr, contents)  
     pth = File.join(dr,Repo::IGNOREFILENAME)
     File.open(pth,'w') do |f|
@@ -210,7 +234,8 @@ end
     if args.is_a? String
       args = args.split
     end
-    args.concat(["-w", @@sourceDir, "-q"])
+    args.concat(["-w", @@sourceDir])
+    args.concat(["-q"])
     LEncApp.new().run(args)
   end
   
@@ -234,14 +259,14 @@ end
   
   def update_repo(silent = true)
     rp = build_repo_obj(silent)
-    rp.open(@@sourceDir)
-    rp.perform_update
+    rp.open(@@sourceDir,@@key)
+    rp.perform_encrypt
     rp.close  
   end
   
   def do_recover
     rp = build_repo_obj
-    rp.perform_recovery(@@key, @@encryptDir,@@recoverDir)
+    rp.perform_recovery(@@key, @@encryptDir, @@recoverDir)
     rp.close
   end
   
@@ -304,25 +329,25 @@ end
   end
   
   # Create repo using lencrypt program
-  def test_101_create_repo
+  def test_101_create_repo_with_lencrypt_program
     clean
-    a = "-i #{@@key} #{@@encryptDir} --storekey"
+    a = "--init #{@@encryptDir} --key #{@@key}"
     ex(a)
   end
 
   def test_101_update_repo_with_verify
     clean
-    ex("-i #{@@key} #{@@encryptDir} --storekey")
+    ex("--init #{@@encryptDir} --key #{@@key}")
     rp = build_repo_obj
-    rp.open(@@sourceDir)
-    rp.perform_update(true)
+    rp.open(@@sourceDir,@@key)
+    rp.perform_encrypt()
     rp.close  
   end
 
   def test_110_open_repo_using_Repo_class
     # (assumes repo exists at this point; preceding test creates it)
     rp = build_repo_obj
-    rp.open(@@sourceDir)
+    rp.open(@@sourceDir,@@key)
   end
 
   def test_120_update_repo_using_Repo_class
@@ -331,8 +356,11 @@ end
   end
   
   def test_121_update_repo_with_lencrypt_program  
+    create_repo
     remove_file_or_dir(@@encryptDir)
-    ex("")
+    
+     ex("--key #{@@key}")
+    
     assert(File.directory?(@@encryptDir))
   end
 
@@ -353,7 +381,7 @@ end
   
   def test_200_recover_with_incorrect_password   
     create_repo
-    ex("") # updates repo
+    ex("--key #{@@key}") # updates repo
     assert_raise(DecryptionError) do
       remove_file_or_dir(@@recoverDir)
       rp = build_repo_obj()
@@ -362,4 +390,44 @@ end
     end
   end
   
+  def test_300_singular_repo
+    create_source_tree2
+    
+    # Create in-place repository
+    rp = build_repo_obj
+    rp.create(@@sourceDir2,@@key,nil)
+    rp.close  
+
+    # Update the repo
+    rp = build_repo_obj   
+    rp.open(@@sourceDir2, @@key)
+    rp.perform_encrypt()
+    rp.close
+    
+       
+  end
+  
+def test_310_singular_encrypt_then_decrypt
+  
+  create_source_tree2
+  
+  # Create in-place repository
+  rp = build_repo_obj
+  rp.create(@@sourceDir2,@@key,nil)
+  rp.close  
+
+  # Update the repo
+  rp = build_repo_obj
+  rp.open(@@sourceDir2, @@key)
+  rp.perform_encrypt()
+  rp.close
+  
+  # Try decrypting
+  rp = build_repo_obj
+  rp.open(@@sourceDir2, @@key)
+  rp.perform_decrypt()
+  rp.close
+end
+
+  
 end

metadata

@@ -1,22 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: lenc
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Jeff Sember
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
-dependencies: []
+date: 2013-05-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "Encrypts a set of local files, and copies the encrypted versions to
   a repository, \nwhich may be located within a free cloud service (Dropbox, Google
   Drive, Microsoft SkyDrive). \nThe program uses the trusted AES 256-bit encryption
   standard. \nAll files are encrypted on the user machine; \npasswords and unencrypted
-  files are never seen by the cloud service. \n"
+  files are never seen by the cloud service. \n\nIt can also encrypt or decrypt directory
+  trees 'in place', so that the original files are\noverwritten by their encrypted
+  versions.\n\n"
 email: jpsember@gmail.com
 executables:
+- encr
 - lencrypt
 extensions: []
 extra_rdoc_files: []
@@ -25,10 +42,12 @@ files:
 - lib/lenc/_OLD_tools.rb
 - lib/lenc/aes.rb
 - lib/lenc/config_file.rb
+- lib/lenc/encr.rb
 - lib/lenc/lencrypt.rb
 - lib/lenc/repo.rb
 - lib/lenc/tools.rb
 - lib/lenc/trollop.rb
+- bin/encr
 - bin/lencrypt
 - CHANGELOG.txt
 - README.md
@@ -53,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Maintains an encrypted repository of a set of files for secure cloud storage.