aws-kicker 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmI3MjY4OWM0OTE3NGE1MGMyMGZhNGVlODY1ZjZlZDFiMDVjYTQyZg==
+    NDhlOWQ3YzllOTdlZTQzNGI1YWQyMjkyYzY1ZDA1ZjE5OTg2NjU3Yw==
   data.tar.gz: !binary |-
-    NWYyOGVlYzA4OTljNjE2MzZjNWIxNDIxNjhiOGMyMmVjMjk3YjYxMA==
+    MDk3ZWExMGE3MzlmYTA4MWU0NzlkODQ5YzdlNDA3MTQzOWExODAxZQ==
 SHA512:
   metadata.gz: !binary |-
-    YWZmYzlhZTEwNzA5NTAwYWRkOTdiODJjN2YyYjVkNzE2NmEwYzAwNmZkMDg4
-    OTA2OWFhYzQxYjNjZjU4MmI3YzYxNzM4MWRhMmI0ZWEyNTE3ZmJkOTVkYzcw
-    NWYyMTFlYjM0MDcwM2NmZmQ3ZGQyNzNlMGI5MDE3NjQyMGVmZDM=
+    NDFkZTY2ZjY4NDljNDkxZDNlZjliMWY4ODFiZTQwMDk1NjE1YmU1MDI4NWZi
+    MjVmNTEyNTZjYWNmNjc4MmYzNzU3NjNmYzRlNTEwNjYyM2Y1ZDFiYjk0NWMx
+    MTNhNzQ0NTQ4NzA0ZjYwMTczZGQ3MjlhOWQ0YTQxMTc2NDdjZjU=
   data.tar.gz: !binary |-
-    NzA3ZmQ2MzZkOTY1NDBiMGViMjBiYjgwYzM4MWIxZjM0YmZjYTQzMDdmNWVi
-    ZTFjOTA5ZmNjNWNjZTgzMTU5ZmUwNWM3NzhhMTI0MjQ5MjU3MjZiYjEzNjEy
-    YTIzOGNlNDk3NGYwNzAxN2EzZmMxNzZkY2RhYzVjOTljMmY3MTE=
+    ZWJmNjE3ZTNhOTRmODY4MjFmNmE0Y2M0NTA1ZjllMGUwMjBkMGMxZDIwYWI2
+    YjQ4ODAzYjFhNDg1MzA4YWFjZjBhMDRiOTI2NTg5OTY2ZGY3NjcwYjc1OWU1
+    MDc5MjYzZDY5NGIwYTE2MDM2M2FjMDQ1YmRiZGU4NzMxYTRkYzU=

data/README.md

@@ -20,6 +20,48 @@ Or install it yourself as:
 
 TODO: Write usage instructions here
 
+## Stackfile
+The Stackfile is a ruby based config that is eval'd at runtime.  Here's a sample config:
+	
+	module StackConfig
+	  Stacks = {
+	    # eu-west-1-simon-micro
+	    'rentpro-bmtw' => {
+	      :provider               => 'AWS',
+	      :aws_access_key_id      => ENV['AWS_ACCESS_KEY'],
+	      :aws_secret_access_key  => ENV['AWS_SECRET_KEY'],
+	      :keypair                => 'jobdoneright',
+	      # generic
+	      :region                 => 'eu-west-1',
+	      :availability_zone      => 'eu-west-1a',
+	      :flavor_id              => 't1.micro',
+	      :image_id               => 'ami-ffecde8b',
+	      :dns_domain             => 'bmtw.net',
+	      :dns_id                 => 'Z2NT1FUYUEREUK',
+	      :roles                  => {
+	        'rentpro-db'  => { 
+	          :count => 1, 
+	          :publish_private_ip => true, 
+	          :flavor_id => 'm1.small' 
+	        },
+	        'rentpro-web' => { 
+	          :count => 1, 
+	          :dns_wildcard => true 
+	        }
+	      }
+	    }
+	  }
+	end
+
+2 instances will be booted, rentpro-db & rentpro-web
+
+### Global Parameters
+| Name | Type | Description |
+|------|------|------------ |
+| mime_encode_user_data | Boolean | Defaults to True. When set to False sends only the bootstrap script as user-data, useful for working around issues with Ubuntu Hardy's iffy EC2 Init handling |
+
+#### Role Parameters
+
 ## Contributing
 
 1. Fork it

data/aws-kicker.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |gem|
   gem.version       = Aws::Kicker::VERSION
   gem.authors       = ["Simon McCartney"]
   gem.email         = ["simon@mccartney.ie"]
+  gem.licenses      = ['Apache']
   gem.description   = %q{Utility for kicking an application stack into life on Amazon EC2}
   gem.summary       = %q{Stacks are built from a collection of instances required to build an application stack.
 Each instance is described in the Stackfile & provisioned using variety of methods. Supported models include:
@@ -18,16 +19,16 @@ Amazon EC2 interaction is done through fog, so other providers should be easily
 
 The guiding principle is that your Stackfile should be shareable & re-useable by others, and support templates, so that other users can use the template and easily adjust items in the stack (such as the instance size used, DNS Domain updated during deploy, EC2 account & location)
 }
-  gem.homepage      = "https://github.com/simonmcc/kicker"
+  gem.homepage      = "https://github.com/simonmcc/aws-kicker"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.add_development_dependency('rdoc')
-  gem.add_development_dependency('aruba')
+  gem.add_development_dependency('rdoc', '~> 0')
+  gem.add_development_dependency('aruba', '~> 0')
   gem.add_development_dependency('rake', '~> 0.9.2')
-  gem.add_development_dependency('gem-release')
-  gem.add_dependency('methadone', '~> 1.2.4')
-  gem.add_dependency('fog', '~> 1.12.1')
+  gem.add_development_dependency('gem-release', '~> 0.7')
+  gem.add_dependency('methadone', '~> 1.2')
+  gem.add_dependency('fog', '~> 1.12')
 end

data/lib/aws-kicker/version.rb

@@ -1,5 +1,5 @@
 module Aws
   module Kicker
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/lib/stack.rb

@@ -32,6 +32,7 @@ module Stack
   def Stack.populate_config(config)
 
     config[:find_file_paths] = Array.new if config[:find_file_paths].nil?
+    config[:mime_encode_user_data] = true if config[:mime_encode_user_data].nil?
 
     # build out the full config for each node, supplying defaults from the
     # global config if explicitly supplied
@@ -85,8 +86,17 @@ module Stack
       bootstrap_abs = Stack.find_file(config, config[:node_details][fqdn][:bootstrap])
       cloud_config_yaml_abs = Stack.find_file(config, config[:node_details][fqdn][:cloud_config_yaml])
 
-      multipart_cmd = "#{libdir}/write-mime-multipart #{bootstrap_abs} #{cloud_config_yaml_abs}"
-      user_data = `#{multipart_cmd}`
+      if config[:mime_encode_user_data]
+        Logger.debug "mime encoding user-data..."
+        multipart_cmd = "#{libdir}/write-mime-multipart #{bootstrap_abs} #{cloud_config_yaml_abs}"
+        user_data = `#{multipart_cmd}`
+      else
+        # Ubuntu Hardy seems to struggle with some mime-encoded user-data
+        # so allow the user to forse submitting user-data un-mimed,
+        # in which case we can only pass one file & it must be the bootstrap script
+        Logger.debug "mime encoding user-data disabled, only sending the bootstrap script"
+        user_data = File.read(bootstrap_abs)
+      end
 
       user_data.gsub!(/rentpro-unconfigured/, hostname)
       user_data.gsub!(/rentpro-stage.local/, config[:dns_domain])

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: aws-kicker
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Simon McCartney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2015-02-21 00:00:00.000000000 Z
 dependencies:
 - !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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -56,44 +56,44 @@ dependencies:
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: methadone
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: '1.12'
 description: Utility for kicking an application stack into life on Amazon EC2
 email:
 - simon@mccartney.ie
@@ -103,7 +103,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -119,8 +118,9 @@ files:
 - lib/stack.rb
 - lib/write-mime-multipart
 - test/tc_something.rb
-homepage: https://github.com/simonmcc/kicker
-licenses: []
+homepage: https://github.com/simonmcc/aws-kicker
+licenses:
+- Apache
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: ! 'Stacks are built from a collection of instances required to build an application

data/.rvmrc

@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
-# Only full ruby name is supported here, for short names use:
-#     echo "rvm use 1.9.3" > .rvmrc
-environment_id="ruby-1.9.3@aws-kicker"
-
-# Uncomment the following lines if you want to verify rvm version per project
-# rvmrc_rvm_version="1.17.3 (stable)" # 1.10.1 seams as a safe start
-# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
-#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
-#   return 1
-# }
-
-# First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficient compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
-then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
-    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  rvm --create  "$environment_id" || {
-    echo "Failed to create RVM environment '${environment_id}'."
-    return 1
-  }
-fi
-
-# If you use bundler, this might be useful to you:
-# if [[ -s Gemfile ]] && {
-#   ! builtin command -v bundle >/dev/null ||
-#   builtin command -v bundle | GREP_OPTIONS= \grep $rvm_path/bin/bundle >/dev/null
-# }
-# then
-#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
-#   gem install bundler
-# fi
-# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
-# then
-#   bundle install | GREP_OPTIONS= \grep -vE '^Using|Your bundle is complete'
-# fi