Skip to content

Commit d70a433

Browse files
committed
Dependency fixes. #RN
1 parent dc7da41 commit d70a433

7 files changed

+19
-30
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/.bundle/
22
.setup
3+
Gemfile.lock
34
/releases/

.travis.yml

+12-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,17 @@ rvm:
44
- 2.0
55
- 2.1
66
- 2.2
7+
sudo: required
78
before_install:
8-
- ruby --version
9+
- gem update --system
10+
- gem install bundler -v '~>1.11'
11+
- bundler --version
12+
install:
13+
- make
14+
- gem build mpcat.gemspec
15+
- gem install mpcat-*.gem
16+
- gem list -l mpcat
917
script:
10-
- make test
18+
- make test
19+
- cd
20+
- which -a mpcat

Gemfile.lock

-20
This file was deleted.

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ include Makefile.common
55

66
.PHONY: test
77
test:
8-
RUBYOPT=-w ./bin/mpcat tests/test1.mp
8+
RUBYOPT=-w $(BUNDLER) exec ./bin/mpcat tests/test1.mp

Makefile.common

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
# Ruby Common Big
3-
# 2015-12-15
3+
# 2015-12-21
44

55
MV = mv -nv
66
RM = rm -rf
@@ -35,7 +35,9 @@ update:
3535

3636
.PHONY: clean
3737
clean:
38+
$(RM) .bundle
3839
$(RM) .setup
40+
$(RM) Gemfile.lock
3941

4042
.PHONY: release
4143
release: | releases

bin/mpcat

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ raise 'Ruby >=1.9 required' unless RUBY_VERSION >= '1.9.0'
66
require 'optparse'
77
require 'yaml'
88
require 'pp'
9-
10-
require 'bundler/setup'
119
require 'msgpack'
1210

1311

mpcat.gemspec

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
Gem::Specification.new do |spec|
44
spec.name = 'mpcat'
5-
spec.version = '1.0.0'
6-
spec.date = '2015-12-18'
5+
spec.version = '1.0.1-dev'
6+
spec.date = '2015-12-21'
77
spec.author = 'Christian Mayer'
88
spec.email = '[email protected]'
99

@@ -17,7 +17,5 @@ Gem::Specification.new do |spec|
1717
spec.executables = ['mpcat']
1818
spec.required_ruby_version = '>=1.9.0'
1919

20-
spec.add_development_dependency 'bundler', '~>1.10'
21-
2220
spec.add_dependency 'msgpack', '~>0.7'
2321
end

0 commit comments

Comments
 (0)