awsborn 0.9.5 → 0.9.6

data/VERSION

@@ -1 +1 @@
-0.9.5
+0.9.6

data/awsborn.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{awsborn}
-  s.version = "0.9.5"
+  s.version = "0.9.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Vrensk", "Jean-Louis Giordano"]
-  s.date = %q{2012-04-02}
+  s.date = %q{2012-04-04}
   s.description = %q{Awsborn lets you define and launch a server cluster on Amazon EC2.}
   s.email = %q{david@icehouse.se}
   s.extra_rdoc_files = [
@@ -58,7 +58,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/icehouse/awsborn}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Awsborn defines servers as instances with a certain disk volume, which makes it easy to restart missing servers.}
   s.test_files = [
     "spec/aws_constants_spec.rb",
@@ -73,7 +73,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/awsborn/server.rb

@@ -7,10 +7,20 @@ module Awsborn
       @options = options.dup
       self.host_name = elastic_ip
     end
-    
+
     class << self
       attr_accessor :logger
 
+      def get_class_attr(class_attr)
+        if (class_var = instance_variable_get("@#{class_attr}"))
+          class_var
+        elsif self != ::Awsborn::Server
+          superclass.send(class_attr)
+        else
+          nil
+        end
+      end
+
       # Set image_id.  Examples:
       #   image_id 'ami-123123'
       #   image_id 'ami-123123', :sudo_user => 'ubuntu'
@@ -20,35 +30,35 @@ module Awsborn
           @image_id = args.first
           @sudo_user = args.last[:sudo_user] if args.last.is_a?(Hash)
         end
-        @image_id
+        get_class_attr(:image_id)
       end
       def instance_type (*args)
         @instance_type = args.first unless args.empty?
-        @instance_type
+        get_class_attr(:instance_type)
       end
       def security_group (*args)
         @security_group = args unless args.empty?
-        @security_group
+        get_class_attr(:security_group)
       end
       def individual_security_group (*args)
         @individual_security_group = args.first unless args.empty?
-        @individual_security_group
+        get_class_attr(:individual_security_group)
       end
       def keys (*args)
         @keys = args unless args.empty?
-        @keys
+        get_class_attr(:keys)
       end
       def sudo_user (*args)
         @sudo_user = args.first unless args.empty?
-        @sudo_user
+        get_class_attr(:sudo_user)
       end
       def bootstrap_script (*args)
         @bootstrap_script = args.first unless args.empty?
-        @bootstrap_script
+        get_class_attr(:bootstrap_script)
       end
       def monitor (*args)
         @monitor = args.first unless args.empty?
-        @monitor
+        get_class_attr(:monitor)
       end
       
       def cluster (name = ServerCluster.next_name, &block)

data/spec/server_spec.rb

@@ -45,6 +45,9 @@ describe Awsborn::Server do
       server = BigAndSmallServer.new :sample, :zone => :eu_west_1a, :disk => {:sdf => "vol-a"}, :instance_type => :m1_large
       server.image_id.should == 'ami-big'
     end
+    it "should be inherited by subclasses" do
+      Class.new(SampleServer).image_id.should == 'ami-2fc2e95b'
+    end
   end
 
   describe "running?" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: awsborn
 version: !ruby/object:Gem::Version 
-  hash: 49
-  prerelease: false
+  hash: 55
+  prerelease: 
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - David Vrensk
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-02 00:00:00 +02:00
+date: 2012-04-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Awsborn defines servers as instances with a certain disk volume, which makes it easy to restart missing servers.