guignol 0.3.10 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 602a8585b6cfa0db283f93cdfba5b3cf3b83df95
-  data.tar.gz: 5612487338b4c8fc3fc38fd1faf281443568746c
+  metadata.gz: 6b0f962e2f0e7ea9c001589f806953114824f90c
+  data.tar.gz: 8d77edcfc2f89886fb24c5a76a6aac0c1a83c393
 SHA512:
-  metadata.gz: fbd093e9fc9047efc71bb618af7c5f87a6ee827509ef8f7aeb6aad2748fe91f98642628151e663a291d18cbb8ebf7a19ca4a956f9ec57bc053e222b6690cfecf
-  data.tar.gz: bf1dc14babf9a08fbdec9ef987a967756de7caa4f9fc3b4bb643b13401e0fc98f70d781ce08b259a864426bc38af66d88ec85bd184bb6972767f8c9eaac9de2f
+  metadata.gz: 1ea90b6c5c7a26e657c522ac159ecc32314ad797ac0ab61a09e9f7857bcc43c2ef31c19b62301bb25e9b8043e793e3c5bf3cdf189f4c36a5dfdec99734ff0843
+  data.tar.gz: fc396f426f5dcfbab51af910abd72aa00bcb56508c58f2727ab427f126cedbfc4fb4247c94b0be7f371b92c9ab416e0c4823323f61109806b64df74c8d1d1dce

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    guignol (0.3.10)
+    guignol (0.3.12)
       activesupport
       fog (~> 1.12.0)
       parallel (~> 0.6.2)
@@ -11,7 +11,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.0.1)
+    activesupport (4.0.3)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
@@ -33,14 +33,14 @@ GEM
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.4)
-    i18n (0.6.5)
+    i18n (0.6.9)
     method_source (0.8.1)
-    mime-types (1.25)
+    mime-types (2.0)
     minitest (4.7.5)
-    multi_json (1.8.2)
+    multi_json (1.8.4)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.8)
+    net-ssh (2.7.0)
     nokogiri (1.5.10)
     parallel (0.6.5)
     pry (0.9.12.2)

data/README.md

@@ -164,6 +164,8 @@ Note that Guignol does not delete volumes when tearing down instances.
 - `:username`
   Will be used for the SSH connection performed by the `execute` command.
 
+- `:root_ebs_size`
+  Create instance with a bigger root EBS volume
 
 
 ## "User data" boot script
@@ -217,6 +219,7 @@ This one just contains 1 machine, `fubar.example.com.`
       :image_id:            ami-15f7c961
       :flavor_id:           m1.small
       :key_name:            john-doe
+      :root_ebs_size:       30
       :security_group_ids:
         - sg-7e638abc
       :volumes:

data/lib/guignol/models/instance.rb

@@ -39,6 +39,11 @@ module Guignol::Models
       zones = create_options[:volumes].map { |name,volume_options| Volume.new(name, volume_options).availability_zone }.compact.uniq
       availability_zone = create_options[:availability_zone]
 
+      if options[:root_ebs_size]
+        raise "root_ebs_size have to be a number" unless options[:root_ebs_size].is_a? Integer
+        create_options[:block_device_mapping] = [{"DeviceName"=>"/dev/sda1", "Ebs.VolumeSize"=>options[:root_ebs_size], "Ebs.DeleteOnTermination"=>"true"}]
+      end
+
       # check if provided availability_zone is valid
       if availability_zone
         unless availability_zone.match(connection.region)

data/lib/guignol/version.rb

@@ -1,4 +1,4 @@
 
 module Guignol
-  VERSION = "0.3.10"
+  VERSION = "0.3.12"
 end  

data/spec/guignol/instance_spec.rb

@@ -56,11 +56,21 @@ describe Guignol::Models::Instance do
       expect { instance.create }.to_not raise_error
     end
 
+    it 'does not break when providing a root ebs size' do
+      instance = described_class.new(name, options.merge(:root_ebs_size => 30))
+      expect { instance.create }.to_not raise_error
+    end
+
     it 'does not allow an availability zone that does not match the region' do
       instance = described_class.new(name, options.merge(:availability_zone => 'us-west-1a'))
       expect { instance.create }.to raise_error('availability zone us-west-1a is not in the defined region eu-west-1')
     end
 
+    it 'does not allow a non numeric root ebs size' do
+      instance = described_class.new(name, options.merge(:root_ebs_size => 'foobar'))
+      expect { instance.create }.to raise_error
+    end
+
     it 'requires existing volumes to live in a given availability zone'
     it 'reuses existing volumes'
     it 'fails when existing volumes are in different zones'

data/spec/spec_helper.rb

@@ -11,6 +11,6 @@ ENV['AWS_SECRET_ACCESS_KEY'] = 'aws-password'
 
 RSpec.configure do |config|
   config.before do
-    Fog::Mock.reset    
+    Fog::Mock.reset
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guignol
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.12
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler