cloud-toaster 1.1.3 → 1.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzY3ODY2Zjg5MDdjZWNmY2E1Yjg0OTJmNTJkZmEzMzNlYjhkNzkzOA==
+    NDI4NmI5ZGYwZThlMjE0YzlmZDAwMTI1Yjg5NGNlMzRmYjBiYTE0ZA==
   data.tar.gz: !binary |-
-    MTFmMmM2NDFiZGI2ZjIwZTNmZTQ5OWFkN2NmNGUyZWNmYzljNGY5Yw==
+    MTg3NmM0NmQwZGJhZjc5OWU0ZWFjYzEyZjdjZTEzMzk1OTkzNjc4Zg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmJmOTQ0MjM3N2I0NTk3Y2Q3MGUzYzUxMTZmNTI4ZDUyMzNmYTE2MWU2NGNj
-    MjNjNmY3NDdjNDAwNzZhYjk3NDIwOGViODE3YjZkNTgyZTdiMmZjYjJjMzgw
-    MzcwY2VhZGM2YmRhYWJlZTFiYzk4Yjk5YTBlNGZiMmVkODg0OGE=
+    MzIxZGJiM2U0NDBlMjIxOGQ4MTU4MmZkNmUyMzFhZDIwNzA5NWM1ZWE4OTg0
+    NmI1YzcwZDk1OTNlMThhYjBiY2E4YjdjMTQxZmYwNTZmOTUzNTA3MjExZDQ5
+    ZmE3MjA0NjkxNDQ1MDRlZThjYjliYjBjNDgxYTAxMzRlZTFiMDg=
   data.tar.gz: !binary |-
-    NDExZGI2NmQ5ZjRmYTk0MThkYjY0NmEyYjZmOWQyZGE1MWQ2ZmJkMmUzYzNh
-    NmUzNDEzNDhjOThmODAwNDk1OTU3ZThkMTgzZjcxOTExMjlhNzY3ZDU0YWRm
-    NTNmODEzMTU2NTVlYmE4NWQ3MzhkYjY5YzIxYzg0M2JiMTkyZjQ=
+    NWY2NzAzNjlmMGQzODE1OTYyZTMxYWFjOWZlZDYyNjM5NDk0MDY1YzZjZjgy
+    OTgzYzlhMDU0NTUyMTI4YjNhYjQ2NzBhNmZkMjFhODgzNGFlN2FiNjk3ZTlk
+    MzllOTBlYTA2ZmU5NDdkMDIzMGQ5MTQ5ZDJmMDU5YmM3MzMxN2E=

data/Gemfile

@@ -30,6 +30,7 @@ gem 'thin'
 # TOASTER DEPENDENCIES
 gem 'hashdiff' 		# diff hashes
 gem 'json'
+gem 'aquarium'
 gem 'jsonpath'
 gem 'open4'			# open processes with stdin/stdout
 gem 'chef'

data/README.md

@@ -49,16 +49,6 @@ toaster spawn lxc1 ubuntu1		# (create container)
 toaster clean					# (clean containers)
 ```
 
-## Notes and Known Issues
-
-* If the command "toaster web" does not work for you (i.e., hangs), try the following:
-
-```
-cd /usr/local/rvm/gems/ruby-2.1.2/gems/cloud-toaster-1.1.2/webapp/ && bundle install
-/usr/local/rvm/gems/ruby-2.1.2/gems/cloud-toaster-1.1.2/webapp/bin/rails server thin
-# (assuming your gems directory is /usr/local/rvm/gems/ruby-2.1.2/gems)
-```
-
 ## License
 
-ToASTER is published under the Apache License version 2.0. See LICENSE.txt for details.
+ToASTER is published under the Apache License version 2.0. See LICENSE file for details.

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4

data/bin/toaster

@@ -5,7 +5,9 @@
 # 
 
 # some global/constant variables
-REQUIRED_CONFIGS = {"db.host" => "Database host"}
+REQUIRED_CONFIGS = {
+  #"db.host" => "Database host"
+}
 ROOT_DIR = File.join(File.dirname(File.expand_path(__FILE__)), "..")
 
 # call bundler
@@ -14,6 +16,7 @@ require "bundler/setup"
 # bug fix for ruby 1.9+
 require 'dl/import'
 DL::Importable = DL::Importer
+ENV['BUNDLE_GEMFILE'] = File.join(ROOT_DIR, "Gemfile")
 Bundler.require(:default)
 
 # requires

data/chef/cookbooks/toaster/recipes/testing.rb

@@ -35,6 +35,19 @@ require 'fileutils'
 databags_dir = "/var/chef/data_bags"
 FileUtils.mkpath(databags_dir) if !File.directory?(databags_dir)
 
+# Add code directories to Ruby LOAD_PATH.
+root_dir = File.join(File.dirname(__FILE__), "..","..","..","..")
+code_dir = File.join(root_dir, "lib")
+$:.unshift(code_dir)
+require "rubygems"
+require "bundler/setup"
+# bug fix for ruby 1.9+
+require 'dl/import'
+DL::Importable = DL::Importer
+ENV['BUNDLE_GEMFILE'] = File.join(root_dir, "Gemfile")
+Bundler.require(:default)
+
+
 package "gcc-c++" do
   action :install
   not_if "which g++"
@@ -89,7 +102,6 @@ end
 
 
 bash "install_toaster_gem" do
-  require 'toaster/util/config'
   code <<-EOH
     gem install --no-ri --no-rdoc cloud-toaster
   EOH
@@ -103,8 +115,6 @@ $postprocessing_scripts = []
 $postprocessing_scripts_by_name = {}
 
 # Add code directories to Ruby LOAD_PATH.
-code_dir = File.join(__FILE__, "..","..","..","..", "lib")
-$:.unshift(code_dir)
 if node['toaster']['additional_load_paths'].kind_of?(Array)
   node['toaster']['additional_load_paths'].each do |path|
     if File.exist?(path)

data/config.json

@@ -12,7 +12,8 @@
 		}
 	},
 	"cookbook_dirs": [
-		"/tmp/toaster_cookbooks/"
+		"/tmp/toaster_cookbooks/",
+		"/tmp/toaster_cookbooks/cookbooks"
 	]
 },
 

data/lib/toaster/api.rb

@@ -139,15 +139,13 @@ module Toaster
     # Start an existing container
     desc "start NAME", "Start container with given NAME."
     def start(lxc_name)
-      distribution = "" # TODO remove?
-      start_stop_container("start", lxc_name, distribution)
+      start_stop_container("start", lxc_name)
     end
 
     # Stop an existing container
     desc "stop NAME", "Stop container with given NAME."
     def stop(lxc_name)
-      distribution = "" # TODO remove?
-      start_stop_container("stop", lxc_name, distribution)
+      start_stop_container("stop", lxc_name)
     end
 
     # run tests of a specific test suite

data/lib/toaster/test/test_runner.rb

@@ -51,6 +51,7 @@ module Toaster
       @local_semaphore.synchronize do
         current_num = @active_threads.size
       end
+      puts "DEBUG: currently active worker threads: #{current_num} of #{@max_threads_active}"
       ((current_num)..(@max_threads_active-1)).each do 
         t = Thread.start {
           running = true
@@ -286,7 +287,8 @@ module Toaster
       config_file_cont = "#{lxc['rootdir']}/root/.toaster"
       `cp '#{config_file_host}' '#{config_file_cont}'`
 
-      `ssh #{lxc["ip"]} "gem install --no-ri --no-rdoc cloud-toaster 2>&1"`
+      # TODO: should we always re-install the toaster gem?
+      #`ssh #{lxc["ip"]} "gem install --no-ri --no-rdoc cloud-toaster 2>&1"`
 
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud-toaster
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Waldemar Hummer
@@ -192,6 +192,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aquarium
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jsonpath
   requirement: !ruby/object:Gem::Requirement