yore 0.2.1 → 0.2.3

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.authors = ["buzzware"]
     gem.rubyforge_project = "buzzware"
     gem.add_dependency('cmdparse', '>= 2.0.2')
-    gem.add_dependency('buzzcore', '>= 0.3.1')
+    gem.add_dependency('buzzcore', '>= 0.3.3')
     gem.add_dependency('nokogiri', '>= 1.3.3')
     gem.add_dependency('aws-s3', '>= 0.6.2')
     gem.add_development_dependency "thoughtbot-shoulda"

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.3

data/lib/yore/yore_core.rb

@@ -6,6 +6,7 @@ require 'fileutils'
 require 'net/smtp'
 
 require 'yore/AWSS3Client'
+require 'yaml'
 
 
 THIS_FILE = File.expand_path(__FILE__)
@@ -25,6 +26,7 @@ module YoreCore
       :first_hour => 4,
       :prefix => 'backup',
       :log_level => 'INFO',
+			:leave_temp_files => false,
       :bucket => String,
 			:email_report => false,
       :mail_host => String,
@@ -44,7 +46,6 @@ module YoreCore
     attr_reader :config
     attr_reader :logger
     attr_reader :reporter
-    attr_reader :s3client
 
     def initialize(aConfig=nil)
       DEFAULT_CONFIG[:email_report] = false  # fixes some bug where this was nil
@@ -68,6 +69,13 @@ module YoreCore
       configure(aConfig)
     end
 		
+		def s3client
+			return @s3client if @s3client		
+			@s3client = ::AWSS3Client.new()
+			logger.info "Using S3 key #{@s3client.credentials[:s3_access_key_id]}"
+			@s3client			
+		end
+		
 		#aOptions may require {:basepath => File.dirname(File.expand_path(job))}
 		def self.launch(aConfigXml,aCmdOptions=nil,aOptions=nil)
 			if !aConfigXml
@@ -183,9 +191,6 @@ module YoreCore
 			config[:basepath] = MiscUtils.canonize_path(config[:basepath],Dir.pwd)
 
 			expand_app_option()
-
-			@s3client = ::AWSS3Client.new()
-			logger.info "Using S3 key #{@s3client.credentials[:s3_access_key_id]}"
     end
 		
 		def do_action(aAction,aArgs)
@@ -252,9 +257,12 @@ module YoreCore
       tarfile = MiscUtils.file_change_ext(aDestFile, 'tar')
 			
 			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}")
+			shell("rm #{tarfile}") unless config[:leave_temp_files]
+			
 			logger.info "Compressed #{'%.1f' % (tarfile_size*1.0/2**10)} KB to #{'%.1f' % (File.size(aDestFile)*1.0/2**10)} KB"
     end
 
@@ -473,8 +481,9 @@ module YoreCore
 			save_internal(temp_file)
       backup_file = File.expand_path(encode_file_name(),temp_path)
       pack(temp_file,backup_file)
+			shell("rm #{temp_file}") unless config[:leave_temp_files]
       upload(backup_file)
-      #clean
+			shell("rm #{backup_file}") unless config[:leave_temp_files]
     end
 				
 		def load(aArgs,aCmdOptions=nil)

data/yore.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{yore}
-  s.version = "0.2.1"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["buzzware"]
-  s.date = %q{2010-01-16}
+  s.date = %q{2010-09-27}
   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}
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{buzzware}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{yore (as in "days of yore") is a user data management utility for web applications.}
   s.test_files = [
     "test/AWS_gem_test.rb",
@@ -62,24 +62,25 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<cmdparse>, [">= 2.0.2"])
-      s.add_runtime_dependency(%q<buzzcore>, [">= 0.3.1"])
+      s.add_runtime_dependency(%q<buzzcore>, [">= 0.3.3"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.3.3"])
       s.add_runtime_dependency(%q<aws-s3>, [">= 0.6.2"])
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else
       s.add_dependency(%q<cmdparse>, [">= 2.0.2"])
-      s.add_dependency(%q<buzzcore>, [">= 0.3.1"])
+      s.add_dependency(%q<buzzcore>, [">= 0.3.3"])
       s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
       s.add_dependency(%q<aws-s3>, [">= 0.6.2"])
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     end
   else
     s.add_dependency(%q<cmdparse>, [">= 2.0.2"])
-    s.add_dependency(%q<buzzcore>, [">= 0.3.1"])
+    s.add_dependency(%q<buzzcore>, [">= 0.3.3"])
     s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
     s.add_dependency(%q<aws-s3>, [">= 0.6.2"])
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
   end
 end
+

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: yore
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  hash: 17
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - buzzware
@@ -9,59 +15,87 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-16 00:00:00 +08:00
+date: 2010-09-27 00:00:00 +08:00
 default_executable: yore
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cmdparse
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 0
+        - 2
         version: 2.0.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: buzzcore
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.1
-    version: 
+        hash: 21
+        segments: 
+        - 0
+        - 3
+        - 3
+        version: 0.3.3
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 3
+        - 3
         version: 1.3.3
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: aws-s3
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 6
+        - 2
         version: 0.6.2
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id005
 description: yore (as in "days of yore") is a user data management utility for web applications.
 email: contact@buzzware.com.au
 executables: 
@@ -105,21 +139,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: buzzware
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: yore (as in "days of yore") is a user data management utility for web applications.