cloud-toaster 1.1.2 → 1.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTU1MTk3N2RlMjAxZGRlNzNlNmIxNDYwMjY1NzU1MmJkYTBhZmI0NA==
+    MzY3ODY2Zjg5MDdjZWNmY2E1Yjg0OTJmNTJkZmEzMzNlYjhkNzkzOA==
   data.tar.gz: !binary |-
-    YWVjOTAyNTcwYmEwY2U3ZTkyOTZkOWRjOTFjOTUxM2JlNTU1MmZkMA==
+    MTFmMmM2NDFiZGI2ZjIwZTNmZTQ5OWFkN2NmNGUyZWNmYzljNGY5Yw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    M2JlYWRmNzM3ZDczNjdmM2VmNWQxMmVhMjBkOWY2ZGQ5YmI0MDhjZjQ3YzM0
-    ZGZlZDUxNjQyMTY0Yjg3ZjBmYjczMzlmNTRlYzY0MmUzNmVlYjYyYzNkYmUz
-    MWUwZGM3MGZlODg3ZmVmNTA3NWYzZDFjN2QwNDIxZjFiZGEyMzM=
+    NmJmOTQ0MjM3N2I0NTk3Y2Q3MGUzYzUxMTZmNTI4ZDUyMzNmYTE2MWU2NGNj
+    MjNjNmY3NDdjNDAwNzZhYjk3NDIwOGViODE3YjZkNTgyZTdiMmZjYjJjMzgw
+    MzcwY2VhZGM2YmRhYWJlZTFiYzk4Yjk5YTBlNGZiMmVkODg0OGE=
   data.tar.gz: !binary |-
-    YzYxODU2ZWUxOTEwMmRlN2QxZTJmYWIwZmFmOWMwMDVjM2E0OGZmZmE3NTM1
-    ZGZlMzg4MDIzMTUwNTEwOTVlMjZkMTY0ZDMxMmFmMzRkMzhhNDMyMGQ1N2Nl
-    NDEzM2I4ODBhOTllMTk2YWNkNmIzNzkzOWVjMzZkODgxZDhlMmU=
+    NDExZGI2NmQ5ZjRmYTk0MThkYjY0NmEyYjZmOWQyZGE1MWQ2ZmJkMmUzYzNh
+    NmUzNDEzNDhjOThmODAwNDk1OTU3ZThkMTgzZjcxOTExMjlhNzY3ZDU0YWRm
+    NTNmODEzMTU2NTVlYmE4NWQ3MzhkYjY5YzIxYzg0M2JiMTkyZjQ=

data/{webapp/Gemfile → Gemfile}

@@ -36,11 +36,14 @@ gem 'chef'
 gem 'ohai'
 gem 'rspec'			# tests
 gem 'ruby_parser'	# parse Ruby code
+gem 'bson'
 gem 'bson_ext'
+gem 'logger'
+gem 'thor'			# CLI generator
 gem 'tidy'			# tidy XML library
 gem 'diffy'  		# comparing source files
 gem 'mysql2'  		# for DB access
 gem 'therubyracer'	# required by execjs
 gem 'railties'
-gem 'activesupport'
-gem 'bundler'
+gem 'activesupport', :require => "active_support"
+gem 'activerecord', :require => "active_record"

data/README.md

@@ -11,7 +11,7 @@ Automated testing of Infrastructure as Code automation scripts (e.g., Chef).
   production servers or your own development machine! The reasons are twofold: first, 
   toaster requires a high amount of disk space for creating LXC containers, storing 
   test data etc; second, toaster relies on a comprehensive third-party software stack
-  (docker.io, LXC, Squid, MongoDB, Ruby, Ruby gems, etc), which might interfere with
+  (docker.io, LXC, Squid, MySQL, Ruby, Ruby gems, etc), which might interfere with
   and pollute the working environment of production machines.
 
 * Target platform: Ubuntu 13.04
@@ -32,12 +32,12 @@ gem install --no-ri --no-rdoc toaster-1.0.0.gem
 # (OR: install directly using rubygems.org: gem install cloud-toaster)
 
 # toaster setup:
-toaster setup					# (setup testing host / utility host. Enter 192.168.100.2 as "mongodb.host" parameter)
+toaster setup					# (setup testing host / utility host. Enter 192.168.100.2 as "db.host" parameter)
 toaster proto ubuntu1 ubuntu	# (initialize prototype container)
 ```
 
 The code listing above illustrates the single-node installation. For multiple testing hosts,
-set the mongodb.host configuration to the public IP/hostname of a central MongoDB server to be 
+set the db.host configuration to the public IP/hostname of a central MySQL DB server to be 
 shared among all hosts.
 
 ## User Commands
@@ -45,10 +45,20 @@ shared among all hosts.
 ```
 toaster web -d 					# (run the Web UI in a screen session in the background; web port 8080)
 toaster agent 					# (start test agent in the background; web port 8385)
-toaster spawn lxc1 ubuntu1			# (create container)
+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.

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/bin/toaster

@@ -8,9 +8,16 @@
 REQUIRED_CONFIGS = {"db.host" => "Database host"}
 ROOT_DIR = File.join(File.dirname(File.expand_path(__FILE__)), "..")
 
+# call bundler
+require "rubygems"
+require "bundler/setup"
+# bug fix for ruby 1.9+
+require 'dl/import'
+DL::Importable = DL::Importer
+Bundler.require(:default)
+
 # requires
 $LOAD_PATH << File.join(ROOT_DIR, "lib")
-require "rubygems"
 require "toaster/api.rb"
 
 # util functions

data/chef/cookbooks/chef-solo-search/tests/test_search.rb

@@ -17,7 +17,6 @@
 # limitations under the License.
 #
 
-require "rubygems"
 require "test/unit"
 require "chef"
 

data/chef/cookbooks/lxc/attributes/install_ruby.rb

@@ -34,7 +34,6 @@ set['ruby']['install_script']['ubuntu'] = <<-EOH
     # The following line fails under Ubuntu quantal..
     apt-get -y --force-yes install libc6-dev-amd6
     apt-get -y --force-yes install libeditline-dev build-essential
-	  # removed from list: package rubygems (automatically installs Ruby 1.8, which is undesired)
   	apt-get -y --force-yes install bison git autoconf automake patch make bzip2 zlib1g-dev sed libtool
   	apt-get -y --force-yes install less screen whiptail tar lsof unzip curl wget patch apt-utils make vim
   

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

@@ -134,7 +134,6 @@ $last_toaster_resource_name = "toaster_init_chef_listener"
 ruby_block $last_toaster_resource_name do
   block do
 
-    require 'rubygems'
     begin
       # the following two commands are used to load gems that were actually installed 
       # within this Chef run and are hence not yet available in this running instance.

data/lib/toaster/api.rb

@@ -61,7 +61,6 @@ module Toaster
     long_desc "Example: #{CMD} spawn lxc1 ubuntu1"
     def spawn(lxc_name, prototype_name)
 
-      distribution = "" # TODO remove ?
       prototype_name = "prototype_#{prototype_name}"
 
       prototype_dir = "/lxc/#{prototype_name}"
@@ -91,9 +90,6 @@ module Toaster
           "cont": {
             "name": "#{lxc_name}",
             "ip_address": "#{guest_ip}"
-          },
-          "bare_os": {
-            "distribution": "#{distribution}"
           }
         }
       }
@@ -283,10 +279,12 @@ module Toaster
     #option :detached, :type => :boolean, :aliases => ["-d"]
     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"
       if detached
-        exec("screen -d -m ruby #{ROOT_DIR}/lib/toaster/web_ui.rb")
+        Kernel::exec("screen -d -m #{cmd}")
       else
-        exec("ruby #{ROOT_DIR}/lib/toaster/web_ui.rb")
+        Kernel::exec("#{cmd}")
       end
     end
 
@@ -345,12 +343,6 @@ module Toaster
       end
     end
 
-    def exec(command)
-      out = `#{command}`
-      puts out
-      return out
-    end
-
     }
 
     ####################
@@ -390,7 +382,7 @@ module Toaster
     def init_db_connection()
       Toaster::Config.init_db_connection()
     end
-    def start_stop_container(action, lxc_name, distribution="")
+    def start_stop_container(action, lxc_name)
 
       if !Dir.exist?("/lxc/#{lxc_name}")
         puts "ERROR: Container directory does not exist: /lxc/#{lxc_name}"
@@ -412,9 +404,6 @@ module Toaster
           "name": "#{lxc_name}",
           "ip_address": "#{guest_ip}",
           "proxy_ip": "#{proxy_ip}"
-        },
-        "bare_os": {
-          "distribution": "#{distribution}"
         }
       }
     }

data/lib/toaster/chef/chef_util.rb

@@ -4,7 +4,6 @@
 # Author: Waldemar Hummer (hummer@dsg.tuwien.ac.at)
 #
 
-require 'rubygems'
 require 'chef/log'
 require 'chef/run_context'
 require 'chef/client'
@@ -243,49 +242,49 @@ module Toaster
     end
 
     # TODO remove?
-    def self.download_cookbook_version1(name, version="latest", 
-          target_dir=@@DEFAULT_COOKBOOKS_DIR, quiet=false, num_attempts=2)
-
-      link = get_cookbook_download_link(name, version)
-
-      `mkdir -p '#{target_dir}'` if !File.exist?(target_dir)
-      tgz_file = File.join(target_dir, "#{name}.tgz")
-      tar_file = File.join(target_dir, "#{name}.tar")
-      File.delete(tar_file) if File.exist?(tar_file)
-      cookbook_dir = File.join(target_dir, name)
-      if @@create_backups
-        if File.exist?(cookbook_dir) && !File.exist?("#{cookbook_dir}.bak")
-          `mv #{cookbook_dir} #{cookbook_dir}.bak`
-        end
-      end
-      while num_attempts > 0
-        `rm -rf #{cookbook_dir}`
-        if !quiet
-          puts "DEBUG: Downloading '#{link}' to #{target_dir}"
-        end
-        error = false
-        `wget #{link} -O #{tgz_file} > /dev/null 2>&1`
-        error ||= $?.exitstatus != 0
-        out = `cd #{target_dir} && tar zxf #{name}.tgz`
-        # tar reports status code 2 in case of error...
-        if $?.exitstatus > 1
-          # sometimes, the files are in tar format, 
-          # not in tgz format - let's give it a try!
-          puts "DEBUG: 'cd #{target_dir} && tar zxf #{name}.tgz' returned exit code #{$?.exitstatus}, trying to extract as tar file..."
-          full_file = "#{target_dir}/#{name}.tgz"
-          puts "DEBUG: File #{full_file} exists: #{File.exist?(full_file)}}"
-          out += `cd #{target_dir} && cp #{name}.tgz #{name}.tar`
-          out += `cd #{target_dir} && tar xf #{name}.tar`
-        end
-        error ||= $?.exitstatus > 1
-        break if !error
-        puts "WARN: Could not download/extract #{link} to #{target_dir} . Remaining attempts: #{num_attempts}"
-        num_attempts -= 1
-        sleep 2
-      end
-
-      return out   
-    end
+#    def self.download_cookbook_version1(name, version="latest", 
+#          target_dir=@@DEFAULT_COOKBOOKS_DIR, quiet=false, num_attempts=2)
+#
+#      link = get_cookbook_download_link(name, version)
+#
+#      `mkdir -p '#{target_dir}'` if !File.exist?(target_dir)
+#      tgz_file = File.join(target_dir, "#{name}.tgz")
+#      tar_file = File.join(target_dir, "#{name}.tar")
+#      File.delete(tar_file) if File.exist?(tar_file)
+#      cookbook_dir = File.join(target_dir, name)
+#      if @@create_backups
+#        if File.exist?(cookbook_dir) && !File.exist?("#{cookbook_dir}.bak")
+#          `mv #{cookbook_dir} #{cookbook_dir}.bak`
+#        end
+#      end
+#      while num_attempts > 0
+#        `rm -rf #{cookbook_dir}`
+#        if !quiet
+#          puts "DEBUG: Downloading '#{link}' to #{target_dir}"
+#        end
+#        error = false
+#        `wget #{link} -O #{tgz_file} > /dev/null 2>&1`
+#        error ||= $?.exitstatus != 0
+#        out = `cd #{target_dir} && tar zxf #{name}.tgz`
+#        # tar reports status code 2 in case of error...
+#        if $?.exitstatus > 1
+#          # sometimes, the files are in tar format, 
+#          # not in tgz format - let's give it a try!
+#          puts "DEBUG: 'cd #{target_dir} && tar zxf #{name}.tgz' returned exit code #{$?.exitstatus}, trying to extract as tar file..."
+#          full_file = "#{target_dir}/#{name}.tgz"
+#          puts "DEBUG: File #{full_file} exists: #{File.exist?(full_file)}}"
+#          out += `cd #{target_dir} && cp #{name}.tgz #{name}.tar`
+#          out += `cd #{target_dir} && tar xf #{name}.tar`
+#        end
+#        error ||= $?.exitstatus > 1
+#        break if !error
+#        puts "WARN: Could not download/extract #{link} to #{target_dir} . Remaining attempts: #{num_attempts}"
+#        num_attempts -= 1
+#        sleep 2
+#      end
+#
+#      return out   
+#    end
 
     def self.download_cookbook_url(link, target_dir=@@DEFAULT_COOKBOOKS_DIR, 
         quiet=false, num_attempts=2)

data/lib/toaster/db/db.rb

@@ -9,8 +9,6 @@ require "toaster/util/util"
 
 module Toaster
 
-  # TODO deprecated, remove?
-
   class DB
 
     class << self;

data/lib/toaster/markup/markup_util.rb

@@ -4,7 +4,6 @@
 # Author: Waldemar Hummer (hummer@dsg.tuwien.ac.at)
 #
 
-require 'rubygems'
 require 'json'
 require 'rexml/document'
 require 'hashdiff'

data/lib/toaster/model/automation.rb

@@ -2,8 +2,6 @@
 # Author: Waldemar Hummer (hummer@dsg.tuwien.ac.at)
 #
 
-#require "toaster/model/automation_run"
-#require "toaster/model/task"
 require 'active_record'
 require "toaster/markup/markup_util"
 require "toaster/chef/chef_util"
@@ -86,6 +84,7 @@ module Toaster
       return nil
     end
 
+    # TODO: fix/revise
     def get_seen_attribute_values()
       map = {}
       attribute_names = self.class.get_attribute_array_names(automation_attributes,"")

data/lib/toaster/model/automation_run.rb

@@ -4,7 +4,6 @@
 # Author: Waldemar Hummer (hummer@dsg.tuwien.ac.at)
 #
 
-require "active_record"
 require "toaster/model/automation"
 require "toaster/model/task_execution"
 require "toaster/model/run_attribute"

data/lib/toaster/model/key_value_pair.rb

@@ -2,8 +2,6 @@
 # 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/state_change.rb

@@ -3,8 +3,6 @@
 # Author: Waldemar Hummer (hummer@dsg.tuwien.ac.at)
 #
 
-require "active_record"
-
 module Toaster
 
   class StateChange < ActiveRecord::Base

data/lib/toaster/model/task.rb

@@ -4,7 +4,6 @@
 # Author: Waldemar Hummer (hummer@dsg.tuwien.ac.at)
 #
 
-require "active_record"
 require "toaster/util/util"
 require "toaster/model/task_execution"
 require "toaster/model/task_parameter"

data/lib/toaster/model/task_execution.rb

@@ -4,7 +4,6 @@
 # Author: Waldemar Hummer (hummer@dsg.tuwien.ac.at)
 #
 
-require "active_record"
 require "toaster/model/task"
 require "toaster/model/state"
 require "toaster/model/state_change"

data/lib/toaster/test/test_coverage_goal.rb

@@ -4,8 +4,6 @@
 # Author: Waldemar Hummer (hummer@dsg.tuwien.ac.at)
 #
 
-require "active_record"
-
 include Toaster
 
 module Toaster

data/lib/toaster/test/test_generator.rb

@@ -136,9 +136,8 @@ module Toaster
     end
 
     def gen_test_each_transition()
-      result = []
       # TODO
-      return result
+      raise "not implemented"
     end
 
     private

data/lib/toaster/test/test_suite.rb

@@ -139,11 +139,10 @@ module Toaster
       DB.find_activerecord(TestSuite, criteria)
     end
 
-    # TODO
     def query_unfinished_tests 
       return TestCase.find(
-        {"automation_run_id" => nil, "test_suite_id" => id}, 
-        {"test_suite" => self}
+        :automation_run => nil,
+        :test_suite_id => id
       )
     end
 

data/lib/toaster/toaster_app_service.rb

@@ -1,7 +1,18 @@
 
 $LOAD_PATH << File.join(File.expand_path(File.dirname(__FILE__)), "..")
 
+
 require 'rubygems'
+require 'bundler/setup'
+
+# bug fix for ruby 1.9+
+require 'dl/import'
+DL::Importable = DL::Importer
+
+# call bundler
+Bundler.require(:default)
+
+
 require 'toaster/util/config'
 require 'toaster/util/docker'
 
@@ -44,7 +55,7 @@ end
 $stdout = MyThreadOut.new
 
 ## capture stdout using thread-local variable
-require 'stringio'
+#require 'stringio'
 module Kernel
   def capture_stdout(&block)
     out = StringIO.new
@@ -134,6 +145,7 @@ if ARGV.include?("do_start_service")
   puts "Starting service on port #{$service_port}"
   Toaster::Config.init_db_connection()
   server = ToasterAppService.new($service_port, "0.0.0.0")
+
 #  client = ToasterApp.new()
 # client.runtest("2285f8539f6c48873")
 #  client.runtests("88056bebc7e384cac")