dnapi 1.1.88 → 1.1.89

data/lib/dnapi/component.rb

@@ -27,11 +27,13 @@ module DNApi
     end
 
     def self.[](key)
-      components.detect {|c| c.key_id == key } or raise NoSuchComponent, "unknown component #{key.inspect}"
+      components.detect {|c| c.key_id == key }
     end
 
     def self.from(values)
-      self[values.delete('key').to_sym].new(values)
+      if klass = self[values.delete('key').to_sym]
+        klass.new(values)
+      end
     end
 
     def key

data/lib/dnapi/component_possessor.rb

@@ -37,7 +37,10 @@ module DNApi
     end
 
     def add_component(key, component_options={})
-      c = Component[key.to_sym].new(component_options.merge(:parent => self))
+      unless klass = Component[key.to_sym]
+        raise Component::NoSuchComponent, "unknown component #{key.inspect}"
+      end
+      c = klass.new(component_options.merge(:parent => self))
       unless c.can_belong_to?(self)
         raise ComponentAttachmentError, "Can't attach #{key.inspect} to a #{self.class}"
       end

data/lib/dnapi/components/ruby.rb

@@ -18,7 +18,7 @@ module DNApi
       end
 
       NAME             = 'Ruby'.freeze
-      RUBYGEMS_VERSION = '1.5.2'.freeze
+      RUBYGEMS_VERSION = '1.8.17'.freeze
 
       def rubygems_version
         self.class::RUBYGEMS_VERSION
@@ -86,6 +86,7 @@ module DNApi
       NAME        = 'REE'.freeze
       VERSION     = '1.8.7'.freeze
       PATCH_LEVEL = '2011.12'.freeze
+      RUBYGEMS_VERSION = '1.5.2'.freeze
 
       def self.label
         "#{self::NAME} #{self::PATCH_LEVEL}"
@@ -136,7 +137,6 @@ module DNApi
 
       VERSION     = '1.9.3'.freeze
       PATCH_LEVEL = 'p0'.freeze
-      RUBYGEMS_VERSION = '1.8.11'.freeze
 
       def ruby_version
         "#{version}_#{patch_level}"
@@ -215,6 +215,7 @@ module DNApi
       VERSION     = '2.0.0-r3'.freeze
       VM_VERSION  = '1.8'.freeze
       PATCH_LEVEL = nil
+      RUBYGEMS_VERSION = nil
 
       def self.label
         "#{self::NAME} 2.0 (ruby-1.8.7-p352)"
@@ -250,6 +251,7 @@ module DNApi
       VERSION     = '2.0.0-r3'.freeze
       VM_VERSION  = '1.9'.freeze
       PATCH_LEVEL = nil
+      RUBYGEMS_VERSION = nil
 
       def self.label
         "#{self::NAME} 2.0 (ruby-1.9.2-p136)"

data/lib/dnapi/components/rubygems.rb

@@ -0,0 +1,13 @@
+module DNApi
+  module Components
+    class Rubygems < Struct.new(:key, :version)
+      include Component
+
+      desc "A way to set a specific Rubygems version for the environment"
+
+      key :rubygems
+
+      belongs_to Environment
+    end
+  end
+end

data/lib/dnapi/struct.rb

@@ -29,13 +29,11 @@ module DNApi
 
     def self.from(jexp)
       _many.each do |assoc|
-        jexp[assoc.to_s] = jexp[assoc.to_s].map do |item|
+        jexp[assoc.to_s] = (jexp[assoc.to_s] || []).map do |item|
           if klass = map[assoc.to_sym]
             klass.from(item)
-          else
-            raise "No class found for #{assoc.inspect}"
           end
-        end
+        end.compact
       end
 
       _ones.each do |assoc|
@@ -44,8 +42,6 @@ module DNApi
             item = jexp[assoc.to_s]
             if klass = map[assoc.to_sym]
               klass.from(item)
-            else
-              raise "No class found for #{assoc.inspect}"
             end
           end
         end

data/lib/dnapi/version.rb

@@ -1,3 +1,3 @@
 module DNApi
-  VERSION = '1.1.88'
+  VERSION = '1.1.89'
 end

data/spec/component_spec.rb

@@ -62,5 +62,7 @@ describe DNApi::Component do
         env.add_component(:lovely_bunch_of_coconuts)
       end.should raise_error(DNApi::Component::NoSuchComponent)
     end
+
+
   end
-end 
+end

data/spec/components/ruby_spec.rb

@@ -70,8 +70,8 @@ describe DNApi::Components::Ruby187 do
   end
 
   describe "#rubygems_version" do
-    it 'is 1.5.2' do
-      @ruby.rubygems_version.should == '1.5.2'
+    it 'is 1.8.17' do
+      @ruby.rubygems_version.should == '1.8.17'
     end
   end
 end
@@ -146,8 +146,8 @@ describe DNApi::Components::Ruby192 do
   end
 
   describe "#rubygems_version" do
-    it 'is 1.5.2' do
-      @ruby.rubygems_version.should == '1.5.2'
+    it 'is 1.8.17' do
+      @ruby.rubygems_version.should == '1.8.17'
     end
   end
 end
@@ -184,8 +184,8 @@ describe DNApi::Components::Ruby193 do
   end
 
   describe "#rubygems_version" do
-    it 'is 1.8.11' do
-      @ruby.rubygems_version.should == '1.8.11'
+    it 'is 1.8.17' do
+      @ruby.rubygems_version.should == '1.8.17'
     end
   end
 
@@ -228,8 +228,8 @@ describe DNApi::Components::Rubinius do
   end
 
   describe "#rubygems_version" do
-    it 'is 1.5.2' do
-      @ruby.rubygems_version.should == '1.5.2'
+    it 'is nil' do
+      @ruby.rubygems_version.should be_nil
     end
   end
 end
@@ -265,8 +265,8 @@ describe DNApi::Components::Rubinius19 do
   end
 
   describe "#rubygems_version" do
-    it 'is 1.5.2' do
-      @ruby.rubygems_version.should == '1.5.2'
+    it 'is nil' do
+      @ruby.rubygems_version.should be_nil
     end
   end
 end

data/spec/components/rubygems_spec.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe DNApi::Components::Rubygems do
+  before do
+    @environment = DNApi::Environment.new
+    @environment.add_component :rubygems, :version => DNApi::Components::RubyVersion::RUBYGEMS_VERSION
+  end
+
+  it 'can be added to an environment with its version' do
+    @environment.should have_component(:rubygems)
+    @environment.component(:rubygems).key.should == :rubygems
+    @environment.component(:rubygems).version.should == DNApi::Components::RubyVersion::RUBYGEMS_VERSION
+  end
+end

data/spec/environment_spec.rb

@@ -224,4 +224,40 @@ describe DNApi::Environment do
       end
     end
   end
+
+  describe ".from" do
+    it 'creates a new environment with identified components' do
+      attrs = {
+        :instances => [],
+        :apps => [],
+        :crons => [],
+        :components => [ {:key => :ruby_192} ],
+      }
+      env = DNApi::Environment.from(JSON.parse(attrs.to_json))
+      env.components.size.should == 1
+      env.component(:ruby_192).should be_true
+    end
+
+    it 'creates a new environment with unidentified components' do
+      attrs = {
+        :instances => [],
+        :apps => [],
+        :crons => [],
+        :components => [ {:key => :ruby_192}, {:key => :foo} ],
+      }
+      env = DNApi::Environment.from(JSON.parse(attrs.to_json))
+      env.components.size.should == 1
+      env.component(:ruby_192).should be_true
+      env.component(:foo).should be_nil
+    end
+
+    it 'creates a new environment with missing children' do
+      attrs = {
+        :instances => [],
+        :apps => [],
+      }
+      env = DNApi::Environment.from(JSON.parse(attrs.to_json))
+      env.crons.should be_empty
+    end
+  end
 end

data/spec/vhost_spec.rb

@@ -0,0 +1,16 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe DNApi::VHost do
+  describe ".from" do
+    it 'creates a new vhost with an ssl cert' do
+      attrs = {
+        :domain_name => "www.example.org",
+        :ssl_cert => {:certificate => "foocert"},
+      }
+      env = DNApi::VHost.from(JSON.parse(attrs.to_json))
+      env.domain_name.should == "www.example.org"
+      env.ssl_cert.certificate.should == "foocert"
+      env.ssl_cert.certificate_chain.should be_nil
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dnapi
 version: !ruby/object:Gem::Version
-  version: 1.1.88
+  version: 1.1.89
   prerelease: 
 platform: ruby
 authors:
@@ -100,6 +100,7 @@ files:
 - lib/dnapi/components/passenger3.rb
 - lib/dnapi/components/php.rb
 - lib/dnapi/components/ruby.rb
+- lib/dnapi/components/rubygems.rb
 - lib/dnapi/components/ssmtp.rb
 - lib/dnapi/components/stunneled.rb
 - lib/dnapi/components/v8.rb
@@ -130,6 +131,7 @@ files:
 - spec/components/nodejs_spec.rb
 - spec/components/passenger3_spec.rb
 - spec/components/ruby_spec.rb
+- spec/components/rubygems_spec.rb
 - spec/components/stunneled.rb
 - spec/components/volume_spec.rb
 - spec/db_stack_spec.rb
@@ -140,6 +142,7 @@ files:
 - spec/spec_helper.rb
 - spec/stack_spec.rb
 - spec/struct_spec.rb
+- spec/vhost_spec.rb
 homepage: http://github.com/engineyard/dnapi
 licenses: []
 post_install_message: 
@@ -160,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: API for chef DNA.
@@ -173,6 +176,7 @@ test_files:
 - spec/components/nodejs_spec.rb
 - spec/components/passenger3_spec.rb
 - spec/components/ruby_spec.rb
+- spec/components/rubygems_spec.rb
 - spec/components/stunneled.rb
 - spec/components/volume_spec.rb
 - spec/db_stack_spec.rb
@@ -183,3 +187,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/stack_spec.rb
 - spec/struct_spec.rb
+- spec/vhost_spec.rb