dnapi 1.1.82.php → 1.1.82.ruby19

data/lib/dnapi.rb

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

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
@@ -97,11 +96,7 @@ module DNApi
     end
 
     def db_host
-      if db_master
-        db_master.public_hostname
-      else
-        solo.public_hostname
-      end
+      host = (db_master || solo) and host.public_hostname
     end
 
     def solo?
@@ -141,7 +136,7 @@ module DNApi
     end
 
     def environment_hash
-      {:name => name, :framework_env => framework_env, :stack => stack.name}
+      {:name => name, :framework_env => framework_env, :stack => (stack and stack.name)}
     end
 
     def haproxy_hash
@@ -220,7 +215,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/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          => '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, NginxPHP]
+      [NginxMongrel, NginxPassenger, NginxPassenger3, ApachePassenger, NginxUnicorn, Trinidad, Nginxtcp,NginxThin,NginxPuma]
     end
 
     def self.get(name)

data/lib/dnapi/struct.rb

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

data/lib/dnapi/test.rb

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

data/lib/dnapi/version.rb

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

data/spec/proxies_spec.rb

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

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

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.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/extensions.rb

@@ -1,32 +0,0 @@
-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