dnapi 1.1.81.php → 1.1.81

data/lib/dnapi/environment.rb

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

data/lib/dnapi/recipe.rb

@@ -3,8 +3,9 @@ module DNApi
     Monit = new(:name => 'monit')
     Memcached = new(:name => 'memcached')
     Nginx = new(:name => 'nginx')
-    NginxPassenger = new(:name => 'nginx-passenger')
+    NginxPassenger = new(:name => 'passenger::nginx')
     Passenger = new(:name => 'passenger')
+    Passenger3 = new(:name => 'passenger3')
     ApachePassenger = new(:name => 'passenger::apache')
     Mongrel = new(:name => 'mongrel')
     Unicorn = new(:name => 'unicorn')
@@ -15,7 +16,6 @@ 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, PHP]
+       Trinidad,Thin,Puma]
     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::NginxPassenger])
+                          :recipes       => [Recipe::Nginx, Recipe::Passenger, 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::NginxPassenger])
+                          :recipes       => [Recipe::Nginx, Recipe::Passenger3])
 
     #FIXME: Remove
     ApachePassenger = new(:name          => 'apache_passenger',
@@ -81,15 +81,9 @@ module DNApi
                           :ruby_versions => DNApi::Components::RubyVersion.all,
                           :recipes       => [Recipe::Nginx, Recipe::Puma])
 
-    NginxPHP        = new(:name          => 'php_fcgi',
-                          :label         => 'PHP + FastCGI',
-                          :web_server    => :nginx,
-                          :rack_server   => :fastcgi,
-                          :ruby_versions => DNApi::Components::PHP,
-                          :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,NginxThin,NginxPuma]
     end
 
     def self.get(name)

data/lib/dnapi/version.rb

@@ -1,3 +1,3 @@
 module DNApi
-  VERSION = '1.1.81.php'
+  VERSION = '1.1.81'
 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::NginxPassenger]
+      DNApi::Stack::NginxPassenger.recipes.should == [DNApi::Recipe::Nginx, DNApi::Recipe::Passenger, 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::NginxPassenger.recipes.should == [DNApi::Recipe::Nginx, DNApi::Recipe::NginxPassenger]
+      DNApi::Stack::NginxPassenger3.recipes.should == [DNApi::Recipe::Nginx, DNApi::Recipe::Passenger3]
     end
   end
 

metadata

@@ -1,56 +1,74 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: dnapi
-version: !ruby/object:Gem::Version
-  version: 1.1.81.php
-  prerelease: 7
+version: !ruby/object:Gem::Version 
+  hash: 177
+  prerelease: 
+  segments: 
+  - 1
+  - 1
+  - 81
+  version: 1.1.81
 platform: ruby
-authors:
+authors: 
 - Engine Yard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-26 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-07-26 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &70243759137500 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70243759137500
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: extlib
-  requirement: &70243759136880 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70243759136880
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: sexp_processor
-  requirement: &70243759136340 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70243759136340
+  version_requirements: *id003
 description: API for chef DNA.
-email:
+email: 
 - gems@engineyard.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/dnapi/app.rb
 - lib/dnapi/component.rb
 - lib/dnapi/component_possessor.rb
@@ -64,7 +82,6 @@ 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
@@ -109,29 +126,40 @@ files:
 - spec/struct_spec.rb
 homepage: http://github.com/engineyard/dnapi
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: API for chef DNA.
-test_files:
+test_files: 
 - spec/app_spec.rb
 - spec/component_spec.rb
 - spec/components/addons_spec.rb

data/lib/dnapi/components/php.rb

@@ -1,26 +0,0 @@
-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.2'.freeze
-      PATCH_LEVEL = '8'.freeze
-
-      def self.label
-        "#{NAME} - #{version}"
-      end
-
-      def self.version
-        "#{VERSION}.#{PATCH_LEVEL}"
-      end
-
-      def self.package
-        'dev-lang/php'
-      end
-    end
-  end
-end