gondola 1.1.9.pre2 → 1.1.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/gondola.gemspec +3 -3
- data/lib/gondola/tester.rb +3 -3
- data/lib/gondola/testrunner.rb +8 -6
- data/lib/gondola/version.rb +1 -1
- metadata +6 -6
data/gondola.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{gondola}
|
8
|
-
s.version = "1.1.9
|
8
|
+
s.version = "1.1.9"
|
9
9
|
|
10
|
-
s.required_rubygems_version = Gem::Requirement.new("
|
10
|
+
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Matthew Perry"]
|
12
|
-
s.date = %q{2011-03-
|
12
|
+
s.date = %q{2011-03-21}
|
13
13
|
s.default_executable = %q{gondola}
|
14
14
|
s.description = %q{
|
15
15
|
Gondola is Ruby command line utility and as well as a library which helps
|
data/lib/gondola/tester.rb
CHANGED
@@ -37,19 +37,19 @@ module Gondola
|
|
37
37
|
end
|
38
38
|
|
39
39
|
def assert_not(expr)
|
40
|
-
unless
|
40
|
+
unless verifyNot(expr)
|
41
41
|
raise "Assertion Failed"
|
42
42
|
end
|
43
43
|
end
|
44
44
|
|
45
45
|
def assert_equal(eq, expr)
|
46
|
-
unless
|
46
|
+
unless verify(eq, expr)
|
47
47
|
raise "Assertion Failed"
|
48
48
|
end
|
49
49
|
end
|
50
50
|
|
51
51
|
def assert_not_equal(eq, expr)
|
52
|
-
unless
|
52
|
+
unless verifyNot(eq, expr)
|
53
53
|
raise "Assertion Failed"
|
54
54
|
end
|
55
55
|
end
|
data/lib/gondola/testrunner.rb
CHANGED
@@ -83,11 +83,11 @@ module Gondola
|
|
83
83
|
|
84
84
|
# Function to read any config files which contain data for this
|
85
85
|
# test case or suite
|
86
|
-
def config_from_file(file, api=true)
|
86
|
+
def config_from_file(file, api=true, data=true)
|
87
87
|
# If the given test is just a file then start your search in
|
88
88
|
# its parent directory
|
89
89
|
unless File.directory? file
|
90
|
-
return config_from_file(File.
|
90
|
+
return config_from_file(File.dirname(file))
|
91
91
|
end
|
92
92
|
# Load any config files in the current directory only if
|
93
93
|
# a config hasn't already been found
|
@@ -99,15 +99,17 @@ module Gondola
|
|
99
99
|
api = false
|
100
100
|
end
|
101
101
|
end
|
102
|
-
if
|
103
|
-
|
104
|
-
|
102
|
+
if data
|
103
|
+
if File.exists? "config.yml"
|
104
|
+
conf.merge! YAML.load_file("config.yml")
|
105
|
+
data = false
|
106
|
+
end
|
105
107
|
end
|
106
108
|
end
|
107
109
|
# Recurse through the parent directories and merge the
|
108
110
|
# current configuration
|
109
111
|
unless file == File.dirname(file)
|
110
|
-
return config_from_file(File.
|
112
|
+
return config_from_file(File.dirname(file), api, data).merge(conf)
|
111
113
|
end
|
112
114
|
return conf
|
113
115
|
end
|
data/lib/gondola/version.rb
CHANGED
metadata
CHANGED
@@ -1,8 +1,8 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: gondola
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
prerelease:
|
5
|
-
version: 1.1.9
|
4
|
+
prerelease:
|
5
|
+
version: 1.1.9
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
8
8
|
- Matthew Perry
|
@@ -10,7 +10,7 @@ autorequire:
|
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
12
|
|
13
|
-
date: 2011-03-
|
13
|
+
date: 2011-03-21 00:00:00 -04:00
|
14
14
|
default_executable: gondola
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
@@ -111,16 +111,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
111
111
|
requirements:
|
112
112
|
- - ">="
|
113
113
|
- !ruby/object:Gem::Version
|
114
|
-
hash:
|
114
|
+
hash: 635731009
|
115
115
|
segments:
|
116
116
|
- 0
|
117
117
|
version: "0"
|
118
118
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
119
119
|
none: false
|
120
120
|
requirements:
|
121
|
-
- - "
|
121
|
+
- - ">="
|
122
122
|
- !ruby/object:Gem::Version
|
123
|
-
version:
|
123
|
+
version: "0"
|
124
124
|
requirements: []
|
125
125
|
|
126
126
|
rubyforge_project:
|