cloud-toaster 1.1.4 → 1.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDI4NmI5ZGYwZThlMjE0YzlmZDAwMTI1Yjg5NGNlMzRmYjBiYTE0ZA==
+    ZmI2MjQ0MGYzYjJhZmVhNjkwYjBiOWFiNWY2YjI5Y2EyZTRlNzE4Mg==
   data.tar.gz: !binary |-
-    MTg3NmM0NmQwZGJhZjc5OWU0ZWFjYzEyZjdjZTEzMzk1OTkzNjc4Zg==
+    NjdlYjdiMDA5Yzk0OWZkNzRmNDJjYjE0M2JhNWIyZjUxODg5N2ExZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzIxZGJiM2U0NDBlMjIxOGQ4MTU4MmZkNmUyMzFhZDIwNzA5NWM1ZWE4OTg0
-    NmI1YzcwZDk1OTNlMThhYjBiY2E4YjdjMTQxZmYwNTZmOTUzNTA3MjExZDQ5
-    ZmE3MjA0NjkxNDQ1MDRlZThjYjliYjBjNDgxYTAxMzRlZTFiMDg=
+    NGVjZjBiMDI2NDk4ZTZkYzc3YjY0YWRhMDFhNjgwN2ViZjc4Njg1ZGY1YzI5
+    NDRjMmE1NDY3OGUzMThjNmMwNTE0YWZiNmUzNDkyODdmOWVlZWEyNjBjYWE4
+    NTEyMGFmY2Q2Nzk1OGM2MjNmNjBmZDkwZDY5NTZkMGI5YzZjZTI=
   data.tar.gz: !binary |-
-    NWY2NzAzNjlmMGQzODE1OTYyZTMxYWFjOWZlZDYyNjM5NDk0MDY1YzZjZjgy
-    OTgzYzlhMDU0NTUyMTI4YjNhYjQ2NzBhNmZkMjFhODgzNGFlN2FiNjk3ZTlk
-    MzllOTBlYTA2ZmU5NDdkMDIzMGQ5MTQ5ZDJmMDU5YmM3MzMxN2E=
+    MGFlMDE4ZTBhOTE1YjRkNTA3Y2VlNDhmNDhiMWM2YThhMGNhOGM4N2Y4MzYz
+    MGVkODAzMzkyYTRlNzQ3MTYxNDY2NjU3ZTE0ZmQ4MDBkMDI3YjAzNGJlODY0
+    NGNjYzVlMWZjOWNhMjE0ZWU1MzE4YTgwMzU3NzlmYWVkNzdhMWY=

data/Gemfile

@@ -24,8 +24,9 @@ group :doc do
 end
 # Authentication module
 gem 'devise'
-# Get rid of some rails warnings
-gem 'thin'
+# Use thin server (faster; prints less rails output/warnings)
+gem 'thin', '~> 1.6'	# 14-07-08: default version 2.0.0.pre is incompatible
+                        # http://stackoverflow.com/questions/19579984/sinatra-server-wont-start-wrong-number-of-arguments
 
 # TOASTER DEPENDENCIES
 gem 'hashdiff' 		# diff hashes

data/README.md

@@ -23,11 +23,12 @@ sudo su -
 # prerequisites:
 apt-get -y install wget make bzip2 curl patch screen libgdbm-dev libyaml-dev libxml2-dev libxslt-dev libmysqlclient-dev libsqlite3-dev
 curl -L https://get.rvm.io | bash -s stable --ruby
+# (OR: install stable ruby versions from repo: apt-get install -y ruby ruby-dev)
 source /usr/local/rvm/scripts/rvm
 
 # install toaster gem:
 gem build toaster.gemspec
-gem install --no-ri --no-rdoc toaster-1.0.0.gem
+gem install --no-ri --no-rdoc cloud-toaster-*version*.gem
 
 # (OR: install directly using rubygems.org: gem install cloud-toaster)
 

data/Rakefile

@@ -11,19 +11,6 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  gem.name = "cloud-toaster"
-  gem.license = "Apache"
-  gem.authors     = ["Waldemar Hummer"]
-  gem.email       = ["hummer@infosys.tuwien.ac.at"]
-  gem.homepage    = "https://github.com/whummer/toaster"
-  gem.summary     = %q{Testing of infrastructure-as-code automations.}
-  gem.description = %q{This gem provides tools for testing of infrastructure-as-code automations.}
-  gem.files = FileList['lib/**/*.rb', '[A-Z]*', 'spec/**/*'].to_a
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
@@ -35,9 +22,6 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-require 'cucumber/rake/task'
-Cucumber::Rake::Task.new(:features)
-
 task :default => :spec
 
 require 'rdoc/task'

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.5

data/bin/toaster

@@ -5,23 +5,17 @@
 # 
 
 # some global/constant variables
+ROOT_DIR = File.join(File.dirname(File.expand_path(__FILE__)), "..")
 REQUIRED_CONFIGS = {
   #"db.host" => "Database host"
 }
-ROOT_DIR = File.join(File.dirname(File.expand_path(__FILE__)), "..")
+$LOAD_PATH << File.join(ROOT_DIR, "lib")
 
-# call bundler
-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)
+# load dependencies using Bundler
+require "toaster/util/load_bundler"
 
 # requires
-$LOAD_PATH << File.join(ROOT_DIR, "lib")
-require "toaster/api.rb"
+require "toaster/api"
 
 # util functions
 def install_chef()

data/chef/cookbooks/lxc/recipes/setup_database.rb

@@ -4,8 +4,13 @@ if platform_family?("debian")
   node.set['mysql']['server_root_password'] = "root"
   include_recipe "mysql::server"
 
+  root_dir = File.join(File.dirname(__FILE__), "..","..","..","..")
+
   bash 'db_create' do
-    code "echo 'create database toaster;' | mysql -u root -p#{node['mysql']['server_root_password']}"
+    code <<-EOH
+    echo 'create database toaster;' | mysql -u root -p#{node['mysql']['server_root_password']}
+    cd #{root_dir}/webapp && ./bin/rake db:migrate RAILS_ENV=development
+EOH
     not_if "echo \"show databases;\" | mysql -u root -p#{node['mysql']['server_root_password']} | grep toaster"
   end
 
@@ -19,4 +24,3 @@ EOH
   end
 
 end
-

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

@@ -39,14 +39,8 @@ FileUtils.mkpath(databags_dir) if !File.directory?(databags_dir)
 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)
-
+# load gems and require files using Bundler
+require "toaster/util/load_bundler"
 
 package "gcc-c++" do
   action :install

data/lib/toaster/api.rb

@@ -278,7 +278,7 @@ module Toaster
     def web(detached=false)
       puts "INFO: Starting Web application on port 8080"
       dir = File.join(File.dirname(__FILE__), "..", "..")
-      cmd = "cd \"#{dir}\" && webapp/bin/rails server thin"
+      cmd = "cd \"#{dir}\" && #{dir}/webapp/bin/rails server thin"
       if detached
         Kernel::exec("screen -d -m #{cmd}")
       else
@@ -325,7 +325,7 @@ module Toaster
         if blocking
           print_output = true
           destroy_container = true
-          TestRunner.execute_test(test_case, nil, destroy_container, print_output)
+          TestRunner.execute_test(test_case, destroy_container, print_output)
         else
           puts "INFO: Scheduling test cases #{test_case_uuids} for test suite uuid '#{test_suite_uuid}'"
           if $test_runners[test_suite_uuid]

data/lib/toaster/chef/chef_util.rb

@@ -161,9 +161,8 @@ module Toaster
       Util.write(solo_file, (<<-EOF
       cookbook_path [
         "#{File.expand_path(File.join(Dir.pwd, "cookbooks"))}",
-        "#{File.expand_path(Dir.pwd)}",
-        "#{File.join(root_dir, "chef", "cookbooks")}",
-        "#{@@DEFAULT_COOKBOOKS_DIR}"
+        "#{@@DEFAULT_COOKBOOKS_DIR}",
+        "#{File.join(root_dir, "chef", "cookbooks")}"
       ]
     EOF
     ), true)
@@ -809,7 +808,6 @@ module Toaster
             puts "WARN: Could not parse code file #{recipe_file} : #{line + 1}"
           else
             resource_obj = ResourceInspector.get_resource_from_source(code, attributes_source)
-            puts "received resource_obj: #{resource_obj}"
             result[cookbook][recipe_name]["resources"][line] = code
             result[cookbook][recipe_name]["resource_objs"][line] = resource_obj
             if !code.match(/not_if\s*/) && !code.match(/only_if\s*/)

data/lib/toaster/chef/failsafe_resource_parser.rb

@@ -55,7 +55,6 @@ class ::Chef
 
   module DSL
     module Recipe
-      #alias_method :old_method_missing, :method_missing
       $old_mm = ::Chef::DSL::Recipe.instance_method(:method_missing)
       def attributes_proxy=(attrs)
         @attributes_proxy = attrs
@@ -70,18 +69,10 @@ class ::Chef
         begin
           super
         rescue Object => ex
-          puts "WARN: cannot run instance_eval on recipe: #{ex}"
+          puts "WARN: cannot run instance_eval on recipe: #{ex} - #{ex.backtrace.join("\n")}"
         end
       end
-#      def build_resource(type, name, created_at=nil, &resource_attrs_block)
-#        if !name
-#          name = "__unnamed__"
-#        end
-#        super(type, name, created_at, &resource_attrs_block)
-#      end
       def method_missing(method_symbol, *args, &block)
-        #puts "method_missing:"
-        puts method_symbol
         begin
 
           # code copied from chef/dsl/recipe.rb
@@ -104,8 +95,6 @@ class ::Chef
             end
           end
 
-          #old_method_missing(method_symbol, args, block)
-          #super
           if caller.size > 250
             puts $old_mm.object_id
             puts "--"
@@ -113,24 +102,9 @@ class ::Chef
             puts "-------"
             return nil
           end
-          # puts "--->"
-          # puts self
-          # $old_mm.bind(self).(method_symbol, *args, &block)
         rescue Object => ex
-#                      begin
-            #puts ex
-            #puts ex.backtrace.join(" \n")
             proxy = @attributes_proxy ? @attributes_proxy : $new_node
-            #puts "proxy (in new line):"
-            #puts proxy
-            #puts method_symbol
             proxy.send(method_symbol, *args, &block)
-#                      rescue Object => ex1
-#                        puts ex1
-#                        puts ex1.backtrace.join(" \n")
-#                        puts "----"
-#                        puts caller
-#                      end
         end
       end
     end

data/lib/toaster/chef/resource_inspector.rb

@@ -47,7 +47,7 @@ module Toaster
         if task_or_sourcecode.kind_of?(Task)
           param = TaskParameter.new(task_or_sourcecode, param)
         else
-          param = TaskParameter.new(nil, param)
+          param = TaskParameter.new(:key => param)
         end
         exists = result.find { |p| (p.kind_of?(TaskParameter) ? p.key : p) == 
             (param.kind_of?(TaskParameter) ? param.key : param) }
@@ -191,11 +191,6 @@ module Toaster
               msg = ex.to_s
               puts msg if attempt <= 1
               puts ex.backtrace if attempt <= 1
-              #puts "----"
-              #puts resource_src
-              #puts "----"
-#              puts msg
-#              puts ex.backtrace
 
               if msg.match(/Cannot find a resource for/)
                 pkg_name = msg.gsub(/.*for ([a-z0-9A-Z_]+) on.*/, '\1').to_s

data/lib/toaster/model/key_value_pair.rb

@@ -2,6 +2,8 @@
 # Author: Waldemar Hummer (hummer@dsg.tuwien.ac.at)
 #
 
+require "active_record"
+
 module Toaster
   class KeyValuePair < ActiveRecord::Base
     self.inheritance_column = :type

data/lib/toaster/model/task_parameter.rb

@@ -9,8 +9,6 @@ require "toaster/model/key_value_pair"
 module Toaster
   class TaskParameter < KeyValuePair
 
-    #attr_accessor :uuid, :task, :key, :value, :type, :constraints
-
     @@id_attributes = ["task_id", "key", "value", "type"]
 
     def initialize(attr_hash)

data/lib/toaster/test/test_runner.rb

@@ -163,7 +163,7 @@ module Toaster
       c = TestCase.new(test_suite)
       test_suite.test_cases << c
       puts "INFO: Executing initial automation run; test case '#{c.uuid}'"
-      automation_run = execute_test(c, automation_name, destroy_container, print_output)
+      automation_run = execute_test(c, destroy_container, print_output)
       puts "DEBUG: Finished execution of initial automation run; test case '#{c.uuid}': #{automation_run}"
       return nil if !automation_run
       return automation_run.automation
@@ -194,8 +194,8 @@ module Toaster
     #
     # execute the provided test case
     #
-    def self.execute_test(test_case, automation_name=nil, 
-        destroy_container=true, print_output=false, num_attempts=2)
+    def self.execute_test(test_case, destroy_container=true, 
+        print_output=false, num_attempts=2)
 
       test_suite = nil
       test_id = nil
@@ -205,13 +205,9 @@ module Toaster
         test_suite = test_case.test_suite
         automation = test_suite.automation
         test_id = test_suite.uuid
-        automation_name = automation.get_short_name if !automation_name
         recipes = automation.recipes
       end
 
-      # generate automation attributes which represent this test case
-      chef_node_attrs = test_case.create_chef_node_attrs()
-
       sleep_time = 0
       self.semaphore.synchronize do
         time = TimeStamp.now()
@@ -234,7 +230,12 @@ module Toaster
         begin
           automation_run = nil
           if automation.is_chef?
-            automation_run = TestRunner.do_execute_test_chef(automation_name,
+            # generate automation attributes which represent this test case
+            chef_node_attrs = test_case.create_chef_node_attrs()
+            # set cookbook if necessary
+            automation.cookbook = automation.get_short_name if !automation.cookbook
+            # now run test!
+            automation_run = TestRunner.do_execute_test_chef(automation.cookbook,
                 automation.script, recipes, chef_node_attrs, test_suite.lxc_prototype, 
                 test_id, destroy_container, print_output)
           else
@@ -300,12 +301,12 @@ module Toaster
       Toaster::ChefUtil.download_cookbook_url_in_lxc(lxc, script_url)
     end
 
-    def self.do_execute_test_chef(automation_name, script_url, recipes, chef_node_attrs,
+    def self.do_execute_test_chef(cookbook_name, script_url, recipes, chef_node_attrs,
         prototype_name, test_id=nil, destroy_container=true, print_output=false, num_repeats=0)
 
       # Create/prepare new LXC container. 
       lxc = LXC.new_container(prototype_name)
-      prepare_test_container_for_chef(lxc, script_url, automation_name, recipes)
+      prepare_test_container_for_chef(lxc, script_url, cookbook_name, recipes)
 
       recipes = [recipes] if !recipes.kind_of?(Array)
       automation_run = nil
@@ -314,13 +315,16 @@ module Toaster
 
       begin
         # create run list from list of recipe names
-        run_list = recipes.collect { |r| r.include?("recipe[") ? r :
-          "recipe[#{automation_name}::#{r}]" }
+        run_list = recipes.collect { |r| 
+          r.include?("recipe[") ? r : 
+            r.include?("::") ? 
+            "recipe[#{r}]" : 
+            "recipe[#{cookbook_name}::#{r}]" }
 
         # run chef automation within LXC container
         key = "runChef " + Util.generate_short_uid()
         TimeStamp.add(nil, key)
-        output = LXC.run_chef_node(lxc, automation_name, run_list, chef_node_attrs)
+        output = LXC.run_chef_node(lxc, cookbook_name, run_list, chef_node_attrs)
         TimeStamp.add(nil, key)
 
         automation_run_id = nil
@@ -331,12 +335,12 @@ module Toaster
           puts "WARN: Could not extract automation run ID from output of previous test case run ('#{automation_run_id}')."
           # repeat the process
           (1..num_repeats).each do |iteration|
-            puts "INFO: Repeating test case '#{test_id}' - automation '#{automation_name}', run list '#{run_list}'"
+            puts "INFO: Repeating test case '#{test_id}' - cookbook '#{cookbook_name}', run list '#{run_list}'"
             # create/prepate new container
             lxc_new = LXC.new_container(prototype_name)
-            prepare_test_container_for_chef(lxc_new, script_url, automation_name, recipes)
+            prepare_test_container_for_chef(lxc_new, script_url, cookbook_name, recipes)
 
-            output = LXC.run_chef_node(lxc_new, automation_name, run_list, chef_node_attrs)
+            output = LXC.run_chef_node(lxc_new, cookbook_name, run_list, chef_node_attrs)
             output.scan(pattern) { |id| automation_run_id = id[0].strip }
             if destroy_container
               LXC.destroy_container(lxc_new)
@@ -361,7 +365,7 @@ module Toaster
             else
               auto = automation_run.automation
               if !auto.chef_run_list || auto.chef_run_list.empty?
-                chef_node = ChefUtil.extract_node_name(automation_name)
+                chef_node = ChefUtil.extract_node_name(cookbook_name)
                 auto.chef_run_list = [].concat(ChefUtil.prepare_run_list(chef_node, run_list))
                 auto.save
               end

data/lib/toaster/toaster_app_service.rb

@@ -1,18 +1,10 @@
 
 $LOAD_PATH << File.join(File.expand_path(File.dirname(__FILE__)), "..")
 
+# load dependencies using bundler
+require "toaster/util/load_bundler"
 
-require 'rubygems'
-require 'bundler/setup'
-
-# bug fix for ruby 1.9+
-require 'dl/import'
-DL::Importable = DL::Importer
-
-# call bundler
-Bundler.require(:default)
-
-
+# requires
 require 'toaster/util/config'
 require 'toaster/util/docker'
 

data/lib/toaster/util/load_bundler.rb

@@ -0,0 +1,23 @@
+# Load dependent gems into $LOAD_PATH and 
+# invoke all necessary *require*s using Bundler
+
+if !$toaster_bundler_loaded
+  TOASTER_ROOT_DIR = File.join(File.dirname(__FILE__), "..","..","..")
+  ENV['BUNDLE_GEMFILE'] = File.join(TOASTER_ROOT_DIR, "Gemfile")
+  require 'rubygems'
+  require 'bundler/setup'
+
+  # bug fix for ruby 1.9+ required to load gem tidy
+  original_verbosity = $VERBOSE
+  $VERBOSE = nil # disable warning "DL is deprecated, please use Fiddle"
+  require 'dl/import'
+  DL::Importable = DL::Importer
+  $VERBOSE = original_verbosity
+
+  # call bundler
+  Bundler.require(:default)
+
+  # $LOAD_PATH changed by Bundler, we have to add toaster again
+  $LOAD_PATH << File.join(TOASTER_ROOT_DIR, "lib")
+  $toaster_bundler_loaded = true
+end

data/lib/toaster/util/lxc.rb

@@ -139,7 +139,7 @@ module Toaster
           node_attributes["toaster"][key] = value
         end
       end
-      puts "DEBUG: Chef node attributes: #{node_attributes.inspect}"
+      puts "DEBUG: Chef automation #{chef_node}, node attributes: #{node_attributes.inspect}"
 
       run_chef(lxc, chef_node, node_attributes)
     end

data/webapp/app/controllers/scripts_controller.rb

@@ -113,7 +113,7 @@ class ScriptsController < ApplicationController
 	  				params[:cookbook], rec, params[:cookbook_version])[params[:cookbook]][rec]
 	  			recipe_info["resources"].each do |line,code|
             action = "__action__"
-            resource = "__action__"
+            resource = "__resource__"
 	  			  if recipe_info["resource_objs"][line]
 		  			   action = recipe_info["resource_objs"][line].action
 	  				   action = action.join(" , ") if action.kind_of?(Array)

data/webapp/app/views/test/gen.html.erb

@@ -119,7 +119,7 @@ begin
 		test_coverage = TestCoverage.new(test_suite, state_graph)
 	end
 
-	test_suites = Toaster::TestSuite.find()
+	test_suites = Toaster::TestSuite.find().to_a
 	test_suites.sort! { |x,y| (!x.last_test || !y.last_test) ? 0 : 
 		x.last_test.start_time.to_i <=> y.last_test.start_time.to_i }
 rescue => ex

data/webapp/app/views/test/suites.html.erb

@@ -152,7 +152,7 @@ end
 			<%= link_to 'details', "/execs/#{test_suite.automation.id}/#{test.automation_run.id}" %>
 		<% end %>
 		</td><td>
-		<% if !test.running_or_scheduled? %>
+		<% if !test.automation_run && !test.running_or_scheduled? %>
 			<%= link_to 'execute', "/test/exec/#{test.test_suite.id}/#{test.id}",
             :data => { :confirm => 'Are you sure you want to execute this test case?', :method => :post } %>
 		<% end %>

data/webapp/config/application.rb

@@ -1,14 +1,20 @@
 require File.expand_path('../boot', __FILE__)
 
+root_dir = File.join(File.dirname(__FILE__), "..", "..")
+$LOAD_PATH << File.join(root_dir, "lib")
+# load dependencies using bundler
+require "toaster/util/load_bundler"
+
+
 require 'rails/all'
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
 
 # bug fix for ruby 1.9+
-require 'dl/import'
-DL::Importable = DL::Importer
-Bundler.require(:default, Rails.env)
+#require 'dl/import'
+#DL::Importable = DL::Importer
+#Bundler.require(:default, Rails.env)
 
 module Toaster
   class Application < Rails::Application

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloud-toaster
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Waldemar Hummer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -486,6 +486,7 @@ files:
 - lib/toaster/util/docker.rb
 - lib/toaster/util/mem_dump.rb
 - lib/toaster/util/util.rb
+- lib/toaster/util/load_bundler.rb
 - lib/toaster/util/lxc.rb
 - lib/toaster/util/timestamp.rb
 - lib/toaster/test/test_result.rb