railties 5.0.7.2 → 5.1.0.beta1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (197) hide show
  1. checksums.yaml +5 -5
  2. data/CHANGELOG.md +77 -567
  3. data/MIT-LICENSE +1 -1
  4. data/RDOC_MAIN.rdoc +3 -3
  5. data/README.rdoc +1 -1
  6. data/exe/rails +2 -2
  7. data/lib/rails.rb +18 -18
  8. data/lib/rails/all.rb +1 -1
  9. data/lib/rails/api/generator.rb +28 -0
  10. data/lib/rails/api/task.rb +54 -42
  11. data/lib/rails/app_loader.rb +9 -9
  12. data/lib/rails/application.rb +30 -35
  13. data/lib/rails/application/bootstrap.rb +13 -7
  14. data/lib/rails/application/configuration.rb +30 -53
  15. data/lib/rails/application/default_middleware_stack.rb +3 -5
  16. data/lib/rails/application/finisher.rb +16 -7
  17. data/lib/rails/application/routes_reloader.rb +16 -1
  18. data/lib/rails/application_controller.rb +10 -10
  19. data/lib/rails/backtrace_cleaner.rb +5 -5
  20. data/lib/rails/cli.rb +7 -5
  21. data/lib/rails/code_statistics.rb +16 -17
  22. data/lib/rails/code_statistics_calculator.rb +3 -3
  23. data/lib/rails/command.rb +111 -0
  24. data/lib/rails/command/actions.rb +42 -0
  25. data/lib/rails/command/base.rb +149 -0
  26. data/lib/rails/command/behavior.rb +123 -0
  27. data/lib/rails/command/environment_argument.rb +34 -0
  28. data/lib/rails/commands.rb +2 -4
  29. data/lib/rails/commands/application/application_command.rb +29 -0
  30. data/lib/rails/commands/console/console_command.rb +89 -0
  31. data/lib/rails/commands/dbconsole/dbconsole_command.rb +155 -0
  32. data/lib/rails/commands/destroy/destroy_command.rb +21 -0
  33. data/lib/rails/commands/generate/generate_command.rb +23 -0
  34. data/lib/rails/commands/help/USAGE +15 -0
  35. data/lib/rails/commands/help/help_command.rb +13 -0
  36. data/lib/rails/commands/new/new_command.rb +15 -0
  37. data/lib/rails/commands/plugin/plugin_command.rb +43 -0
  38. data/lib/rails/commands/rake/rake_command.rb +49 -0
  39. data/lib/rails/commands/runner/USAGE +17 -0
  40. data/lib/rails/commands/runner/runner_command.rb +46 -0
  41. data/lib/rails/commands/secrets/USAGE +52 -0
  42. data/lib/rails/commands/secrets/secrets_command.rb +36 -0
  43. data/lib/rails/commands/server/server_command.rb +177 -0
  44. data/lib/rails/commands/test/test_command.rb +20 -0
  45. data/lib/rails/commands/version/version_command.rb +9 -0
  46. data/lib/rails/configuration.rb +7 -7
  47. data/lib/rails/console/app.rb +4 -4
  48. data/lib/rails/dev_caching.rb +8 -8
  49. data/lib/rails/engine.rb +62 -63
  50. data/lib/rails/engine/commands.rb +6 -13
  51. data/lib/rails/engine/configuration.rb +2 -2
  52. data/lib/rails/gem_version.rb +3 -3
  53. data/lib/rails/generators.rb +229 -313
  54. data/lib/rails/generators/actions.rb +20 -21
  55. data/lib/rails/generators/actions/create_migration.rb +24 -25
  56. data/lib/rails/generators/active_model.rb +3 -3
  57. data/lib/rails/generators/app_base.rb +123 -93
  58. data/lib/rails/generators/base.rb +32 -33
  59. data/lib/rails/generators/css/assets/assets_generator.rb +1 -1
  60. data/lib/rails/generators/erb.rb +14 -14
  61. data/lib/rails/generators/erb/controller/controller_generator.rb +1 -1
  62. data/lib/rails/generators/erb/mailer/mailer_generator.rb +12 -12
  63. data/lib/rails/generators/erb/scaffold/scaffold_generator.rb +3 -3
  64. data/lib/rails/generators/generated_attribute.rb +27 -27
  65. data/lib/rails/generators/js/assets/assets_generator.rb +1 -1
  66. data/lib/rails/generators/migration.rb +8 -8
  67. data/lib/rails/generators/model_helpers.rb +2 -2
  68. data/lib/rails/generators/named_base.rb +56 -56
  69. data/lib/rails/generators/rails/app/app_generator.rb +98 -81
  70. data/lib/rails/generators/rails/app/templates/Gemfile +7 -2
  71. data/lib/rails/generators/rails/app/templates/app/assets/config/manifest.js.tt +0 -2
  72. data/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt +6 -4
  73. data/lib/rails/generators/rails/app/templates/app/assets/javascripts/cable.js +1 -1
  74. data/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css +2 -2
  75. data/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt +1 -1
  76. data/lib/rails/generators/rails/app/templates/bin/{setup → setup.tt} +6 -0
  77. data/lib/rails/generators/rails/app/templates/bin/{update → update.tt} +2 -1
  78. data/lib/rails/generators/rails/app/templates/bin/yarn +9 -0
  79. data/lib/rails/generators/rails/app/templates/config/cable.yml +1 -0
  80. data/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml +1 -0
  81. data/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml +1 -0
  82. data/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml +1 -0
  83. data/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml +2 -1
  84. data/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml +1 -0
  85. data/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml +1 -0
  86. data/lib/rails/generators/rails/app/templates/config/databases/mysql.yml +2 -2
  87. data/lib/rails/generators/rails/app/templates/config/databases/oracle.yml +1 -0
  88. data/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml +1 -1
  89. data/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml +1 -1
  90. data/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt +1 -1
  91. data/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt +10 -1
  92. data/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt +1 -1
  93. data/lib/rails/generators/rails/app/templates/config/initializers/application_controller_renderer.rb +4 -6
  94. data/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt +8 -3
  95. data/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt +6 -5
  96. data/lib/rails/generators/rails/app/templates/config/locales/en.yml +10 -0
  97. data/lib/rails/generators/rails/app/templates/config/puma.rb +16 -7
  98. data/lib/rails/generators/rails/app/templates/config/secrets.yml +12 -2
  99. data/lib/rails/generators/rails/app/templates/gitignore +5 -1
  100. data/lib/rails/generators/rails/app/templates/package.json +5 -0
  101. data/lib/rails/generators/rails/app/templates/public/404.html +6 -6
  102. data/lib/rails/generators/rails/app/templates/public/422.html +6 -6
  103. data/lib/rails/generators/rails/app/templates/public/500.html +6 -6
  104. data/lib/rails/generators/rails/app/templates/public/robots.txt +0 -4
  105. data/lib/rails/generators/rails/app/templates/test/application_system_test_case.rb +5 -0
  106. data/lib/rails/generators/rails/app/templates/test/test_helper.rb +0 -1
  107. data/lib/rails/generators/rails/assets/assets_generator.rb +10 -10
  108. data/lib/rails/generators/rails/controller/controller_generator.rb +15 -12
  109. data/lib/rails/generators/rails/encrypted_secrets/encrypted_secrets_generator.rb +66 -0
  110. data/lib/rails/generators/rails/encrypted_secrets/templates/config/secrets.yml.enc +3 -0
  111. data/lib/rails/generators/rails/generator/generator_generator.rb +2 -3
  112. data/lib/rails/generators/rails/helper/helper_generator.rb +1 -1
  113. data/lib/rails/generators/rails/model/model_generator.rb +1 -1
  114. data/lib/rails/generators/rails/plugin/plugin_generator.rb +21 -26
  115. data/lib/rails/generators/rails/plugin/templates/bin/rails.tt +1 -0
  116. data/lib/rails/generators/rails/plugin/templates/bin/test.tt +3 -9
  117. data/lib/rails/generators/rails/plugin/templates/test/application_system_test_case.rb +5 -0
  118. data/lib/rails/generators/rails/plugin/templates/test/test_helper.rb +0 -3
  119. data/lib/rails/generators/rails/resource/resource_generator.rb +2 -2
  120. data/lib/rails/generators/rails/scaffold/scaffold_generator.rb +5 -1
  121. data/lib/rails/generators/rails/scaffold/templates/scaffold.css +4 -8
  122. data/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb +2 -3
  123. data/lib/rails/generators/rails/system_test/USAGE +10 -0
  124. data/lib/rails/generators/rails/system_test/system_test_generator.rb +7 -0
  125. data/lib/rails/generators/rails/task/task_generator.rb +1 -2
  126. data/lib/rails/generators/resource_helpers.rb +13 -10
  127. data/lib/rails/generators/test_case.rb +5 -6
  128. data/lib/rails/generators/test_unit.rb +1 -1
  129. data/lib/rails/generators/test_unit/controller/controller_generator.rb +3 -3
  130. data/lib/rails/generators/test_unit/generator/generator_generator.rb +3 -3
  131. data/lib/rails/generators/test_unit/helper/helper_generator.rb +1 -1
  132. data/lib/rails/generators/test_unit/integration/integration_generator.rb +2 -2
  133. data/lib/rails/generators/test_unit/job/job_generator.rb +3 -3
  134. data/lib/rails/generators/test_unit/mailer/mailer_generator.rb +5 -5
  135. data/lib/rails/generators/test_unit/model/model_generator.rb +3 -4
  136. data/lib/rails/generators/test_unit/plugin/plugin_generator.rb +2 -2
  137. data/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb +3 -3
  138. data/lib/rails/generators/test_unit/system/system_generator.rb +17 -0
  139. data/lib/rails/generators/test_unit/system/templates/application_system_test_case.rb +5 -0
  140. data/lib/rails/generators/test_unit/system/templates/system_test.rb +9 -0
  141. data/lib/rails/generators/testing/assertions.rb +4 -4
  142. data/lib/rails/generators/testing/behaviour.rb +20 -21
  143. data/lib/rails/info.rb +20 -20
  144. data/lib/rails/info_controller.rb +15 -15
  145. data/lib/rails/initializable.rb +6 -2
  146. data/lib/rails/mailers_controller.rb +11 -11
  147. data/lib/rails/paths.rb +4 -5
  148. data/lib/rails/plugin/test.rb +7 -0
  149. data/lib/rails/rack/logger.rb +44 -46
  150. data/lib/rails/railtie.rb +41 -38
  151. data/lib/rails/railtie/configurable.rb +6 -6
  152. data/lib/rails/railtie/configuration.rb +1 -1
  153. data/lib/rails/ruby_version_check.rb +1 -1
  154. data/lib/rails/secrets.rb +111 -0
  155. data/lib/rails/source_annotation_extractor.rb +15 -9
  156. data/lib/rails/tasks.rb +3 -2
  157. data/lib/rails/tasks/annotations.rake +3 -3
  158. data/lib/rails/tasks/dev.rake +2 -2
  159. data/lib/rails/tasks/engine.rake +4 -4
  160. data/lib/rails/tasks/framework.rake +4 -18
  161. data/lib/rails/tasks/initializers.rake +1 -1
  162. data/lib/rails/tasks/log.rake +14 -10
  163. data/lib/rails/tasks/middleware.rake +1 -1
  164. data/lib/rails/tasks/misc.rake +10 -10
  165. data/lib/rails/tasks/restart.rake +4 -4
  166. data/lib/rails/tasks/routes.rake +3 -12
  167. data/lib/rails/tasks/statistics.rake +3 -3
  168. data/lib/rails/tasks/tmp.rake +7 -7
  169. data/lib/rails/tasks/yarn.rake +11 -0
  170. data/lib/rails/templates/rails/mailers/email.html.erb +4 -1
  171. data/lib/rails/test_help.rb +28 -10
  172. data/lib/rails/test_unit/line_filtering.rb +69 -3
  173. data/lib/rails/test_unit/minitest_plugin.rb +139 -0
  174. data/lib/rails/test_unit/railtie.rb +2 -1
  175. data/lib/rails/test_unit/reporter.rb +3 -8
  176. data/lib/rails/test_unit/test_requirer.rb +28 -0
  177. data/lib/rails/test_unit/testing.rake +19 -14
  178. data/lib/rails/version.rb +1 -1
  179. data/lib/rails/welcome_controller.rb +1 -1
  180. metadata +53 -30
  181. data/lib/minitest/rails_plugin.rb +0 -49
  182. data/lib/rails/commands/application.rb +0 -17
  183. data/lib/rails/commands/commands_tasks.rb +0 -180
  184. data/lib/rails/commands/console.rb +0 -68
  185. data/lib/rails/commands/console_helper.rb +0 -34
  186. data/lib/rails/commands/dbconsole.rb +0 -173
  187. data/lib/rails/commands/destroy.rb +0 -11
  188. data/lib/rails/commands/generate.rb +0 -13
  189. data/lib/rails/commands/plugin.rb +0 -23
  190. data/lib/rails/commands/rake_proxy.rb +0 -41
  191. data/lib/rails/commands/runner.rb +0 -71
  192. data/lib/rails/commands/server.rb +0 -163
  193. data/lib/rails/commands/test.rb +0 -10
  194. data/lib/rails/engine/commands_tasks.rb +0 -118
  195. data/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt +0 -3
  196. data/lib/rails/rack/debugger.rb +0 -3
  197. data/lib/rails/test_unit/runner.rb +0 -141
data/lib/rails/generators/rails/app/templates/package.json ADDED
@@ -0,0 +1,5 @@
1
+ {
2
+ "name": "<%= app_name %>",
3
+ "private": true,
4
+ "dependencies": {}
5
+ }
data/lib/rails/generators/rails/app/templates/public/404.html CHANGED
@@ -4,7 +4,7 @@
4
4
  <title>The page you were looking for doesn't exist (404)</title>
5
5
  <meta name="viewport" content="width=device-width,initial-scale=1">
6
6
  <style>
7
- .rails-default-error-page {
7
+ body {
8
8
  background-color: #EFEFEF;
9
9
  color: #2E2F30;
10
10
  text-align: center;
@@ -12,13 +12,13 @@
12
12
  margin: 0;
13
13
  }
14
14
 
15
- .rails-default-error-page div.dialog {
15
+ div.dialog {
16
16
  width: 95%;
17
17
  max-width: 33em;
18
18
  margin: 4em auto 0;
19
19
  }
20
20
 
21
- .rails-default-error-page div.dialog > div {
21
+ div.dialog > div {
22
22
  border: 1px solid #CCC;
23
23
  border-right-color: #999;
24
24
  border-left-color: #999;
@@ -31,13 +31,13 @@
31
31
  box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
32
32
  }
33
33
 
34
- .rails-default-error-page h1 {
34
+ h1 {
35
35
  font-size: 100%;
36
36
  color: #730E15;
37
37
  line-height: 1.5em;
38
38
  }
39
39
 
40
- .rails-default-error-page div.dialog > p {
40
+ div.dialog > p {
41
41
  margin: 0 0 1em;
42
42
  padding: 1em;
43
43
  background-color: #F7F7F7;
@@ -54,7 +54,7 @@
54
54
  </style>
55
55
  </head>
56
56
 
57
- <body class="rails-default-error-page">
57
+ <body>
58
58
  <!-- This file lives in public/404.html -->
59
59
  <div class="dialog">
60
60
  <div>
data/lib/rails/generators/rails/app/templates/public/422.html CHANGED
@@ -4,7 +4,7 @@
4
4
  <title>The change you wanted was rejected (422)</title>
5
5
  <meta name="viewport" content="width=device-width,initial-scale=1">
6
6
  <style>
7
- .rails-default-error-page {
7
+ body {
8
8
  background-color: #EFEFEF;
9
9
  color: #2E2F30;
10
10
  text-align: center;
@@ -12,13 +12,13 @@
12
12
  margin: 0;
13
13
  }
14
14
 
15
- .rails-default-error-page div.dialog {
15
+ div.dialog {
16
16
  width: 95%;
17
17
  max-width: 33em;
18
18
  margin: 4em auto 0;
19
19
  }
20
20
 
21
- .rails-default-error-page div.dialog > div {
21
+ div.dialog > div {
22
22
  border: 1px solid #CCC;
23
23
  border-right-color: #999;
24
24
  border-left-color: #999;
@@ -31,13 +31,13 @@
31
31
  box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
32
32
  }
33
33
 
34
- .rails-default-error-page h1 {
34
+ h1 {
35
35
  font-size: 100%;
36
36
  color: #730E15;
37
37
  line-height: 1.5em;
38
38
  }
39
39
 
40
- .rails-default-error-page div.dialog > p {
40
+ div.dialog > p {
41
41
  margin: 0 0 1em;
42
42
  padding: 1em;
43
43
  background-color: #F7F7F7;
@@ -54,7 +54,7 @@
54
54
  </style>
55
55
  </head>
56
56
 
57
- <body class="rails-default-error-page">
57
+ <body>
58
58
  <!-- This file lives in public/422.html -->
59
59
  <div class="dialog">
60
60
  <div>
data/lib/rails/generators/rails/app/templates/public/500.html CHANGED
@@ -4,7 +4,7 @@
4
4
  <title>We're sorry, but something went wrong (500)</title>
5
5
  <meta name="viewport" content="width=device-width,initial-scale=1">
6
6
  <style>
7
- .rails-default-error-page {
7
+ body {
8
8
  background-color: #EFEFEF;
9
9
  color: #2E2F30;
10
10
  text-align: center;
@@ -12,13 +12,13 @@
12
12
  margin: 0;
13
13
  }
14
14
 
15
- .rails-default-error-page div.dialog {
15
+ div.dialog {
16
16
  width: 95%;
17
17
  max-width: 33em;
18
18
  margin: 4em auto 0;
19
19
  }
20
20
 
21
- .rails-default-error-page div.dialog > div {
21
+ div.dialog > div {
22
22
  border: 1px solid #CCC;
23
23
  border-right-color: #999;
24
24
  border-left-color: #999;
@@ -31,13 +31,13 @@
31
31
  box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
32
32
  }
33
33
 
34
- .rails-default-error-page h1 {
34
+ h1 {
35
35
  font-size: 100%;
36
36
  color: #730E15;
37
37
  line-height: 1.5em;
38
38
  }
39
39
 
40
- .rails-default-error-page div.dialog > p {
40
+ div.dialog > p {
41
41
  margin: 0 0 1em;
42
42
  padding: 1em;
43
43
  background-color: #F7F7F7;
@@ -54,7 +54,7 @@
54
54
  </style>
55
55
  </head>
56
56
 
57
- <body class="rails-default-error-page">
57
+ <body>
58
58
  <!-- This file lives in public/500.html -->
59
59
  <div class="dialog">
60
60
  <div>
data/lib/rails/generators/rails/app/templates/public/robots.txt CHANGED
@@ -1,5 +1 @@
1
1
  # See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
2
- #
3
- # To ban all spiders from the entire site uncomment the next two lines:
4
- # User-agent: *
5
- # Disallow: /
data/lib/rails/generators/rails/app/templates/test/application_system_test_case.rb ADDED
@@ -0,0 +1,5 @@
1
+ require "test_helper"
2
+
3
+ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
4
+ driven_by :selenium, using: :chrome, screen_size: [1400, 1400]
5
+ end
data/lib/rails/generators/rails/app/templates/test/test_helper.rb CHANGED
@@ -1,4 +1,3 @@
1
- ENV['RAILS_ENV'] ||= 'test'
2
1
  require File.expand_path('../../config/environment', __FILE__)
3
2
  require 'rails/test_help'
4
3
 
data/lib/rails/generators/rails/assets/assets_generator.rb CHANGED
@@ -7,19 +7,19 @@ module Rails
7
7
  class_option :javascript_engine, desc: "Engine for JavaScripts"
8
8
  class_option :stylesheet_engine, desc: "Engine for Stylesheets"
9
9
 
10
- protected
10
+ private
11
11
 
12
- def asset_name
13
- file_name
14
- end
12
+ def asset_name
13
+ file_name
14
+ end
15
15
 
16
- hook_for :javascript_engine do |javascript_engine|
17
- invoke javascript_engine, [name] if options[:javascripts]
18
- end
16
+ hook_for :javascript_engine do |javascript_engine|
17
+ invoke javascript_engine, [name] if options[:javascripts]
18
+ end
19
19
 
20
- hook_for :stylesheet_engine do |stylesheet_engine|
21
- invoke stylesheet_engine, [name] if options[:stylesheets]
22
- end
20
+ hook_for :stylesheet_engine do |stylesheet_engine|
21
+ invoke stylesheet_engine, [name] if options[:stylesheets]
22
+ end
23
23
  end
24
24
  end
25
25
  end
data/lib/rails/generators/rails/controller/controller_generator.rb CHANGED
@@ -9,14 +9,14 @@ module Rails
9
9
  check_class_collision suffix: "Controller"
10
10
 
11
11
  def create_controller_files
12
- template 'controller.rb', File.join('app/controllers', class_path, "#{file_name}_controller.rb")
12
+ template "controller.rb", File.join("app/controllers", class_path, "#{file_name}_controller.rb")
13
13
  end
14
14
 
15
15
  def add_routes
16
16
  unless options[:skip_routes]
17
17
  actions.reverse_each do |action|
18
18
  # route prepends two spaces onto the front of the string that is passed, this corrects that.
19
- route generate_routing_code(action)[2..-1]
19
+ route indent(generate_routing_code(action), 2)[2..-1]
20
20
  end
21
21
  end
22
22
  end
@@ -34,27 +34,30 @@ module Rails
34
34
  # end
35
35
  # end
36
36
  def generate_routing_code(action)
37
- depth = regular_class_path.length
37
+ depth = 0
38
+ lines = []
39
+
38
40
  # Create 'namespace' ladder
39
41
  # namespace :foo do
40
42
  # namespace :bar do
41
- namespace_ladder = regular_class_path.each_with_index.map do |ns, i|
42
- indent(" namespace :#{ns} do\n", i * 2)
43
- end.join
43
+ regular_class_path.each do |ns|
44
+ lines << indent("namespace :#{ns} do\n", depth * 2)
45
+ depth += 1
46
+ end
44
47
 
45
48
  # Create route
46
49
  # get 'baz/index'
47
- route = indent(%{ get '#{file_name}/#{action}'\n}, depth * 2)
50
+ lines << indent(%{get '#{file_name}/#{action}'\n}, depth * 2)
48
51
 
49
52
  # Create `end` ladder
50
53
  # end
51
54
  # end
52
- end_ladder = (1..depth).reverse_each.map do |i|
53
- indent("end\n", i * 2)
54
- end.join
55
+ until depth.zero?
56
+ depth -= 1
57
+ lines << indent("end\n", depth * 2)
58
+ end
55
59
 
56
- # Combine the 3 parts to generate complete route entry
57
- namespace_ladder + route + end_ladder
60
+ lines.join
58
61
  end
59
62
  end
60
63
  end
data/lib/rails/generators/rails/encrypted_secrets/encrypted_secrets_generator.rb ADDED
@@ -0,0 +1,66 @@
1
+ require "rails/generators/base"
2
+ require "rails/secrets"
3
+
4
+ module Rails
5
+ module Generators
6
+ class EncryptedSecretsGenerator < Base
7
+ def add_secrets_key_file
8
+ unless File.exist?("config/secrets.yml.key") || File.exist?("config/secrets.yml.enc")
9
+ key = Rails::Secrets.generate_key
10
+
11
+ say "Adding config/secrets.yml.key to store the encryption key: #{key}"
12
+ say ""
13
+ say "Save this in a password manager your team can access."
14
+ say ""
15
+ say "If you lose the key, no one, including you, can access any encrypted secrets."
16
+
17
+ say ""
18
+ create_file "config/secrets.yml.key", key
19
+ say ""
20
+ end
21
+ end
22
+
23
+ def ignore_key_file
24
+ if File.exist?(".gitignore")
25
+ unless File.read(".gitignore").include?(key_ignore)
26
+ say "Ignoring config/secrets.yml.key so it won't end up in Git history:"
27
+ say ""
28
+ append_to_file ".gitignore", key_ignore
29
+ say ""
30
+ end
31
+ else
32
+ say "IMPORTANT: Don't commit config/secrets.yml.key. Add this to your ignore file:"
33
+ say key_ignore, :on_green
34
+ say ""
35
+ end
36
+ end
37
+
38
+ def add_encrypted_secrets_file
39
+ unless File.exist?("config/secrets.yml.enc")
40
+ say "Adding config/secrets.yml.enc to store secrets that needs to be encrypted."
41
+ say ""
42
+
43
+ template "config/secrets.yml.enc" do |prefill|
44
+ say ""
45
+ say "For now the file contains this but it's been encrypted with the generated key:"
46
+ say ""
47
+ say prefill, :on_green
48
+ say ""
49
+
50
+ Secrets.encrypt(prefill)
51
+ end
52
+
53
+ say "You can edit encrypted secrets with `bin/rails secrets:edit`."
54
+
55
+ say "Add this to your config/environments/production.rb:"
56
+ say "config.read_encrypted_secrets = true"
57
+ end
58
+ end
59
+
60
+ private
61
+ def key_ignore
62
+ [ "", "# Ignore encrypted secrets key file.", "config/secrets.yml.key", "" ].join("\n")
63
+ end
64
+ end
65
+ end
66
+ end
data/lib/rails/generators/rails/encrypted_secrets/templates/config/secrets.yml.enc ADDED
@@ -0,0 +1,3 @@
1
+ # See `secrets.yml` for tips on generating suitable keys.
2
+ # production:
3
+ # external_api_key: 1466aac22e6a869134be3d09b9e89232fc2c2289…
data/lib/rails/generators/rails/generator/generator_generator.rb CHANGED
@@ -7,12 +7,12 @@ module Rails
7
7
  desc: "Namespace generator under lib/generators/name"
8
8
 
9
9
  def create_generator_files
10
- directory '.', generator_dir
10
+ directory ".", generator_dir
11
11
  end
12
12
 
13
13
  hook_for :test_framework
14
14
 
15
- protected
15
+ private
16
16
 
17
17
  def generator_dir
18
18
  if options[:namespace]
@@ -21,7 +21,6 @@ module Rails
21
21
  File.join("lib", "generators", regular_class_path)
22
22
  end
23
23
  end
24
-
25
24
  end
26
25
  end
27
26
  end
data/lib/rails/generators/rails/helper/helper_generator.rb CHANGED
@@ -4,7 +4,7 @@ module Rails
4
4
  check_class_collision suffix: "Helper"
5
5
 
6
6
  def create_helper_files
7
- template 'helper.rb', File.join('app/helpers', class_path, "#{file_name}_helper.rb")
7
+ template "helper.rb", File.join("app/helpers", class_path, "#{file_name}_helper.rb")
8
8
  end
9
9
 
10
10
  hook_for :test_framework
data/lib/rails/generators/rails/model/model_generator.rb CHANGED
@@ -1,4 +1,4 @@
1
- require 'rails/generators/model_helpers'
1
+ require "rails/generators/model_helpers"
2
2
 
3
3
  module Rails
4
4
  module Generators
data/lib/rails/generators/rails/plugin/plugin_generator.rb CHANGED
@@ -1,6 +1,6 @@
1
- require 'active_support/core_ext/hash/slice'
1
+ require "active_support/core_ext/hash/slice"
2
2
  require "rails/generators/rails/app/app_generator"
3
- require 'date'
3
+ require "date"
4
4
 
5
5
  module Rails
6
6
  # The plugin builder allows you to override elements of the plugin
@@ -18,20 +18,20 @@ module Rails
18
18
  def app
19
19
  if mountable?
20
20
  if api?
21
- directory 'app', exclude_pattern: %r{app/(views|helpers)}
21
+ directory "app", exclude_pattern: %r{app/(views|helpers)}
22
22
  else
23
- directory 'app'
23
+ directory "app"
24
24
  empty_directory_with_keep_file "app/assets/images/#{namespaced_name}"
25
25
  end
26
26
  elsif full?
27
- empty_directory_with_keep_file 'app/models'
28
- empty_directory_with_keep_file 'app/controllers'
29
- empty_directory_with_keep_file 'app/mailers'
27
+ empty_directory_with_keep_file "app/models"
28
+ empty_directory_with_keep_file "app/controllers"
29
+ empty_directory_with_keep_file "app/mailers"
30
30
 
31
31
  unless api?
32
32
  empty_directory_with_keep_file "app/assets/images/#{namespaced_name}"
33
- empty_directory_with_keep_file 'app/helpers'
34
- empty_directory_with_keep_file 'app/views'
33
+ empty_directory_with_keep_file "app/helpers"
34
+ empty_directory_with_keep_file "app/views"
35
35
  end
36
36
  end
37
37
  end
@@ -91,6 +91,7 @@ task default: :test
91
91
  opts[:skip_bundle] = true
92
92
  opts[:api] = options.api?
93
93
  opts[:skip_listen] = true
94
+ opts[:skip_git] = true
94
95
 
95
96
  invoke Rails::Generators::AppGenerator,
96
97
  [ File.expand_path(dummy_path, destination_root) ], opts
@@ -112,7 +113,6 @@ task default: :test
112
113
 
113
114
  def test_dummy_clean
114
115
  inside dummy_path do
115
- remove_file ".gitignore"
116
116
  remove_file "db/seeds.rb"
117
117
  remove_file "doc"
118
118
  remove_file "Gemfile"
@@ -149,7 +149,7 @@ task default: :test
149
149
  end
150
150
 
151
151
  def bin(force = false)
152
- bin_file = engine? ? 'bin/rails.tt' : 'bin/test.tt'
152
+ bin_file = engine? ? "bin/rails.tt" : "bin/test.tt"
153
153
  template bin_file, force: force do |content|
154
154
  "#{shebang}\n" + content
155
155
  end
@@ -186,7 +186,7 @@ task default: :test
186
186
  desc: "Skip gemspec file"
187
187
 
188
188
  class_option :skip_gemfile_entry, type: :boolean, default: false,
189
- desc: "If creating plugin in application's directory " +
189
+ desc: "If creating plugin in application's directory " \
190
190
  "skip adding entry to Gemfile"
191
191
 
192
192
  class_option :api, type: :boolean, default: false,
@@ -195,10 +195,6 @@ task default: :test
195
195
  def initialize(*args)
196
196
  @dummy_path = nil
197
197
  super
198
-
199
- unless plugin_path
200
- raise Error, "Plugin name should be provided in arguments. For details run: rails plugin new --help"
201
- end
202
198
  end
203
199
 
204
200
  public_task :set_default_accessors!
@@ -270,8 +266,8 @@ task default: :test
270
266
  @name ||= begin
271
267
  # same as ActiveSupport::Inflector#underscore except not replacing '-'
272
268
  underscored = original_name.dup
273
- underscored.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
274
- underscored.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
269
+ underscored.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
270
+ underscored.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
275
271
  underscored.downcase!
276
272
 
277
273
  underscored
@@ -283,10 +279,10 @@ task default: :test
283
279
  end
284
280
 
285
281
  def namespaced_name
286
- @namespaced_name ||= name.gsub('-', '/')
282
+ @namespaced_name ||= name.tr("-", "/")
287
283
  end
288
284
 
289
- protected
285
+ private
290
286
 
291
287
  def create_dummy_app(path = nil)
292
288
  dummy_path(path) if path
@@ -320,7 +316,7 @@ task default: :test
320
316
  end
321
317
 
322
318
  def with_dummy_app?
323
- options[:skip_test].blank? || options[:dummy_path] != 'test/dummy'
319
+ options[:skip_test].blank? || options[:dummy_path] != "test/dummy"
324
320
  end
325
321
 
326
322
  def api?
@@ -328,7 +324,7 @@ task default: :test
328
324
  end
329
325
 
330
326
  def self.banner
331
- "rails plugin new #{self.arguments.map(&:usage).join(' ')} [options]"
327
+ "rails plugin new #{arguments.map(&:usage).join(' ')} [options]"
332
328
  end
333
329
 
334
330
  def original_name
@@ -340,7 +336,7 @@ task default: :test
340
336
  end
341
337
 
342
338
  def wrap_in_modules(unwrapped_code)
343
- unwrapped_code = "#{unwrapped_code}".strip.gsub(/\s$\n/, '')
339
+ unwrapped_code = "#{unwrapped_code}".strip.gsub(/\s$\n/, "")
344
340
  modules.reverse.inject(unwrapped_code) do |content, mod|
345
341
  str = "module #{mod}\n"
346
342
  str += content.lines.map { |line| " #{line}" }.join
@@ -357,7 +353,7 @@ task default: :test
357
353
  end
358
354
 
359
355
  def camelized
360
- @camelized ||= name.gsub(/\W/, '_').squeeze('_').camelize
356
+ @camelized ||= name.gsub(/\W/, "_").squeeze("_").camelize
361
357
  end
362
358
 
363
359
  def author
@@ -415,7 +411,6 @@ task default: :test
415
411
  require 'rake/testtask'
416
412
 
417
413
  Rake::TestTask.new(:test) do |t|
418
- t.libs << 'lib'
419
414
  t.libs << 'test'
420
415
  t.pattern = 'test/**/*_test.rb'
421
416
  t.verbose = false
@@ -442,7 +437,7 @@ end
442
437
 
443
438
  def relative_path
444
439
  return unless inside_application?
445
- app_path.sub(/^#{rails_app_path}\//, '')
440
+ app_path.sub(/^#{rails_app_path}\//, "")
446
441
  end
447
442
  end
448
443
  end