dnapi 1.1.75.ruby193.b → 1.1.78

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

@@ -8,12 +8,13 @@ module DNApi
           DNApi::Components::JRuby187,
           DNApi::Components::JRuby192,
           DNApi::Components::Rubinius,
+          DNApi::Components::Rubinius19,
           DNApi::Components::Ruby193,
           DNApi::Components::Ruby192 ]
       end
 
       def self.encoding_aware
-        [DNApi::Components::Ruby192, DNApi::Components::Ruby193, DNApi::Components::Rubinius]
+        [DNApi::Components::Ruby192, DNApi::Components::Ruby193, DNApi::Components::Rubinius, DNApi::Components::Rubinius19]
       end
 
       NAME             = 'Ruby'.freeze
@@ -211,9 +212,14 @@ module DNApi
       belongs_to Environment
 
       NAME        = 'Rubinius'.freeze
-      VERSION     = '1.2.4'.freeze
+      VERSION     = '2.0.0-r2'.freeze
+      VM_VERSION  = '1.8'.freeze
       PATCH_LEVEL = nil
 
+      def self.label
+        "#{self::NAME} 2.0 (ruby-1.8.7-p352)"
+      end
+
       def ruby_version
         version
       end
@@ -223,7 +229,46 @@ module DNApi
       end
 
       def ruby_module
-        'rubyrbx12'
+        'rubyrbx-2.0'
+      end
+
+      def mysql_adapter
+        'mysql2'
+      end
+    end
+
+    class Rubinius19 < RubyVersion
+      include Component
+
+      desc "A Ruby runtime written mostly in Ruby"
+
+      key :rubinius19
+
+      belongs_to Environment
+
+      NAME        = 'Rubinius'.freeze
+      VERSION     = '2.0.0'.freeze
+      VM_VERSION  = '1.9'.freeze
+      PATCH_LEVEL = nil
+
+      def self.label
+        "#{self::NAME} 2.0 (ruby-1.9.2-p136)"
+      end
+
+      def self.compat_version
+        '(ruby-1.9.2)'
+      end
+
+      def ruby_version
+        version
+      end
+
+      def ruby_flavor
+        'dev-lang/rubinius19'
+      end
+
+      def ruby_module
+        'rubyrbx-2.0'
       end
 
       def mysql_adapter

data/lib/dnapi/db_stack.rb

@@ -16,7 +16,7 @@ module DNApi
     )
     Mysql5_5 = new(
       :name => 'mysql5_5',
-      :label => 'MySQL 5.5.x',
+      :label => 'MySQL 5.5.x (Beta)',
       :supports_replication => true,
       :backup_command => 'eybackup -e mysql --quiet',
       :adapter => 'mysql'
@@ -39,10 +39,10 @@ module DNApi
 
     Postgres91 = new(
       :name => 'postgres9_1',
-      :label => 'PostgreSQL 9.1.x',
+      :label => 'PostgreSQL 9.1.x (Beta)',
       :supports_replication => true,
       :backup_command => 'eybackup -e postgresql --quiet',
-      :adapter => 'postgersql'
+      :adapter => 'postgresql'
     )
 
     def self.all

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
 
@@ -41,7 +41,7 @@ module DNApi
         component(:ree) || component(:ruby_192) ||
         component(:jruby_187) || component(:jruby_192) ||
         component(:rubinius) || component(:ruby_193) ||
-        component(:nodejs)
+        component(:nodejs) || component(:rubinius19) 
     end
 
     def stack

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

@@ -14,6 +14,7 @@ module DNApi
     Node = new(:name => 'node::component')
     Trinidad = new(:name => 'trinidad')
     Thin = new(:name => 'thin')
+    Puma = new(:name => 'puma')
 
     def self.defaults
       [Memcached, Monit]
@@ -21,7 +22,8 @@ module DNApi
 
     def self.all
       [Monit, Memcached, Nginx, NginxPassenger, ApachePassenger,
-       Mongrel, Unicorn, Mysql51, Mysql55, Nginxtcp, Node, Trinidad,Thin]
+       Mongrel, Unicorn, Mysql51, Mysql55, Nginxtcp, Node, 
+       Trinidad,Thin,Puma]
     end
   end
 end

data/lib/dnapi/stack.rb

@@ -13,7 +13,8 @@ module DNApi
                                                                                    DNApi::Components::Ruby192,
                                                                                    DNApi::Components::JRuby187,
                                                                                    DNApi::Components::JRuby192,
-                                                                                   DNApi::Components::Rubinius]),
+                                                                                   DNApi::Components::Rubinius,
+                                                                                   DNApi::Components::Rubinius19]),
                           :recipes       => [Recipe::Nginx, Recipe::Mongrel])
 
     NginxPassenger  = new(:name          => 'nginx_passenger',
@@ -22,7 +23,8 @@ module DNApi
                           :rack_server   => :passenger,
                           :ruby_versions => (DNApi::Components::RubyVersion.all - [DNApi::Components::JRuby187,
                                                                                    DNApi::Components::JRuby192,
-                                                                                   DNApi::Components::Rubinius]),
+                                                                                   DNApi::Components::Rubinius,
+                                                                                   DNApi::Components::Rubinius19]),
                           :recipes       => [Recipe::Nginx, Recipe::NginxPassenger])
 
     NginxPassenger3 = new(:name          => 'nginx_passenger3',
@@ -47,8 +49,7 @@ module DNApi
                           :web_server    => :nginx,
                           :rack_server   => :unicorn,
                           :ruby_versions => (DNApi::Components::RubyVersion.all - [DNApi::Components::JRuby187,
-                                                                                   DNApi::Components::JRuby192,
-                                                                                   DNApi::Components::Rubinius]),
+                                                                                   DNApi::Components::JRuby192]),
                           :recipes       => [Recipe::Nginx, Recipe::Unicorn])
 
     Trinidad        = new(:name          => 'trinidad',
@@ -70,12 +71,19 @@ module DNApi
                           :web_server    => :nginx,
                           :rack_server   => :thin,
                           :ruby_versions => (DNApi::Components::RubyVersion.all - [DNApi::Components::JRuby187,
-                                                                                   DNApi::Components::JRuby192,
-                                                                                   DNApi::Components::Rubinius]),
+                                                                                   DNApi::Components::JRuby192]),
                           :recipes       => [Recipe::Nginx, Recipe::Thin])
 
+    NginxPuma       = new(:name          => 'puma',
+                          :label         => 'Puma',
+                          :web_server    => :nginx,
+                          :rack_server   => :puma,
+                          :ruby_versions => DNApi::Components::RubyVersion.all,
+                          :recipes       => [Recipe::Nginx, Recipe::Puma])
+
+
     def self.all
-      [NginxMongrel, NginxPassenger, NginxPassenger3, ApachePassenger, NginxUnicorn, Trinidad, Nginxtcp,NginxThin]
+      [NginxMongrel, NginxPassenger, NginxPassenger3, ApachePassenger, NginxUnicorn, Trinidad, Nginxtcp,NginxThin,NginxPuma]
     end
 
     def self.get(name)
@@ -102,7 +110,7 @@ module DNApi
       end
     end
 
-    [:passenger, :mongrel, :unicorn, :trinidad, :thin].each do |as|
+    [:passenger, :mongrel, :unicorn, :trinidad, :thin, :puma].each do |as|
       define_method :"#{as}?" do
         self.rack_server == as
       end

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.75.ruby193.b'
+  VERSION = '1.1.78'
 end

data/spec/components/ruby_spec.rb

@@ -190,7 +190,7 @@ describe DNApi::Components::Ruby193 do
   end
 
   describe "#ruby_version" do
-    it "is 1.9.3_rc1" do
+    it "is 1.9.3_p0" do
       @ruby.ruby_version.should == '1.9.3_p0'
     end
   end
@@ -204,8 +204,8 @@ describe DNApi::Components::Rubinius do
 
   describe "#label" do
     it "should have the right label" do
-      described_class.label.should == 'Rubinius 1.2.4'
-      @ruby.label.should == 'Rubinius 1.2.4'
+      described_class.label.should == 'Rubinius 2.0 (ruby-1.8.7-p352)'
+      @ruby.label.should == 'Rubinius 2.0 (ruby-1.8.7-p352)'
     end
   end
 
@@ -216,8 +216,45 @@ describe DNApi::Components::Rubinius do
   end
 
   describe "#version" do
-    it 'is 1.2.3' do
-      @ruby.version.should == '1.2.4'
+    it 'is 2.0' do
+      @ruby.version.should == '2.0.0-r2'
+    end
+  end
+
+  describe "#patch_level" do
+    it 'is nil' do
+      @ruby.patch_level.should be_nil
+    end
+  end
+
+  describe "#rubygems_version" do
+    it 'is 1.5.2' do
+      @ruby.rubygems_version.should == '1.5.2'
+    end
+  end
+end
+describe DNApi::Components::Rubinius19 do
+  before do
+    @environment = DNApi::Environment.new
+    @ruby = @environment.add_component(:rubinius19)
+  end
+
+  describe "#label" do
+    it "should have the right label" do
+      described_class.label.should == 'Rubinius 2.0 (ruby-1.9.2-p136)'
+      @ruby.label.should == 'Rubinius 2.0 (ruby-1.9.2-p136)'
+    end
+  end
+
+  describe "#name" do
+    it 'is Rubinius' do
+      @ruby.name.should == 'Rubinius'
+    end
+  end
+
+  describe "#version" do
+    it 'is 2.0.0' do
+      @ruby.version.should == '2.0.0'
     end
   end
 
@@ -276,6 +313,7 @@ describe 'JRuby' do
   end
 end
 
+
 describe DNApi::Components::RubyVersion do
   describe ".all" do
     it "should return all ruby versions" do
@@ -285,6 +323,7 @@ describe DNApi::Components::RubyVersion do
         DNApi::Components::JRuby187,
         DNApi::Components::JRuby192,
         DNApi::Components::Rubinius,
+        DNApi::Components::Rubinius19,
         DNApi::Components::Ruby192,
         DNApi::Components::Ruby193 ].each do |ruby_version|
         DNApi::Components::RubyVersion.all.should include(ruby_version)

data/spec/db_stack_spec.rb

@@ -76,10 +76,10 @@ describe "DNApi::DbStack" do
   it "has a meaningful label" do
     DNApi::DbStack::Mysql.label.should == 'MySQL 5.0.x'
     DNApi::DbStack::Mysql5_1.label.should == 'MySQL 5.1.x'
-    DNApi::DbStack::Mysql5_5.label.should == 'MySQL 5.5.x'
+    DNApi::DbStack::Mysql5_5.label.should == 'MySQL 5.5.x (Beta)'
     DNApi::DbStack::Postgres.label.should ==  'PostgreSQL 8.3.x'
     DNApi::DbStack::Postgres9.label.should == 'PostgreSQL 9.0.x'
-    DNApi::DbStack::Postgres91.label.should == 'PostgreSQL 9.1.x'
+    DNApi::DbStack::Postgres91.label.should == 'PostgreSQL 9.1.x (Beta)'
   end
 
   context "selects the adapter for each component" do

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

@@ -48,10 +48,6 @@ describe DNApi::Stack do
   end
 
   describe "NginxPassenger3" do
-    it "is the ONLY stack that supports Rubinius" do
-      DNApi::Stack.all.select {|stack| stack.ruby_versions.include?(DNApi::Components::Rubinius) }.should == [DNApi::Stack::NginxPassenger3]
-    end
-
     it 'does not support Ruby 1.8.6' do
       DNApi::Stack::NginxPassenger3.ruby_versions.should_not include(DNApi::Components::Ruby186)
     end
@@ -76,14 +72,9 @@ describe DNApi::Stack do
       DNApi::Stack::NginxMongrel.ruby_versions.should_not include(DNApi::Components::JRuby187)
       DNApi::Stack::NginxMongrel.ruby_versions.should_not include(DNApi::Components::JRuby192)
     end
-
-    it "does not support Rubinius" do
-      DNApi::Stack::NginxUnicorn.ruby_versions.should_not include(DNApi::Components::Rubinius)
-    end
   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,74 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: dnapi
-version: !ruby/object:Gem::Version
-  version: 1.1.75.ruby193.b
-  prerelease: 7
+version: !ruby/object:Gem::Version 
+  hash: 143
+  prerelease: 
+  segments: 
+  - 1
+  - 1
+  - 78
+  version: 1.1.78
 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 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &2156963500 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: *2156963500
-- !ruby/object:Gem::Dependency
-  name: extlib
-  requirement: &2156962660 !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: *2156962660
-- !ruby/object:Gem::Dependency
-  name: sexp_processor
-  requirement: &2156962000 !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: *2156962000
-- !ruby/object:Gem::Dependency
-  name: jexp
-  requirement: &2156961180 !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: *2156961180
+  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
@@ -85,6 +92,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
@@ -118,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
 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 +178,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/stack_spec.rb
 - spec/struct_spec.rb
-has_rdoc: