infra-ctrl 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a20ea9fdca4060e35455bfd95e798aff5aebd88b
-  data.tar.gz: f32042a097739689a8343c3c459897ecd2613bcd
+  metadata.gz: 61af13373a9219c1b84f2a2d74f50f901e138c2f
+  data.tar.gz: 494a698e36789034a631ae9fe79229fa03321672
 SHA512:
-  metadata.gz: 2c4fd0cc3c814ff55ff494e81d4624e7def7f05e959fdab55ef445acbc010aaeed244e24df0b5b0e37efcdf9f8febf8df7d15f77310cde72122671c0f855f5e6
-  data.tar.gz: b790b3efad626c62a362f18295cf957393bd9b2c6363a0b7ac66a70e2dec98d47676df0117a259951f9f678ad351800ae91f4c2f00d5ef19ef1964f5730d68ac
+  metadata.gz: 78b5125f1480b3cdb4fe148bec8a7282ac092e38ba15cb0d035c5dfaf7b221ec1fe40ea2d836ea4f3c2650dd14b2adb7654221918d0afe8ca6d7b349e7acf95d
+  data.tar.gz: f6e58b7da91de9652aa324db7053415697b52985529beb5d3eea9acf06808ecdc745ef9c477d93f1754a46c933c31cf53cb67278a4ff483b3adcfcde2951a442

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ctrl (0.1.0)
+    infra-ctrl (0.1.6)
       aws-sdk (~> 2)
       methadone (~> 1.9.2)
       virtus
@@ -93,7 +93,7 @@ PLATFORMS
 DEPENDENCIES
   aruba
   bundler (~> 1.12)
-  ctrl!
+  infra-ctrl!
   pry
   rake (~> 10.0)
   rdoc

data/README.md

@@ -1,36 +1,36 @@
 # Ctrl
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/ctrl`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+This is a simple gem to ease listing and sshing to instances in an AWS VPC.
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'ctrl'
-```
+    $ gem install infra-ctrl
 
-And then execute:
+Add environment variables for AWS (direnv.net FTW):
 
-    $ bundle
+* AWS_DEFAULT_REGION
+* AWS_SECRET_ACCESS_KEY
+* AWS_ACCESS_KEY_ID
 
-Or install it yourself as:
+As well as a couple for specifying the users to log in as when sshing to the nat and internal instances:
 
-    $ gem install ctrl
+* CTRL_SSH_USER
+* CTRL_SSH_NAT_USER
 
-## Usage
+## Notes
 
-TODO: Write usage instructions here
+Assumptions about your infrastructure:
 
-## Development
+1. Instances with public ips are connected to directly using the CTRL_SSH_USER
+2. Each instance has a tag:Environment
+3. VPC private instances use the same user to log in
+4. You have the necessary keys locally, and are fine forwarding your agent
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+## Usage
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+    $ ctrl ls <env> <instance name>
+    $ ctrl ssh <env> <instance name>
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/ctrl.
-
+Bug reports and pull requests are welcome on GitHub at https://github.com/MattHall/ctrl

data/ctrl.gemspec

@@ -5,7 +5,7 @@ require 'ctrl/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "infra-ctrl"
-  spec.license=""
+  spec.license       = "MIT"
   spec.version       = Ctrl::VERSION
   spec.authors       = ["Matt Hall"]
   spec.email         = ["matt@codebeef.com"]
@@ -19,14 +19,13 @@ Gem::Specification.new do |spec|
   spec.executables   = ["ctrl"]
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "virtus"
-  spec.add_dependency('methadone', '~> 1.9.2')
+  spec.add_dependency "virtus", '~> 1.0'
+  spec.add_dependency('methadone', '~> 1.9')
   spec.add_dependency('aws-sdk', '~> 2')
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency('rdoc')
-  spec.add_development_dependency('aruba')
-  spec.add_development_dependency('pry')
+  spec.add_development_dependency('aruba', "~> 0.14")
+  spec.add_development_dependency('pry', "0.14")
 end

data/lib/ctrl/instance_selector.rb

@@ -26,6 +26,7 @@ module Ctrl
     end
 
     def perform
+      return 'No instances found' if instances.empty?
       instances.size == 1 ? instances.first : selection
     end
   end

data/lib/ctrl/ssh_command.rb

@@ -8,12 +8,12 @@ module Ctrl
     attribute :nat_instance
     attribute :target_instance
 
-    def target_is_nat?
-      nat_instance.instance_id == target_instance.instance_id
+    def target_is_public?
+      target_instance.public_ip_address.to_s != ""
     end
 
     def direct_cmd
-      "ssh -A #{SSH_USER}@#{nat_instance.public_ip_address}"
+      "ssh -A #{SSH_USER}@#{target_instance.public_ip_address}"
     end
 
     def proxied_cmd
@@ -21,7 +21,7 @@ module Ctrl
     end
 
     def to_s
-      return direct_cmd if target_is_nat?
+      return direct_cmd if target_is_public?
       proxied_cmd
     end
   end

data/lib/ctrl/version.rb

@@ -1,3 +1,3 @@
 module Ctrl
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: infra-ctrl
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Matt Hall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: methadone
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -94,48 +94,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
 description: Simple way to ls / ssh into vpns
 email:
 - matt@codebeef.com
@@ -149,7 +135,6 @@ files:
 - Gemfile
 - Gemfile.lock
 - README.md
-- README.rdoc
 - Rakefile
 - bin/console
 - bin/ctrl
@@ -165,7 +150,7 @@ files:
 - lib/ctrl/version.rb
 homepage: https://github.com/MattHall/ctrl
 licenses:
-- ''
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/README.rdoc

@@ -1,19 +0,0 @@
-= ctrl - DESCRIBE YOUR GEM
-
-Author::  YOUR NAME (YOUR EMAIL)
-Copyright:: Copyright (c) 2016 YOUR NAME
-
-
-DESCRIBE YOUR GEM HERE
-
-== Links
-
-* {Source on Github}[LINK TO GITHUB]
-* RDoc[LINK TO RDOC.INFO]
-
-== Install
-
-== Examples
-
-== Contributing
-