yore 0.2.4 → 0.3.0

data/VERSION

@@ -1 +1,2 @@
-0.2.4
+0.3.0
+

data/lib/yore/AWSS3Client.rb

@@ -82,6 +82,7 @@ class AWSS3Client
 		policy
 	end
 
+	# aContent can be a String or File eg. 'something' or open('file.txt')
 	def put_content(aFilename, aContent, aBucketName)
 		AWS::S3::S3Object.store(aFilename, aContent, aBucketName)
 	end
@@ -89,15 +90,16 @@ class AWSS3Client
 	def upload(aFilename,aBucketName,aObjectName=nil)
 		aObjectName ||= File.basename(aFileName)
 		#AWS::S3::S3Object.store(aObjectName, MiscUtils.string_from_file(aFileName), aBucketName)
-		content = MiscUtils.string_from_file(aFileName)
+		#content = MiscUtils.string_from_file(aFileName)
 
-		put_content(aObjectName, content, aBucketName)
+		put_content(aObjectName, open(aFilename), aBucketName)
 	end	
 	
 	def get_content(aFilename, aBucketName)	
 		return AWS::S3::S3Object.value(aFilename, aBucketName)
 	end
 
+	# should replace string_to_file with file object
 	def download(aFilename,aBucketName,aObjectName=nil)
 		aObjectName ||= File.basename(aFilename)
 		#AWS::S3::S3Object.store(aObjectName, MiscUtils.string_from_file(aFilename), aBucketName)
@@ -115,7 +117,7 @@ class AWSS3Client
 	# * This requires the bucket to give WRITE & READ_ACP permissions to this user
 	def upload_backup(aFileName,aBucketName,aObjectName = nil)
 		aObjectName ||= File.basename(aFileName)
-		AWS::S3::S3Object.store(aObjectName, MiscUtils.string_from_file(aFileName), aBucketName)
+		AWS::S3::S3Object.store(aObjectName, open(aFileName), aBucketName)
 		bucket_owner = AWS::S3::Bucket.acl(aBucketName).owner
 		policy = AWS::S3::S3Object.acl(aObjectName,aBucketName)
 		policy.grants.clear

data/lib/yore/yore_core.rb

@@ -21,6 +21,7 @@ module YoreCore
 			:basepath => String,
 			:backup_id => String,
 			:backup_email => String,
+			:compress => true,
       :crypto_iv => "3A63775C1E3F291B0925578165EB917E",    # apparently a string of up to 32 random hex digits
       :crypto_key => "07692FC8656F04AE5518B80D38681E038A3C12050DF6CC97CEEC33D800D5E2FE",   # apparently a string of up to 64 random hex digits
       :first_hour => 4,
@@ -258,11 +259,15 @@ module YoreCore
 			
 			shell("tar cv #{aParentDir ? '--directory='+aParentDir.to_s : ''} --file=#{tarfile} --files-from=#{listfile}")
 			shell("rm #{listfile}") unless config[:leave_temp_files]
-			logger.info "Compressing ..."
-			tarfile_size = File.size(tarfile)
-			shell("bzip2 #{tarfile}; mv #{tarfile}.bz2 #{aDestFile}")
-			
-			logger.info "Compressed #{'%.1f' % (tarfile_size*1.0/2**10)} KB to #{'%.1f' % (File.size(aDestFile)*1.0/2**10)} KB"
+			if config[:compress]
+				logger.info "Compressing ..."
+				tarfile_size = File.size(tarfile)
+				shell("bzip2 #{tarfile}; mv #{tarfile}.bz2 #{aDestFile}")
+				
+				logger.info "Compressed #{'%.1f' % (tarfile_size*1.0/2**10)} KB to #{'%.1f' % (File.size(aDestFile)*1.0/2**10)} KB"
+			else
+				shell("mv #{tarfile} #{aDestFile}")
+			end
     end
 
     def uncompress(aArchive,aDestination=nil,aArchiveContent=nil)			

data/yore.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yore}
-  s.version = "0.2.4"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["buzzware"]
-  s.date = %q{2011-11-03}
+  s.date = %q{2011-11-07}
   s.default_executable = %q{yore}
   s.description = %q{yore (as in "days of yore") is a user data management utility for web applications.}
   s.email = %q{contact@buzzware.com.au}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: yore
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 4
-  version: 0.2.4
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - buzzware
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-03 00:00:00 +08:00
+date: 2011-11-07 00:00:00 +08:00
 default_executable: yore
 dependencies: 
 - !ruby/object:Gem::Dependency