Skip to content

Commit c85716b

Browse files
authored
Merge pull request #27 from rvm/bugfix/fix-travis-gem-install
Fix travis gem installation
2 parents 0f45ee4 + bcbd4e0 commit c85716b

File tree

3 files changed

+27
-11
lines changed

3 files changed

+27
-11
lines changed

.travis.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
11
language: ruby
22
rvm:
3-
- 1.8.7
4-
- 1.9.2
5-
- 1.9.3
6-
- 2.0.0
73
- jruby-18mode
84
- jruby-19mode
95
- jruby-head
106
- ruby-head
117
- rbx-18mode
128
- rbx-19mode
9+
- 1.8.7
10+
- 1.9.2
11+
- 1.9.3
12+
- 2.0.0
13+
- 2.1
14+
- 2.2
15+
- 2.3
16+
- 2.4
17+
- 2.5
1318
before_install:
1419
- 'rm -rf $rvm_path/gems/*/{bin,gems}/rubygems-bundler-* $rvm_path/gems/*/{bin,gems}/executable-hooks-* $rvm_path/gems/*/bin/ruby_*_{wrapper,hooks}'
1520
- hash -r
16-
- 'curl -L https://get.smf.sh | sh'
17-
- 'export PATH=~/.sm/bin:$PATH'
18-
- 'sm ext install gem mpapis/sm_gem'
19-
install: gem install tf -v '>=0.4.1'
21+
- gem build executable-hooks.gemspec
22+
- gem install executable-hooks-$(awk -F'"' '/VERSION/{print $2}' < lib/executable-hooks/version.rb).gem --development
2023
before_script:
2124
- unset BUNDLE_GEMFILE
22-
script: tf --text test/tf/*
25+
script: tf --text test-tf/*
2326
notifications:
2427
irc:
2528
channels:

executable-hooks.gemspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,5 @@ gem regenerate_binstubs
2424
s.extensions = %w( ext/wrapper_installer/extconf.rb )
2525
s.executables = %w( executable-hooks-uninstaller )
2626

27-
s.add_development_dependency "tf"
28-
#s.add_development_dependency "smf-gem"
27+
s.add_development_dependency "tf", "~>0.4"
2928
end

test-tf/rubygems_comment_test.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
gem install executable-hooks-$(awk -F'"' '/VERSION/{print $2}' < lib/executable-hooks/version.rb).gem --development
2+
# match=/installed/
3+
4+
gem install haml # match=/installed/
5+
head -n 1 $(which haml) # match=/ruby_executable_hooks/
6+
which ruby_executable_hooks # status=0
7+
8+
gem list # match=/haml/
9+
executable-hooks-uninstaller # match=/haml/
10+
11+
head -n 1 $(which haml) # match!=/ruby_executable_hooks/
12+
which ruby_executable_hooks # status=1
13+
14+
gem uninstall -x haml # match=/Successfully uninstalled/

0 commit comments

Comments
 (0)