dnapi 1.1.79.ruby19.p1 → 1.1.81.passenger

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

@@ -57,7 +57,7 @@ module DNApi
       belongs_to Environment
 
       VERSION          = '1.8.6'.freeze
-      PATCH_LEVEL      = '420'.freeze
+      PATCH_LEVEL      = '420-r2'.freeze
       RUBYGEMS_VERSION = '1.4.2'.freeze
     end
 
@@ -71,7 +71,7 @@ module DNApi
       belongs_to Environment
 
       VERSION          = '1.8.7'.freeze
-      PATCH_LEVEL      = '352'.freeze
+      PATCH_LEVEL      = '357'.freeze
     end
 
     class REE < RubyVersion
@@ -85,7 +85,7 @@ module DNApi
 
       NAME        = 'REE'.freeze
       VERSION     = '1.8.7'.freeze
-      PATCH_LEVEL = '2011.03'.freeze
+      PATCH_LEVEL = '2011.12'.freeze
 
       def self.label
         "#{self::NAME} #{self::PATCH_LEVEL}"
@@ -153,7 +153,7 @@ module DNApi
 
     class JRuby < RubyVersion
       NAME             = 'JRuby'.freeze
-      VERSION          = '1.6.5'.freeze
+      VERSION          = '1.6.5.1'.freeze
       PATCH_LEVEL      = nil
       RUBYGEMS_VERSION = '1.5.1'.freeze
 

data/lib/dnapi/environment.rb

@@ -10,7 +10,7 @@ module DNApi
                                  :stack_name, :name, :framework_env,
                                  :stats_password, :ssh_username, :ssh_password,
                                  :ssh_keys, :db_stack_name,
-                                 :monitoring, :region, :backup_bucket, :run_list)
+                                 :monitoring, :region, :backup_bucket)
 
     include ComponentPossessor
 
@@ -219,7 +219,7 @@ module DNApi
     end
 
     def to_legacy_hash
-      shared = %w(run_list 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

@@ -3,7 +3,7 @@ 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')
     ApachePassenger = new(:name => 'passenger::apache')
     Mongrel = new(:name => 'mongrel')

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])
 
     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',

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.79.ruby19.p1'
+  VERSION = '1.1.81.passenger'
 end

data/spec/components/ruby_spec.rb

@@ -27,7 +27,7 @@ describe DNApi::Components::Ruby186 do
 
   describe "#patch_level" do
     it 'is 420' do
-      @ruby.patch_level.should == '420'
+      @ruby.patch_level.should == '420-r2'
     end
   end
 
@@ -64,8 +64,8 @@ describe DNApi::Components::Ruby187 do
   end
 
   describe "#patch_level" do
-    it 'is 352' do
-      @ruby.patch_level.should == '352'
+    it 'is 357' do
+      @ruby.patch_level.should == '357'
     end
   end
 
@@ -84,8 +84,8 @@ describe DNApi::Components::REE do
 
   describe "#label" do
     it "should have the right label" do
-      described_class.label.should == 'REE 2011.03'
-      @ruby.label.should == 'REE 2011.03'
+      described_class.label.should == 'REE 2011.12'
+      @ruby.label.should == 'REE 2011.12'
     end
   end
 
@@ -103,7 +103,7 @@ describe DNApi::Components::REE do
 
   describe "#patch_level" do
     it 'is 2011.03' do
-      @ruby.patch_level.should == '2011.03'
+      @ruby.patch_level.should == '2011.12'
     end
   end
 
@@ -281,8 +281,8 @@ describe 'JRuby' do
 
       describe "#label" do
         it "should have the right label" do
-          described_class.label.should == "JRuby 1.6.5 #{jruby.compat_version}"
-          @ruby.label.should == "JRuby 1.6.5 #{jruby.compat_version}"
+          described_class.label.should == "JRuby 1.6.5.1 #{jruby.compat_version}"
+          @ruby.label.should == "JRuby 1.6.5.1 #{jruby.compat_version}"
         end
       end
 
@@ -293,8 +293,8 @@ describe 'JRuby' do
       end
 
       describe "#version" do
-        it 'is 1.6.5' do
-          @ruby.version.should == '1.6.5'
+        it 'is 1.6.5.1' do
+          @ruby.version.should == '1.6.5.1'
         end
       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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dnapi
 version: !ruby/object:Gem::Version
-  version: 1.1.79.ruby19.p1
+  version: 1.1.81.passenger
   prerelease: 7
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2157286640 !ruby/object:Gem::Requirement
+  requirement: &2154918340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157286640
+  version_requirements: *2154918340
 - !ruby/object:Gem::Dependency
   name: extlib
-  requirement: &2157300900 !ruby/object:Gem::Requirement
+  requirement: &2154917860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157300900
+  version_requirements: *2154917860
 - !ruby/object:Gem::Dependency
   name: sexp_processor
-  requirement: &2157299640 !ruby/object:Gem::Requirement
+  requirement: &2154917380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,18 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157299640
-- !ruby/object:Gem::Dependency
-  name: jexp
-  requirement: &2157298060 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *2157298060
+  version_requirements: *2154917380
 description: API for chef DNA.
 email:
 - gems@engineyard.com
@@ -85,6 +74,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