cloud-toaster 1.1.5 → 1.1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmI2MjQ0MGYzYjJhZmVhNjkwYjBiOWFiNWY2YjI5Y2EyZTRlNzE4Mg==
+    YWY2YTE5NDFmNjYyZjMwZmYzNjI0ZjQ0NGU1ZTJkNTRmNmJjNDRmMA==
   data.tar.gz: !binary |-
-    NjdlYjdiMDA5Yzk0OWZkNzRmNDJjYjE0M2JhNWIyZjUxODg5N2ExZA==
+    YWE5ZjQzNzE5YTNhYWRkN2UwOTNiNDg0NjFjM2QwNTIyODc0MGZjMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGVjZjBiMDI2NDk4ZTZkYzc3YjY0YWRhMDFhNjgwN2ViZjc4Njg1ZGY1YzI5
-    NDRjMmE1NDY3OGUzMThjNmMwNTE0YWZiNmUzNDkyODdmOWVlZWEyNjBjYWE4
-    NTEyMGFmY2Q2Nzk1OGM2MjNmNjBmZDkwZDY5NTZkMGI5YzZjZTI=
+    NWVjNmM3ZTcwOGMxM2YyZDAzYzY3MDhkOWU5YmQ3OGZhNzJmOTQ5NzFiYzgw
+    ODdmMzMzZmExYzA3ZDcxYzU2ZDg5NGJhNzM1MDk1OTM4MTVkNDczNjhjNmQ4
+    OTY0MzUzZGM0MmE0NzExMjBlNGMxZDRjODc5NGQ1YzI2Y2EwZmE=
   data.tar.gz: !binary |-
-    MGFlMDE4ZTBhOTE1YjRkNTA3Y2VlNDhmNDhiMWM2YThhMGNhOGM4N2Y4MzYz
-    MGVkODAzMzkyYTRlNzQ3MTYxNDY2NjU3ZTE0ZmQ4MDBkMDI3YjAzNGJlODY0
-    NGNjYzVlMWZjOWNhMjE0ZWU1MzE4YTgwMzU3NzlmYWVkNzdhMWY=
+    ZGY3NTg4YWY2ZjBlNTg3YmQ3NDE5MTJlZDRkNTRmMjQ4MzE4YWMzMjdjOTJl
+    Mzc2MGViYTFhN2NjYTU0ZWM3NTRkMDQxYTZjYThkNTAwMDFmM2MwNzU5NmE5
+    Mzc4N2RlYmI3MDczM2FmNmNiZjNjNDk3NmUyZThjZThlMTMzY2M=

data/Gemfile

@@ -1,51 +1,11 @@
 source 'https://rubygems.org'
 
-# RUBY ON RAILS DEPENDENCIES 
-
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails'			#, '4.0.2'
-# Use sqlite3 as the database for Active Record
-gem 'sqlite3'
-# Use SCSS for stylesheets
-gem 'sass-rails'	#, '~> 4.0.0'
-# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier'		#, '>= 1.3.0'
-# Use CoffeeScript for .js.coffee assets and views
-gem 'coffee-rails'	#, '~> 4.0.0'
-# Use jquery as the JavaScript library
-gem 'jquery-rails'
-# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
-gem 'turbolinks'
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder'		#, '~> 1.2'
-group :doc do
-  # bundle exec rake doc:rails generates the API under doc/api.
-  gem 'sdoc', require: false
+# load gem dependencies from cloud-toaster.gemspec
+deps = gemspec :name => 'cloud-toaster'
+deps.each do |dep|
+	gem dep.name, dep.requirement
 end
-# Authentication module
-gem 'devise'
-# 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
-gem 'json'
-gem 'aquarium'
-gem 'jsonpath'
-gem 'open4'			# open processes with stdin/stdout
-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'
+# some overrides
 gem 'activesupport', :require => "active_support"
 gem 'activerecord', :require => "active_record"

data/README.md

@@ -21,13 +21,13 @@ Automated testing of Infrastructure as Code automation scripts (e.g., Chef).
 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
+apt-get -y install wget make bzip2 curl patch screen libgdbm-dev libyaml-dev libxml2-dev libxslt-dev libmysqlclient-dev libsqlite3-dev g++
 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 build cloud-toaster.gemspec
 gem install --no-ri --no-rdoc cloud-toaster-*version*.gem
 
 # (OR: install directly using rubygems.org: gem install cloud-toaster)

data/VERSION

@@ -1 +1 @@
-1.1.5
+1.1.6

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

@@ -1,14 +1,22 @@
 
 if platform_family?("debian")
 
-  node.set['mysql']['server_root_password'] = "root"
-  include_recipe "mysql::server"
-
   root_dir = File.join(File.dirname(__FILE__), "..","..","..","..")
+  $LOAD_PATH << File.join(root_dir, "lib")
+  require 'toaster/util/config'
+
+  cfg_db_pass = Toaster::Config.get("db.password")
+  cfg_db_pass = "root" if "#{cfg_db_pass}".empty?
+  node.set['mysql']['server_root_password'] = cfg_db_pass
+  include_recipe "mysql::server"
 
   bash 'db_create' do
     code <<-EOH
-    echo 'create database toaster;' | mysql -u root -p#{node['mysql']['server_root_password']}
+    db_pass=#{node['mysql']['server_root_password']}
+    ip_pattern=#{node["network"]["ip_pattern"].gsub('*','%')}
+    echo 'create database toaster;' | mysql -u root -p$db_pass
+    echo "GRANT ALL ON toaster.* TO 'root'@'$ip_pattern' IDENTIFIED BY '$db_pass';" | mysql -u root -p$db_pass
+    echo "FLUSH PRIVILEGES;" | mysql -u root -p$db_pass
     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"

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

@@ -156,8 +156,8 @@ ruby_block $last_toaster_resource_name do
         {
           "db_type" => db_type,
           db_type => node['toaster'][db_type],
-          "user_id" => node['user_id'],
-          "automation_uuid" => node['automation_uuid'],
+          "user_id" => node['toaster']['user_id'],
+          "automation_uuid" => node['toaster']['automation_uuid'],
           "cookbook_paths" => node['toaster']['cookbook_paths'],
           "skip_tasks" => node['toaster']['skip_tasks'],
           "repeat_tasks" => node['toaster']['repeat_tasks'],

data/cloud-toaster.gemspec

@@ -0,0 +1,94 @@
+require 'date'
+
+Gem::Specification.new do |s|
+  s.name = %q{cloud-toaster}
+  s.version = File.exist?('VERSION') ? File.read('VERSION').strip : ""
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = [	%q{Waldemar Hummer} ]
+  s.date = DateTime.now.strftime("%Y-%m-%d")
+  s.description = %q{A tool for automated testing and debugging of automation scripts (e.g., Chef).}
+  s.email = [%q{hummer@infosys.tuwien.ac.at}]
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "Rakefile",
+    "README.md",
+    "VERSION"
+  ]
+  s.files = Dir.glob("lib/**/*") + Dir.glob("bin/*") +
+		Dir.glob("bin/strace-4.8_patched/strace-x86_64") +
+		Dir.glob("bin/strace-4.8_patched/strace-i686") +
+		Dir.glob("chef/**/*") + Dir.glob("webapp/**/*") + 
+		Dir.glob("config.json") + Dir.glob("Gemfile") + 
+		Dir.glob("cloud-toaster.gemspec")
+
+  deps = {
+  	'bundler'		=> '~> 1.3',
+  	# RUBY ON RAILS DEPENDENCIES 
+	'rails'			=> '>= 0',		#, '4.0.2'
+	'sqlite3'		=> '>= 0',
+	'sass-rails'	=> '>= 0',		#, '~> 4.0.0'
+	'uglifier'		=> '>= 0',		#, '>= 1.3.0'
+	'coffee-rails'	=> '>= 0',		#, '~> 4.0.0'
+	'jquery-rails'	=> '>= 0',
+	'turbolinks'	=> '>= 0',
+	'jbuilder'		=> '>= 0',		#, '~> 1.2'
+	'devise'		=> '>= 0',
+	'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
+	'hashdiff'		=> '>= 0', 		# diff hashes
+	'json'			=> '>= 0',
+	'aquarium'		=> '>= 0',
+	'jsonpath'		=> '>= 0',
+	'open4'			=> '>= 0',		# open processes with stdin/stdout
+	'chef'			=> '>= 0',
+	'ohai'			=> '>= 0',
+	'rspec'			=> '>= 0',		# tests
+	'ruby_parser'	=> '>= 0',		# parse Ruby code
+	'bson'			=> '>= 0',
+	'bson_ext'		=> '>= 0',
+	'logger'		=> '>= 0',
+	'thor'			=> '>= 0',		# CLI generator
+	'tidy'			=> '>= 0',		# tidy XML library
+	'diffy'  		=> '>= 0',		# comparing source files
+	'mysql2'  		=> '>= 0',		# for DB access
+	'therubyracer'	=> '>= 0',		# required by execjs
+	'railties'		=> '>= 0',
+	'activesupport'	=> '>= 0',
+	'activerecord'	=> '>= 0'
+  }
+
+  #deps = File.read('Gemfile').scan(/^\s*gem\s*['"]([^'"]+)['"]/).uniq
+
+  deps.each do |dep,version|
+  	#dep = matched_dep[0]
+    #version = matched_dep[2]
+    #puts "#{dep} - #{version}"
+    if version && !version.empty?
+      #s.add_runtime_dependency dep, version
+      s.add_development_dependency dep, version
+    else
+      #s.add_runtime_dependency dep
+      s.add_development_dependency dep
+    end
+
+  end
+
+  # further project dependencies:
+  # * MySQL server
+  # * Squid proxy server	# License: GNU GPL v2.0
+  # * docker.io				# License: Apache v2.0
+  # * strace				# License: BSD
+
+
+  s.homepage = %q{https://github.com/whummer/toaster}
+  s.licenses = [%q{Apache v2.0}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.9}
+  s.summary = %q{Automated Testing/Debugging of Automation Scripts.}
+  s.executables << "toaster"
+
+end
+

data/config.json

@@ -19,10 +19,12 @@
 
 "testing": {
 	"timeservice_url" : "http://www.infosys.tuwien.ac.at/staff/hummer/tmp/time.php",
-	"test_hosts" : ["localhost"]
+	"test_hosts" : ["localhost"],
+	"max_threads" : 8
 },
 "db": {
 	"host": "localhost",
+	"host_from_container": "192.168.100.2",
 	"port": 3306,
 	"database": "toaster",
 	"username": "root",

data/lib/toaster/api.rb

@@ -182,14 +182,14 @@ module Toaster
       else
         puts "INFO: Running/continuing tests for test suite '#{test_suite_uuid}'"
         test_suite = test_suites[0]
-        test_suite.coverage_goal.idempotence = idem_N if idem_N
-        test_suite.coverage_goal.combinations[Toaster::CombinationCoverage::SKIP_N] = skip_N if skip_N
-        test_suite.coverage_goal.combinations[Toaster::CombinationCoverage::SKIP_N_SUCCESSIVE] = skip_N_succ if skip_N_succ
-        test_suite.coverage_goal.combinations[Toaster::CombinationCoverage::COMBINE_N] = combine_N if combine_N
-        test_suite.coverage_goal.combinations[Toaster::CombinationCoverage::COMBINE_N_SUCCESSIVE] = combine_N_succ if combine_N_succ
-        test_suite.save()
+#        test_suite.coverage_goal.idempotence = idem_N if idem_N
+#        test_suite.coverage_goal.combinations[Toaster::CombinationCoverage::SKIP_N] = skip_N if skip_N
+#        test_suite.coverage_goal.combinations[Toaster::CombinationCoverage::SKIP_N_SUCCESSIVE] = skip_N_succ if skip_N_succ
+#        test_suite.coverage_goal.combinations[Toaster::CombinationCoverage::COMBINE_N] = combine_N if combine_N
+#        test_suite.coverage_goal.combinations[Toaster::CombinationCoverage::COMBINE_N_SUCCESSIVE] = combine_N_succ if combine_N_succ
+#        test_suite.save()
         orch = Toaster::TestOrchestrator.new
-        orch.generate_tests_for_suite(test_suite)
+#        orch.generate_tests_for_suite(test_suite)
         if Config.get("testing.test_hosts").kind_of?(Array)
           Config.get("testing.test_hosts").each do |test_host|
             orch.add_host(test_host)
@@ -264,7 +264,7 @@ module Toaster
       require "toaster/toaster_app_service"
       ToasterAppService.start_service()
     end
-
+  
     # Clean spawned containers
     desc "clean", "Clean all spawned containers (prototypes will be preserved)."
     def clean()
@@ -272,15 +272,25 @@ module Toaster
       Toaster::LXC.clean()
     end
 
+    # Print version information
+    desc "version", "Print version of ToASTER."
+    def version()
+      file = File.join(File.dirname(__FILE__), "..", "..", "VERSION")
+      version = File.read(file)
+      puts version
+      return "#{version}".strip
+    end
+
     # Start web app
     desc "web", "Start the Web application. (params: --detached=false)"
-    #option :detached, :type => :boolean, :aliases => ["-d"]
+    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}\" && #{dir}/webapp/bin/rails server thin"
+      detached ||= options[:detached]
       if detached
-        Kernel::exec("screen -d -m #{cmd}")
+        Kernel::exec("screen -d -m bash -c '#{cmd}'")
       else
         Kernel::exec("#{cmd}")
       end
@@ -305,8 +315,7 @@ module Toaster
       test_case_uuids = test_case_uuid.split(/[ ;,]+/)
       test_cases = TestCase.find(:uuid => test_case_uuids[0]).to_a
       if !test_cases || test_cases.empty?
-        puts "ERROR: Invalid test case id(s) specified: '#{test_case_uuid}'"
-        puts "database: #{Toaster::Config.get("db.host")}"
+        puts "ERROR: Invalid test case id(s) specified: '#{test_case_uuid}' (DB host: #{Toaster::Config.get("db.host")})"
       else
         
         # set the start time of all test cases. This is important
@@ -328,15 +337,8 @@ module Toaster
           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]
-            runner = $test_runners[test_suite_uuid]
-            runner.schedule_tests(test_suite, test_case_uuids)
-          else
-            runner = TestRunner.new(test_suite, num_threads, true)
-            runner.schedule_tests(test_suite, test_case_uuids)
-            runner.start_worker_threads()
-            $test_runners[test_suite_uuid] = runner
-          end
+          runner = TestRunner.instance
+          runner.schedule_tests(test_suite, test_case_uuids)
         end
       end
     end
@@ -366,8 +368,9 @@ module Toaster
         EOF
         )
       end
-      puts "INFO: Running Chef scripts..."
       require "toaster/chef/chef_util"
+      Toaster::ChefUtil.create_chef_config(CHEF_TMP_SOLO_FILE)
+      puts "INFO: Running Chef scripts..."
       Toaster::ChefUtil.run_chef(CHEF_TMP_SOLO_FILE, CHEF_TMP_NODE_FILE, print_output)
     end
     def parse_recipes(arg)

data/lib/toaster/chef/chef_listener.rb

@@ -148,9 +148,9 @@ module Toaster
       # try to retrieve automation from DB, if it exists..
       if File.exist?(json_file)
         attribs = JSON.parse(File.read(json_file))
-        if attribs["automation_uuid"]
+        if attribs["toaster"] && attribs["toaster"]["automation_uuid"]
           autos = Toaster::Automation.find(
-            :uuid => attribs["automation_uuid"]).to_a
+            :uuid => attribs["toaster"]["automation_uuid"]).to_a
           if !autos.empty?
             run.automation = autos[0]
             return
@@ -432,7 +432,7 @@ module Toaster
                 end
               end
               task = get_task_from_sourcecode_line(resource, action, source_line_spec)
-              puts "get task #{resource} #{action} #{source_line_spec}: #{task}"
+              #puts "get task #{resource} #{action} #{source_line_spec}: #{task}"
             end
 
             # check if we execute within an "immediate notification"

data/lib/toaster/chef/chef_node_inspector.rb

@@ -110,7 +110,8 @@ module Toaster
     public
     
     # * chef_paths - Chef dirs on local filesystem
-    def initialize(chef_paths, processor = nil, &error_reporting)
+    def initialize(chef_paths = [ChefUtil.DEFAULT_OPSCODE_TMP_DIR,
+      ChefUtil.DEFAULT_COOKBOOKS_DIR], processor = nil, &error_reporting)
       @chef_paths = chef_paths
       @processor = processor
       raise "Invalid 'error_reporting'" if error_reporting.nil?
@@ -125,10 +126,11 @@ module Toaster
         return {}
       end
       
-      default_file = get_filename("cookbooks/" + cookbook_name + "/attributes/#{recipe_name}.rb")
+      file_name = cookbook_name + "/attributes/#{recipe_name}.rb"
+      default_file = get_filename(file_name)
 
       if default_file.nil?
-        @error_reporting.call(Logger::INFO, "Unknown default file #{("cookbooks/" + cookbook_name + "/attributes/#{recipe_name}.rb").inspect}")
+        @error_reporting.call(Logger::INFO, "Unknown attribute file '#{file_name.inspect}'")
         return {}
       end
       
@@ -156,7 +158,7 @@ module Toaster
       end
       
       # No such file
-      @@logger.info "File not found '#{filename}'"
+      @@logger.info "File not found '#{filename}' in paths #{@chef_paths}"
       return nil
     end
 

data/lib/toaster/chef/chef_util.rb

@@ -43,6 +43,17 @@ module Toaster
 
     @@DEFAULT_CHEF_DIR = "/tmp/toaster_cookbooks/"
     @@DEFAULT_COOKBOOKS_DIR = "#{@@DEFAULT_CHEF_DIR}/cookbooks/"
+    @@DEFAULT_OPSCODE_TMP_DIR = "/tmp/opscode_cookbooks/" # TODO merge with above?
+
+    def self.DEFAULT_CHEF_DIR
+      @@DEFAULT_CHEF_DIR
+    end
+    def self.DEFAULT_COOKBOOKS_DIR
+      @@DEFAULT_COOKBOOKS_DIR
+    end
+    def self.DEFAULT_OPSCODE_TMP_DIR
+      @@DEFAULT_OPSCODE_TMP_DIR
+    end
 
     def self.guess_cookbook_from_runlist(runlist)
       guess_cookbook_or_recipe_from_runlist(runlist, "cookbook")
@@ -322,7 +333,7 @@ module Toaster
 
       cookbooks_after = Dir.entries(target_dir)
       new_cb = cookbooks_after - cookbooks_before
-      puts "INFO: Downloaded and installed new cookbooks: #{new_cb}"
+      puts "INFO: Downloaded and installed new cookbooks: #{new_cb}" if !new_cb.empty?
 
       # download dependencies
       new_cb.each do |cb|
@@ -591,7 +602,7 @@ module Toaster
     end
 
     def self.available_recipes_from_opscode(cookbook_name, version="latest", 
-        overwrite_downloads=false, target_dir="/tmp/opscode_cookbooks/")
+        overwrite_downloads=false, target_dir=@@DEFAULT_OPSCODE_TMP_DIR)
       if target_dir
         FileUtils.mkpath(target_dir) if !File.directory?(target_dir)
         # check if cookbook folder already exists
@@ -699,6 +710,12 @@ module Toaster
       url = "#{OPSCODE_API_URL}cookbooks/#{cookbook_name}/"
       json = `curl '#{url}' 2> /dev/null`
       details = MarkupUtil.parse_json(json.strip)
+      if !details['latest_version']
+        if details['error_code']
+          raise "WARN: Unable to fetch cookbook metadata from #{url}: " +
+              "#{details['error_code']} - #{details['error_messages']}"
+        end
+      end
       latest_version = details['latest_version'].gsub(/.*\/([^\/]+)/, '\1')
       cbook['_latest_version'] = latest_version
       versions = []
@@ -747,7 +764,7 @@ module Toaster
       fetch_cookbook_details(cookbook_name)["_versions"].uniq
     end
 
-    def self.download_all_from_opscode(target_dir="/tmp/opscode_cookbooks/", overwrite_downloads=false)
+    def self.download_all_from_opscode(target_dir=@@DEFAULT_OPSCODE_TMP_DIR, overwrite_downloads=false)
       target_dir = "/tmp/opscode_cookbooks/" if !target_dir
       if overwrite_downloads || !File.exist?(target_dir)
         `mkdir -p "#{target_dir}"`
@@ -760,7 +777,8 @@ module Toaster
       end
     end
   
-    def self.parse_resources(cookbook, recipe_name, version="latest", result = {}, cookbook_dir="/tmp/opscode_cookbooks/")
+    def self.parse_resources(cookbook, recipe_name, version="latest", 
+        result = {}, cookbook_dir=@@DEFAULT_OPSCODE_TMP_DIR)
       recipe_file = "#{cookbook_dir}/#{cookbook}/recipes/#{recipe_name}.rb"
       attributes_file = "#{cookbook_dir}/#{cookbook}/attributes/#{recipe_name}.rb"
       recipe_file_relative = "#{cookbook}/recipes/#{recipe_name}.rb"
@@ -795,7 +813,7 @@ module Toaster
 
       File.open(recipe_file) do |io|
         io.each_with_index { |line,idx| 
-          #if line.match(/^\s*((#{resource_names.join(")|(")}))\s+.*((do)|(\{)).*$/)
+          idx += 1 # index is 0-based, line should be 1-based
           if line.match(/^(\s*[0-9a-zA-Z_]+\s*=\s*)?\s*((#{resource_names.join(")|(")}))((\s+)|($)|(\s*\())/)
             resource_lines << idx
           elsif line.match(/execute.*do/) && !line.match(/^\s*#/)
@@ -803,9 +821,9 @@ module Toaster
           end
         }
         resource_lines.each do |line|
-          code = read_sourcecode_from_line(recipe_file, line + 1)
+          code = read_sourcecode_from_line(recipe_file, line)
           if !code
-            puts "WARN: Could not parse code file #{recipe_file} : #{line + 1}"
+            puts "WARN: Could not parse code file #{recipe_file} : #{line}"
           else
             resource_obj = ResourceInspector.get_resource_from_source(code, attributes_source)
             result[cookbook][recipe_name]["resources"][line] = code
@@ -822,7 +840,7 @@ module Toaster
       return result
     end
 
-    def self.parse_all_resources(recipe_pattern="default.rb", cookbook_dir="/tmp/opscode_cookbooks/")
+    def self.parse_all_resources(recipe_pattern="default.rb", cookbook_dir=@@DEFAULT_OPSCODE_TMP_DIR)
       # cookbook_name -> recipe_file -> line_no -> resource_code
       result = {}
       scanned_files = 0