dnapi 1.1.98 → 1.1.100.pre2

data/lib/dnapi/components/metadata.rb

@@ -7,6 +7,9 @@ module DNApi
 
       desc "Adds arbitrary data to the DNA. DO UNDER NO CIRCUMSTANCE ADD ANY VALIDATION TO THIS!"
 
+      key :metadata
+      belongs_to DNApi::Environment
+
       def [](key)
         self.send(key)
       end

data/lib/dnapi/components/nodejs.rb

@@ -1,6 +1,6 @@
 module DNApi
   module Components
-    class NodeJS < VersionedComponent.new(:key)
+    class NodeJS < Struct.new(:key)
       include Component
 
       desc "Evented I/O for V8 JavaScript"
@@ -9,22 +9,26 @@ module DNApi
 
       belongs_to Environment
 
-      NAME        = 'Node.js'.freeze
-      VERSION = '0.6'.freeze
-      PATCH_LEVEL = '17'.freeze
+      NAME = 'Node.js'.freeze
+
+      def app_server_stacks
+        DNApi::Stack.all.select do |stack|
+          stack.ruby_versions.include?(self.class)
+        end
+      end
 
       def self.label
-        "#{NAME} - #{VERSION}.x"
+        NAME
       end
 
-      def self.version
-        "#{VERSION}.#{PATCH_LEVEL}"
+      def label
+        NAME
       end
 
-      def self.package
-        'net-libs/nodejs'
+      def name
+        NAME
       end
-    end
 
+    end
   end
 end

data/lib/dnapi/recipe.rb

@@ -24,7 +24,7 @@ module DNApi
 
     def self.all
       [Monit, Memcached, Nginx, NginxPassenger, ApachePassenger,
-       Mongrel, Unicorn, Mysql51, Mysql55, Nginxtcp, Node, 
+       Mongrel, Unicorn, Mysql51, Mysql55, Nginxtcp, Node,
        Trinidad, Thin, Puma, PHP]
     end
   end

data/lib/dnapi/stack.rb

@@ -60,12 +60,19 @@ module DNApi
                           :recipes       => [Recipe::Nginx, Recipe::Trinidad])
 
     Nginxtcp        = new(:name          => 'nginxtcp',
-                          :label         => 'NodeJS',
+                          :label         => 'Node.js Early Access',
                           :web_server    => :nginxtcp,
                           :rack_server   => :nodejs,
                           :ruby_versions => [DNApi::Components::NodeJS],
                           :recipes       => [Recipe::Nginxtcp, Recipe::Node])
 
+    NginxNode       = new(:name          => 'node',
+                          :label         => 'Node.js',
+                          :web_server    => :nginx,
+                          :rack_server   => :nodejs,
+                          :ruby_versions => [DNApi::Components::NodeJS],
+                          :recipes       => [Recipe::Nginx, Recipe::Node])
+
     NginxThin       = new(:name          => 'thin',
                           :label         => 'Thin',
                           :web_server    => :nginx,
@@ -89,7 +96,7 @@ module DNApi
                           :recipes       => [Recipe::Nginx, Recipe::PHP])
 
     def self.all
-      [NginxMongrel, NginxPassenger, NginxPassenger3, ApachePassenger, NginxUnicorn, Trinidad, Nginxtcp, NginxThin, NginxPuma, NginxPHP]
+      [NginxMongrel, NginxPassenger, NginxPassenger3, ApachePassenger, NginxUnicorn, Trinidad, Nginxtcp, NginxNode, NginxThin, NginxPuma, NginxPHP]
     end
 
     def self.get(name)

data/lib/dnapi/version.rb

@@ -1,3 +1,3 @@
 module DNApi
-  VERSION = '1.1.98'
+  VERSION = '1.1.100.pre2'
 end

data/spec/app_spec.rb

@@ -52,7 +52,7 @@ describe DNApi::App do
   end
   describe "nginx_nodejs environment" do
     before do
-      @environment = DNApi::Environment.new(:stack => DNApi::Stack.get('nginxtcp'))
+      @environment = DNApi::Environment.new(:stack => DNApi::Stack.get('node'))
       @app = DNApi::App.new
       @environment.apps = [@app]
     end

data/spec/components/nodejs_spec.rb

@@ -8,8 +8,7 @@ describe DNApi::Components::NodeJS do
 
   describe "#label" do
     it "should have the right label" do
-      described_class.label.should == 'Node.js - 0.6.x'
-      @nodejs.label.should == 'Node.js - 0.6.x'
+      @nodejs.label.should == 'Node.js'
     end
   end
 
@@ -17,11 +16,8 @@ describe DNApi::Components::NodeJS do
     it { @nodejs.name.should == 'Node.js' }
   end
 
-  describe "#version" do
-    it { @nodejs.version.should == '0.6' }
+  it "does not have a version because package.json takes care of that" do
+    expect { @nodejs.version }.to raise_error(NoMethodError)
   end
 
-  describe "#patch_level" do
-    it { @nodejs.patch_level.should == '17' }
-  end
 end

data/spec/stack_spec.rb

@@ -1,9 +1,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe DNApi::Stack do
-  describe "Nginxtcp" do
-    it 'has node & nginxtcp for recipes' do
-      DNApi::Stack::Nginxtcp.recipes.should == [DNApi::Recipe::Nginxtcp, DNApi::Recipe::Node]
+  describe "NginxNode" do
+    it 'has node & nginx for recipes' do
+      DNApi::Stack::NginxNode.recipes.should == [DNApi::Recipe::Nginx, DNApi::Recipe::Node]
     end
   end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dnapi
 version: !ruby/object:Gem::Version
-  version: 1.1.98
-  prerelease: 
+  version: 1.1.100.pre2
+  prerelease: 8
 platform: ruby
 authors:
 - Engine Yard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000 Z
+date: 2012-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json