filestore 0.0.6 → 0.0.7

data/lib/filestore.rb

@@ -96,9 +96,9 @@ module FileStore
 				Logger.instance.logger.info "Using file id #{id}"
 				dstPath = File.join(dir, id)
 				Logger.instance.logger.info "Created destination path #{dstPath}"
-			
-				shouldMove ? Logger.instance.logger.info("Moving file") : Logger.instance.logger.info("Copying file")
-				shouldMove ? (FileUtils.mv(file, dstPath)) : (FileUtils.copy_file(file, dstPath))
+				
+				shouldMove ? (Logger.instance.logger.info("Moving file"); FileUtils.mv(file, dstPath)) : 
+					(Logger.instance.logger.info("Copying file"); FileUtils.copy_file(file, dstPath))
 			rescue Exception => e
 				raise FileStoreException, "Couldn't add file #{file} to store.", e.backtrace
 			end

data/lib/memory_meta.rb

@@ -86,7 +86,7 @@ module FileStore
 		#
 		def shutdown
 			begin
-				File.open(@file, "w+") do |fh|
+				File.open(@file, "wb+") do |fh|
 					YAML.dump({:current => @data, :removed => @removed}, fh)
 				end
 				

data/test/tc_filestore.rb

@@ -11,21 +11,22 @@ require_relative '../lib/memory_meta.rb'
 
 include FileStore
 
-basePath = "/Users/thomas/Documents/DEV/ruby/FileStoreGEM/test/store_test"
-testFile = "/Users/thomas/Documents/DEV/ruby/FileStoreGEM/test/testfile.txt"
+basePath = "#{Dir.getwd}/store_test"
+testFile = $*[0]
 
 begin
+	puts "Using file: #{testFile}"
 	mm = MemoryMetaManager.new(File.join(basePath, "meta.yaml"))
 	sfs = SimpleFileStore.new(mm, basePath)
-	id = sfs.add(testFile, {:hugo => 'boss'}, false)
+	id = sfs.add(testFile, {:original_file => testFile}, false)
 
 	puts id
 	puts "Enter something to finish"
 	enter = gets 
 
 	sfs.remove(id)
-	sfs.shutdown
 rescue Exception => e
 	puts e
+ensure
 	sfs.shutdown if not sfs.nil?
 end

data/test/tc_multitenant.rb

@@ -11,13 +11,13 @@ require 'fileutils'
 
 include FileStore
 
-basePath = "/Users/thomas/Documents/DEV/ruby/FileStoreRepo/test/multi_store_test"
-testFile = "/Users/thomas/Documents/DEV/ruby/FileStoreRepo/test/testfile.txt"
+basePath = "#{Dir.getwd}/multi_store_test"
+testFile = "#{Dir.getwd}/testfile.txt"
 
 begin
 	MultiTenantFileStore.instance.set_root_path basePath
 	tenant = MultiTenantFileStore.instance.create_tenant_store
-	MultiTenantFileStore.instance.add_to_tenant tenant, testFile, { :hugo => "boss" }
+	MultiTenantFileStore.instance.add_to_tenant tenant, testFile, { :original_file => testFile }
 	
 	puts MultiTenantFileStore.instance.stores
 	MultiTenantFileStore.instance.shutdown

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filestore
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools