cloud-toaster 1.1.3 → 1.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +8 -8
- data/Gemfile +1 -0
- data/README.md +1 -11
- data/VERSION +1 -1
- data/bin/toaster +4 -1
- data/chef/cookbooks/toaster/recipes/testing.rb +13 -3
- data/config.json +2 -1
- data/lib/toaster/api.rb +2 -4
- data/lib/toaster/test/test_runner.rb +3 -1
- metadata +15 -1
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
NDI4NmI5ZGYwZThlMjE0YzlmZDAwMTI1Yjg5NGNlMzRmYjBiYTE0ZA==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
MTg3NmM0NmQwZGJhZjc5OWU0ZWFjYzEyZjdjZTEzMzk1OTkzNjc4Zg==
|
7
7
|
!binary "U0hBNTEy":
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
MzIxZGJiM2U0NDBlMjIxOGQ4MTU4MmZkNmUyMzFhZDIwNzA5NWM1ZWE4OTg0
|
10
|
+
NmI1YzcwZDk1OTNlMThhYjBiY2E4YjdjMTQxZmYwNTZmOTUzNTA3MjExZDQ5
|
11
|
+
ZmE3MjA0NjkxNDQ1MDRlZThjYjliYjBjNDgxYTAxMzRlZTFiMDg=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
NWY2NzAzNjlmMGQzODE1OTYyZTMxYWFjOWZlZDYyNjM5NDk0MDY1YzZjZjgy
|
14
|
+
OTgzYzlhMDU0NTUyMTI4YjNhYjQ2NzBhNmZkMjFhODgzNGFlN2FiNjk3ZTlk
|
15
|
+
MzllOTBlYTA2ZmU5NDdkMDIzMGQ5MTQ5ZDJmMDU5YmM3MzMxN2E=
|
data/Gemfile
CHANGED
data/README.md
CHANGED
@@ -49,16 +49,6 @@ toaster spawn lxc1 ubuntu1 # (create container)
|
|
49
49
|
toaster clean # (clean containers)
|
50
50
|
```
|
51
51
|
|
52
|
-
## Notes and Known Issues
|
53
|
-
|
54
|
-
* If the command "toaster web" does not work for you (i.e., hangs), try the following:
|
55
|
-
|
56
|
-
```
|
57
|
-
cd /usr/local/rvm/gems/ruby-2.1.2/gems/cloud-toaster-1.1.2/webapp/ && bundle install
|
58
|
-
/usr/local/rvm/gems/ruby-2.1.2/gems/cloud-toaster-1.1.2/webapp/bin/rails server thin
|
59
|
-
# (assuming your gems directory is /usr/local/rvm/gems/ruby-2.1.2/gems)
|
60
|
-
```
|
61
|
-
|
62
52
|
## License
|
63
53
|
|
64
|
-
ToASTER is published under the Apache License version 2.0. See LICENSE
|
54
|
+
ToASTER is published under the Apache License version 2.0. See LICENSE file for details.
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.1.
|
1
|
+
1.1.4
|
data/bin/toaster
CHANGED
@@ -5,7 +5,9 @@
|
|
5
5
|
#
|
6
6
|
|
7
7
|
# some global/constant variables
|
8
|
-
REQUIRED_CONFIGS = {
|
8
|
+
REQUIRED_CONFIGS = {
|
9
|
+
#"db.host" => "Database host"
|
10
|
+
}
|
9
11
|
ROOT_DIR = File.join(File.dirname(File.expand_path(__FILE__)), "..")
|
10
12
|
|
11
13
|
# call bundler
|
@@ -14,6 +16,7 @@ require "bundler/setup"
|
|
14
16
|
# bug fix for ruby 1.9+
|
15
17
|
require 'dl/import'
|
16
18
|
DL::Importable = DL::Importer
|
19
|
+
ENV['BUNDLE_GEMFILE'] = File.join(ROOT_DIR, "Gemfile")
|
17
20
|
Bundler.require(:default)
|
18
21
|
|
19
22
|
# requires
|
@@ -35,6 +35,19 @@ require 'fileutils'
|
|
35
35
|
databags_dir = "/var/chef/data_bags"
|
36
36
|
FileUtils.mkpath(databags_dir) if !File.directory?(databags_dir)
|
37
37
|
|
38
|
+
# Add code directories to Ruby LOAD_PATH.
|
39
|
+
root_dir = File.join(File.dirname(__FILE__), "..","..","..","..")
|
40
|
+
code_dir = File.join(root_dir, "lib")
|
41
|
+
$:.unshift(code_dir)
|
42
|
+
require "rubygems"
|
43
|
+
require "bundler/setup"
|
44
|
+
# bug fix for ruby 1.9+
|
45
|
+
require 'dl/import'
|
46
|
+
DL::Importable = DL::Importer
|
47
|
+
ENV['BUNDLE_GEMFILE'] = File.join(root_dir, "Gemfile")
|
48
|
+
Bundler.require(:default)
|
49
|
+
|
50
|
+
|
38
51
|
package "gcc-c++" do
|
39
52
|
action :install
|
40
53
|
not_if "which g++"
|
@@ -89,7 +102,6 @@ end
|
|
89
102
|
|
90
103
|
|
91
104
|
bash "install_toaster_gem" do
|
92
|
-
require 'toaster/util/config'
|
93
105
|
code <<-EOH
|
94
106
|
gem install --no-ri --no-rdoc cloud-toaster
|
95
107
|
EOH
|
@@ -103,8 +115,6 @@ $postprocessing_scripts = []
|
|
103
115
|
$postprocessing_scripts_by_name = {}
|
104
116
|
|
105
117
|
# Add code directories to Ruby LOAD_PATH.
|
106
|
-
code_dir = File.join(__FILE__, "..","..","..","..", "lib")
|
107
|
-
$:.unshift(code_dir)
|
108
118
|
if node['toaster']['additional_load_paths'].kind_of?(Array)
|
109
119
|
node['toaster']['additional_load_paths'].each do |path|
|
110
120
|
if File.exist?(path)
|
data/config.json
CHANGED
data/lib/toaster/api.rb
CHANGED
@@ -139,15 +139,13 @@ module Toaster
|
|
139
139
|
# Start an existing container
|
140
140
|
desc "start NAME", "Start container with given NAME."
|
141
141
|
def start(lxc_name)
|
142
|
-
|
143
|
-
start_stop_container("start", lxc_name, distribution)
|
142
|
+
start_stop_container("start", lxc_name)
|
144
143
|
end
|
145
144
|
|
146
145
|
# Stop an existing container
|
147
146
|
desc "stop NAME", "Stop container with given NAME."
|
148
147
|
def stop(lxc_name)
|
149
|
-
|
150
|
-
start_stop_container("stop", lxc_name, distribution)
|
148
|
+
start_stop_container("stop", lxc_name)
|
151
149
|
end
|
152
150
|
|
153
151
|
# run tests of a specific test suite
|
@@ -51,6 +51,7 @@ module Toaster
|
|
51
51
|
@local_semaphore.synchronize do
|
52
52
|
current_num = @active_threads.size
|
53
53
|
end
|
54
|
+
puts "DEBUG: currently active worker threads: #{current_num} of #{@max_threads_active}"
|
54
55
|
((current_num)..(@max_threads_active-1)).each do
|
55
56
|
t = Thread.start {
|
56
57
|
running = true
|
@@ -286,7 +287,8 @@ module Toaster
|
|
286
287
|
config_file_cont = "#{lxc['rootdir']}/root/.toaster"
|
287
288
|
`cp '#{config_file_host}' '#{config_file_cont}'`
|
288
289
|
|
289
|
-
|
290
|
+
# TODO: should we always re-install the toaster gem?
|
291
|
+
#`ssh #{lxc["ip"]} "gem install --no-ri --no-rdoc cloud-toaster 2>&1"`
|
290
292
|
|
291
293
|
end
|
292
294
|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cloud-toaster
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.1.
|
4
|
+
version: 1.1.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Waldemar Hummer
|
@@ -192,6 +192,20 @@ dependencies:
|
|
192
192
|
- - ! '>='
|
193
193
|
- !ruby/object:Gem::Version
|
194
194
|
version: '0'
|
195
|
+
- !ruby/object:Gem::Dependency
|
196
|
+
name: aquarium
|
197
|
+
requirement: !ruby/object:Gem::Requirement
|
198
|
+
requirements:
|
199
|
+
- - ! '>='
|
200
|
+
- !ruby/object:Gem::Version
|
201
|
+
version: '0'
|
202
|
+
type: :runtime
|
203
|
+
prerelease: false
|
204
|
+
version_requirements: !ruby/object:Gem::Requirement
|
205
|
+
requirements:
|
206
|
+
- - ! '>='
|
207
|
+
- !ruby/object:Gem::Version
|
208
|
+
version: '0'
|
195
209
|
- !ruby/object:Gem::Dependency
|
196
210
|
name: jsonpath
|
197
211
|
requirement: !ruby/object:Gem::Requirement
|