cloudflock 0.4.1 → 0.4.2

data/bin/cloudflock-profile

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+$0 = 'cloudflock-profile'
+
 require 'cloudflock/interface/cli/app/servers/profile'
 CLI = CloudFlock::Interface::CLI::Console
 Opts = CloudFlock::Interface::CLI::Opts

data/bin/cloudflock-servers

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+$0 = 'cloudflock-servers'
+
 require 'cloudflock/interface/cli/app/servers/migrate'
 CLI = CloudFlock::Interface::CLI::Console
 Opts = CloudFlock::Interface::CLI::Opts

data/bin/cloudflock.default

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+$0 = 'cloudflock-servers'
+
 require 'cloudflock/interface/cli/app/servers/migrate'
 CLI = CloudFlock::Interface::CLI::Console
 Opts = CloudFlock::Interface::CLI::Opts

data/lib/cloudflock/interface/cli/app/servers/migrate.rb

@@ -293,8 +293,9 @@ class CloudFlock::Interface::CLI::App::Servers::Migrate
       destination_host_def[:target_addr] = destination_host_def[:host]
     end
 
-    # Define no timeout for the migration rsync
+    # Set rsync path and no timeout for the migration rsync
     destination_host_def[:timeout] = -1
+    destination_host_def[:rsync] = source_profile[:rsync]
 
     # Kick off the migration proper
     if opts[:verbose]

data/lib/cloudflock/target/servers/migrate.rb

@@ -69,7 +69,7 @@ module CloudFlock::Target::Servers::Migrate extend self
     preserve_files = ["passwd", "shadow", "group"]
     path = "/mnt/migration_target/etc"
     preserve_files.each do |file|
-      copy_command = "[ -f #{path}migration.#{file} ] || cp -af " +
+      copy_command = "[ -f #{path}/migration.#{file} ] || /bin/cp -an " +
                      "#{path}/#{file} #{path}/migration.#{file}"
       host.puts(copy_command)
       host.prompt
@@ -164,7 +164,7 @@ module CloudFlock::Target::Servers::Migrate extend self
   #                    (default: {}):
   #                    :target_addr - String containing the address to use when
   #                                   communicating with the destination host.
-  #                    :rsync_path  - String containing path to rsync binary on
+  #                    :rsync       - String containing path to rsync binary on
   #                                   the source machine.  If this is nil, copy
   #                                   rsync from the destination machine to
   #                                   /root/.rackspace/ for the purposes of
@@ -179,7 +179,7 @@ module CloudFlock::Target::Servers::Migrate extend self
     end
 
     # If we lack rsync, fetch it from the destination server
-    if args[:rsync_path].nil?
+    if args[:rsync].nil?
       source_host.puts("mkdir /root/.rackspace")
       source_host.prompt
 
@@ -189,7 +189,7 @@ module CloudFlock::Target::Servers::Migrate extend self
                       "/root/.rackspace/rsync"
       source_host.puts(rsync_install)
       source_host.prompt
-      args[:rsync_path] = "/root/.rackspace/rsync"
+      args[:rsync] = "/root/.rackspace/rsync"
     end
 
     2.times do
@@ -218,7 +218,7 @@ module CloudFlock::Target::Servers::Migrate extend self
   #                    Expected parameters are:
   #                    :target_addr - String containing the address to use when
   #                                   communicating with the destination host.
-  #                    :rsync_path  - String containing path to rsync binary on
+  #                    :rsync       - String containing path to rsync binary on
   #                                   the source machine.  If this is nil, copy
   #                                   rsync from the destination machine to
   #                                   /root/.rackspace/ for the purposes of
@@ -234,7 +234,7 @@ module CloudFlock::Target::Servers::Migrate extend self
   # Returns true if rsync finishes.
   # Returns false if rsync does not complete within timeout.
   def migration_watcher(source_host, args)
-    rsync_command = "#{args[:rsync_path]} -azP -e 'ssh " +
+    rsync_command = "#{args[:rsync]} -azP -e 'ssh " +
                     "#{CloudFlock::Remote::SSH::SSH_ARGUMENTS} -i " +
                     "/tmp/RACKSPACE_MIGRATION/migration_id_rsa' " +
                     "--exclude-from='/root/.rackspace/" +

data/lib/cloudflock/version.rb

@@ -1,3 +1,3 @@
 module CloudFlock
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudflock
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -126,3 +126,4 @@ signing_key:
 specification_version: 3
 summary: Server migration automation
 test_files: []
+has_rdoc: