yore 0.1.1 → 0.1.2

data/README.rdoc

@@ -40,13 +40,13 @@ to get an "Access Key ID" and click Show to get its "Secret Access Key"
 
 * Create a bucket with backup permissions for an AWS account
 
-yore new_backup_bucket --backup_email "blah@buzzware.com.au" testbucket
+yore new_backup_bucket --backup_email "blah@buzzware.com.au" --bucket testbucket
 
 == SYNOPSIS:
 
 yore [global options] command [command options] [arguments]
 eg.
-* yore backup yore_config.xml
+* yore backup yore.config.xml
 * cd my_rails_app; yore save --kind=spree data.tgz
 
 == REQUIREMENTS:

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.homepage = "http://github.com/buzzware/yore"
     gem.authors = ["buzzware"]
     gem.rubyforge_project = "buzzware"
+    gem.add_dependency('cmdparse', '>= 2.0.2')
     gem.add_dependency('buzzcore', '>= 0.2.6')
     gem.add_dependency('aws-s3', '>= 0.6.2')
     gem.add_development_dependency "thoughtbot-shoulda"

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bin/yore

@@ -70,6 +70,9 @@ encrypt_decrypt_option_parser = CmdParse::OptionParserWrapper.new do |opt|
 end
 
 new_backup_bucket_option_parser = CmdParse::OptionParserWrapper.new do |opt|
+  opt.on( '--bucket=Bucket Name', String, 'Name of bucket' ) do |value|
+    CMD_OPTIONS[:bucket] = value
+  end
   opt.on( '--backup_id=S3 Access Key ID', String, 'S3 Access Key ID from Amazon' ) do |value|
     CMD_OPTIONS[:backup_id] = value
   end
@@ -86,6 +89,8 @@ command(cmd,yore,:load,"Load application data from local file",load_save_option_
 
 command(cmd,yore,:decrypt,"Expand archive file",encrypt_decrypt_option_parser)
 
+command(cmd,yore,:retrieve,"download and decrypt file",encrypt_decrypt_option_parser)
+
 #command(cmd,yore,:encrypt,"Create archive file",encrypt_decrypt_option_parser)
 
 command(cmd,yore,:test_email,"Test email sending\n")

data/lib/yore/yore_core.rb

@@ -264,6 +264,7 @@ module YoreCore
       @keepers << KeepMonthly.new(config[:keep_monthly])
 			
 			@s3client = ::AWSS3Client.new()
+			logger.info "Using S3 key #{@s3client.credentials[:s3_access_key_id]}"
     end
 		
 		def do_action(aAction,aArgs)
@@ -617,8 +618,13 @@ module YoreCore
 			uncompress(temp_file,folder)
 		end
 		
+		def retrieve(aArgs)
+			download(aArgs[0])
+			decrypt(aArgs)
+		end
+		
 		def new_backup_bucket(aArgs)
-			bucket_name = aArgs[0]
+			bucket_name = config[:bucket]
 			if s3client.bucket_exists?(bucket_name)
 				puts "sorry, bucket already exists"
 			else

data/yore.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yore}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["buzzware"]
@@ -63,15 +63,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<cmdparse>, [">= 2.0.2"])
       s.add_runtime_dependency(%q<buzzcore>, [">= 0.2.6"])
       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.2.6"])
       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.2.6"])
     s.add_dependency(%q<aws-s3>, [">= 0.6.2"])
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yore
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - buzzware
@@ -12,6 +12,16 @@ cert_chain: []
 date: 2009-12-08 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 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: buzzcore
   type: :runtime