gondola 1.1.9.pre1 → 1.1.9.pre2

data/gondola.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gondola}
-  s.version = "1.1.9.pre1"
+  s.version = "1.1.9.pre2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew Perry"]

data/lib/gondola/tester.rb

@@ -37,19 +37,19 @@ module Gondola
     end
 
     def assert_not(expr)
-      unless verifyNot(expr)
+      unless verify_not(expr)
         raise "Assertion Failed"
       end
     end
 
     def assert_equal(eq, expr)
-      unless verify(eq, expr)
+      unless verify_equal(eq, expr)
         raise "Assertion Failed"
       end
     end
 
     def assert_not_equal(eq, expr)
-      unless verifyNot(eq, expr)
+      unless verify_not_equal(eq, expr)
         raise "Assertion Failed"
       end
     end

data/lib/gondola/testrunner.rb

@@ -83,7 +83,7 @@ module Gondola
 
     # Function to read any config files which contain data for this
     # test case or suite
-    def config_from_file(file, api=true, data=true)
+    def config_from_file(file, api=true)
       # If the given test is just a file then start your search in
       # its parent directory
       unless File.directory? file
@@ -99,17 +99,15 @@ module Gondola
             api = false
           end
         end
-        if data
-          if File.exists? "config.yml"
-            conf.merge! YAML.load_file("config.yml")
-            data = false
-          end
+        if File.exists? "config.yml"
+          conf.merge! YAML.load_file("config.yml")
+          data = false
         end
       end
       # Recurse through the parent directories and merge the
       # current configuration
       unless file == File.dirname(file)
-        return config_from_file(File.expand_path(File.dirname(file)), api, data).merge(conf)
+        return config_from_file(File.expand_path(File.dirname(file)), api).merge(conf)
       end
       return conf
     end

data/lib/gondola/version.rb

@@ -1,3 +1,3 @@
 module Gondola
-    VERSION = "1.1.9.pre1"
+    VERSION = "1.1.9.pre2"
 end

metadata

@@ -2,7 +2,7 @@
 name: gondola
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.1.9.pre1
+  version: 1.1.9.pre2
 platform: ruby
 authors: 
 - Matthew Perry
@@ -111,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 636356211
+      hash: 684839645
       segments: 
       - 0
       version: "0"