refinerycms 1.0.0 → 1.0.1

Sign up to get free protection for your applications and to get access to all the features.
data/Gemfile CHANGED
@@ -5,13 +5,6 @@ gemspec
5
5
  # Bundle edge Rails instead:
6
6
  # gem 'rails', :git => 'git://github.com/rails/rails'
7
7
 
8
- if RUBY_PLATFORM == 'java'
9
- gem 'activerecord-jdbcsqlite3-adapter', '>= 1.0.2', :platform => :jruby
10
- else
11
- gem 'sqlite3'
12
- gem 'mysql2', '~> 0.2.7'
13
- end
14
-
15
8
  # Use unicorn as the web server
16
9
  # gem 'unicorn'
17
10
  # gem 'mongrel'
@@ -30,27 +23,23 @@ end
30
23
  # REFINERY CMS ================================================================
31
24
  # Anything you put in here will be overridden when the app gets updated.
32
25
 
33
- # gem 'refinerycms', '~> 1.0.0'
26
+ # gem 'refinerycms', '~> 1.0.1'
34
27
 
35
28
  group :development, :test do
36
29
  # To use refinerycms-testing, uncomment it (if it's commented out) and run 'bundle install'
37
30
  # Then, run 'rails generate refinerycms_testing' which will copy its support files.
38
31
  # Finally, run 'rake' to run the tests.
39
- gem 'refinerycms-testing', '~> 1.0.0'
32
+ gem 'refinerycms-testing', '~> 1.0.1'
40
33
  end
41
34
 
42
35
  # END REFINERY CMS ============================================================
43
36
 
44
- # REFINERY CMS DEVELOPMENT ====================================================
45
-
46
- # END REFINERY CMS DEVELOPMENT =================================================
47
-
48
37
  # USER DEFINED
49
38
 
50
39
  # Specify additional Refinery CMS Engines here (all optional):
51
40
  # gem 'refinerycms-inquiries', '~> 1.0'
52
41
  # gem "refinerycms-news", '~> 1.2'
53
- # gem 'refinerycms-blog', '~> 1.5'
42
+ # gem 'refinerycms-blog', '~> 1.6'
54
43
  # gem 'refinerycms-page-images', '~> 1.0'
55
44
 
56
45
  # Add i18n support (optional, you can remove this if you really want to).
@@ -1,51 +1,51 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- refinerycms (1.0.0)
4
+ refinerycms (1.0.1)
5
5
  bundler (~> 1.0)
6
- refinerycms-authentication (= 1.0.0)
7
- refinerycms-base (= 1.0.0)
8
- refinerycms-core (= 1.0.0)
9
- refinerycms-dashboard (= 1.0.0)
10
- refinerycms-images (= 1.0.0)
11
- refinerycms-pages (= 1.0.0)
12
- refinerycms-resources (= 1.0.0)
13
- refinerycms-settings (= 1.0.0)
14
- refinerycms-authentication (1.0.0)
6
+ refinerycms-authentication (= 1.0.1)
7
+ refinerycms-base (= 1.0.1)
8
+ refinerycms-core (= 1.0.1)
9
+ refinerycms-dashboard (= 1.0.1)
10
+ refinerycms-images (= 1.0.1)
11
+ refinerycms-pages (= 1.0.1)
12
+ refinerycms-resources (= 1.0.1)
13
+ refinerycms-settings (= 1.0.1)
14
+ refinerycms-authentication (1.0.1)
15
15
  devise (~> 1.3.0)
16
16
  friendly_id_globalize3 (~> 3.2.1)
17
- refinerycms-core (= 1.0.0)
18
- refinerycms-base (1.0.0)
19
- refinerycms-core (1.0.0)
17
+ refinerycms-core (= 1.0.1)
18
+ refinerycms-base (1.0.1)
19
+ refinerycms-core (1.0.1)
20
20
  acts_as_indexed (~> 0.7)
21
21
  awesome_nested_set (~> 2.0)
22
22
  friendly_id_globalize3 (~> 3.2.1)
23
23
  globalize3 (~> 0.1)
24
- rails (~> 3.0.7)
25
- refinerycms-base (= 1.0.0)
24
+ rails (~> 3.0.9)
25
+ refinerycms-base (= 1.0.1)
26
26
  refinerycms-generators (~> 1.0)
27
- refinerycms-settings (= 1.0.0)
27
+ refinerycms-settings (= 1.0.1)
28
28
  truncate_html (~> 0.5)
29
29
  will_paginate (~> 3.0.pre)
30
- refinerycms-dashboard (1.0.0)
31
- refinerycms-core (= 1.0.0)
32
- refinerycms-images (1.0.0)
30
+ refinerycms-dashboard (1.0.1)
31
+ refinerycms-core (= 1.0.1)
32
+ refinerycms-images (1.0.1)
33
33
  dragonfly (~> 0.9.0)
34
34
  rack-cache (>= 0.5.3)
35
- refinerycms-core (= 1.0.0)
36
- refinerycms-pages (1.0.0)
35
+ refinerycms-core (= 1.0.1)
36
+ refinerycms-pages (1.0.1)
37
37
  awesome_nested_set (~> 2.0)
38
38
  friendly_id_globalize3 (~> 3.2.1)
39
39
  globalize3 (~> 0.1)
40
- refinerycms-core (= 1.0.0)
40
+ refinerycms-core (= 1.0.1)
41
41
  seo_meta (~> 1.1)
42
- refinerycms-resources (1.0.0)
42
+ refinerycms-resources (1.0.1)
43
43
  dragonfly (~> 0.9.0)
44
44
  rack-cache (>= 0.5.3)
45
- refinerycms-core (= 1.0.0)
46
- refinerycms-settings (1.0.0)
47
- refinerycms-base (= 1.0.0)
48
- refinerycms-testing (1.0.0)
45
+ refinerycms-core (= 1.0.1)
46
+ refinerycms-settings (1.0.1)
47
+ refinerycms-base (= 1.0.1)
48
+ refinerycms-testing (1.0.1)
49
49
  autotest
50
50
  autotest-notification
51
51
  autotest-rails
@@ -58,21 +58,21 @@ PATH
58
58
  json_pure
59
59
  launchy
60
60
  rack-test (~> 0.5.6)
61
- rcov
62
- refinerycms-core (= 1.0.0)
61
+ refinerycms-core (= 1.0.1)
63
62
  rspec-rails (~> 2.6)
63
+ simplecov
64
64
 
65
65
  GEM
66
66
  remote: http://rubygems.org/
67
67
  specs:
68
68
  ZenTest (4.5.0)
69
69
  abstract (1.0.0)
70
- actionmailer (3.0.7)
71
- actionpack (= 3.0.7)
72
- mail (~> 2.2.15)
73
- actionpack (3.0.7)
74
- activemodel (= 3.0.7)
75
- activesupport (= 3.0.7)
70
+ actionmailer (3.0.9)
71
+ actionpack (= 3.0.9)
72
+ mail (~> 2.2.19)
73
+ actionpack (3.0.9)
74
+ activemodel (= 3.0.9)
75
+ activesupport (= 3.0.9)
76
76
  builder (~> 2.1.2)
77
77
  erubis (~> 2.6.6)
78
78
  i18n (~> 0.5.0)
@@ -80,19 +80,19 @@ GEM
80
80
  rack-mount (~> 0.6.14)
81
81
  rack-test (~> 0.5.7)
82
82
  tzinfo (~> 0.3.23)
83
- activemodel (3.0.7)
84
- activesupport (= 3.0.7)
83
+ activemodel (3.0.9)
84
+ activesupport (= 3.0.9)
85
85
  builder (~> 2.1.2)
86
86
  i18n (~> 0.5.0)
87
- activerecord (3.0.7)
88
- activemodel (= 3.0.7)
89
- activesupport (= 3.0.7)
90
- arel (~> 2.0.2)
87
+ activerecord (3.0.9)
88
+ activemodel (= 3.0.9)
89
+ activesupport (= 3.0.9)
90
+ arel (~> 2.0.10)
91
91
  tzinfo (~> 0.3.23)
92
- activeresource (3.0.7)
93
- activemodel (= 3.0.7)
94
- activesupport (= 3.0.7)
95
- activesupport (3.0.7)
92
+ activeresource (3.0.9)
93
+ activemodel (= 3.0.9)
94
+ activesupport (= 3.0.9)
95
+ activesupport (3.0.9)
96
96
  acts_as_indexed (0.7.2)
97
97
  arel (2.0.10)
98
98
  autotest (4.4.6)
@@ -101,43 +101,40 @@ GEM
101
101
  autotest (~> 4.3)
102
102
  autotest-rails (4.1.0)
103
103
  ZenTest
104
- awesome_nested_set (2.0.0)
104
+ awesome_nested_set (2.0.1)
105
105
  activerecord (>= 3.0.0)
106
- babosa (0.3.4)
106
+ babosa (0.3.5)
107
107
  bcrypt-ruby (2.1.4)
108
108
  bcrypt-ruby (2.1.4-java)
109
109
  builder (2.1.2)
110
- capybara (0.4.1.2)
111
- celerity (>= 0.7.9)
112
- culerity (>= 0.2.4)
110
+ capybara (1.0.0)
113
111
  mime-types (>= 1.16)
114
112
  nokogiri (>= 1.3.3)
115
113
  rack (>= 1.0.0)
116
114
  rack-test (>= 0.5.4)
117
- selenium-webdriver (>= 0.0.27)
118
- xpath (~> 0.1.3)
119
- celerity (0.8.9)
115
+ selenium-webdriver (~> 0.2.0)
116
+ xpath (~> 0.1.4)
120
117
  childprocess (0.1.9)
121
118
  ffi (~> 1.0.6)
122
- configuration (1.2.0)
123
- cucumber (0.10.3)
119
+ configuration (1.3.1)
120
+ cucumber (1.0.0)
124
121
  builder (>= 2.1.2)
125
122
  diff-lcs (>= 1.1.2)
126
- gherkin (>= 2.3.8)
123
+ gherkin (~> 2.4.1)
127
124
  json (>= 1.4.6)
128
125
  term-ansicolor (>= 1.0.5)
129
- cucumber-rails (0.4.1)
130
- cucumber (>= 0.10.1)
126
+ cucumber-rails (1.0.0)
127
+ capybara (>= 1.0.0)
128
+ cucumber (~> 1.0.0)
131
129
  nokogiri (>= 1.4.4)
132
130
  rack-test (>= 0.5.7)
133
- culerity (0.2.15)
134
131
  database_cleaner (0.6.7)
135
132
  devise (1.3.4)
136
133
  bcrypt-ruby (~> 2.1.2)
137
134
  orm_adapter (~> 0.0.3)
138
135
  warden (~> 1.0.3)
139
136
  diff-lcs (1.1.2)
140
- dragonfly (0.9.2)
137
+ dragonfly (0.9.4)
141
138
  rack
142
139
  erubis (2.6.6)
143
140
  abstract (>= 1.0.0)
@@ -146,17 +143,17 @@ GEM
146
143
  ffi (1.0.9-java)
147
144
  friendly_id_globalize3 (3.2.1.3)
148
145
  babosa (~> 0.3.0)
149
- gherkin (2.3.9)
146
+ gherkin (2.4.1)
150
147
  json (>= 1.4.6)
151
- gherkin (2.3.9-java)
148
+ gherkin (2.4.1-java)
152
149
  json (>= 1.4.6)
153
150
  globalize3 (0.1.0)
154
151
  activemodel (>= 3.0.0)
155
152
  activerecord (>= 3.0.0)
156
153
  i18n (0.5.0)
157
- json (1.5.1)
158
- json (1.5.1-java)
159
- json_pure (1.5.1)
154
+ json (1.5.3)
155
+ json (1.5.3-java)
156
+ json_pure (1.5.3)
160
157
  launchy (0.4.0)
161
158
  configuration (>= 0.0.5)
162
159
  rake (>= 0.8.1)
@@ -166,9 +163,9 @@ GEM
166
163
  mime-types (~> 1.16)
167
164
  treetop (~> 1.4.8)
168
165
  mime-types (1.16)
169
- mysql2 (0.2.7)
170
- nokogiri (1.4.4)
171
- nokogiri (1.4.4-java)
166
+ mysql2 (0.2.11)
167
+ nokogiri (1.4.6)
168
+ nokogiri (1.4.6-java)
172
169
  weakling (>= 0.0.3)
173
170
  orm_adapter (0.0.5)
174
171
  polyglot (0.3.1)
@@ -179,23 +176,23 @@ GEM
179
176
  rack (>= 1.0.0)
180
177
  rack-test (0.5.7)
181
178
  rack (>= 1.0)
182
- rails (3.0.7)
183
- actionmailer (= 3.0.7)
184
- actionpack (= 3.0.7)
185
- activerecord (= 3.0.7)
186
- activeresource (= 3.0.7)
187
- activesupport (= 3.0.7)
179
+ rails (3.0.9)
180
+ actionmailer (= 3.0.9)
181
+ actionpack (= 3.0.9)
182
+ activerecord (= 3.0.9)
183
+ activeresource (= 3.0.9)
184
+ activesupport (= 3.0.9)
188
185
  bundler (~> 1.0)
189
- railties (= 3.0.7)
190
- railties (3.0.7)
191
- actionpack (= 3.0.7)
192
- activesupport (= 3.0.7)
186
+ railties (= 3.0.9)
187
+ railties (3.0.9)
188
+ actionpack (= 3.0.9)
189
+ activesupport (= 3.0.9)
193
190
  rake (>= 0.8.7)
191
+ rdoc (~> 3.4)
194
192
  thor (~> 0.14.4)
195
- rake (0.9.0)
196
- rcov (0.9.9)
197
- rcov (0.9.9-java)
198
- refinerycms-generators (1.0.1)
193
+ rake (0.9.2)
194
+ rdoc (3.6.1)
195
+ refinerycms-generators (1.0.2)
199
196
  refinerycms-i18n (1.0.0)
200
197
  refinerycms-core (>= 0.9.9.12)
201
198
  routing-filter (>= 0.2.3)
@@ -205,7 +202,7 @@ GEM
205
202
  rspec-core (~> 2.6.0)
206
203
  rspec-expectations (~> 2.6.0)
207
204
  rspec-mocks (~> 2.6.0)
208
- rspec-core (2.6.3)
205
+ rspec-core (2.6.4)
209
206
  rspec-expectations (2.6.0)
210
207
  diff-lcs (~> 1.1.2)
211
208
  rspec-mocks (2.6.0)
@@ -215,20 +212,23 @@ GEM
215
212
  railties (~> 3.0)
216
213
  rspec (~> 2.6.0)
217
214
  rubyzip (0.9.4)
218
- selenium-webdriver (0.2.0)
215
+ selenium-webdriver (0.2.1)
219
216
  childprocess (>= 0.1.7)
220
217
  ffi (>= 1.0.7)
221
218
  json_pure
222
219
  rubyzip
223
220
  seo_meta (1.1.1)
224
221
  refinerycms-generators (~> 1.0.1)
222
+ simplecov (0.4.2)
223
+ simplecov-html (~> 0.4.4)
224
+ simplecov-html (0.4.5)
225
225
  sqlite3 (1.3.3)
226
226
  term-ansicolor (1.0.5)
227
227
  thor (0.14.6)
228
228
  treetop (1.4.9)
229
229
  polyglot (>= 0.3.1)
230
230
  truncate_html (0.5.1)
231
- tzinfo (0.3.27)
231
+ tzinfo (0.3.28)
232
232
  warden (1.0.4)
233
233
  rack (>= 1.0)
234
234
  weakling (0.0.4-java)
@@ -244,5 +244,5 @@ DEPENDENCIES
244
244
  mysql2 (~> 0.2.7)
245
245
  refinerycms!
246
246
  refinerycms-i18n (~> 1.0.0)
247
- refinerycms-testing (~> 1.0.0)
247
+ refinerycms-testing (~> 1.0.1)
248
248
  sqlite3
data/Rakefile CHANGED
@@ -1,5 +1,11 @@
1
- # Add your own tasks in files placed in lib/tasks ending in .rake,
2
- # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
1
+ # Ensure that the database has *a* config.
2
+ unless File.exist?(db_yml = File.expand_path('../config/database.yml', __FILE__))
3
+ require 'fileutils'
4
+ FileUtils.cp "#{db_yml}.sqlite3", db_yml
5
+ puts "Copied #{db_yml}.sqlite3 to #{db_yml}"
6
+ puts "Migrating..."
7
+ puts `bundle exec rake -f #{__FILE__} db:migrate`
8
+ end
3
9
 
4
10
  require File.expand_path('../config/application', __FILE__)
5
11
  require 'rake'
@@ -3,6 +3,7 @@
3
3
  begin
4
4
  require 'rubygems'
5
5
  require 'bundler'
6
+ ENV["BUNDLE_GEMFILE"] = File.expand_path('../../Gemfile', __FILE__)
6
7
  rescue LoadError
7
8
  puts "\n=== ACTION REQUIRED ===\n\n"
8
9
  puts "Could not load the bundler gem. This is a required dependency of Refinery CMS."
@@ -39,7 +40,8 @@ module Refinery
39
40
  :duostack => false,
40
41
  :force => false,
41
42
  :gems => [],
42
- :heroku => false
43
+ :heroku => false,
44
+ :testing => false
43
45
  }
44
46
 
45
47
  @optparse = OptionParser.new do |opts|
@@ -55,7 +57,7 @@ module Refinery
55
57
  puts "To update your application:"
56
58
  puts "- Change the version of the 'refinerycms' gem in your Gemfile."
57
59
  puts "- Run bundle install"
58
- puts "- Run rails generate refinerycms --update"
60
+ puts "- Run bundle exec rails generate refinerycms --update"
59
61
  puts "\n"
60
62
  exit(1)
61
63
  end
@@ -102,6 +104,10 @@ module Refinery
102
104
  @options[:confirm] = true
103
105
  end
104
106
 
107
+ opts.on('-t', '--testing', "Automatically set up the project with refinerycms-testing support.") do
108
+ @options[:testing] = true
109
+ end
110
+
105
111
  opts.separator ""
106
112
  opts.separator "Common options:"
107
113
 
@@ -127,29 +133,8 @@ module Refinery
127
133
  # Bundle the application which activates Refinery CMS
128
134
  bundle!
129
135
 
130
- unless @options[:database][:skip]
131
- # Ensure the database exists so that queries like .table_exists? don't fail.
132
- puts "\nCreating a new database.."
133
- # Warn about incorrect username or password.
134
- unless @options[:database][:adapter] == 'sqlite3'
135
- if @options[:database][:ident]
136
- note = "NOTE: If ident authentication fails then the installer will stall or fail here.\n\n"
137
- else
138
- note = "NOTE: if your database username is not '#{@options[:database][:username]}'"
139
- note << " or your password is not '#{@options[:database][:password]}' then the installer will stall here.\n\n"
140
- end
141
- puts note
142
- end
143
- run_command("rake -f \"#{@app_path.join('Rakefile')}\" db:create", {
144
- :fail => "Unable to create the application's database"
145
- })
146
-
147
- # Run the newly activated Refinery CMS generator.
148
- run_command("rails generate refinerycms", {
149
- :cd => true,
150
- :fail => "Could not run the refinerycms generator successfully."
151
- })
152
- end
136
+ # Run any database migrations
137
+ migrate! unless @options[:database][:skip]
153
138
 
154
139
  # Output helpful messages to user
155
140
  output!
@@ -222,14 +207,18 @@ module Refinery
222
207
  end
223
208
 
224
209
  def generate!
210
+ # First, ensure dependencies are satisfied
211
+ run_command('bundle install', {:cd => false, :bundler => false})
212
+
225
213
  # Generate a rails application
226
214
  rails_command = "rails new \"#{@app_path}\""
227
215
  rails_command << " --database #{@options[:database][:adapter]}"
228
216
  rails_command << " --force" if @options[:force]
229
217
  rails_command << " --skip-test-unit --skip-prototype"
218
+ rails_command << " --skip-bundle" # Rails automatically installs the bundle, but so do we!
230
219
  rails_command << " -m http://jruby.org" if defined? JRUBY_VERSION
231
220
 
232
- rails_output = run_command(rails_command, {:cd => false})
221
+ rails_output = run_command(rails_command, {:cd => false, :bundler => true})
233
222
 
234
223
  # Detect non-success or a blank rails output or starting with "Can't initialize" or "Error"
235
224
  if !$?.success? or rails_output.to_s.length == 0 or rails_output =~ /^(Can't\ initialize|Error)/
@@ -240,6 +229,9 @@ module Refinery
240
229
  find_and_replace(@app_path.join('Gemfile'), /['|"]sqlite3['|"]/, "'activerecord-jdbcsqlite3-adapter'")
241
230
  end
242
231
 
232
+ # Remove rails from the Gemfile so that Refinery can manage it
233
+ find_and_replace('Gemfile', %r{^gem 'rails'}, "# gem 'rails'")
234
+
243
235
  # Override username and password
244
236
  if @options[:database][:ident]
245
237
  find_and_replace('config/database.yml', %r{username:}, '#username:')
@@ -252,6 +244,9 @@ module Refinery
252
244
  puts "\n---------"
253
245
  puts "Refinery successfully installed in '#{@app_path}'!\n\n"
254
246
  end
247
+ ensure
248
+ # Now switch to the app's Gemfile.
249
+ ENV["BUNDLE_GEMFILE"] = @app_path.join('Gemfile').to_s
255
250
  end
256
251
 
257
252
  def bundle!
@@ -259,7 +254,9 @@ module Refinery
259
254
  refinery_gemfile_contents = Refinery.root.join('Gemfile').read
260
255
  refinery_gems = refinery_gemfile_contents.match(/# REFINERY CMS =+.*# END REFINERY CMS =+/m)[0]
261
256
  refinery_gems.gsub!("# gem 'refinerycms'", "gem 'refinerycms'") # Enable refinerycms
262
- refinery_gems.gsub!("gem 'refinerycms-testing'", "# gem 'refinerycms-testing'") # Disable testing
257
+ unless @options[:testing] # Disable testing
258
+ refinery_gems.gsub!("gem 'refinerycms-testing'", "# gem 'refinerycms-testing'")
259
+ end
263
260
 
264
261
  app_gemfile = @app_path.join('Gemfile')
265
262
  refinery_user_defined_gems = refinery_gemfile_contents.match(/# USER DEFINED(.*)# END USER DEFINED/m)
@@ -279,7 +276,6 @@ module Refinery
279
276
  f.write "\n# USER DEFINED\n#{@options[:gems].join("\n")}\n# END USER DEFINED" if @options[:gems].any?
280
277
  end
281
278
 
282
-
283
279
  # Specify the correct version of the Refinery CMS gem (may be git source).
284
280
  src = Refinery.version !~ /\.pre$/ ? "'~> #{Refinery.version}'" : ":git => 'git://github.com/resolve/refinerycms'"
285
281
  find_and_replace('Gemfile', %r{gem 'refinerycms',.*}, "gem 'refinerycms', #{src}")
@@ -295,12 +291,52 @@ module Refinery
295
291
  run_command("bundle install", {:fail => "Unable to install necessary gems"})
296
292
  end
297
293
 
298
- def output!
299
- unless @options[:database][:skip]
300
- puts "\n\nSetting up your development database..\n"
301
- run_command("rake -f \"#{@app_path.join('Rakefile')}\" db:migrate")
294
+ def migrate!
295
+ unless @options[:database][:adapter] == 'sqlite3'
296
+ # Ensure the database exists so that queries like .table_exists? don't fail.
297
+ puts "\nCreating a new database.."
298
+
299
+ # Warn about incorrect username or password.
300
+ if @options[:database][:ident]
301
+ note = "NOTE: If ident authentication fails then the installer will stall or fail here.\n\n"
302
+ else
303
+ note = "NOTE: if your database username is not '#{@options[:database][:username]}'"
304
+ note << " or your password is not '#{@options[:database][:password]}' then the installer will stall here.\n\n"
305
+ end
306
+ puts note
307
+
308
+ run_command("rake -f \"#{@app_path.join('Rakefile')}\" db:create", {
309
+ :fail => "Unable to create the application's database",
310
+ :bundler => true
311
+ })
312
+ end
313
+
314
+ generators!
315
+
316
+ puts "\n\nSetting up your development database..\n"
317
+ run_command("rake -f \"#{@app_path.join('Rakefile')}\" db:migrate", :bundler => true)
318
+ end
319
+
320
+ def generators!
321
+ # Run the newly activated Refinery CMS generator.
322
+ puts "\n\nPreparing your application using the refinerycms generator..\n"
323
+ run_command("rails generate refinerycms", {
324
+ :cd => true,
325
+ :fail => "Could not run the refinerycms generator successfully.",
326
+ :bundler => true
327
+ })
328
+
329
+ if @options[:testing]
330
+ puts "\n\nAdding testing support files using the refinerycms_testing generator..\n"
331
+ run_command("rails generate refinerycms_testing", {
332
+ :cd => true,
333
+ :fail => "Could not run the refinerycms_testing generator successfully.",
334
+ :bundler => true
335
+ })
302
336
  end
337
+ end
303
338
 
339
+ def deploy!
304
340
  # Deploy to Heroku
305
341
  hosting = nil
306
342
  hosting = "Heroku" if @options[:heroku]
@@ -324,16 +360,18 @@ module Refinery
324
360
  end
325
361
  end
326
362
  # End automation
363
+ end
327
364
 
365
+ def output!
328
366
  # Construct helpful output messages
329
367
  note = ["\n=== ACTION REQUIRED ==="]
330
368
  if @options[:database][:skip]
331
369
  note << "Because you elected to skip database creation and migration in the installer"
332
370
  note << "you will need to run the following tasks manually to maintain correct operation:"
333
371
  note << "\ncd #{@app_path}"
334
- note << "rake db:create"
335
- note << "rails generate refinerycms"
336
- note << "rake db:migrate"
372
+ note << "bundle exec rake db:create"
373
+ note << "bundle exec rails generate refinerycms"
374
+ note << "bundle exec rake db:migrate"
337
375
  note << "\n---------\n"
338
376
  end
339
377
  note << "Now you can launch your webserver using:"
@@ -354,11 +392,11 @@ module Refinery
354
392
  puts note.join("\n")
355
393
  end
356
394
 
357
- private :validate!, :generate!, :bundle!, :output!
395
+ private :bundle!, :deploy!, :generate!, :generators!, :migrate!, :output!, :validate!
358
396
 
359
397
  def run_command(command, options = {})
360
398
  require 'rbconfig'
361
- options = {:cd => true, :puts => true, :fail => nil, :ruby => true}.merge(options)
399
+ options = {:cd => true, :puts => true, :fail => nil, :ruby => true, :bundler => false}.merge(options)
362
400
  to_run = %w()
363
401
  to_run << "cd \"#{@app_path}\" &&" if options[:cd]
364
402
 
@@ -369,6 +407,8 @@ module Refinery
369
407
  to_run << "\"#{exe}\" -S "
370
408
  end
371
409
 
410
+ to_run << "bundle exec" if options[:bundler]
411
+
372
412
  to_run << command
373
413
 
374
414
  if Refinery::WINDOWS
@@ -25,3 +25,7 @@ RefineryApp::Application.configure do
25
25
  end
26
26
 
27
27
  Refinery.rescue_not_found = false
28
+
29
+ # When true will use Amazon's Simple Storage Service on your production machine
30
+ # instead of the default file system for resources and images
31
+ Refinery.s3_backend = !(ENV['S3_KEY'].nil? || ENV['S3_SECRET'].nil?)
@@ -47,4 +47,9 @@ RefineryApp::Application.configure do
47
47
  # Send deprecation notices to registered listeners
48
48
  config.active_support.deprecation = :notify
49
49
  end
50
+
50
51
  Refinery.rescue_not_found = true
52
+
53
+ # When true will use Amazon's Simple Storage Service on your production machine
54
+ # instead of the default file system for resources and images
55
+ Refinery.s3_backend = !(ENV['S3_KEY'].nil? || ENV['S3_SECRET'].nil?)
@@ -33,4 +33,9 @@ RefineryApp::Application.configure do
33
33
  # Print deprecation notices to the stderr
34
34
  config.active_support.deprecation = :stderr
35
35
  end
36
+
36
37
  Refinery.rescue_not_found = false
38
+
39
+ # When true will use Amazon's Simple Storage Service on your production machine
40
+ # instead of the default file system for resources and images
41
+ Refinery.s3_backend = !(ENV['S3_KEY'].nil? || ENV['S3_SECRET'].nil?)
@@ -1,15 +1,16 @@
1
+ # Encoding: UTF-8
1
2
  # DO NOT EDIT THIS FILE DIRECTLY! Instead, use lib/gemspec.rb to generate it.
2
3
 
3
4
  Gem::Specification.new do |s|
4
5
  s.name = %q{refinerycms}
5
- s.version = %q{1.0.0}
6
+ s.version = %q{1.0.1}
6
7
  s.description = %q{A Ruby on Rails CMS that supports Rails 3. It's easy to extend and sticks to 'the Rails way' where possible.}
7
- s.date = %q{2011-05-28}
8
+ s.date = %q{2011-06-21}
8
9
  s.summary = %q{A Ruby on Rails CMS that supports Rails 3}
9
10
  s.email = %q{info@refinerycms.com}
10
11
  s.homepage = %q{http://refinerycms.com}
11
12
  s.rubyforge_project = %q{refinerycms}
12
- s.authors = ['Resolve Digital', 'Philip Arndt', 'David Jones', 'Steven Heidel']
13
+ s.authors = ['Resolve Digital', 'Philip Arndt', 'David Jones', 'Steven Heidel', 'Uģis Ozols']
13
14
  s.license = %q{MIT}
14
15
  s.require_paths = %w(lib)
15
16
  s.executables = %w(refinerycms)
@@ -18,14 +19,14 @@ Gem::Specification.new do |s|
18
19
  s.add_dependency 'bundler', '~> 1.0'
19
20
 
20
21
  # Refinery CMS
21
- s.add_dependency 'refinerycms-authentication', '= 1.0.0'
22
- s.add_dependency 'refinerycms-base', '= 1.0.0'
23
- s.add_dependency 'refinerycms-core', '= 1.0.0'
24
- s.add_dependency 'refinerycms-dashboard', '= 1.0.0'
25
- s.add_dependency 'refinerycms-images', '= 1.0.0'
26
- s.add_dependency 'refinerycms-pages', '= 1.0.0'
27
- s.add_dependency 'refinerycms-resources', '= 1.0.0'
28
- s.add_dependency 'refinerycms-settings', '= 1.0.0'
22
+ s.add_dependency 'refinerycms-authentication', '= 1.0.1'
23
+ s.add_dependency 'refinerycms-base', '= 1.0.1'
24
+ s.add_dependency 'refinerycms-core', '= 1.0.1'
25
+ s.add_dependency 'refinerycms-dashboard', '= 1.0.1'
26
+ s.add_dependency 'refinerycms-images', '= 1.0.1'
27
+ s.add_dependency 'refinerycms-pages', '= 1.0.1'
28
+ s.add_dependency 'refinerycms-resources', '= 1.0.1'
29
+ s.add_dependency 'refinerycms-settings', '= 1.0.1'
29
30
 
30
31
  s.files = [
31
32
  '.gitignore',
@@ -69,7 +70,6 @@ Gem::Specification.new do |s|
69
70
  'public',
70
71
  'public/javascripts',
71
72
  'public/javascripts/translations.js',
72
- 'public/stylesheets',
73
73
  'readme.md',
74
74
  'readme.md',
75
75
  'refinerycms.gemspec',
metadata CHANGED
@@ -1,20 +1,25 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: refinerycms
3
3
  version: !ruby/object:Gem::Version
4
+ hash: 21
4
5
  prerelease:
5
- version: 1.0.0
6
+ segments:
7
+ - 1
8
+ - 0
9
+ - 1
10
+ version: 1.0.1
6
11
  platform: ruby
7
12
  authors:
8
13
  - Resolve Digital
9
14
  - Philip Arndt
10
15
  - David Jones
11
16
  - Steven Heidel
17
+ - "U\xC4\xA3is Ozols"
12
18
  autorequire:
13
19
  bindir: bin
14
20
  cert_chain: []
15
21
 
16
- date: 2011-05-28 00:00:00 +12:00
17
- default_executable:
22
+ date: 2011-06-21 00:00:00 Z
18
23
  dependencies:
19
24
  - !ruby/object:Gem::Dependency
20
25
  name: bundler
@@ -24,6 +29,10 @@ dependencies:
24
29
  requirements:
25
30
  - - ~>
26
31
  - !ruby/object:Gem::Version
32
+ hash: 15
33
+ segments:
34
+ - 1
35
+ - 0
27
36
  version: "1.0"
28
37
  type: :runtime
29
38
  version_requirements: *id001
@@ -35,7 +44,12 @@ dependencies:
35
44
  requirements:
36
45
  - - "="
37
46
  - !ruby/object:Gem::Version
38
- version: 1.0.0
47
+ hash: 21
48
+ segments:
49
+ - 1
50
+ - 0
51
+ - 1
52
+ version: 1.0.1
39
53
  type: :runtime
40
54
  version_requirements: *id002
41
55
  - !ruby/object:Gem::Dependency
@@ -46,7 +60,12 @@ dependencies:
46
60
  requirements:
47
61
  - - "="
48
62
  - !ruby/object:Gem::Version
49
- version: 1.0.0
63
+ hash: 21
64
+ segments:
65
+ - 1
66
+ - 0
67
+ - 1
68
+ version: 1.0.1
50
69
  type: :runtime
51
70
  version_requirements: *id003
52
71
  - !ruby/object:Gem::Dependency
@@ -57,7 +76,12 @@ dependencies:
57
76
  requirements:
58
77
  - - "="
59
78
  - !ruby/object:Gem::Version
60
- version: 1.0.0
79
+ hash: 21
80
+ segments:
81
+ - 1
82
+ - 0
83
+ - 1
84
+ version: 1.0.1
61
85
  type: :runtime
62
86
  version_requirements: *id004
63
87
  - !ruby/object:Gem::Dependency
@@ -68,7 +92,12 @@ dependencies:
68
92
  requirements:
69
93
  - - "="
70
94
  - !ruby/object:Gem::Version
71
- version: 1.0.0
95
+ hash: 21
96
+ segments:
97
+ - 1
98
+ - 0
99
+ - 1
100
+ version: 1.0.1
72
101
  type: :runtime
73
102
  version_requirements: *id005
74
103
  - !ruby/object:Gem::Dependency
@@ -79,7 +108,12 @@ dependencies:
79
108
  requirements:
80
109
  - - "="
81
110
  - !ruby/object:Gem::Version
82
- version: 1.0.0
111
+ hash: 21
112
+ segments:
113
+ - 1
114
+ - 0
115
+ - 1
116
+ version: 1.0.1
83
117
  type: :runtime
84
118
  version_requirements: *id006
85
119
  - !ruby/object:Gem::Dependency
@@ -90,7 +124,12 @@ dependencies:
90
124
  requirements:
91
125
  - - "="
92
126
  - !ruby/object:Gem::Version
93
- version: 1.0.0
127
+ hash: 21
128
+ segments:
129
+ - 1
130
+ - 0
131
+ - 1
132
+ version: 1.0.1
94
133
  type: :runtime
95
134
  version_requirements: *id007
96
135
  - !ruby/object:Gem::Dependency
@@ -101,7 +140,12 @@ dependencies:
101
140
  requirements:
102
141
  - - "="
103
142
  - !ruby/object:Gem::Version
104
- version: 1.0.0
143
+ hash: 21
144
+ segments:
145
+ - 1
146
+ - 0
147
+ - 1
148
+ version: 1.0.1
105
149
  type: :runtime
106
150
  version_requirements: *id008
107
151
  - !ruby/object:Gem::Dependency
@@ -112,7 +156,12 @@ dependencies:
112
156
  requirements:
113
157
  - - "="
114
158
  - !ruby/object:Gem::Version
115
- version: 1.0.0
159
+ hash: 21
160
+ segments:
161
+ - 1
162
+ - 0
163
+ - 1
164
+ version: 1.0.1
116
165
  type: :runtime
117
166
  version_requirements: *id009
118
167
  description: A Ruby on Rails CMS that supports Rails 3. It's easy to extend and sticks to 'the Rails way' where possible.
@@ -154,7 +203,6 @@ files:
154
203
  - spec/rcov.opts
155
204
  - spec/spec_helper.rb
156
205
  - spec/support/refinery/controller_macros.rb
157
- has_rdoc: true
158
206
  homepage: http://refinerycms.com
159
207
  licenses:
160
208
  - MIT
@@ -168,17 +216,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
168
216
  requirements:
169
217
  - - ">="
170
218
  - !ruby/object:Gem::Version
219
+ hash: 3
220
+ segments:
221
+ - 0
171
222
  version: "0"
172
223
  required_rubygems_version: !ruby/object:Gem::Requirement
173
224
  none: false
174
225
  requirements:
175
226
  - - ">="
176
227
  - !ruby/object:Gem::Version
228
+ hash: 3
229
+ segments:
230
+ - 0
177
231
  version: "0"
178
232
  requirements: []
179
233
 
180
234
  rubyforge_project: refinerycms
181
- rubygems_version: 1.6.2
235
+ rubygems_version: 1.8.5
182
236
  signing_key:
183
237
  specification_version: 3
184
238
  summary: A Ruby on Rails CMS that supports Rails 3