dnapi 1.1.94 → 1.1.97

data/lib/dnapi/components/ruby.rb

@@ -85,11 +85,11 @@ module DNApi
 
       NAME        = 'REE'.freeze
       VERSION     = '1.8.7'.freeze
-      PATCH_LEVEL = '2011.12'.freeze
+      PATCH_LEVEL = '2012.02'.freeze
       RUBYGEMS_VERSION = '1.5.2'.freeze
 
       def self.label
-        "#{self::NAME} #{self::PATCH_LEVEL}"
+        self::NAME
       end
 
       def ruby_version
@@ -184,7 +184,7 @@ module DNApi
       key :jruby_187
 
       def self.compat_version
-        '(ruby-1.8.7-p330)'
+        '(ruby-1.8.7)'
       end
     end
 
@@ -198,7 +198,7 @@ module DNApi
       key :jruby_192
 
       def self.compat_version
-        '(ruby-1.9.2-p136)'
+        '(ruby-1.9.2)'
       end
     end
 
@@ -218,7 +218,7 @@ module DNApi
       RUBYGEMS_VERSION = nil
 
       def self.label
-        "#{self::NAME} 2.0.0dev (ruby-1.8.7)"
+        "#{self::NAME} (ruby-1.8.7)"
       end
 
       def ruby_version
@@ -254,7 +254,7 @@ module DNApi
       RUBYGEMS_VERSION = nil
 
       def self.label
-        "#{self::NAME} 2.0.0dev (ruby-1.9.3)"
+        "#{self::NAME} (ruby-1.9.3)"
       end
 
       def self.compat_version

data/lib/dnapi/version.rb

@@ -1,3 +1,3 @@
 module DNApi
-  VERSION = '1.1.94'
+  VERSION = '1.1.97'
 end

data/spec/components/ruby_spec.rb

@@ -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.12'
-      @ruby.label.should == 'REE 2011.12'
+      described_class.label.should == 'REE'
+      @ruby.label.should == 'REE'
     end
   end
 
@@ -102,8 +102,8 @@ describe DNApi::Components::REE do
   end
 
   describe "#patch_level" do
-    it 'is 2011.03' do
-      @ruby.patch_level.should == '2011.12'
+    it 'is 2012.02' do
+      @ruby.patch_level.should == '2012.02'
     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 2.0.0dev (ruby-1.8.7)'
-      @ruby.label.should == 'Rubinius 2.0.0dev (ruby-1.8.7)'
+      described_class.label.should == 'Rubinius (ruby-1.8.7)'
+      @ruby.label.should == 'Rubinius (ruby-1.8.7)'
     end
   end
 
@@ -241,8 +241,8 @@ describe DNApi::Components::Rubinius19 do
 
   describe "#label" do
     it "should have the right label" do
-      described_class.label.should == 'Rubinius 2.0.0dev (ruby-1.9.3)'
-      @ruby.label.should == 'Rubinius 2.0.0dev (ruby-1.9.3)'
+      described_class.label.should == 'Rubinius (ruby-1.9.3)'
+      @ruby.label.should == 'Rubinius (ruby-1.9.3)'
     end
   end
 
@@ -271,44 +271,78 @@ describe DNApi::Components::Rubinius19 do
   end
 end
 
-describe 'JRuby' do
-  [DNApi::Components::JRuby187, DNApi::Components::JRuby192].each do |jruby|
-    describe jruby do
-      before do
-        @environment = DNApi::Environment.new
-        @ruby = @environment.add_component(jruby.key_id)
-      end
+describe DNApi::Components::JRuby187 do
+  before do
+    @environment = DNApi::Environment.new
+    @ruby = @environment.add_component(:jruby_187)
+  end
 
-      describe "#label" do
-        it "should have the right label" do
-          described_class.label.should == "JRuby 1.6.7 #{jruby.compat_version}"
-          @ruby.label.should == "JRuby 1.6.7 #{jruby.compat_version}"
-        end
-      end
+  describe "#label" do
+    it "should have the right label" do
+      described_class.label.should == "JRuby 1.6.7 (ruby-1.8.7)"
+      @ruby.label.should == "JRuby 1.6.7 (ruby-1.8.7)"
+    end
+  end
 
-      describe "#name" do
-        it 'is JRuby' do
-          @ruby.name.should == 'JRuby'
-        end
-      end
+  describe "#name" do
+    it 'is JRuby' do
+      @ruby.name.should == 'JRuby'
+    end
+  end
 
-      describe "#version" do
-        it 'is the expected version' do
-          @ruby.version.should == '1.6.7'
-        end
-      end
+  describe "#version" do
+    it 'is the expected version' do
+      @ruby.version.should == '1.6.7'
+    end
+  end
 
-      describe "#patch_level" do
-        it 'is nil' do
-          @ruby.patch_level.should be_nil
-        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.1' do
-          @ruby.rubygems_version.should == '1.5.1'
-        end
-      end
+  describe "#rubygems_version" do
+    it 'is 1.5.1' do
+      @ruby.rubygems_version.should == '1.5.1'
+    end
+  end
+end
+
+describe DNApi::Components::JRuby192 do
+  before do
+    @environment = DNApi::Environment.new
+    @ruby = @environment.add_component(:jruby_192)
+  end
+
+  describe "#label" do
+    it "should have the right label" do
+      described_class.label.should == "JRuby 1.6.7 (ruby-1.9.2)"
+      @ruby.label.should == "JRuby 1.6.7 (ruby-1.9.2)"
+    end
+  end
+
+  describe "#name" do
+    it 'is JRuby' do
+      @ruby.name.should == 'JRuby'
+    end
+  end
+
+  describe "#version" do
+    it 'is the expected version' do
+      @ruby.version.should == '1.6.7'
+    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.1' do
+      @ruby.rubygems_version.should == '1.5.1'
     end
   end
 end

metadata

@@ -1,87 +1,90 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: dnapi
-version: !ruby/object:Gem::Version
-  version: 1.1.94
+version: !ruby/object:Gem::Version 
+  hash: 209
   prerelease: 
+  segments: 
+  - 1
+  - 1
+  - 97
+  version: 1.1.97
 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: 2012-07-19 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: extlib
-  requirement: !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: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sexp_processor
-  requirement: !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: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: jexp
-  requirement: !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
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: jexp
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
+  type: :runtime
+  version_requirements: *id004
 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
@@ -145,29 +148,40 @@ files:
 - spec/vhost_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.19
+rubygems_version: 1.8.24
 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