guignol 0.3.0 → 0.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    guignol (0.3.0)
+    guignol (0.3.1)
       active_support
       fog (~> 1.6.0)
       parallel (~> 0.5.14)

data/README.md

@@ -149,6 +149,23 @@ Note that Guignol does not delete volumes when tearing down instances.
 
 
 
+## "User data" boot script
+
+EC2 instances will run the script passed as `user_data` at boot time, letting you perform one-time setup.
+
+Guignol parses this setting through ERB, and lets your access the configuration hash.
+Possible use case:
+
+    # ~/.guignol.yml
+    --- 
+    hello-world:
+      :uuid: AF123799-3F55-4F0B-8E58-87C67A5977BA
+      :domain: example.com
+      :user_data: |
+        #!/bin/sh
+        echo "<%= name %>.<%= domain %>" > /etc/hostname
+
+
 ## Managing existing instances
 
 

data/lib/guignol/models/instance.rb

@@ -1,4 +1,4 @@
-
+require 'erb'
 require 'yaml'
 require 'fog'
 require 'active_support/core_ext/hash/slice'
@@ -6,13 +6,22 @@ require 'guignol'
 require 'guignol/models/base'
 require 'guignol/models/volume'
 
-require 'pry'
-
 module Guignol::Models
   class Instance < Base
     class Error < Exception; end
 
+    class HashERB < OpenStruct
+      def parse(data)
+        ERB.new(data).result(binding)
+      end
+    end
+
     def initialize(name, options)
+      if options[:user_data]
+        options[:name] = name
+        options[:user_data] = HashERB.new(options).parse(options[:user_data])
+      end
+
       super
       subject.username = options[:username] if options[:username] && exists?
     end
@@ -24,7 +33,7 @@ module Guignol::Models
 
     def create
       log "server already exists" and return self if exist?
-        
+
       create_options = Guignol::DefaultServerOptions.merge options.slice(:image_id, :flavor_id, :key_name, :security_group_ids, :user_data, :username)
 
       # check for pre-existing volume(s). if any exist, add their AZ to the server's options

data/lib/guignol/version.rb

@@ -1,4 +1,4 @@
 
 module Guignol
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end  

data/spec/guignol/configuration_spec.rb

@@ -7,7 +7,7 @@ describe Guignol::Configuration do
   let(:result) { subject.configuration }
 
   before do
-    ENV['GUIGNOL_YML'] = test_path
+    ENV['GUIGNOL_YML'] = test_path.to_s
     test_path.open('w') do |io|
       io.write config_data
     end

data/spec/guignol/instance_spec.rb

@@ -28,6 +28,12 @@ describe Guignol::Models::Instance do
     it 'should pass with minimal options' do
       subject
     end
+
+    it 'parses ERB in user data' do
+      options[:foo] = 'bar'
+      options[:user_data] = "foo=<%= foo %>,<%= name %>"
+      subject.options[:user_data].should == 'foo=bar,foobar'
+    end
   end
 
 

data/spec/spec_helper.rb

@@ -8,5 +8,7 @@ ENV['GUIGNOL_ENV'] = 'test'
 ENV['GUIGNOL_LOG'] = '/dev/null'
 
 RSpec.configure do |config|
-  # nib
+  config.before do
+    Fog::Mock.reset
+  end
 end

metadata

@@ -1,181 +1,185 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: guignol
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.3.1
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-30 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-10-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  prerelease: false
-  name: bundler
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 2
-        - 4
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.4.0
-  prerelease: false
-  name: rspec
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
   name: rake
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: pry
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: pry-nav
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.6.0
-  prerelease: false
-  name: fog
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 5
-        - 14
-        version: 0.5.14
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
   name: parallel
-  type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.14
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.14
+- !ruby/object:Gem::Dependency
   name: active_support
-  type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: uuidtools
-  type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id010
-description: "\n    Create, start, stop, destroy instances from the command line\n    based on a YAML description of your instances.\n  "
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! "\n    Create, start, stop, destroy instances from the command line\n
+  \   based on a YAML description of your instances.\n  "
+email:
 - julien.letessier@gmail.com
-executables: 
+executables:
 - guignol
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
@@ -214,43 +218,34 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - tmp/.keepme
-has_rdoc: true
 homepage: https://github.com/mezis/guignol
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2633968983297838480
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.9.5
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Manipulate Amazon EC2 instances
-test_files: 
+test_files:
 - spec/guignol/configuration_spec.rb
 - spec/guignol/instance_spec.rb
 - spec/guignol/volume_spec.rb