sistero 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c966aa5e013e4a912ed85572ea3df024ba5b3552
-  data.tar.gz: e3a8f4a357ad77c63cb781c13b3a6700377ea798
+  metadata.gz: 60c3c0cce22325698cd6ada1765e6e771f700a52
+  data.tar.gz: 772c3c63c9a2d22b0fb956f419611eba03465a5d
 SHA512:
-  metadata.gz: 85c52cd18afca7958e0a30991238cc737381f22eb6b5f6eb81c198483410ac77647788fcd06d8cae6b924c81d5fe4b4f9491b0b0a269e436c4af6b3ab539e5c3
-  data.tar.gz: cc127f77567046ba6ad2ffdd2aa904741c87b89fa96efad279401ff934d6efdbca52399f07d4d5c7b136c4a81702ae4abd64adc898891767996e62ad0b27e311
+  metadata.gz: 2604863ec2d2c06d905172ac59964f7b19ea9317e8dd9856a635d469a26474134684585797bc8f02880748fed640276970c10ed94a31e8ad99f1743d9209a73f
+  data.tar.gz: ddc8a02f965185ca02af3d0b5ad3a0d06c5da1d2a1a8f17ed722645fc2b817af24000c1e3c286b0ab989ef46991fb24f8f6a3dae409d787c30b7204ed82c0e00

data/bin/sistero

@@ -28,7 +28,7 @@ module Sistero::Command
         subop.on '-o val', 'add ssh options', 'ssh_options'
       end
 
-      op.subcommand 'rsync vm *cmd', 'rsync files to vm'
+      op.subcommand 'rsync vm *cmd', 'rsync files to/from vm'
 
       op.subcommand 'create [*vms]', 'create vm'
       op.subcommand 'create-all', 'create all vms in config'

data/lib/sistero.rb

@@ -10,12 +10,12 @@ module Sistero
     end
 
     def find_droplet(name)
-      @client.droplets.all.find { |vm| vm.name == name }
+      @client.droplets.all.find { |droplet| droplet.name == name }
     end
 
     def list_vms()
-      @client.droplets.all.each do |vm|
-        puts "#{vm.name} - #{vm.networks[0][0].ip_address}"
+      @client.droplets.all.each do |droplet|
+        puts "#{droplet.name} - #{get_public_ip droplet}"
       end
     end
 
@@ -70,10 +70,10 @@ module Sistero
       ssh_options ||= vm.ssh_options
 
       droplet = find_droplet(name) || create_droplet_from_vm(name)
-      public_network = get_public_network name, droplet
-      ip = wait_for_ssh_port public_network
+      public_ip = get_public_ip droplet
+      wait_for_ssh_port public_ip
 
-      cmd = "ssh -o 'StrictHostKeyChecking no' #{ssh_options} #{vm.ssh_user || 'root'}@#{ip}"
+      cmd = "ssh -o 'StrictHostKeyChecking no' #{ssh_options} #{vm.ssh_user || 'root'}@#{public_ip}"
       unless run.empty?
         cmd += ' ' + run.join(' ')
       end
@@ -85,10 +85,10 @@ module Sistero
     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
+      public_ip = get_public_ip droplet
+      wait_for_ssh_port public_ip
 
-      cmd_str = 'rsync ' + cmd.join(' ').gsub('vm:', "#{vm.ssh_user || 'root'}@#{ip}:")
+      cmd_str = 'rsync ' + cmd.join(' ').gsub('vm:', "#{vm.ssh_user || 'root'}@#{public_ip}:")
       exec cmd_str
     end
 
@@ -145,27 +145,25 @@ module Sistero
     end
 
     private
-    def get_public_network name, droplet
+    def get_public_ip 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)
+        droplet = find_droplet(droplet.name)
         public_network = droplet.networks.v4.find { |network| network.type == 'public' }
       end
-      public_network
+      public_network.ip_address
     end
 
-    def wait_for_ssh_port public_network
-      ip = public_network.ip_address
-      unless is_port_open? ip, 22
+    def wait_for_ssh_port public_ip
+      unless is_port_open? public_ip, 22
         puts "waiting for ssh port to open"
         sleep 1
-        until is_port_open? ip, 22 do
+        until is_port_open? public_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.4'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sistero
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - James Pike
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-18 00:00:00.000000000 Z
+date: 2016-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler