guignol 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4636c00535c5d18a301b19f0bfa09d50c68e66dc
-  data.tar.gz: 0b61247adf8fc490581a3013790a351bb9feec36
+  metadata.gz: 3122effa5c76fb24af333186992f6746ec24ce1d
+  data.tar.gz: 871d6fcb768cd9de2aa8319d46a7b0c78c8489cf
 SHA512:
-  metadata.gz: f80fe802b17f4f02bf0b0a8d5e8ec5cc8b891d4baa2f71b1e4648a62b731adc14c43998d76d5fbfd451b15f36ee384e060181cc384e11a22c204e6d2c6fc2ff0
-  data.tar.gz: 3891a19536afa2869bed4a6072d577c8d761ba7d07b9a1d17dea2567f7f1c0e4dbd4c70e12bb5f60b2c83ddf2b7691ad564550d709752fcd6e6211696a405942
+  metadata.gz: 6697a1414b262ceb5856635b64622f7208d9fde7e91baa77b80e1b92af2e91a56bfbbdbd79ee4085094a99457c1b715d4a97efd370d99ae0511ff20fabfa2e99
+  data.tar.gz: 168039823e8ae50ed47fecfc19a2279a283164d07b56ed45c479d20403a2e2ed9dbdc58026e700e8ed1bc4ec2db77fb3ae988bdb351cdf112efd01380ed66d10

data/.ruby-version

@@ -1 +1 @@
-1.9.2-p320
+2.0.0-p247

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    guignol (0.3.8)
+    guignol (0.3.9)
       activesupport
       fog (~> 1.12.0)
       parallel (~> 0.6.2)
@@ -11,12 +11,16 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    atomic (1.1.10)
     builder (3.2.2)
     coderay (1.0.9)
-    diff-lcs (1.2.1)
+    diff-lcs (1.2.4)
     excon (0.23.0)
     fog (1.12.1)
       builder
@@ -29,33 +33,37 @@ GEM
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.4)
-    i18n (0.6.1)
+    i18n (0.6.4)
     method_source (0.8.1)
     mime-types (1.23)
+    minitest (4.7.5)
     multi_json (1.7.7)
-    net-scp (1.1.1)
+    net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.7)
+    net-ssh (2.6.8)
     nokogiri (1.5.10)
     parallel (0.6.5)
-    pry (0.9.12)
+    pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
     pry-nav (0.2.3)
       pry (~> 0.9.10)
-    rake (10.0.3)
+    rake (10.1.0)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
       rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.0)
+    rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
+    rspec-mocks (2.13.1)
     ruby-hmac (0.4.0)
-    slop (3.4.3)
+    slop (3.4.5)
     thor (0.18.1)
+    thread_safe (0.1.0)
+      atomic
+    tzinfo (0.3.37)
     uuidtools (2.1.4)
 
 PLATFORMS

data/README.md

@@ -126,6 +126,9 @@ Note that Guignol does not delete volumes when tearing down instances.
 - `:region`
   The EC2 region. Defaults to `eu-west-1`.
 
+- `:availability_zone`
+  The EC2 availability zone. Defaults to whatever Amazon chooses.
+
 - `:image_id`
   The AMI to use when creating this instance. Defaults to whatever Amazon defaults it to.
   

data/lib/guignol/models/instance.rb

@@ -34,10 +34,22 @@ 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)
+      create_options = Guignol::DefaultServerOptions.merge options.slice(:image_id, :flavor_id, :key_name, :security_group_ids, :user_data, :username, :availability_zone)
 
-      # check for pre-existing volume(s). if any exist, add their AZ to the server's options
       zones = create_options[:volumes].map { |name,volume_options| Volume.new(name, volume_options).availability_zone }.compact.uniq
+      availability_zone = create_options[:availability_zone]
+
+      # check if provided availability_zone is valid
+      if availability_zone
+        unless availability_zone.match(connection.region)
+          raise "availability zone #{availability_zone} is not in the defined region #{connection.region}"
+        end
+        if zones.first && zones.first != availability_zone
+          raise "volume availability zone differs to configured server availability_zone"
+        end
+      end
+
+      # check for pre-existing volume(s). if any exist, add their AZ to the server's options
       if zones.size > 1
         raise "pre-existing volumes volumes are in different availability zones"
       elsif zones.size == 1
@@ -119,7 +131,7 @@ module Guignol::Models
         return
       end
       log "updating DNS"
-      
+
       unless dns_zone
         log "DNS zone does not exist"
         return self
@@ -246,7 +258,7 @@ module Guignol::Models
 
     def dns_record
       dns_zone.records.find { |record| record.name == fqdn }
-    end      
+    end
 
     def dns_record_matches?(record)
       !!record and record.value.any? { |dns_name| dns_name == subject.dns_name }
@@ -263,4 +275,4 @@ module Guignol::Models
         find { |s| s.tags['UUID'] == uuid }
     end
   end
-end
+end

data/lib/guignol/version.rb

@@ -1,4 +1,4 @@
 
 module Guignol
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end  

data/spec/guignol/instance_spec.rb

@@ -48,6 +48,17 @@ describe Guignol::Models::Instance do
       subject.create
     end
 
+    it 'does not break when providing an availibity zone' do
+      instance = described_class.new(name, options.merge(:availability_zone => 'eu-west-1c'))
+      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 'requires existing volumes to live in a given availability zone'
     it 'reuses existing volumes'
     it 'fails when existing volumes are in different zones'
 
@@ -74,4 +85,4 @@ describe Guignol::Models::Instance do
       subject.destroy
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guignol
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler