dnapi 1.1.82.ruby19 → 1.1.83.php

data/lib/dnapi.rb

@@ -1,7 +1,6 @@
 require 'forwardable'
 require 'extlib'
 require 'json'
-require 'jexp'
 
 module DNApi
   def self.build(attributes = {})
@@ -33,6 +32,7 @@ module DNApi
 end
 
 require 'dnapi/component'
+require 'dnapi/extensions'
 require 'dnapi/struct'
 require 'dnapi/component_possessor'
 require 'dnapi/recipe'

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
@@ -96,7 +97,11 @@ module DNApi
     end
 
     def db_host
-      host = (db_master || solo) and host.public_hostname
+      if db_master
+        db_master.public_hostname
+      else
+        solo.public_hostname
+      end
     end
 
     def solo?
@@ -136,7 +141,7 @@ module DNApi
     end
 
     def environment_hash
-      {:name => name, :framework_env => framework_env, :stack => (stack and stack.name)}
+      {:name => name, :framework_env => framework_env, :stack => stack.name}
     end
 
     def haproxy_hash
@@ -215,7 +220,7 @@ module DNApi
     end
 
     def to_legacy_hash
-      shared = %w(alert_email aws_secret_key aws_secret_id
+      shared = %w( alert_email aws_secret_key aws_secret_id
         backup_interval backup_window
         admin_ssh_key mailserver
         internal_ssh_public_key

data/lib/dnapi/extensions.rb

@@ -0,0 +1,32 @@
+class Array
+  def to_jexp
+    map {|v| JSON.jexp(v) }
+  end
+end
+
+class Hash
+  def to_jexp
+    inject(self::class.new) do |h, (key, value)|
+      h.update key.to_s => JSON.jexp(value)
+    end
+  end
+end
+
+class Integer
+  def to_jexp() self end
+end
+
+module JSON
+  def self.jexp(*a)
+    if a.size == 1 && RUBY_VERSION >= "1.9.0"
+      o = a.first
+      o.respond_to?(:to_jexp) ? o.to_jexp : JSON.parse(JSON.dump([o])).first
+    else
+      return *a.map{|o| o.respond_to?(:to_jexp) ? o.to_jexp : JSON.parse(JSON.dump([o])).first}
+    end
+  end
+end
+
+class String
+  def to_jexp() self end
+end

data/lib/dnapi/recipe.rb

@@ -16,6 +16,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 +25,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

@@ -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/struct.rb

@@ -129,10 +129,7 @@ module DNApi
     def to_hash
       data = members.zip(values)
       association_data = _many.zip(_many_values) + _ones.zip(_ones_values)
-      hash = (data + association_data).inject({}) do |h,(k,v)| 
-        h.update(k => v)
-      end #.reject {|k,v| v.nil? }
-      hash
+      (data + association_data).inject({}) {|h,(k,v)| h.update(k => v) } #.reject {|k,v| v.nil? }
     end
 
     def ==(other)

data/lib/dnapi/test.rb

@@ -1,6 +1,6 @@
 require 'dnapi'
 
-%w( randexp  ).each do |dep|
+%w( randexp ey_slater ).each do |dep|
   begin
     require dep
   rescue LoadError => e

data/lib/dnapi/version.rb

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

data/spec/proxies_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('proxies', File.dirname(__FILE__))
+require File.dirname(__FILE__) + '/proxies'
 require 'pp'
 require 'sexp_processor' #defines Object#deep_copy
 

data/spec/stack_spec.rb

@@ -75,7 +75,6 @@ describe DNApi::Stack do
   end
 
   context "responds to legacy helper methods" do
-    subject { DNApi::Stack.all.first }
     it { should respond_to(:apache?)}
     it { should respond_to(:nginx?)}
     it { should respond_to(:passenger?)}

metadata

@@ -1,67 +1,76 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: dnapi
-version: !ruby/object:Gem::Version
-  version: 1.1.82.ruby19
-  prerelease: 7
+version: !ruby/object:Gem::Version 
+  hash: 961239185
+  prerelease: true
+  segments: 
+  - 1
+  - 1
+  - 83
+  - php
+  version: 1.1.83.php
 platform: ruby
-authors:
+authors: 
 - Engine Yard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-07-26 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &2165535080 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: *2165535080
-- !ruby/object:Gem::Dependency
-  name: extlib
-  requirement: &2165534600 !ruby/object:Gem::Requirement
+  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
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: extlib
   prerelease: false
-  version_requirements: *2165534600
-- !ruby/object:Gem::Dependency
-  name: sexp_processor
-  requirement: &2165534120 !ruby/object:Gem::Requirement
+  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
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sexp_processor
   prerelease: false
-  version_requirements: *2165534120
-- !ruby/object:Gem::Dependency
-  name: jexp
-  requirement: &2165533640 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2165533640
+  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
@@ -75,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
@@ -85,6 +95,7 @@ files:
 - lib/dnapi/db_stack.rb
 - lib/dnapi/ebuild_dep.rb
 - lib/dnapi/environment.rb
+- lib/dnapi/extensions.rb
 - lib/dnapi/gem_dep.rb
 - lib/dnapi/instance.rb
 - lib/dnapi/monitoring.rb
@@ -116,31 +127,43 @@ files:
 - spec/spec_helper.rb
 - spec/stack_spec.rb
 - spec/struct_spec.rb
+has_rdoc: true
 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.3.7
 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
@@ -159,4 +182,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/stack_spec.rb
 - spec/struct_spec.rb
-has_rdoc: