cloner 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff039ecf77aa04b16d10b76f3ec8ec8dc494085d
-  data.tar.gz: 03534218c250e015f8f4ecc8d8f33d4cc6a7b610
+  metadata.gz: 32d8735e858cfef73a306c3c97b2e28025f796b7
+  data.tar.gz: 0fefb2d9aaf996acdaa975efd96e65dbf5ccbfc0
 SHA512:
-  metadata.gz: b9b5605a4be19035cc327d101f8a35cb654d1bee6f859af0ece4eeacc694277b6bb761d4940e21c7f1af9630c453d4b26a7215bc82210b3bf7e2474e860f63c2
-  data.tar.gz: 76a975a0aa4083a9e78ee1a38aa8718f20979354bc9c99b4adb55e5eacee5a2e8e178f691eabaf2ddd975aaa77a78319289ebf967b7841780527b90c8f125b9a
+  metadata.gz: 94388283f46759e3b2ba846c0cc2e0713b6f4c65c1b210be9b061e8be678ee1ebc2956830aab9b535d979086135a8c93dbb696cf903c349dbdae60081aa81935
+  data.tar.gz: 50ac11a234d90e286506e68e89b03f390f4ab4818c8be8454bd7385217c7fb9e4cc3327fec573b65a9fda80427e1c3e739b6ae8cef9290dafcfa26eb0fbbd71e

data/lib/cloner/mongodb.rb

@@ -18,10 +18,19 @@ module Cloner::MongoDB
 
   def mongodb_r_conf
     @r_conf ||= begin
-      Net::SSH.start(ssh_host, ssh_user, ssh_opts) do |ssh|
+      do_ssh do |ssh|
         ret = ssh_exec!(ssh, "cat #{e(remote_app_path + '/config/mongoid.yml')}")
         check_ssh_err(ret)
-        yml = YAML.load(ret[0])[env_from]
+
+        begin
+          yml = YAML.load(ret[0])[env_from]
+          raise 'no data' if yml.blank?
+        rescue Exception => e
+          puts "unable to read remote database.yml for env #{env_from}."
+          puts "Remote file contents:"
+          puts ret[0]
+        end
+
         if yml.key?('sessions')
           yml['sessions']['default']
         else
@@ -43,7 +52,7 @@ module Cloner::MongoDB
 
   def mongodb_dump_remote
     puts "backup remote DB via ssh"
-    Net::SSH.start(ssh_host, ssh_user, ssh_opts) do |ssh|
+    do_ssh do |ssh|
       ssh.exec!("rm -R #{remote_dump_path}")
       ret = ssh_exec!(ssh, "mkdir -p #{remote_dump_path}")
       check_ssh_err(ret)

data/lib/cloner/postgres.rb

@@ -13,11 +13,18 @@ module Cloner::Postgres
 
   def ar_r_conf
     @ar_r_conf ||= begin
-      Net::SSH.start(ssh_host, ssh_user, ssh_opts) do |ssh|
+      do_ssh do |ssh|
         ret = ssh_exec!(ssh, "cat #{e(remote_app_path + '/config/database.yml')}")
         check_ssh_err(ret)
-        res = YAML.load(ret[0])[env_from]
-        res['host'] ||= '127.0.0.1'
+        begin
+          res = YAML.load(ret[0])[env_from]
+          raise 'no data' if res.blank?
+          res['host'] ||= '127.0.0.1'
+        rescue Exception => e
+          puts "unable to read remote database.yml for env #{env_from}."
+          puts "Remote file contents:"
+          puts ret[0]
+        end
         res
       end
     end
@@ -41,7 +48,7 @@ module Cloner::Postgres
 
   def pg_dump_remote
     puts "backup remote DB via ssh"
-    Net::SSH.start(ssh_host, ssh_user, ssh_opts) do |ssh|
+    do_ssh do |ssh|
       ssh.exec!("rm -R #{e remote_dump_path}")
       ret = ssh_exec!(ssh, "mkdir -p #{e remote_dump_path}")
       check_ssh_err(ret)

data/lib/cloner/rsync.rb

@@ -1,7 +1,8 @@
 module Cloner::RSync
   extend ActiveSupport::Concern
   def rsync(from, to)
-    cmd = "rsync -e ssh -zutvr --checksum #{e ssh_user}@#{e ssh_host}:#{e from}/ #{e to}/"
+    port = ssh_opts[:port] || 22
+    cmd = "rsync -e ssh -zutvr --checksum -e \"ssh -p #{port}\" #{e ssh_user}@#{e ssh_host}:#{e from}/ #{e to}/"
     puts "Running RSync: #{cmd}"
     pipe = IO.popen(cmd)
     while (line = pipe.gets)

data/lib/cloner/ssh.rb

@@ -5,6 +5,12 @@ module Cloner::SSH
     {}
   end
 
+  def do_ssh(&block)
+    Net::SSH.start(ssh_host, ssh_user, ssh_opts) do |ssh|
+      yield ssh
+    end
+  end
+
   # http://stackoverflow.com/questions/3386233/how-to-get-exit-status-with-rubys-netssh-library
   def ssh_exec!(ssh, command)
     stdout_data = ""
@@ -46,3 +52,4 @@ module Cloner::SSH
     end
   end
 end
+

data/lib/cloner/version.rb

@@ -1,3 +1,4 @@
 module Cloner
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloner
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-09 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Easily clone your production Mongoid database and files for local development