phase 0.0.16 → 0.0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4d5af31cbe28ce6b554391603524b7b2e1f09c6
-  data.tar.gz: 0cb46939ed6cd9190d37e8c3ce8ca7687ff7e3dd
+  metadata.gz: d5ebb4484b885d8dad52f7413fdaf3c50929d193
+  data.tar.gz: 55d319392ca5d5056f071e05831c951f15a59395
 SHA512:
-  metadata.gz: e8d0c8cfff6a464bd2393ada3cb073bd885d5114098a47444d7f4a73308f2d3328624af311af8cff3c7a01f30647f5bd66760f125d627f08622d0326d00cf186
-  data.tar.gz: 6fff147f369b8c82aea3c31b0bac1948eb6d62cdb144288953f2752c010a679d93ff40636ab5ae7be654852c46d852c89acc46be311359e332e60d68c7048f78
+  metadata.gz: 6553814d3f824afe7db88505de68b74dfdc07c8468568ec671512552771684bfb764af74856351dcd5cc02051d703da7d1a7be8a8c3812683b941bed5043a49d
+  data.tar.gz: 2e1476f1da9b4f3a8088074c049bb9326ceb4323f2f8b7ece9e4e1bf2de07ec06574047d22a2b4444678eb17eaff0b8e97c604ec2e6c347611a4640250f162f4

data/lib/phase/adapters/aws/server.rb

@@ -3,15 +3,6 @@ module Phase
     module AWS
       class Server < ::Phase::Adapters::Abstract::Server
 
-        attr_accessor :username
-
-        def to_host_hash(host_method)
-          {
-            user:     username,
-            hostname: resource.__send__(host_method)
-          }
-        end
-
         class << self
           # @return [Array<AWS::Server>] All known EC2 instances
           def all

data/lib/phase/dsl.rb

@@ -1,31 +1,37 @@
-require 'sshkit/dsl'
-
 module Phase
   module DSL
 
-    # Runs a command on servers with the given role.
-    #
-    # @param [String] role_name The value of the 'Role' tag. Can be nil
-    # @param [String] environment The value of the 'Environment' tag. Can be nil
-    # @param [Hash] options Query and concurrency options
-    # @option options [String] :bastion (true) Whether to connect through a bastion host
+    # @param [String] role_name The value of the 'Role' tag
+    # @param [String] environment The value of the 'Environment' tag
+    # @param [Hash] options SSHKit concurrency options
     # @see SSHKit::Coordinator for concurrency options
     # @return [void]
-    def run_remotely(options = {}, &block)
-      filter_options = options.extract!(:role_name, :environment, :user)
-      servers = ::Phase.servers.where(filter_options)
-
-      if options.has_key?(:bastion) && bastion = options.delete(:bastion)
-        hosts = servers.map { |s| {user: options[:user], hostname: s.resource.private_ip_address} }
-        on_servers_through_bastion(bastion, servers, options, &block)
-      else
-        hosts = servers.map { |s| {user: options[:user], hostname: s.resource.dns_name} }
-        on(hosts, options, &block)
+    def on_role(role_name, environment = "staging", options = {}, &block)
+      servers = ::Phase.servers.where(role: role_name, environment: environment)
+      on(servers.map {|s| s.resource.private_ip_address }, options, &block)
+    end
+
+    def on(destination_ips, options = {}, &block)
+      server = ::Phase.servers.where(role: ::Phase.config.bastion_role).first
+      raise ArgumentError, "no servers found" unless server
+
+      # TODO: identify the CORRECT bastion host per subnet/network
+      bastion_host = "#{ ::Phase.config.bastion_user }@#{ server.resource.dns_name }"
+      coordinator  = ::SSHKit::Coordinator.new(bastion_host)
+
+      # TODO: clean up this logic. this should be done within a coordinator
+      # (or elsewhere) so we can ID networks on a per-adapter basis
+      results = Array(destination_ips).map do |ip|
+        coordinator.each(options) do
+          on_remote_host(ip) { instance_exec(&block) }
+        end
       end
+
+      results.flatten
     end
 
-    def on_servers_through_bastion(bastion, servers, options = {}, &block)
-      ::Phase::Kit::SSH::BastionCoordinator.new(bastion, hosts).run!(options, &block)
+    def run_locally(&block)
+      ::SSHKit::Backend::Local.new(&block).run
     end
 
   end

data/lib/phase/version.rb

@@ -1,3 +1,3 @@
 module Phase
-	VERSION = "0.0.16"
+	VERSION = "0.0.16.1"
 end

data/lib/phase.rb

@@ -4,7 +4,6 @@ require 'colorize'
 require 'erb'
 require 'fog'
 require 'progressbar'
-require 'pry'
 require 'sshkit'
 require 'terminal-table'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phase
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.16.1
 platform: ruby
 authors:
 - Piers Mainwaring