Got travis working, fixed ruby 1.9.3 compatibility
This commit is contained in:
parent
df196aa346
commit
982665aafa
4 changed files with 32 additions and 17 deletions
38
.travis.yml
38
.travis.yml
|
|
@ -6,6 +6,30 @@ env:
|
||||||
- BINDINGS=none
|
- BINDINGS=none
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
|
- compiler: gcc
|
||||||
|
language: ruby
|
||||||
|
rvm: ruby-1.9.3-p484
|
||||||
|
env: BINDINGS=ruby
|
||||||
|
- compiler: clang
|
||||||
|
language: ruby
|
||||||
|
rvm: ruby-1.9.3-p484
|
||||||
|
env: BINDINGS=ruby CC=clang
|
||||||
|
- compiler: gcc
|
||||||
|
language: ruby
|
||||||
|
rvm: ruby-2.0.0-p353
|
||||||
|
env: BINDINGS=ruby
|
||||||
|
- compiler: clang
|
||||||
|
language: ruby
|
||||||
|
rvm: ruby-2.0.0-p353
|
||||||
|
env: BINDINGS=ruby CC=clang
|
||||||
|
- compiler: gcc
|
||||||
|
language: ruby
|
||||||
|
rvm: ruby-2.1.0
|
||||||
|
env: BINDINGS=ruby
|
||||||
|
- compiler: clang
|
||||||
|
language: ruby
|
||||||
|
rvm: ruby-2.1.0
|
||||||
|
env: BINDINGS=ruby CC=clang
|
||||||
- compiler: gcc
|
- compiler: gcc
|
||||||
language: python
|
language: python
|
||||||
python: "2.7"
|
python: "2.7"
|
||||||
|
|
@ -60,20 +84,6 @@ matrix:
|
||||||
- compiler: clang
|
- compiler: clang
|
||||||
language: dotnet
|
language: dotnet
|
||||||
env: BINDINGS=dotnet CC=clang
|
env: BINDINGS=dotnet CC=clang
|
||||||
- compiler: gcc
|
|
||||||
language: ruby
|
|
||||||
rvm:
|
|
||||||
- ruby-1.9.3-p484
|
|
||||||
- ruby-2.0.0-p353
|
|
||||||
- ruby-2.1.0
|
|
||||||
env: BINDINGS=ruby
|
|
||||||
- compiler: clang
|
|
||||||
language: ruby
|
|
||||||
rvm:
|
|
||||||
- ruby-1.9.3-p484
|
|
||||||
- ruby-2.0.0-p353
|
|
||||||
- ruby-2.1.0
|
|
||||||
env: BINDINGS=ruby CC=clang
|
|
||||||
before_install:
|
before_install:
|
||||||
- sudo apt-get update -qq
|
- sudo apt-get update -qq
|
||||||
- if [ "$BINDINGS" != "none" ]; then sudo apt-get install -qq swig; fi
|
- if [ "$BINDINGS" != "none" ]; then sudo apt-get install -qq swig; fi
|
||||||
|
|
|
||||||
|
|
@ -4,4 +4,5 @@ gemspec
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
gem 'minitest', '~> 5.2'
|
gem 'minitest', '~> 5.2'
|
||||||
|
gem 'rake', '>10'
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -9,11 +9,15 @@ rubysources = [
|
||||||
"hammer-parser.gemspec",
|
"hammer-parser.gemspec",
|
||||||
"Rakefile",
|
"Rakefile",
|
||||||
"Gemfile",
|
"Gemfile",
|
||||||
"Gemfile.lock",
|
|
||||||
"README.md",
|
"README.md",
|
||||||
]
|
]
|
||||||
|
|
||||||
rubyenv = env.Clone()
|
rubyenv = env.Clone()
|
||||||
|
|
||||||
|
for k,v in os.environ.items():
|
||||||
|
if "RUBY" in k or "GEM" in k or "rvm" in k:
|
||||||
|
rubyenv['ENV'][k] = v
|
||||||
|
|
||||||
rubyenv['ENV']['LD_LIBRARY_PATH'] = os.path.dirname(str(libhammer_shared[0]))
|
rubyenv['ENV']['LD_LIBRARY_PATH'] = os.path.dirname(str(libhammer_shared[0]))
|
||||||
rubyenv['RBDIR'] = os.path.dirname(str(rubyenv.File("Gemfile").path))
|
rubyenv['RBDIR'] = os.path.dirname(str(rubyenv.File("Gemfile").path))
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -113,8 +113,8 @@ module Hammer
|
||||||
|
|
||||||
def self.marshal_ch_arg(num)
|
def self.marshal_ch_arg(num)
|
||||||
if num.is_a?(String)
|
if num.is_a?(String)
|
||||||
raise ArgumentError, "Expecting either a fixnum in 0..255 or a single-byte String" unless num.bytes.length == 1
|
raise ArgumentError, "Expecting either a fixnum in 0..255 or a single-byte String" unless num.bytesize == 1
|
||||||
num = num.bytes[0]
|
num = num.bytes.first
|
||||||
end
|
end
|
||||||
raise ArgumentError, 'Expecting a Fixnum in 0..255 or a single-byte String' unless num.is_a?(Fixnum) and num.between?(0, 255)
|
raise ArgumentError, 'Expecting a Fixnum in 0..255 or a single-byte String' unless num.is_a?(Fixnum) and num.between?(0, 255)
|
||||||
return num
|
return num
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue