rails_apps_composer 2.2.7 → 2.2.8

Sign up to get free protection for your applications and to get access to all the features.
data/recipes/extras.rb CHANGED
@@ -34,16 +34,16 @@ if prefs[:rvmrc]
34
34
  say_wizard "recipe creating project-specific rvm gemset and .rvmrc"
35
35
  # using the rvm Ruby API, see:
36
36
  # http://blog.thefrontiergroup.com.au/2010/12/a-brief-introduction-to-the-rvm-ruby-api/
37
+ # https://rvm.io/integration/passenger
37
38
  if ENV['MY_RUBY_HOME'] && ENV['MY_RUBY_HOME'].include?('rvm')
38
39
  begin
39
- rvm_path = File.dirname(File.dirname(ENV['MY_RUBY_HOME']))
40
- rvm_lib_path = File.join(rvm_path, 'lib')
40
+ gems_path = ENV['MY_RUBY_HOME'].split(/@/)[0].sub(/rubies/,'gems')
41
+ ENV['GEM_PATH'] = "#{gems_path}:#{gems_path}@global"
41
42
  require 'rvm'
43
+ RVM.use_from_path! File.dirname(File.dirname(__FILE__))
42
44
  rescue LoadError
43
- raise "RVM ruby lib is currently unavailable."
45
+ raise "RVM gem is currently unavailable."
44
46
  end
45
- else
46
- raise "RVM ruby lib is currently unavailable."
47
47
  end
48
48
  say_wizard "creating RVM gemset '#{app_name}'"
49
49
  RVM.gemset_create app_name
data/recipes/gems.rb CHANGED
@@ -10,36 +10,36 @@ insert_into_file 'Gemfile', "ruby '1.9.3'\n", :before => "gem 'rails', '3.2.6'"
10
10
  if (prefs[:dev_webserver] == prefs[:prod_webserver])
11
11
  gem 'thin', '>= 1.4.1' if prefer :dev_webserver, 'thin'
12
12
  gem 'unicorn', '>= 4.3.1' if prefer :dev_webserver, 'unicorn'
13
- gem 'puma', '>= 1.6.2' if prefer :dev_webserver, 'puma'
13
+ gem 'puma', '>= 1.6.3' if prefer :dev_webserver, 'puma'
14
14
  else
15
15
  gem 'thin', '>= 1.4.1', :group => [:development, :test] if prefer :dev_webserver, 'thin'
16
16
  gem 'unicorn', '>= 4.3.1', :group => [:development, :test] if prefer :dev_webserver, 'unicorn'
17
- gem 'puma', '>= 1.6.2', :group => [:development, :test] if prefer :dev_webserver, 'puma'
17
+ gem 'puma', '>= 1.6.3', :group => [:development, :test] if prefer :dev_webserver, 'puma'
18
18
  gem 'thin', '>= 1.4.1', :group => :production if prefer :prod_webserver, 'thin'
19
19
  gem 'unicorn', '>= 4.3.1', :group => :production if prefer :prod_webserver, 'unicorn'
20
- gem 'puma', '>= 1.6.2', :group => :production if prefer :prod_webserver, 'puma'
20
+ gem 'puma', '>= 1.6.3', :group => :production if prefer :prod_webserver, 'puma'
21
21
  end
22
22
 
23
23
  ## Database Adapter
24
24
  gsub_file 'Gemfile', /gem 'sqlite3'\n/, '' unless prefer :database, 'sqlite'
25
25
  gem 'mongoid', '>= 3.0.5' if prefer :orm, 'mongoid'
26
- gem 'pg', '>= 0.14.0' if prefer :database, 'postgresql'
26
+ gem 'pg', '>= 0.14.1' if prefer :database, 'postgresql'
27
27
  gem 'mysql2', '>= 0.3.11' if prefer :database, 'mysql'
28
28
 
29
29
  ## Template Engine
30
30
  if prefer :templates, 'haml'
31
31
  gem 'haml', '>= 3.1.7'
32
- gem 'haml-rails', '>= 0.3.4', :group => :development
32
+ gem 'haml-rails', '>= 0.3.5', :group => :development
33
33
  # hpricot and ruby_parser are needed for conversion of HTML to Haml
34
34
  gem 'hpricot', '>= 0.8.6', :group => :development
35
35
  gem 'ruby_parser', '>= 2.3.1', :group => :development
36
36
  end
37
37
  if prefer :templates, 'slim'
38
- gem 'slim', '>= 1.2.2'
38
+ gem 'slim', '>= 1.3.0'
39
39
  gem 'haml2slim', '>= 0.4.6', :group => :development
40
40
  # Haml is needed for conversion of HTML to Slim
41
41
  gem 'haml', '>= 3.1.6', :group => :development
42
- gem 'haml-rails', '>= 0.3.4', :group => :development
42
+ gem 'haml-rails', '>= 0.3.5', :group => :development
43
43
  gem 'hpricot', '>= 0.8.6', :group => :development
44
44
  gem 'ruby_parser', '>= 2.3.1', :group => :development
45
45
  end
@@ -66,7 +66,7 @@ gem 'factory_girl_rails', '>= 4.0.0', :group => [:development, :test] if prefer
66
66
  gem 'machinist', '>= 2.0', :group => :test if prefer :fixtures, 'machinist'
67
67
 
68
68
  ## Front-end Framework
69
- gem 'bootstrap-sass', '>= 2.0.4.0' if prefer :bootstrap, 'sass'
69
+ gem 'bootstrap-sass', '>= 2.1.0.0' if prefer :bootstrap, 'sass'
70
70
  gem 'compass-rails', '>= 1.0.3', :group => :assets if prefer :frontend, 'foundation'
71
71
  gem 'zurb-foundation', '>= 3.0.9', :group => :assets if prefer :frontend, 'foundation'
72
72
  if prefer :bootstrap, 'less'
@@ -104,7 +104,7 @@ gem 'simple_form', '>= 2.0.2' if prefer :form_builder, 'simple_form'
104
104
  ## Signup App
105
105
  if prefer :railsapps, 'rails-prelaunch-signup'
106
106
  gem 'google_visualr', '>= 2.1.2'
107
- gem 'jquery-datatables-rails', '>= 1.10.0'
107
+ gem 'jquery-datatables-rails', '>= 1.11.0'
108
108
  end
109
109
 
110
110
  ## Gems from a defaults file or added interactively
data/templates/layout.erb CHANGED
@@ -17,6 +17,8 @@
17
17
 
18
18
  # >----------------------------[ Initial Setup ]------------------------------<
19
19
 
20
+ run 'bundle update'
21
+
20
22
  initializer 'generators.rb', <<-RUBY
21
23
  Rails.application.config.generators do |g|
22
24
  end
data/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RailsWizard
2
- VERSION = "2.2.7"
2
+ VERSION = "2.2.8"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rails_apps_composer
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.7
4
+ version: 2.2.8
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-09-02 00:00:00.000000000 Z
12
+ date: 2012-09-07 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: i18n
@@ -201,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
201
201
  version: '0'
202
202
  segments:
203
203
  - 0
204
- hash: -1051347487820290549
204
+ hash: -611638150947370728
205
205
  required_rubygems_version: !ruby/object:Gem::Requirement
206
206
  none: false
207
207
  requirements:
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
210
210
  version: '0'
211
211
  segments:
212
212
  - 0
213
- hash: -1051347487820290549
213
+ hash: -611638150947370728
214
214
  requirements: []
215
215
  rubyforge_project: rails_apps_composer
216
216
  rubygems_version: 1.8.24