guignol 0.1.2.1 → 0.3.0

data/.gitignore

@@ -0,0 +1,2 @@
+pkg
+.DS_Store

data/.rspec

@@ -1,2 +1,3 @@
 --color
---format nested
+--tty
+--format progress

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    guignol (0.1.2.1)
+    guignol (0.3.0)
       active_support
-      fog (~> 1.1.2)
+      fog (~> 1.6.0)
       parallel (~> 0.5.14)
-      term-ansicolor
+      thor
       uuidtools
 
 GEM
@@ -14,28 +14,37 @@ GEM
     active_support (3.0.0)
       activesupport (= 3.0.0)
     activesupport (3.0.0)
-    awesome_print (1.0.2)
-    builder (3.0.0)
+    builder (3.1.3)
+    coderay (1.0.7)
     diff-lcs (1.1.3)
-    excon (0.9.6)
-    fog (1.1.2)
+    excon (0.16.4)
+    fog (1.6.0)
       builder
-      excon (~> 0.9.0)
+      excon (~> 0.14)
       formatador (~> 0.2.0)
       mime-types
-      multi_json (~> 1.0.3)
+      multi_json (~> 1.0)
       net-scp (~> 1.0.4)
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
-    formatador (0.2.1)
-    mime-types (1.18)
-    multi_json (1.0.4)
+    formatador (0.2.3)
+    jruby-pageant (1.1.1)
+    method_source (0.8)
+    mime-types (1.19)
+    multi_json (1.3.6)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.3.0)
-    nokogiri (1.5.2)
-    parallel (0.5.16)
+    net-ssh (2.6.0)
+      jruby-pageant (>= 1.1.1)
+    nokogiri (1.5.5)
+    parallel (0.5.18)
+    pry (0.9.10)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
+    pry-nav (0.2.2)
+      pry (~> 0.9.10)
     rake (0.9.2.2)
     rspec (2.4.0)
       rspec-core (~> 2.4.0)
@@ -46,15 +55,17 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.4.0)
     ruby-hmac (0.4.0)
-    term-ansicolor (1.0.7)
-    uuidtools (2.1.2)
+    slop (3.3.3)
+    thor (0.16.0)
+    uuidtools (2.1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  awesome_print
   bundler (>= 1.0.0)
   guignol!
+  pry
+  pry-nav
   rake
   rspec (~> 2.4.0)

data/LICENCE

@@ -0,0 +1,26 @@
+Copyright (c) 2012, HouseTrip SA.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met: 
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution. 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies, 
+either expressed or implied, of the authors.

data/README.md

@@ -5,9 +5,23 @@ Be the puppeteer. Order your EC2 instances to start, stop, die, or be created fr
 Released under the [Simplified BSD License](http://en.wikipedia.org/wiki/BSD_licenses#2-clause_license_.28.22Simplified_BSD_License.22_or_.22FreeBSD_License.22.29).
 
 
+    Guignol -- manipulate EC2 instances from your command line.
+
+    Tasks:
+      guignol clone SOURCE       # Print a new config similar to the server named SOURCE
+      guignol create PATTERNS    # Create and start all instances matching PATTERNS and their volumes
+      guignol execute COMMAND    # Execute a command over SSH on instances
+      guignol fixdns [PATTERNS]  # Make sure the DNS mappings are correct for servers matching PATTERNS
+      guignol help [TASK]        # Describe available tasks or one specific task
+      guignol kill PATTERNS      # Terminate all instances matching PATTERNS
+      guignol list [PATTERNS]    # List the status of all known instances
+      guignol start PATTERNS     # Start all instances matching PATTERNS, attach their volumes, and setup DNS records
+      guignol stop PATTERNS      # Stop all instances matching PATTERNS, and remove DNS records
+      guignol uuid [COUNT]       # Print random UUIDs
+
 ## Getting started
 
-Install `guignol`:
+Install Guignol:
 
     $ gem install guignol
 
@@ -19,13 +33,13 @@ Start by setting up your `~/.fog`:
       :aws_access_key_id:      ABCDEF....
       :aws_secret_access_key:  123456....
 
+Alternatively you can pass crendentials for Guignol by setting the `AWS_SECRET_KEY_ID` and `AWS_SECRET_ACCESS_KEY` environment variables, or by setting `:aws_access_key_id` and `:aws_secret_access_key` in `guignol.yml` (see below).
 
 
 ## Creating, starting and stopping machines
 
 Guignol doesn't care about the list of instances that live on your EC2 account,
 only what it's configured to deal with.
-
 This should prevent destroying other's instances when using (for instance) a
 shared AWS/IAM account !
 
@@ -35,10 +49,13 @@ instance):
 
     # ~/.guignol.yml
     --- 
-    - :name: hello-world
+    hello-world:
       :uuid: AF123799-3F55-4F0B-8E58-87C67A5977BA
 
-Guignol will read it's configuration from `./config/guignol.yml`, `./guignol.yml`, or `~/.guignol.yml`.
+Guignol will read its configuration from the first file in the following list:
+
+- the value of the `GUIGNOL_YML` environment variable,
+- `./guignol.yml`, `./config/guignol.yml`, `~/.guignol.yml`
 
 `guignol uuid` will output a new UUID if you need one.
 You can also use `uuidgen` if your distro come with it.
@@ -59,7 +76,7 @@ You can log in as soon as the command returns.
 Of course, you can `stop`, `start`, or `kill` your instance.
 
 
-### One more thing
+### Parallel actions
 
 You can run any command against multiple instances by listing names and (ruby)
 regular expressions to designate lists of instances.
@@ -72,9 +89,34 @@ regular expressions to designate lists of instances.
 
 If targeting multiple machines, guignol will run **in parallel**.
 
+Parallelism is disabled on Ruby 1.9.3+, as it doesn't deal well with SSL connections in that case.
+
+
+### EBS Volumes
+
+Yes, Guignol will also create and attach your EBS volumes when starting up instances.
+Just add a `:volumes` entry to your instance configuration:
+
+    :volumes:
+      - :name: fubar-swap
+        :uuid: 9D5A278E-432C-41DB-9FB5-8AF5C1BD021F
+        :dev:  /dev/sdf
+        :size: 4
+        :delete_on_termination: true
+      - :name: fubar-data
+        :uuid: E180203F-9DE1-4C6A-B09B-33B2FAC8F36E
+        :dev:  /dev/sdg
+        :size: 20
+        :delete_on_termination: false
+
+Guignol will take care of creating your instances in the right availability zone if its volumes already exist.
+
+Note that Guignol does not delete volumes when tearing down instances.
+
+
 
 
-## Optional configuration
+## Optional instance configuration
 
 - `:domain`
   The machine's domain name. If specified, Guignol will setup a 
@@ -96,31 +138,14 @@ If targeting multiple machines, guignol will run **in parallel**.
 - `:security_group_ids`
   A list of security groups you want your instance to be a member of.
 
+- `:volumes`
+  A list of EBS volumes to be created if necessary, and attached to the instance.
+
 - `:user_data`
   A script to run when an instance is created.
 
-
-
-## EBS Volumes
-
-Yes, Guignol will also create and attach your EBS volumes when starting up instances.
-Just add a `:volumes` entry to your instance configuration:
-
-    :volumes:
-      - :name: fubar-swap
-        :uuid: 9D5A278E-432C-41DB-9FB5-8AF5C1BD021F
-        :dev:  /dev/sdf
-        :size: 4
-        :delete_on_termination: true
-      - :name: fubar-data
-        :uuid: E180203F-9DE1-4C6A-B09B-33B2FAC8F36E
-        :dev:  /dev/sdg
-        :size: 20
-        :delete_on_termination: false
-
-Guignol will take care of creating your instances in the right availability zone if its volumes already exist.
-
-Note that Guignol does not delete volumes when tearing down instances.
+- `:username`
+  Will be used for the SSH connection performed by the `execute` command.
 
 
 
@@ -138,31 +163,35 @@ Simply
 Now you can `guignol stop` your instances from the command line when not using them and save money.
 
 
+## Logging
+
+Guignol will log to standard output if it's a TTY, and be mostly silent otherwise.
+You can direct logging to a file of your choice by setting `GUIGNOL_LOG`.
+
+
 
 ## Complete config example
 
-This one just contains 2 machines, `fubar.housetripdev.com.` and `gargantua.hosuetirpdev.com.`
+This one just contains 1 machine, `fubar.example.com.`
 
     # ~/.guignol.yml
     --- 
-    - :name: hello-world
-      :uuid: AF123799-3F55-4F0B-8E58-87C67A5977BA
-    - :name:                fubar
-      :domain:              housetripdev.com.
+    fubar:
+      :domain:              example.com.
       :uuid:                68C3C0C2-1BA3-465F-8626-E065E4EF9048
       :region:              eu-west-1
-      :image_id:            ami-15f7c961                            # 32 bits
+      :image_id:            ami-15f7c961
       :flavor_id:           m1.small
-      :key_name:            jtl-laptop
+      :key_name:            john-doe
       :security_group_ids:  
-        - sg-7e638109                                               # housetrip-basic
+        - sg-7e638abc
       :volumes:
-        - :name: fubar-swap
+        fubar-swap:
           :uuid: 9D5A278E-432C-41DB-9FB5-8AF5C1BD021F
           :dev:  /dev/sdf
           :size: 4
           :delete_on_termination: true
-        - :name: fubar-data
+        fubar-data:
           :uuid: E180203F-9DE1-4C6A-B09B-33B2FAC8F36E
           :dev:  /dev/sdg
           :size: 20

data/Rakefile

@@ -1,29 +1,3 @@
-# Copyright (c) 2012, HouseTrip SA.
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met: 
-# 
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer. 
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution. 
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# 
-# The views and conclusions contained in the software and documentation are those
-# of the authors and should not be interpreted as representing official policies, 
-# either expressed or implied, of the authors.
 
 require 'bundler'
 require 'rspec/core/rake_task'

data/bin/guignol

@@ -2,42 +2,12 @@
 #
 # Run Guignol commands
 # 
-# Copyright (c) 2012, HouseTrip SA.
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met: 
-# 
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer. 
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution. 
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# 
-# The views and conclusions contained in the software and documentation are those
-# of the authors and should not be interpreted as representing official policies, 
-# either expressed or implied, of the authors.
-
 File.expand_path(__FILE__ + '/../../lib').tap { |libdir| $:.include?(libdir) or $:.unshift(libdir) }
 
+require 'excon'
+require 'guignol/shell'
 
 # Work around SSL certificate errors. Yeah, I know it's insecure.
-require 'excon'
 Excon.defaults[:ssl_verify_peer] = false
 
-
-require 'guignol/shell'
-
-command = ARGV.shift
-Guignol::Shell.instance.execute(command, *ARGV)
+Guignol::Shell.start

data/guignol.gemspec

@@ -1,31 +1,4 @@
 # -*- encoding: utf-8 -*-
-# Copyright (c) 2012, HouseTrip SA.
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met: 
-# 
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer. 
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution. 
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# 
-# The views and conclusions contained in the software and documentation are those
-# of the authors and should not be interpreted as representing official policies, 
-# either expressed or implied, of the authors.
-
 require File.expand_path("../lib/guignol/version", __FILE__)
 
 Gem::Specification.new do |s|
@@ -46,13 +19,14 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rspec", "~> 2.4.0"
   s.add_development_dependency "rake"
-  s.add_development_dependency "awesome_print"
+  s.add_development_dependency "pry"
+  s.add_development_dependency "pry-nav"
 
-  s.add_dependency "fog", "~> 1.1.2"
+  s.add_dependency "fog", "~> 1.6.0"
   s.add_dependency "parallel", "~> 0.5.14"
   s.add_dependency "active_support"
-  s.add_dependency "term-ansicolor"
   s.add_dependency "uuidtools"
+  s.add_dependency "thor"
 
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- spec/*`.split("\n")

data/lib/core_ext/array/collect_key.rb

@@ -0,0 +1,6 @@
+
+Array.class_eval do
+  def collect_key(key)
+    collect { |item| item.kind_of?(Hash) ? item[key] : nil }
+  end
+end

data/lib/core_ext/hash/map_to_hash.rb

@@ -0,0 +1,31 @@
+
+module Hash::MapToHash
+  # Update all values in a hash.
+  # Passes +key,value+ pairs to its block, replaces the pair 
+  # with the block's return value.
+  def map_to_hash(options = {}, &block)
+    Hash.new.tap do |result|
+      self.each_pair do |key,value|
+        value = _deep_convert(value, block) if options[:deep]
+        new_key, new_value = block.call(key, value)
+        result[new_key] = new_value
+      end
+    end
+  end
+
+  private
+
+  def _deep_convert(value, block)
+    case value
+    when Hash
+      value.map_to_hash({ :deep => true }, &block)
+    when Array
+      value.map { |item| _deep_convert(item, block) }
+    else
+      value
+    end
+  end
+
+  Hash.send(:include, self)
+end
+