phase 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb2f988f05568590899c7ae5f3d4455c775af120
-  data.tar.gz: 1f04b470293e4276ee7f3583ca8346d57bd00769
+  metadata.gz: cd754d7a55b13fc301cbf943586379f608d148e4
+  data.tar.gz: 681b6d02ee212ba1c8c45dcf98f22cfc62bdfc36
 SHA512:
-  metadata.gz: 74f5bf568f42b2f10abc042a06493cfc965d0266562142ec027f865e8ed06bd3509c37b50bd4f5e5c77032824c2b17b61258143e382882f13a2cdf30de342428
-  data.tar.gz: 4611698b760898ee8e8589b0c7ec00fc1a872433426122f4d22a2c864d9da6d80c49cb4d2c7c53ff67ea0b93a10fd35529051221c79c4e80cabced72230cefb3
+  metadata.gz: 0fde26b95c1f6e39ead11f894bea20634623d2d8de78e5f7485705e1a491dd111ade3f1103b3b77beea42ffb4481e89421c920ba0d413168d18a8b9624da34a5
+  data.tar.gz: 2df205c7237088708b851097bf7630731870a8e4d810d6c60c2cb35b0247794a6ce8fb391cdacd2b196d63b898ae343776e07d58cb95bfef97b5fe7a714857a7

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/phase/dsl.rb

@@ -7,25 +7,27 @@ module Phase
     # @see SSHKit::Coordinator for concurrency options
     # @return [void]
     def on_role(role_name, environment = "staging", options = {}, &block)
-      servers = ::Phase::Adapters::AWS::Server.where(role: role_name, environment: environment)
+      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::Adapters::AWS::Server.where(role: ::Phase.config.bastion_role).first
+      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  = SSH::Coordinator.new(bastion_host)
+      coordinator  = ::SSHKit::Coordinator.new(bastion_host)
 
-      Array(destination_ips).each do |ip|
+      # 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
 
-      true
+      results.flatten
     end
 
     def run_locally(&block)

data/lib/phase/version.rb

@@ -1,3 +1,3 @@
 module Phase
-	VERSION = "0.0.4"
+	VERSION = "0.0.5"
 end

data/lib/phase.rb

@@ -15,7 +15,6 @@ require 'phase/adapters/aws'
 
 require 'phase/ssh/backend'
 require 'phase/ssh/command'
-require 'phase/ssh/coordinator'
 
 require 'phase/configuration'
 require 'phase/version'

data/phase.gemspec

@@ -8,11 +8,13 @@ Gem::Specification.new do |spec|
   spec.version       = Phase::VERSION
   spec.authors       = ["Piers Mainwaring", "Orca Health, Inc."]
   spec.email         = ["piers@impossibly.org"]
-  spec.summary       = "Provides a simple API for managing cloud instances running in a multi-subnet network."
+  spec.summary       = "A simple way to manage cloud instances within a multi-subnet network, like an AWS VPC."
   spec.description   = ""
   spec.homepage      = "https://github.com/piersadrian/phase"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = '~> 2.0'
+
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
@@ -24,7 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activesupport',  '~> 4'
   spec.add_runtime_dependency 'fog',            '~> 1.23'
   spec.add_runtime_dependency 'capistrano',     '~> 3.2'
-  spec.add_runtime_dependency 'mina',           '~> 0.3'
   spec.add_runtime_dependency 'colorize',       '~> 0.7'
   spec.add_runtime_dependency 'dotenv',         '~> 0.11'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phase
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Piers Mainwaring
@@ -95,20 +95,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: mina
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +208,6 @@ files:
 - lib/phase/keys/key.rb
 - lib/phase/ssh/backend.rb
 - lib/phase/ssh/command.rb
-- lib/phase/ssh/coordinator.rb
 - lib/phase/version.rb
 - phase.gemspec
 - spec/dsl_spec.rb
@@ -237,9 +222,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -250,8 +235,8 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Provides a simple API for managing cloud instances running in a multi-subnet
-  network.
+summary: A simple way to manage cloud instances within a multi-subnet network, like
+  an AWS VPC.
 test_files:
 - spec/dsl_spec.rb
 - spec/spec_helper.rb

data/lib/phase/ssh/coordinator.rb

@@ -1,13 +0,0 @@
-module Phase
-  module SSH
-    class Coordinator < ::SSHKit::Coordinator
-
-      private
-
-        # Prevents Coordinator from uniqifing @raw_hosts.
-        def resolve_hosts
-          @raw_hosts.map { |rh| rh.is_a?(::SSHKit::Host) ? rh : ::SSHKit::Host.new(rh) }
-        end
-    end
-  end
-end