sistero 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e30ac237dbb3880332a0ce711d3c165f3137873
-  data.tar.gz: 1a4490ef36377a71ecbfa8332c3f18063608bd00
+  metadata.gz: c966aa5e013e4a912ed85572ea3df024ba5b3552
+  data.tar.gz: e3a8f4a357ad77c63cb781c13b3a6700377ea798
 SHA512:
-  metadata.gz: 3a62c0b266d8531b555b006c1b22e52e6663057917727c56b7b27297f883c77776ac71f13ee9997a01f60025927b49e3e825cdf704438b137d8f77672583de43
-  data.tar.gz: 76e5cd39e8bb4ffc01451a250a397dc2222b9a0d1f10db3dc387bdf5c61f5a69ff1655e270a3f7793065654f0bdb5fded46d5d35ed1685d435be480854e2ba2e
+  metadata.gz: 85c52cd18afca7958e0a30991238cc737381f22eb6b5f6eb81c198483410ac77647788fcd06d8cae6b924c81d5fe4b4f9491b0b0a269e436c4af6b3ab539e5c3
+  data.tar.gz: cc127f77567046ba6ad2ffdd2aa904741c87b89fa96efad279401ff934d6efdbca52399f07d4d5c7b136c4a81702ae4abd64adc898891767996e62ad0b27e311

data/bin/sistero

@@ -28,6 +28,8 @@ module Sistero::Command
         subop.on '-o val', 'add ssh options', 'ssh_options'
       end
 
+      op.subcommand 'rsync vm *cmd', 'rsync files to vm'
+
       op.subcommand 'create [*vms]', 'create vm'
       op.subcommand 'create-all', 'create all vms in config'
       op.subcommand 'destroy [*vms]', 'destroy vm'
@@ -56,8 +58,9 @@ module Sistero::Command
 
     case command
     when 'ssh'
-      # TODO: pass ssh_args
       sistero.ssh_to_vm(command_cfg.vm, ssh_options: command_cfg.ssh_options, run: command_cfg.run)
+    when 'rsync'
+      sistero.rsync(command_cfg.vm, cmd: command_cfg.cmd)
     when 'create'
       vms = command_cfg.vms
       vms.push nil if vms.empty?

data/lib/sistero.rb

@@ -70,22 +70,8 @@ module Sistero
       ssh_options ||= vm.ssh_options
 
       droplet = find_droplet(name) || create_droplet_from_vm(name)
-      public_network = droplet.networks.v4.find { |network| network.type == 'public' }
-      until public_network
-        puts "no public interfaces, trying again in a second"
-        sleep 1
-        droplet = find_droplet(name)
-        public_network = droplet.networks.v4.find { |network| network.type == 'public' }
-      end
-      ip = public_network.ip_address
-
-      unless is_port_open? ip, 22
-        puts "waiting for ssh port to open"
-        sleep 1
-        until is_port_open? ip, 22 do
-          sleep 1
-        end
-      end
+      public_network = get_public_network name, droplet
+      ip = wait_for_ssh_port public_network
 
       cmd = "ssh -o 'StrictHostKeyChecking no' #{ssh_options} #{vm.ssh_user || 'root'}@#{ip}"
       unless run.empty?
@@ -96,6 +82,16 @@ module Sistero
       exec cmd
     end
 
+    def rsync(name, cmd: nil)
+      vm, name = get_vm name
+      droplet = find_droplet(name) || create_droplet_from_vm(name)
+      public_network = get_public_network name, droplet
+      ip = wait_for_ssh_port public_network
+
+      cmd_str = 'rsync ' + cmd.join(' ').gsub('vm:', "#{vm.ssh_user || 'root'}@#{ip}:")
+      exec cmd_str
+    end
+
     def destroy_vm(name)
       vm, name = get_vm name
 
@@ -147,5 +143,29 @@ module Sistero
         puts "  regions       #{image.regions.join ', '}"
       end
     end
+
+    private
+    def get_public_network name, droplet
+      public_network = droplet.networks.v4.find { |network| network.type == 'public' }
+      until public_network
+        puts "no public interfaces, trying again in a second"
+        sleep 1
+        droplet = find_droplet(name)
+        public_network = droplet.networks.v4.find { |network| network.type == 'public' }
+      end
+      public_network
+    end
+
+    def wait_for_ssh_port public_network
+      ip = public_network.ip_address
+      unless is_port_open? ip, 22
+        puts "waiting for ssh port to open"
+        sleep 1
+        until is_port_open? ip, 22 do
+          sleep 1
+        end
+      end
+      ip
+    end
   end
 end

data/lib/sistero/version.rb

@@ -1,3 +1,3 @@
 module Sistero
-  VERSION = '0.7.3'
+  VERSION = '0.7.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sistero
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - James Pike