niky81-s3rbackup 0.2.2 → 0.2.3

data/bin/s3query.rb

@@ -3,9 +3,13 @@
 require 'rubygems'
 require 'optparse'
 
+development_lib = File.join(File.dirname(__FILE__), '..', 'lib')
+if File.exists? development_lib + '/s3dbsync.rb'
+  $LOAD_PATH.unshift(development_lib).uniq!
+end
 # always look "here" for include files (thanks aktxyz)
-$LOAD_PATH << File.expand_path(File.dirname(__FILE__)) 
-require '../lib/s3dbsync'
+#$LOAD_PATH << File.expand_path(File.dirname(__FILE__)) 
+require 's3dbsync'
 
 
 class OptS3rquery
@@ -81,6 +85,10 @@ class OptS3rquery
 			opts.on("--bucket-log", String, "Bucket log NAME") do |name|
 				options[:bucket_log] = name
 			end
+
+			opts.on("-u", "--config-number NUM", Integer, "Number of config to use if nil use first") do |name|
+				options[:config_num] = name
+			end
 	
 			opts.on_tail("-h", "--help", "Show this message") do
 				puts opts
@@ -106,7 +114,7 @@ end
 
 options = OptS3rquery.parse(ARGV)
 
-config = Configure.new(options[:file_cfg])
+config = Configure.new(options[:file_cfg], options[:config_num])
 config.current["bucket"] = options[:bucket] if options[:bucket]
 
 s3db = S3SyncDb.new(config.current)

data/bin/s3rbackup.rb

@@ -3,9 +3,11 @@
 require 'rubygems'
 require 'optparse'
 
-# always look "here" for include files (thanks aktxyz)
-$LOAD_PATH << File.expand_path(File.dirname(__FILE__)) 
-require '../lib/s3dbsync'
+development_lib = File.join(File.dirname(__FILE__), '..', 'lib')
+if File.exists? development_lib + '/s3dbsync.rb'
+  $LOAD_PATH.unshift(development_lib).uniq!
+end
+require 's3dbsync'
 
 
 class OptS3rbackup
@@ -46,6 +48,10 @@ class OptS3rbackup
 				options[:bucket_log] = name
 			end
 
+			opts.on("-u", "--config-number NUM", Integer, "Number of config to use if nil use first") do |name|
+				options[:config_num] = name
+			end
+
 			opts.on_tail("-h", "--help", "Show this message") do
 				puts opts
 				exit
@@ -61,7 +67,7 @@ options = OptS3rbackup.parse(ARGV)
 #in argv rimane tutto il resto
 #p ARGV
 
-config = Configure.new(options[:file_cfg])
+config = Configure.new(options[:file_cfg], options[:config_num])
 config.current["bucket"] = options[:bucket] if options[:bucket]
 config.current["log"] = options[:log] if options[:log] != nil
 config.current["bucket_log"] = options[:bucket_log] if options[:bucket_log]

data/lib/s3dbsync.rb

@@ -12,7 +12,7 @@ class S3SyncDb
 			    			:secret_access_key => config["secret_access_key"])
 
 		@config = config
-		@db_file = config["db_file"]
+		@db_file = "#{ENV['HOME']}/.s3rbackup/#{config['db_file']}"
 		@db_file = "#{ENV['HOME']}/.s3rbackup/s3db.yml" if !@db_file
 		@db_file_ver = "#{@db_file}.ver"
 		#apro il db
@@ -312,8 +312,12 @@ end
 
 class Configure
 	attr_reader :current
-	def initialize(file_name = "#{ENV['HOME']}/.s3rbackup/config.yml")
+	def initialize(file_name = "#{ENV['HOME']}/.s3rbackup/config.yml", config_num = nil)
+		config_num = 0 if config_num == nil
 		file_name = "#{ENV['HOME']}/.s3rbackup/config.yml" if !file_name
 		@current = YAML::load(File.open(file_name))
+		if @current.class.to_s == "Array"
+			@current = @current[config_num]
+		end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: niky81-s3rbackup
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Nicola Sacchi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-13 00:00:00 -07:00
+date: 2008-06-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency