insxsync 1.0.1 → 1.1.0

data/lib/insxsync.rb

@@ -148,7 +148,7 @@ module InsxSync
 
       # this assumes the role on the production account to access CGE backups
       sts = AWS::STS.new(:access_key_id=>accessKeyId, :secret_access_key=>secretAccessKey)
-      role = sts.assume_role(:role_arn => 'arn:aws:iam::677931414594:role/insxsync', :role_session_name => SecureRandom.uuid.gsub(/-/,''), :duration_seconds => 60 * 15)
+      role = sts.assume_role(:role_arn => $ROLE_ARN, :role_session_name => SecureRandom.uuid.gsub(/-/,''), :duration_seconds => 60 * 15)
 
       # store role credentials
       creds = role[:credentials]
@@ -300,13 +300,13 @@ module InsxSync
   # Returns the truth value of whether the application is running$command an export operation
   # @return [true, false] whether the application in running an export
   def exporting?
-    $command == "export"
+    $OLD_ARGV0 == "export"
   end
 
   # Returns the truth value of whether the application is running an sync operation
   # @return [true, false] whether the application in running an sync
   def syncing?
-    $command =~ /sync(-uat)?/
+    $OLD_ARGV0 =~ /sync(-uat)?/
   end
 
   # Acts like the *nix which command. Given an array of commands ordered from most prefered to lease, it

data/lib/insxsync/version.rb

@@ -1,3 +1,3 @@
 module InsxSync
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/lib/sync_point_restore.rb

@@ -192,9 +192,14 @@ class SyncPointRestore < ErrorHandlingIface
       File.write(file, text)
     end
 
+    Find.find(dest_dir) do |file|
+      puts "Test: #{file}"
+    end
+
     Find.find(dest_dir) do |file|
       next if file == "."
       next if file == ".."
+      next if file == dest_dir
       next unless File.directory?(file)
 
       dirname  = file.scan(/#{dest_dir}\/?(.*)/).flatten[0]
@@ -205,16 +210,18 @@ class SyncPointRestore < ErrorHandlingIface
     end
   end
 
-  def self.restore_data(sync_point_dir, time)
+  def self.restore_data(sync_point_dir, time, databases)
     abbrvs = {'ian' => 1, 'feb' => 2, 'mar' => 3, 'apr' => 4, 'mai' => 5, 'iunie' => 6, 'iulie' => 7, 'aug' => 8, 'sept' => 9, 'oct' => 10, 'noem' => 11, 'dec' => 12}
     reverse_abbrvs = abbrvs.invert
 
     day = Time.at(time.to_i).strftime('%d')
     month = reverse_abbrvs[Time.at(time.to_i).strftime('%m').to_i]
 
+    backup_dbs = []
     Find.find(File.join(sync_point_dir, 'database')) do |file|
       next if File.directory?(file)
       old_name = File.basename(file, '.sql')
+      backup_dbs.push(old_name)
       new_name = old_name.scan(/\A(.*?)(db)?\z/).flatten[0] + day + month
       tmpfile = File.open("#{file}.tmp", 'w')
       tmppath = tmpfile.path
@@ -227,8 +234,20 @@ class SyncPointRestore < ErrorHandlingIface
       FileUtils.mv(tmpfile.path, file)
     end
 
+    if databases.not_nil?
+        databases.each do |item|
+          require_condition backup_dbs.count(item) == 1, "\nArgument Error: Database \"#{item}\" does not exist in specified backup. No changes made. Exiting..."
+        end
+    end
+
+
     Find.find(File.join(sync_point_dir, 'database')) do |file|
       next if File.directory?(file)
+
+      if databases.not_nil?
+        next unless databases.count(File.basename(file, '.sql')) == 1
+      end
+
       mysql = which("mysql")
       raise if mysql.nil?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: insxsync
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-19 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk