ringleader 1.1.5 → 1.1.6

Sign up to get free protection for your applications and to get access to all the features.
@@ -0,0 +1 @@
1
+ ringleader
@@ -1 +1 @@
1
- 1.9.3-p392
1
+ 1.9.3
data/README.md CHANGED
@@ -108,6 +108,9 @@ main_app:
108
108
  # Likewise for rbenv:
109
109
  rbenv: "foreman start"
110
110
 
111
+ # And chruby:
112
+ chruby: "foreman start"
113
+
111
114
  other_app:
112
115
  [...]
113
116
  ```
@@ -48,6 +48,8 @@ module Ringleader
48
48
 
49
49
  if command = options.delete("rvm")
50
50
  options["command"] = "source ~/.rvm/scripts/rvm && rvm in #{options["dir"]} do #{command}"
51
+ elsif command = options.delete("chruby")
52
+ options["command"] = "source /usr/local/share/chruby/chruby.sh ; source /usr/local/share/chruby/auto.sh ; cd #{options["dir"]} ; #{command}"
51
53
  elsif command = options.delete("rbenv")
52
54
  options["command"] = "rbenv exec #{command}"
53
55
  options["env"]["RBENV_VERSION"] = nil
@@ -1,3 +1,3 @@
1
1
  module Ringleader
2
- VERSION = "1.1.5"
2
+ VERSION = "1.1.6"
3
3
  end
@@ -0,0 +1,6 @@
1
+ ---
2
+ chruby_app:
3
+ dir: "~/apps/main"
4
+ chruby: "foreman start"
5
+ server_port: 3000
6
+ app_port: 4000
@@ -83,6 +83,13 @@ describe Ringleader::Config do
83
83
  end
84
84
  end
85
85
 
86
+ context "with a config with an 'chruby' key instead of a 'command'" do
87
+ it "replaces the command with a command to use chruby" do
88
+ config = Ringleader::Config.new "spec/fixtures/chruby.yml"
89
+ expect(config.apps["chruby_app"].command).to eq("source /usr/local/share/chruby/chruby.sh ; source /usr/local/share/chruby/auto.sh ; cd /Users/tapajos/apps/main ; foreman start")
90
+ end
91
+ end
92
+
86
93
  context "with a config with a 'rbenv' key instead of 'command'" do
87
94
  it "replaces the 'rbenv' command with an rbenv command and environment" do
88
95
  config = Ringleader::Config.new "spec/fixtures/rbenv.yml"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ringleader
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.5
4
+ version: 1.1.6
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: 2013-05-12 00:00:00.000000000 Z
12
+ date: 2013-08-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: celluloid
@@ -181,8 +181,8 @@ extra_rdoc_files: []
181
181
  files:
182
182
  - .gitignore
183
183
  - .rspec
184
+ - .ruby-gemset
184
185
  - .ruby-version
185
- - .rvmrc
186
186
  - CHANGES.md
187
187
  - Gemfile
188
188
  - Guardfile
@@ -232,6 +232,7 @@ files:
232
232
  - lib/ringleader/wait_for_port.rb
233
233
  - ringleader.gemspec
234
234
  - screenshot.png
235
+ - spec/fixtures/chruby.yml
235
236
  - spec/fixtures/config.yml
236
237
  - spec/fixtures/invalid.yml
237
238
  - spec/fixtures/invalid_app_dir.yml
@@ -261,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
261
262
  version: '0'
262
263
  segments:
263
264
  - 0
264
- hash: -2758276641286493310
265
+ hash: -1792738039967706784
265
266
  requirements: []
266
267
  rubyforge_project:
267
268
  rubygems_version: 1.8.23
@@ -269,6 +270,7 @@ signing_key:
269
270
  specification_version: 3
270
271
  summary: Proxy TCP connections to an on-demand pool of configured applications
271
272
  test_files:
273
+ - spec/fixtures/chruby.yml
272
274
  - spec/fixtures/config.yml
273
275
  - spec/fixtures/invalid.yml
274
276
  - spec/fixtures/invalid_app_dir.yml
data/.rvmrc DELETED
@@ -1 +0,0 @@
1
- rvm use 1.9.3@ringleader --create