testbot 0.5.3 → 0.5.4
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/CHANGELOG +4 -0
- data/README.markdown +1 -1
- data/lib/shared/adapters/helpers/ruby_env.rb +4 -4
- data/lib/shared/testbot.rb +1 -1
- data/test/shared/adapters/helpers/test_ruby_env.rb +2 -2
- metadata +3 -3
data/CHANGELOG
CHANGED
data/README.markdown
CHANGED
@@ -61,7 +61,7 @@ Running tests:
|
|
61
61
|
|
62
62
|
Using testbot with Rails 2:
|
63
63
|
|
64
|
-
ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.5.
|
64
|
+
ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.5.4'
|
65
65
|
script/generate testbot --connect 192.168.0.100
|
66
66
|
|
67
67
|
rake testbot:spec (or :test, :features)
|
@@ -5,20 +5,20 @@ class RubyEnv
|
|
5
5
|
end
|
6
6
|
|
7
7
|
def self.ruby_command(project_path, opts = {})
|
8
|
-
|
8
|
+
ruby_interpreter = opts[:ruby_interpreter] || "ruby"
|
9
9
|
|
10
10
|
if File.exists?("#{project_path}/#{opts[:script]}")
|
11
11
|
command = opts[:script]
|
12
12
|
elsif opts[:bin]
|
13
13
|
command = opts[:bin]
|
14
14
|
else
|
15
|
-
command =
|
15
|
+
command = ruby_interpreter
|
16
16
|
end
|
17
17
|
|
18
18
|
if bundler?(project_path)
|
19
|
-
"#{
|
19
|
+
"#{ruby_interpreter} -S bundle exec #{command}"
|
20
20
|
else
|
21
|
-
"#{
|
21
|
+
"#{ruby_interpreter} -S #{command}"
|
22
22
|
end
|
23
23
|
end
|
24
24
|
|
data/lib/shared/testbot.rb
CHANGED
@@ -7,7 +7,7 @@ module Testbot
|
|
7
7
|
|
8
8
|
# Don't forget to update readme and changelog
|
9
9
|
def self.version
|
10
|
-
version = "0.5.
|
10
|
+
version = "0.5.4"
|
11
11
|
dev_version_file = File.join(File.dirname(__FILE__), '..', '..', 'DEV_VERSION')
|
12
12
|
if File.exists?(dev_version_file)
|
13
13
|
version += File.read(dev_version_file)
|
@@ -56,14 +56,14 @@ class RubyEnvTest < Test::Unit::TestCase
|
|
56
56
|
flexmock(RubyEnv).should_receive(:bundler?).and_return(false)
|
57
57
|
flexmock(File).should_receive(:exists?).and_return(true)
|
58
58
|
assert_equal 'jruby -S script/spec', RubyEnv.ruby_command("path/to/project", :script => "script/spec",
|
59
|
-
:bin => "rspec", :
|
59
|
+
:bin => "rspec", :ruby_interpreter => "jruby")
|
60
60
|
end
|
61
61
|
|
62
62
|
should "be able to use jruby with bundler" do
|
63
63
|
flexmock(RubyEnv).should_receive(:bundler?).and_return(true)
|
64
64
|
flexmock(File).should_receive(:exists?).and_return(true)
|
65
65
|
assert_equal 'jruby -S bundle exec script/spec', RubyEnv.ruby_command("path/to/project", :script => "script/spec",
|
66
|
-
:bin => "rspec", :
|
66
|
+
:bin => "rspec", :ruby_interpreter => "jruby")
|
67
67
|
end
|
68
68
|
|
69
69
|
should "use the interpeter when there is no binary specified" do
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: testbot
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 3
|
5
5
|
prerelease:
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 5
|
9
|
-
-
|
10
|
-
version: 0.5.
|
9
|
+
- 4
|
10
|
+
version: 0.5.4
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- "Joakim Kolsj\xC3\xB6"
|