rconf 0.7.11 → 0.7.12

Sign up to get free protection for your applications and to get access to all the features.
data/Rakefile CHANGED
@@ -25,7 +25,7 @@ task :build => [ 'spec', 'gem' ]
25
25
 
26
26
  desc "Run unit tests"
27
27
  RSpec::Core::RakeTask.new do |t|
28
- t.rspec_opts = ["--color"]
28
+ t.rspec_opts = ["--color --format=nested"]
29
29
  end
30
30
 
31
31
  namespace :spec do
@@ -37,14 +37,16 @@ module RightConf
37
37
  res = Command.execute_in_ruby('bundle', '--version')
38
38
  success = (res.output =~ /#{version}/)
39
39
  report_result(success)
40
- install_bundler unless success
41
- report_check('Installing gems')
42
- options = [ "_#{version}_", 'install' ]
43
- options << "--without=#{exclusions.delete(' ')}" unless exclusions.nil?
44
- options += [ '--path', bundle_path ] unless bundle_path.nil?
45
- options << { :abort_on_failure => 'Failed to install gems' }
46
- res = Command.execute_in_ruby('bundle', *options)
47
- report_success
40
+ unless success
41
+ install_bundler
42
+ report_check('Installing gems')
43
+ options = [ "_#{version}_", 'install' ]
44
+ options << "--without=#{exclusions.delete(' ')}" unless exclusions.nil?
45
+ options += [ '--path', bundle_path ] unless bundle_path.nil?
46
+ options << { :abort_on_failure => 'Failed to install gems' }
47
+ res = Command.execute_in_ruby('bundle', *options)
48
+ report_success
49
+ end
48
50
  true
49
51
  end
50
52
  alias :run_darwin :run_linux
@@ -143,6 +143,7 @@ module RightConf
143
143
  "alias nstart='#{install_path}/sbin/nginx'\n" +
144
144
  "alias nstop='#{install_path}/sbin/nginx -s stop'"
145
145
  end
146
+ post_note (post_note || '') + "\nNow open http://right-site.rightscale.local:3000 in your browser"
146
147
  File.delete(File.join(ruby_dir, 'rake')) unless rake_exist
147
148
  report_success
148
149
  end
@@ -210,7 +211,7 @@ http {
210
211
 
211
212
  server {
212
213
  ssi on;
213
- listen 8080;
214
+ listen 3000;
214
215
  server_name right-site.rightscale.local;
215
216
  root #{File.join(right_site_src_path, 'public')};
216
217
  passenger_enabled on;
@@ -270,7 +271,7 @@ http {
270
271
 
271
272
  location /direct_library/
272
273
  {
273
- proxy_pass http://library.rightscale.local:8081/;
274
+ proxy_pass http://library.rightscale.local:3001/;
274
275
  proxy_set_header X-Relative-Root library;
275
276
  proxy_set_header X-Embedded on;
276
277
  proxy_set_header X-Core-Site-Domain right-site.rightscale.local;
@@ -278,7 +279,7 @@ http {
278
279
 
279
280
  location ~ ^/library/users/(.+)/openid_consume
280
281
  {
281
- proxy_pass http://library.rightscale.local:8081/users/$1/openid_consume?$args;
282
+ proxy_pass http://library.rightscale.local:3001/users/$1/openid_consume?$args;
282
283
  proxy_set_header X-Relative-Root library;
283
284
  proxy_set_header X-Embedded on;
284
285
  }
@@ -287,25 +288,25 @@ http {
287
288
  location ~ ^/library/(.*).(css|js)
288
289
  {
289
290
  # library assets get proxied directly to the library app
290
- proxy_pass http://library.rightscale.local:8081/$1.$2;
291
+ proxy_pass http://library.rightscale.local:3001/$1.$2;
291
292
  }
292
293
 
293
294
  location /library_images/
294
295
  {
295
- proxy_pass http://library.rightscale.local:8081/library_images/;
296
+ proxy_pass http://library.rightscale.local:3001/library_images/;
296
297
  }
297
298
 
298
299
 
299
300
  location /library_rest/
300
301
  {
301
- proxy_pass http://127.0.0.1:87/;
302
+ proxy_pass http://127.0.0.1:3001/;
302
303
  proxy_set_header X-Relative-Root library;
303
304
  proxy_set_header X-Core-Site-Domain right-site.rightscale.local;
304
305
  }
305
306
  }
306
307
  server {
307
308
  ssi on;
308
- listen 8081;
309
+ listen 3001;
309
310
  server_name library.rightscale.local;
310
311
  root #{library_src_path}/public;
311
312
  passenger_enabled on;
data/lib/rconf/version.rb CHANGED
@@ -13,7 +13,7 @@ module RightConf
13
13
 
14
14
  MAJOR = 0
15
15
  MINOR = 7
16
- BUILD = 11
16
+ BUILD = 12
17
17
 
18
18
  VERSION = [MAJOR, MINOR, BUILD].map(&:to_s).join('.')
19
19
 
@@ -28,8 +28,6 @@ describe RightConf::BundlerConfigurator do
28
28
 
29
29
  it 'should succeed when bundler succeeds' do
30
30
  should_execute_in_ruby('bundle', '--version').once.and_return(success_result('0'))
31
- should_execute_in_ruby('bundle','_0_', 'install',
32
- {:abort_on_failure=>"Failed to install gems"}).once.and_return(success_result)
33
31
  @configurator.run_linux
34
32
  end
35
33
 
@@ -39,6 +39,7 @@ describe RightConf::PackageInstaller do
39
39
 
40
40
  it 'should install packages on Darwin' do
41
41
  flexmock(RightConf::Platform.instance).should_receive(:family).and_return(:darwin)
42
+ flexmock(RightConf::BrewInstaller).should_receive(:check_and_install).once
42
43
  should_execute('brew', 'install', 'mac1').once.and_return(success_result)
43
44
  should_execute('brew', 'install', 'mac2').once.and_return(success_result)
44
45
  RightConf::PackageInstaller.install(['mac1', 'mac2'])
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: rconf
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 0.7.11
5
+ version: 0.7.12
6
6
  platform: ruby
7
7
  authors:
8
8
  - Raphael Simon
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2011-04-05 00:00:00 -07:00
13
+ date: 2011-04-06 00:00:00 -07:00
14
14
  default_executable:
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
142
142
  requirements: []
143
143
 
144
144
  rubyforge_project: rconf
145
- rubygems_version: 1.6.2
145
+ rubygems_version: 1.5.0
146
146
  signing_key:
147
147
  specification_version: 3
148
148
  summary: Cross platform environment configuration