railties 4.2.0.rc2 → 4.2.0.rc3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/rails/gem_version.rb +1 -1
  3. data/lib/rails/generators/app_base.rb +9 -14
  4. metadata +19 -19
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c91a103e181146147ef75a3af5e5df2146518897
4
- data.tar.gz: 4beeae9fa736688642fe541a7db4619a7f4e3f0f
3
+ metadata.gz: 88874438743eb9e5522e5331297d6c94bc06e141
4
+ data.tar.gz: 15f485dbfedcf89849b0c8b3a22a29c39da7e1c0
5
5
  SHA512:
6
- metadata.gz: dd1220d34a987b2ad9cd67025bf17d41d70e4cd538eaba078877bcbcdcd13a02841e2f346dd67a976537c3cea8dd93123ad76ec961f39d3f8c177c68796c283c
7
- data.tar.gz: c7b2de96b3b4bc986fc4bb0d446c594856467b05c0cd86d1bc2b3b9d92fe6db9b9a6c702f4ad3db8420315849557eb2766118de60d0106fc6cd11e14437ccd4b
6
+ metadata.gz: 9bd2a6f33ffceb1f5dad6d8ba92dc87ebebb3841e0d171a9539add1544ac5e8548daddb6505f4bb076cca9edff4f4a52ab2c1f76fae374888b818bf5aad5af86
7
+ data.tar.gz: de8253f7d0311d9929889893376e781728701ba4a91136c8b361b6e47413bc13f079b1c2669271a427caf336d3488d7632e9e29d3be16c52e1e39289a9cb9ca9
data/lib/rails/gem_version.rb CHANGED
@@ -8,7 +8,7 @@ module Rails
8
8
  MAJOR = 4
9
9
  MINOR = 2
10
10
  TINY = 0
11
- PRE = "rc2"
11
+ PRE = "rc3"
12
12
 
13
13
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
14
14
  end
data/lib/rails/generators/app_base.rb CHANGED
@@ -180,8 +180,12 @@ module Rails
180
180
  super
181
181
  end
182
182
 
183
- def self.github(name, github, comment = nil)
184
- new(name, nil, comment, github: github)
183
+ def self.github(name, github, branch = nil, comment = nil)
184
+ if branch
185
+ new(name, nil, comment, github: github, branch: branch)
186
+ else
187
+ new(name, nil, comment, github: github)
188
+ end
185
189
  end
186
190
 
187
191
  def self.version(name, version, comment = nil)
@@ -197,7 +201,7 @@ module Rails
197
201
  if options.dev?
198
202
  [GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH)]
199
203
  elsif options.edge?
200
- [GemfileEntry.github('rails', 'rails/rails')]
204
+ [GemfileEntry.github('rails', 'rails/rails', '4-2-stable')]
201
205
  else
202
206
  [GemfileEntry.version('rails',
203
207
  Rails::VERSION::STRING,
@@ -236,13 +240,8 @@ module Rails
236
240
  return [] if options[:skip_sprockets]
237
241
 
238
242
  gems = []
239
- if options.dev? || options.edge?
240
- gems << GemfileEntry.github('sass-rails', 'rails/sass-rails',
241
- 'Use SCSS for stylesheets')
242
- else
243
- gems << GemfileEntry.version('sass-rails', '~> 4.0',
243
+ gems << GemfileEntry.version('sass-rails', '~> 5.0',
244
244
  'Use SCSS for stylesheets')
245
- end
246
245
 
247
246
  gems << GemfileEntry.version('uglifier',
248
247
  '>= 1.3.0',
@@ -263,11 +262,7 @@ module Rails
263
262
 
264
263
  def coffee_gemfile_entry
265
264
  comment = 'Use CoffeeScript for .coffee assets and views'
266
- if options.dev? || options.edge?
267
- GemfileEntry.github 'coffee-rails', 'rails/coffee-rails', comment
268
- else
269
- GemfileEntry.version 'coffee-rails', '~> 4.1.0', comment
270
- end
265
+ GemfileEntry.version 'coffee-rails', '~> 4.1.0', comment
271
266
  end
272
267
 
273
268
  def javascript_gemfile_entry
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: railties
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.2.0.rc2
4
+ version: 4.2.0.rc3
5
5
  platform: ruby
6
6
  authors:
7
7
  - David Heinemeier Hansson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-12-05 00:00:00.000000000 Z
11
+ date: 2014-12-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -16,60 +16,60 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 4.2.0.rc2
19
+ version: 4.2.0.rc3
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 4.2.0.rc2
26
+ version: 4.2.0.rc3
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: actionpack
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 4.2.0.rc2
33
+ version: 4.2.0.rc3
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 4.2.0.rc2
40
+ version: 4.2.0.rc3
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rake
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - '>='
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
47
  version: 0.8.7
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - '>='
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
54
  version: 0.8.7
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: thor
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - '>='
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
61
  version: 0.18.1
62
- - - <
62
+ - - "<"
63
63
  - !ruby/object:Gem::Version
64
64
  version: '2.0'
65
65
  type: :runtime
66
66
  prerelease: false
67
67
  version_requirements: !ruby/object:Gem::Requirement
68
68
  requirements:
69
- - - '>='
69
+ - - ">="
70
70
  - !ruby/object:Gem::Version
71
71
  version: 0.18.1
72
- - - <
72
+ - - "<"
73
73
  - !ruby/object:Gem::Version
74
74
  version: '2.0'
75
75
  - !ruby/object:Gem::Dependency
@@ -78,14 +78,14 @@ dependencies:
78
78
  requirements:
79
79
  - - '='
80
80
  - !ruby/object:Gem::Version
81
- version: 4.2.0.rc2
81
+ version: 4.2.0.rc3
82
82
  type: :development
83
83
  prerelease: false
84
84
  version_requirements: !ruby/object:Gem::Requirement
85
85
  requirements:
86
86
  - - '='
87
87
  - !ruby/object:Gem::Version
88
- version: 4.2.0.rc2
88
+ version: 4.2.0.rc3
89
89
  description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
90
90
  email: david@loudthinking.com
91
91
  executables:
@@ -341,23 +341,23 @@ licenses:
341
341
  metadata: {}
342
342
  post_install_message:
343
343
  rdoc_options:
344
- - --exclude
345
- - .
344
+ - "--exclude"
345
+ - "."
346
346
  require_paths:
347
347
  - lib
348
348
  required_ruby_version: !ruby/object:Gem::Requirement
349
349
  requirements:
350
- - - '>='
350
+ - - ">="
351
351
  - !ruby/object:Gem::Version
352
352
  version: 1.9.3
353
353
  required_rubygems_version: !ruby/object:Gem::Requirement
354
354
  requirements:
355
- - - '>'
355
+ - - ">"
356
356
  - !ruby/object:Gem::Version
357
357
  version: 1.3.1
358
358
  requirements: []
359
359
  rubyforge_project:
360
- rubygems_version: 2.2.1
360
+ rubygems_version: 2.2.2
361
361
  signing_key:
362
362
  specification_version: 4
363
363
  summary: Tools for creating, working with, and running Rails applications.