opsworks 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e2abd2db629ce47b3e1fe9c08b8a81c2b46859d
-  data.tar.gz: bbe7ec9cb249c43a936d9a8e8e919a08e93116ef
+  metadata.gz: d9a072f70453115aecb14dd6d89b06a53d0755a5
+  data.tar.gz: 51816691809d075b6147c008e2351baeae4f90ba
 SHA512:
-  metadata.gz: 33e6ec81157adb41dd4195a77a26e5cef41b664e0d463dfcc34794e357a8871191eb00c621a97c1c9727ed60ed263a4bd7eb6957b957e6b930a86e4eb7d28424
-  data.tar.gz: a8bfa2a2984dc44fb543fe8728b42636b3579582519a4236f831420c578136d4a6b44cb5fe3e63137368cfeb2eceeee17bbec84f267c03b6d567d0e3389bdaf8
+  metadata.gz: 8b2898d9b42baee528e1f511a8a8b53eac310808abb14b5981e371f4a0e3d3abc43b91ade936c13200eee4f499ecd8cf165210e10f34244b94289ccbf081b702
+  data.tar.gz: 64a66e102bba8012f132bf6364b1c50249e185b0f1bbbe2e51f9816346cda185963eabbd6511d427604d81174b0743fe638f53ac57deb59270827d7fe32d8ee7

data/README.md

@@ -6,26 +6,37 @@ Command line interface for Amazon OpsWorks.
 
 Run `opsworks` with one of the following commands:
 
-* `ssh` Generate and update SSH configuration files
+* `ssh` Generate and update SSH configuration files.
+
+   Instances are added in stack order to the SSH configuration. If you have
+   instances with the same name in multiple stacks, the one from the first
+   stack will be used by SSH.
 
 ## Configuration
 
-This gem uses the same configuration file as the [AWS CLI][aws_cli]
+This gem uses the same configuration file as the [AWS CLI][aws_cli]. This
+requires you to have a working AWS CLI setup before continuing.
 
 Add the following section to the file pointed out by the `AWS_CONFIG_FILE`
 environment variable:
 
     [opsworks]
-    stack-id=<MY STACK ID>
-    ssh-user=<MY SSH USER NAME>
+    stack-id=<MY STACK IDs>
+    ssh-user-name=<MY SSH USER NAME>
+
+The stack ID can be found in the stack settings, under _OpsWorks ID_ (or in the
+address bar of your browser as
+`console.aws.amazon.com/opsworks/home?#/stack/<STACK_ID>/stack`). You can add
+several stack IDs belonging to the same IAM account separated by commas
+(`stack-id=STACK1,...,STACKN`).
 
-The stack ID can be found in the stack settings, under _OpsWorks ID_. The
-`ssh-user` flag should be set to the username you want to use when logging in
-remotely, most probably the user name from your _My Settings_ page on OpsWorks.
+The `ssh-user-name` value should be set to the username you want to use when
+logging in remotely, most probably the user name from your _My Settings_ page
+on OpsWorks.
 
 ## Installation
 
-Install for use on the command line:
+Install for use on the command line (requires Ruby and Rubygems):
 
     $ gem install opsworks
 
@@ -49,4 +60,4 @@ And then execute:
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-[aws_cli]: http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html "Amazon AWS CLI"
+[aws_cli]: http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html "Amazon AWS CLI"

data/lib/opsworks/cli.rb

@@ -5,7 +5,7 @@ class OpsWorks::CLI
   def self.start
     commands = %w(ssh)
 
-    global_opts = Trollop::options do
+    Trollop::options do
       version "opsworks #{OpsWorks::VERSION} " <<
               "(c) #{OpsWorks::AUTHORS.join(", ")}"
       banner <<-EOS.unindent
@@ -25,7 +25,7 @@ class OpsWorks::CLI
     end
 
     command = ARGV.shift
-    command_opts = case command
+    case command
       when "ssh"
         OpsWorks::Commands::SSH.run
       when nil

data/lib/opsworks/commands/ssh.rb

@@ -1,5 +1,4 @@
 require 'aws-sdk'
-require 'awesome_print'
 require 'trollop'
 
 require 'opsworks'
@@ -32,8 +31,12 @@ module OpsWorks::Commands
 
       client = AWS::OpsWorks::Client.new
 
-      result = client.describe_instances(stack_id: config.stack_id)
-      instances = result.instances.select { |i| i[:status] != "stopped" }
+      instances = []
+
+      config.stacks.each do |stack_id|
+        result = client.describe_instances(stack_id: stack_id)
+        instances += result.instances.select { |i| i[:status] != "stopped" }
+      end
 
       instances.map! do |instance|
         ip = instance[:elastic_ip] || instance[:public_ip]

data/lib/opsworks/config.rb

@@ -6,7 +6,7 @@ module OpsWorks
   end
 
   class Config
-    attr_reader :stack_id, :ssh_user_name
+    attr_reader :stacks, :ssh_user_name
 
     def initialize
       ini = IniFile.load(ENV["AWS_CONFIG_FILE"])
@@ -17,8 +17,8 @@ module OpsWorks
         secret_access_key: aws_config["aws_secret_access_key"],
       )
 
-      @stack_id = ini['opsworks']['stack-id']
-      @ssh_user_name = ini['opsworks']['ssh-user-name']
+      @stacks = ini['opsworks']['stack-id'].split(',').map(&:strip)
+      @ssh_user_name = ini['opsworks']['ssh-user-name'].strip
     end
   end
 end

data/lib/opsworks/meta.rb

@@ -1,5 +1,5 @@
 module OpsWorks
-  VERSION = "0.0.10"
+  VERSION = "0.0.12"
   AUTHORS = ["Adam Lindberg"]
   EMAIL = ["hello@alind.io"]
   DESCRIPTION = "Amazon OpsWorks CLI"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opsworks
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - Adam Lindberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Command line interface for Amazon OpsWorks