dnapi 1.1.81 → 1.1.82.php

data/lib/dnapi/components/php.rb

@@ -0,0 +1,26 @@
+module DNApi
+  module Components
+    class PHP < VersionedComponent.new(:key)
+      include Component
+      desc "Hypertext Preprocessor scripting language"
+      key :php
+      belongs_to Environment
+
+      NAME = 'PHP'.freeze
+      VERSION = '5.3'.freeze
+      PATCH_LEVEL = '9'.freeze
+
+      def self.label
+        "#{NAME} - #{version}"
+      end
+
+      def self.version
+        "#{VERSION}.#{PATCH_LEVEL}"
+      end
+
+      def self.package
+        'dev-lang/php'
+      end
+    end
+  end
+end

data/lib/dnapi/environment.rb

@@ -41,7 +41,8 @@ module DNApi
         component(:ree) || component(:ruby_192) ||
         component(:jruby_187) || component(:jruby_192) ||
         component(:rubinius) || component(:ruby_193) ||
-        component(:nodejs) || component(:rubinius19) 
+        component(:nodejs) || component(:rubinius19) ||
+        component(:php)
     end
 
     def stack

data/lib/dnapi/recipe.rb

@@ -3,9 +3,8 @@ module DNApi
     Monit = new(:name => 'monit')
     Memcached = new(:name => 'memcached')
     Nginx = new(:name => 'nginx')
-    NginxPassenger = new(:name => 'passenger::nginx')
+    NginxPassenger = new(:name => 'nginx-passenger')
     Passenger = new(:name => 'passenger')
-    Passenger3 = new(:name => 'passenger3')
     ApachePassenger = new(:name => 'passenger::apache')
     Mongrel = new(:name => 'mongrel')
     Unicorn = new(:name => 'unicorn')
@@ -16,6 +15,7 @@ module DNApi
     Trinidad = new(:name => 'trinidad')
     Thin = new(:name => 'thin')
     Puma = new(:name => 'puma')
+    PHP = new(:name => 'php')
 
     def self.defaults
       [Memcached, Monit]
@@ -24,7 +24,7 @@ module DNApi
     def self.all
       [Monit, Memcached, Nginx, NginxPassenger, ApachePassenger,
        Mongrel, Unicorn, Mysql51, Mysql55, Nginxtcp, Node, 
-       Trinidad,Thin,Puma]
+       Trinidad, Thin, Puma, PHP]
     end
   end
 end

data/lib/dnapi/stack.rb

@@ -25,7 +25,7 @@ module DNApi
                                                                                    DNApi::Components::JRuby192,
                                                                                    DNApi::Components::Rubinius,
                                                                                    DNApi::Components::Rubinius19]),
-                          :recipes       => [Recipe::Nginx, Recipe::Passenger, Recipe::NginxPassenger])
+                          :recipes       => [Recipe::Nginx, Recipe::NginxPassenger])
 
     NginxPassenger3 = new(:name          => 'nginx_passenger3',
                           :label         => 'Passenger 3',
@@ -34,7 +34,7 @@ module DNApi
                           :ruby_versions => (DNApi::Components::RubyVersion.all - [DNApi::Components::JRuby187,
                                                                                    DNApi::Components::JRuby192,
                                                                                    DNApi::Components::Ruby186]),
-                          :recipes       => [Recipe::Nginx, Recipe::Passenger3])
+                          :recipes       => [Recipe::Nginx, Recipe::NginxPassenger])
 
     #FIXME: Remove
     ApachePassenger = new(:name          => 'apache_passenger',
@@ -81,9 +81,15 @@ module DNApi
                           :ruby_versions => DNApi::Components::RubyVersion.all,
                           :recipes       => [Recipe::Nginx, Recipe::Puma])
 
+    NginxPHP        = new(:name          => 'nginx_fpm',
+                          :label         => 'PHP-FPM',
+                          :web_server    => :nginx,
+                          :rack_server   => :fpm,
+                          :ruby_versions => DNApi::Components::PHP,
+                          :recipes       => [Recipe::Nginx, Recipe::PHP])
 
     def self.all
-      [NginxMongrel, NginxPassenger, NginxPassenger3, ApachePassenger, NginxUnicorn, Trinidad, Nginxtcp,NginxThin,NginxPuma]
+      [NginxMongrel, NginxPassenger, NginxPassenger3, ApachePassenger, NginxUnicorn, Trinidad, Nginxtcp, NginxThin, NginxPuma, NginxPHP]
     end
 
     def self.get(name)

data/lib/dnapi/version.rb

@@ -1,3 +1,3 @@
 module DNApi
-  VERSION = '1.1.81'
+  VERSION = '1.1.82.php'
 end

data/spec/stack_spec.rb

@@ -38,7 +38,7 @@ describe DNApi::Stack do
 
   describe "NginxPassenger" do
     it 'has nginx & nginx-passenger for recipes' do
-      DNApi::Stack::NginxPassenger.recipes.should == [DNApi::Recipe::Nginx, DNApi::Recipe::Passenger, DNApi::Recipe::NginxPassenger]
+      DNApi::Stack::NginxPassenger.recipes.should == [DNApi::Recipe::Nginx, DNApi::Recipe::NginxPassenger]
     end
 
     it 'does not support JRuby' do
@@ -53,7 +53,7 @@ describe DNApi::Stack do
     end
 
     it 'has nginx & nginx-passenger for recipes' do
-      DNApi::Stack::NginxPassenger3.recipes.should == [DNApi::Recipe::Nginx, DNApi::Recipe::Passenger3]
+      DNApi::Stack::NginxPassenger.recipes.should == [DNApi::Recipe::Nginx, DNApi::Recipe::NginxPassenger]
     end
   end
 

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dnapi
 version: !ruby/object:Gem::Version 
-  hash: 177
-  prerelease: 
+  hash: 961239189
+  prerelease: true
   segments: 
   - 1
   - 1
-  - 81
-  version: 1.1.81
+  - 82
+  - php
+  version: 1.1.82.php
 platform: ruby
 authors: 
 - Engine Yard
@@ -15,7 +16,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 Z
+date: 2011-07-26 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -82,6 +84,7 @@ files:
 - lib/dnapi/components/newrelic.rb
 - lib/dnapi/components/nodejs.rb
 - lib/dnapi/components/passenger3.rb
+- lib/dnapi/components/php.rb
 - lib/dnapi/components/ruby.rb
 - lib/dnapi/components/ssmtp.rb
 - lib/dnapi/components/stunneled.rb
@@ -124,6 +127,7 @@ files:
 - spec/spec_helper.rb
 - spec/stack_spec.rb
 - spec/struct_spec.rb
+has_rdoc: true
 homepage: http://github.com/engineyard/dnapi
 licenses: []
 
@@ -155,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: API for chef DNA.