jzimmek-ec2-dsl 0.3.0 → 0.4.0

data/README.rdoc

@@ -170,7 +170,6 @@ Having more than one instance in your cloud and you will duplicate parts (ami, k
 
   puts my_network.groups["webserver"].keypair
   puts my_network.groups["webserver"].ami
-  puts my_network.groups["webserver"].instances["web01"].hostname
   puts my_network.groups["webserver"].instances["web01"].elastic_ip
   puts my_network.groups["webserver"].instances["web01"].keypair
   puts my_network.groups["webserver"].instances["web01"].ami
@@ -179,25 +178,7 @@ Having more than one instance in your cloud and you will duplicate parts (ami, k
 
 == Attributes
 
-Each building block can have several attributes to define things like (domain, hostname, elastic_ip, etc.). The attribute value of a building block will be inherited from its parent building. Inherited attributes can always be overwritten.
-
-=== hostname
-
-The hostname attribute describes the `hostname` value of your instance. Defaults to the name of your instance. Can only be applied to an "instance" block.
-
-  ...
-  instance "web01"
-  ...
-  
-  # HOSTNAME = "web01"
-  
-  ...
-  instance "web01" do
-    hostname "some_other_domain"
-  end
-  ...
-  
-  HOSTNAME = "some_other_domain"
+Each building block can have several attributes to define things like (domain, elastic_ip, etc.). The attribute value of a building block will be inherited from its parent building. Inherited attributes can always be overwritten.
 
 === elastic_ip
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/ec2-dsl.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ec2-dsl}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Zimmek"]

data/lib/ec2/dsl/instance.rb

@@ -8,12 +8,11 @@ module Ec2
       define_attribute :security_group
       define_attribute :region
       define_attribute :ami, :ari, :aki
-      define_attribute :hostname, :domain
+      define_attribute :domain
       define_attribute :elastic_ip
       define_attribute :availability_zone
 
       def initialize(name, container)
-        hostname(name)
         @mounts = []
         super
       end
@@ -23,7 +22,6 @@ module Ec2
         validate_required_attribute(:security_group)
         validate_required_attribute(:region)
         validate_required_attribute(:ami)
-        validate_required_attribute(:hostname)
         
         @mounts.each do |mount|
           raise "mounted volume_id in instance '#{self.name}' is empty" if mount[:volume_id].empty?

data/test/ec2-dsl_test.rb

@@ -94,17 +94,7 @@ class Ec2DslTest < Test::Unit::TestCase
     assert "server02", grp.instances["server02"].name
     
   end  
-  
-  should "assign instance name as default hostname" do
-    cloud "my_network", false do
-      group "default" do
-        instance "server01"
-      end
-    end
     
-    assert_equal "server01", @my_network.groups["default"].instances["server01"].hostname_value
-  end
-  
   should "fail if no instance found in group" do
 
     assert_raise RuntimeError do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jzimmek-ec2-dsl
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Jan Zimmek