dnapi 1.1.83.php → 1.1.83
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/dnapi/components/nodejs.rb +1 -1
- data/lib/dnapi/components/ruby.rb +2 -2
- data/lib/dnapi/components/v8.rb +1 -1
- data/lib/dnapi/environment.rb +1 -2
- data/lib/dnapi/recipe.rb +1 -2
- data/lib/dnapi/stack.rb +1 -7
- data/lib/dnapi/version.rb +1 -1
- data/spec/components/nodejs_spec.rb +3 -3
- data/spec/components/ruby_spec.rb +2 -2
- metadata +5 -9
- data/lib/dnapi/components/php.rb +0 -26
@@ -212,7 +212,7 @@ module DNApi
|
|
212
212
|
belongs_to Environment
|
213
213
|
|
214
214
|
NAME = 'Rubinius'.freeze
|
215
|
-
VERSION = '2.0.0-
|
215
|
+
VERSION = '2.0.0-r3'.freeze
|
216
216
|
VM_VERSION = '1.8'.freeze
|
217
217
|
PATCH_LEVEL = nil
|
218
218
|
|
@@ -247,7 +247,7 @@ module DNApi
|
|
247
247
|
belongs_to Environment
|
248
248
|
|
249
249
|
NAME = 'Rubinius'.freeze
|
250
|
-
VERSION = '2.0.0'.freeze
|
250
|
+
VERSION = '2.0.0-r3'.freeze
|
251
251
|
VM_VERSION = '1.9'.freeze
|
252
252
|
PATCH_LEVEL = nil
|
253
253
|
|
data/lib/dnapi/components/v8.rb
CHANGED
data/lib/dnapi/environment.rb
CHANGED
@@ -41,8 +41,7 @@ module DNApi
|
|
41
41
|
component(:ree) || component(:ruby_192) ||
|
42
42
|
component(:jruby_187) || component(:jruby_192) ||
|
43
43
|
component(:rubinius) || component(:ruby_193) ||
|
44
|
-
component(:nodejs) || component(:rubinius19)
|
45
|
-
component(:php)
|
44
|
+
component(:nodejs) || component(:rubinius19)
|
46
45
|
end
|
47
46
|
|
48
47
|
def stack
|
data/lib/dnapi/recipe.rb
CHANGED
@@ -16,7 +16,6 @@ module DNApi
|
|
16
16
|
Trinidad = new(:name => 'trinidad')
|
17
17
|
Thin = new(:name => 'thin')
|
18
18
|
Puma = new(:name => 'puma')
|
19
|
-
PHP = new(:name => 'php')
|
20
19
|
|
21
20
|
def self.defaults
|
22
21
|
[Memcached, Monit]
|
@@ -25,7 +24,7 @@ module DNApi
|
|
25
24
|
def self.all
|
26
25
|
[Monit, Memcached, Nginx, NginxPassenger, ApachePassenger,
|
27
26
|
Mongrel, Unicorn, Mysql51, Mysql55, Nginxtcp, Node,
|
28
|
-
Trinidad,
|
27
|
+
Trinidad,Thin,Puma]
|
29
28
|
end
|
30
29
|
end
|
31
30
|
end
|
data/lib/dnapi/stack.rb
CHANGED
@@ -81,15 +81,9 @@ module DNApi
|
|
81
81
|
:ruby_versions => DNApi::Components::RubyVersion.all,
|
82
82
|
:recipes => [Recipe::Nginx, Recipe::Puma])
|
83
83
|
|
84
|
-
NginxPHP = new(:name => 'nginx_fpm',
|
85
|
-
:label => 'PHP-FPM',
|
86
|
-
:web_server => :nginx,
|
87
|
-
:rack_server => :fpm,
|
88
|
-
:ruby_versions => DNApi::Components::PHP,
|
89
|
-
:recipes => [Recipe::Nginx, Recipe::PHP])
|
90
84
|
|
91
85
|
def self.all
|
92
|
-
[NginxMongrel, NginxPassenger, NginxPassenger3, ApachePassenger, NginxUnicorn, Trinidad, Nginxtcp,
|
86
|
+
[NginxMongrel, NginxPassenger, NginxPassenger3, ApachePassenger, NginxUnicorn, Trinidad, Nginxtcp,NginxThin,NginxPuma]
|
93
87
|
end
|
94
88
|
|
95
89
|
def self.get(name)
|
data/lib/dnapi/version.rb
CHANGED
@@ -8,8 +8,8 @@ describe DNApi::Components::NodeJS do
|
|
8
8
|
|
9
9
|
describe "#label" do
|
10
10
|
it "should have the right label" do
|
11
|
-
described_class.label.should == 'Node.js - 0.6.
|
12
|
-
@nodejs.label.should == 'Node.js - 0.6.
|
11
|
+
described_class.label.should == 'Node.js - 0.6.8'
|
12
|
+
@nodejs.label.should == 'Node.js - 0.6.8'
|
13
13
|
end
|
14
14
|
end
|
15
15
|
|
@@ -22,6 +22,6 @@ describe DNApi::Components::NodeJS do
|
|
22
22
|
end
|
23
23
|
|
24
24
|
describe "#patch_level" do
|
25
|
-
it { @nodejs.patch_level.should == '
|
25
|
+
it { @nodejs.patch_level.should == '8' }
|
26
26
|
end
|
27
27
|
end
|
@@ -217,7 +217,7 @@ describe DNApi::Components::Rubinius do
|
|
217
217
|
|
218
218
|
describe "#version" do
|
219
219
|
it 'is 2.0' do
|
220
|
-
@ruby.version.should == '2.0.0-
|
220
|
+
@ruby.version.should == '2.0.0-r3'
|
221
221
|
end
|
222
222
|
end
|
223
223
|
|
@@ -254,7 +254,7 @@ describe DNApi::Components::Rubinius19 do
|
|
254
254
|
|
255
255
|
describe "#version" do
|
256
256
|
it 'is 2.0.0' do
|
257
|
-
@ruby.version.should == '2.0.0'
|
257
|
+
@ruby.version.should == '2.0.0-r3'
|
258
258
|
end
|
259
259
|
end
|
260
260
|
|
metadata
CHANGED
@@ -1,14 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dnapi
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
5
|
-
prerelease:
|
4
|
+
hash: 181
|
5
|
+
prerelease:
|
6
6
|
segments:
|
7
7
|
- 1
|
8
8
|
- 1
|
9
9
|
- 83
|
10
|
-
|
11
|
-
version: 1.1.83.php
|
10
|
+
version: 1.1.83
|
12
11
|
platform: ruby
|
13
12
|
authors:
|
14
13
|
- Engine Yard
|
@@ -16,8 +15,7 @@ autorequire:
|
|
16
15
|
bindir: bin
|
17
16
|
cert_chain: []
|
18
17
|
|
19
|
-
date: 2011-07-26 00:00:00
|
20
|
-
default_executable:
|
18
|
+
date: 2011-07-26 00:00:00 Z
|
21
19
|
dependencies:
|
22
20
|
- !ruby/object:Gem::Dependency
|
23
21
|
name: json
|
@@ -84,7 +82,6 @@ files:
|
|
84
82
|
- lib/dnapi/components/newrelic.rb
|
85
83
|
- lib/dnapi/components/nodejs.rb
|
86
84
|
- lib/dnapi/components/passenger3.rb
|
87
|
-
- lib/dnapi/components/php.rb
|
88
85
|
- lib/dnapi/components/ruby.rb
|
89
86
|
- lib/dnapi/components/ssmtp.rb
|
90
87
|
- lib/dnapi/components/stunneled.rb
|
@@ -127,7 +124,6 @@ files:
|
|
127
124
|
- spec/spec_helper.rb
|
128
125
|
- spec/stack_spec.rb
|
129
126
|
- spec/struct_spec.rb
|
130
|
-
has_rdoc: true
|
131
127
|
homepage: http://github.com/engineyard/dnapi
|
132
128
|
licenses: []
|
133
129
|
|
@@ -159,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
159
155
|
requirements: []
|
160
156
|
|
161
157
|
rubyforge_project:
|
162
|
-
rubygems_version: 1.
|
158
|
+
rubygems_version: 1.8.6
|
163
159
|
signing_key:
|
164
160
|
specification_version: 3
|
165
161
|
summary: API for chef DNA.
|
data/lib/dnapi/components/php.rb
DELETED
@@ -1,26 +0,0 @@
|
|
1
|
-
module DNApi
|
2
|
-
module Components
|
3
|
-
class PHP < VersionedComponent.new(:key)
|
4
|
-
include Component
|
5
|
-
desc "Hypertext Preprocessor scripting language"
|
6
|
-
key :php
|
7
|
-
belongs_to Environment
|
8
|
-
|
9
|
-
NAME = 'PHP'.freeze
|
10
|
-
VERSION = '5.3'.freeze
|
11
|
-
PATCH_LEVEL = '9'.freeze
|
12
|
-
|
13
|
-
def self.label
|
14
|
-
"#{NAME} - #{version}"
|
15
|
-
end
|
16
|
-
|
17
|
-
def self.version
|
18
|
-
"#{VERSION}.#{PATCH_LEVEL}"
|
19
|
-
end
|
20
|
-
|
21
|
-
def self.package
|
22
|
-
'dev-lang/php'
|
23
|
-
end
|
24
|
-
end
|
25
|
-
end
|
26
|
-
end
|