opsworks 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1eb7d340b41fc33fe2c070c36d46b402bba81e90
-  data.tar.gz: 7bf399ca7517b62676b5d0b5b9602b231040f4ab
+  metadata.gz: db03944410eebab622aef8a4dbde1123e0aa18b7
+  data.tar.gz: d00be8c47178d207ad0827f4c6a940e401f66498
 SHA512:
-  metadata.gz: 85eb67216bedb0b999205144f0d0122d38885dd07a2cf093bdced82df147f19c3f6493ccf3cb67bcb724d8958b2bd882bd491a052f523a720189b89e073c00ba
-  data.tar.gz: c5e50da7f78c72c270ed6fbc5da92fc62668c7ba8224e4abddf4e6cec3dcfb4bb794540169a87686e0b0f1ad35f236e4c87607f924055b6577018ea205fbdf2f
+  metadata.gz: b1828c97f2654843d59aa206dbcb08c011f582c24e1dded8d9d30929f6eda5ea9ce1ac2a63711a8dbd273ad8fd1118d5ac0a05c1e0e514f0b004f1d7ff5f0a5e
+  data.tar.gz: 146edebb50bc1e77d51e25ae11631676031498c09625ea112700aadb2b0bc4d64242dccb2001a4c3b14f3debda2e11c4461d29da1d661857ef910a4a11dd6c51

data/README.md

@@ -12,6 +12,12 @@ Run `opsworks` with one of the following commands:
    instances with the same name in multiple stacks, the one from the first
    stack will be used by SSH.
 
+* `dsh` Generate and update dsh configuration files.
+
+   Instances are added in stack order to the dsh machines.list in $HOME/.dsh,
+   as per `ssh` above. A file is created in $HOME/.dsh/group for each layer
+   in each stack.
+
 ## Configuration
 
 This gem uses the same configuration file as the [AWS CLI][aws_cli]. This
@@ -28,7 +34,8 @@ 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`).
+(`stack-id=STACK1,...,STACKN`). If no stack-id is specified all accessible stacks 
+are used.
 
 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

data/lib/opsworks.rb

@@ -1,6 +1,8 @@
 require "opsworks/meta"
 require "opsworks/config"
+require "opsworks/commands/file_util"
 require "opsworks/commands/ssh"
+require "opsworks/commands/dsh"
 
 class String
   def unindent
@@ -10,4 +12,3 @@ end
 
 module OpsWorks
 end
-

data/lib/opsworks/cli.rb

@@ -3,7 +3,7 @@ require 'opsworks'
 
 class OpsWorks::CLI
   def self.start
-    commands = %w(ssh)
+    commands = %w(ssh dsh)
 
     Trollop::options do
       version "opsworks #{OpsWorks::VERSION} " <<
@@ -15,6 +15,7 @@ class OpsWorks::CLI
 
         Commands
           ssh       #{OpsWorks::Commands::SSH.banner}
+          dsh       #{OpsWorks::Commands::DSH.banner}
 
         For help with specific commands, run:
           opsworks COMMAND -h/--help
@@ -28,6 +29,8 @@ class OpsWorks::CLI
     case command
       when "ssh"
         OpsWorks::Commands::SSH.run
+      when "dsh"
+        OpsWorks::Commands::DSH.run
       when nil
         Trollop::die "no command specified"
       else
@@ -35,4 +38,4 @@ class OpsWorks::CLI
     end
 
   end
-end
+end

data/lib/opsworks/commands/dsh.rb

@@ -0,0 +1,118 @@
+require 'aws-sdk'
+require 'trollop'
+
+require 'opsworks'
+
+DSH_PREFIX  = "# --- OpsWorks ---"
+DSH_POSTFIX = "# --- End of OpsWorks ---"
+
+module OpsWorks::Commands
+  class DSH
+    def self.banner
+      "Generate and update DSH configuration files"
+    end
+
+    def self.run
+      options = Trollop::options do
+        banner <<-EOS.unindent
+          #{DSH.banner}
+
+          Options:
+        EOS
+        opt :update, "Update ~/.dsh config files directly"
+        opt :backup, "Backup old DSH config before updating"
+      end
+
+      config = OpsWorks.config
+
+      client = AWS::OpsWorks::Client.new
+
+      instances = []
+      layers_by_stack = {}
+      instances_by_layer = {}
+
+      config.stacks.each do |stack_id|
+        result = client.describe_stacks(stack_ids: [stack_id])
+        stack_name = result.stacks.first.name
+
+        result = client.describe_instances(stack_id: stack_id)
+        instances += result.instances.select { |i| i[:status] != "stopped" }
+
+        layers_by_stack[stack_name] = []
+        result = client.describe_layers(stack_id: stack_id)
+        layers_by_stack[stack_name] += result.layers
+
+
+        instances_by_layer[stack_name] = {}
+
+        layers_by_stack[stack_name].each do |layer|
+          layer_inst = []
+          result = client.describe_instances(layer_id: layer[:layer_id])
+          layer_inst = result.instances.select { |i| i[:status] != "stopped" }
+
+          layer_inst.map! do |instance|
+            instance[:hostname]
+          end
+
+          instances_by_layer[stack_name][layer[:shortname]] =
+                         "\n\n#{DSH_PREFIX}\n" <<
+                         "#{layer_inst.join("\n")}\n" <<
+                         "#{DSH_POSTFIX}\n\n"
+
+#          puts layer[:shortname]
+#          puts instances_by_layer[stack_name][layer[:shortname]]
+        end
+        layers_by_stack[stack_name].map! do |layer|
+          layer[:shortname]
+        end
+      end
+
+      instances.reject! { |i| i[:elastic_ip].nil? && i[:public_ip].nil? }
+      instances.map! do |instance|
+        instance[:hostname]
+      end
+
+      new_machine_contents = "\n\n#{DSH_PREFIX}\n" <<
+                     "#{instances.join("\n")}\n" <<
+                     "#{DSH_POSTFIX}\n\n"
+
+      if options[:update]
+        dsh_config_dir = "#{ENV['HOME']}/.dsh"
+
+        machines_list = "#{dsh_config_dir}/machines.list"
+        groups_dir = "#{dsh_config_dir}/group"
+
+        [dsh_config_dir, groups_dir].each do |dir|
+          unless Dir.exists? dir
+            Dir.mkdir dir
+          end
+        end
+
+        if options[:backup]
+          OpsWorks::Commands::FileUtil.backup(dsh_config_dir)
+        end
+
+        OpsWorks::Commands::FileUtil.update_file(machines_list, new_machine_contents)
+        puts "Successfully updated #{machines_list} with " <<
+             "#{instances.length} instances!"
+
+        layers_by_stack.keys.each do |stack|
+          puts stack
+          layers_by_stack[stack].each do |layer|
+            puts layer
+            contents = instances_by_layer[stack][layer]
+            group_file = "#{groups_dir}/#{stack}_#{layer}"
+            puts group_file
+            OpsWorks::Commands::FileUtil.update_file(group_file, contents)
+            puts "Successfully updated group/#{group_file}!"
+          end
+        end
+
+        puts "Successfully updated #{machines_list} with " <<
+             "#{instances.length} instances!"
+      else
+        puts new_machine_contents.strip
+      end
+    end
+  end
+end

data/lib/opsworks/commands/file_util.rb

@@ -0,0 +1,42 @@
+require 'fileutils'
+require 'trollop'
+
+require 'opsworks'
+
+module OpsWorks::Commands
+  class FileUtil
+
+    def self.backup (source)
+      if File.exists? source
+        base_name = source + ".backup"
+        if File.exists? base_name
+          number = 0
+          backup = "#{base_name}-#{number}"
+          while base_name.class.exists? backup
+            backup = "#{base_name}-#{number += 1}"
+          end
+        else
+          backup = base_name
+        end
+
+        FileUtils.cp_r(source, backup)
+      end
+    end
+
+    def self.update_file (f, new_contents)
+      options = Trollop::options
+
+      old_contents = (File.exists? f) ? File.read(f) : ""
+
+      File.open(f, "w") do |file|
+        unless old_contents == ""
+          file.puts old_contents.gsub(
+            /\n?\n?#{SSH_PREFIX}.*#{SSH_POSTFIX}\n?\n?/m,
+            ''
+          )
+        end
+        file.puts new_contents
+      end
+    end
+  end
+end

data/lib/opsworks/commands/ssh.rb

@@ -33,7 +33,14 @@ module OpsWorks::Commands
 
       instances = []
 
-      config.stacks.each do |stack_id|
+      stack_ids = if config.stacks.empty?
+        stacks = client.describe_stacks[:stacks]
+        stacks.map{|s| s[:stack_id]}
+      else
+        config.stacks
+      end
+
+      stack_ids.each do |stack_id|
         result = client.describe_instances(stack_id: stack_id)
         instances += result.instances.select { |i| i[:status] != "stopped" }
       end

data/lib/opsworks/meta.rb

@@ -1,7 +1,8 @@
 module OpsWorks
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
   AUTHORS = ["Adam Lindberg"]
   EMAIL = ["hello@alind.io"]
   DESCRIPTION = "Amazon OpsWorks CLI"
   SUMMARY = "Command line interface for Amazon OpsWorks"
 end
+

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: opsworks
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Adam Lindberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.11.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.11.3
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: awesome_print
   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'
 description: Amazon OpsWorks CLI
@@ -102,18 +102,20 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/opsworks
+- ".gitignore"
 - Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- bin/opsworks
+- lib/opsworks.rb
 - lib/opsworks/cli.rb
+- lib/opsworks/commands/dsh.rb
+- lib/opsworks/commands/file_util.rb
 - lib/opsworks/commands/ssh.rb
 - lib/opsworks/config.rb
 - lib/opsworks/meta.rb
-- lib/opsworks.rb
-- LICENSE.txt
 - opsworks.gemspec
-- Rakefile
-- README.md
-- .gitignore
 homepage: https://github.com/eproxus/opsworks
 licenses:
 - MIT
@@ -124,17 +126,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Command line interface for Amazon OpsWorks