diff options
author | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2014-11-22 11:38:57 +0900 |
---|---|---|
committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2014-11-22 11:38:57 +0900 |
commit | 4e53ed8045f89d95b9b09c5277a92bed86fdacb3 (patch) | |
tree | bb19044c2429038f86a2706630752aa674be6270 | |
parent | d0f098b797eee0abe740fbab310cdca9abe5252e (diff) | |
parent | ff8ecf91c2fdf412592147ec2df2fc605d8a5cb0 (diff) | |
download | ruby-openssl-4e53ed8045f89d95b9b09c5277a92bed86fdacb3.tar.gz |
Merge pull request #1 from zzak/master
Sync with fork
-rw-r--r-- | .travis.yml | 9 | ||||
-rw-r--r-- | README.md | 15 | ||||
-rw-r--r-- | lib/openssl/version.rb | 3 | ||||
-rw-r--r-- | lib/openssl/x509.rb | 2 | ||||
-rw-r--r-- | openssl.gemspec | 12 |
5 files changed, 29 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..a1188ec5 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,9 @@ +script: "bundle exec rake test" + +rvm: + - ruby-head + +matrix: + allow_failures: + - rvm: ruby-head + fast_finish: true @@ -1,6 +1,8 @@ # Openssl -TODO: Write a gem description +* [![Build Status](https://travis-ci.org/zzak/openssl.svg?branch=master)](https://travis-ci.org/zzak/openssl) + +OpenSSL provides SSL, TLS and general purpose cryptography. It wraps the OpenSSL library. ## Installation @@ -24,8 +26,17 @@ TODO: Write usage instructions here ## Contributing -1. Fork it ( https://github.com/[my-github-username]/openssl/fork ) +1. Fork it ( https://github.com/zzak/openssl/fork ) 2. Create your feature branch (`git checkout -b my-new-feature`) 3. Commit your changes (`git commit -am 'Add some feature'`) 4. Push to the branch (`git push origin my-new-feature`) 5. Create a new Pull Request + +## Updating from source + +``` +~/code/openssl => cp -R ~/src/ruby/ext/openssl/*.{c,h} ext/openssl/. +~/code/openssl => cp -R ~/src/ruby/ext/openssl/deprecation.rb ext/openssl/deprecation.rb +~/code/openssl => cp -R ~/src/ruby/ext/openssl/extconf.rb ext/openssl/extconf.rb +~/code/openssl => cp -R ~/src/ruby/ext/openssl/lib/* lib/. +``` diff --git a/lib/openssl/version.rb b/lib/openssl/version.rb deleted file mode 100644 index 7be26872..00000000 --- a/lib/openssl/version.rb +++ /dev/null @@ -1,3 +0,0 @@ -module OpenSSL - VERSION = "0.0.1" -end diff --git a/lib/openssl/x509.rb b/lib/openssl/x509.rb index 10a08894..38b65c71 100644 --- a/lib/openssl/x509.rb +++ b/lib/openssl/x509.rb @@ -70,7 +70,7 @@ module OpenSSL HexPair = /#{HexChar}#{HexChar}/ HexString = /#{HexPair}+/ Pair = /\\(?:[#{Special}]|\\|"|#{HexPair})/ - StringChar = /[^#{Special}\\"]/ + StringChar = /[^\\"#{Special}]/ QuoteChar = /[^\\"]/ AttributeType = /[a-zA-Z][0-9a-zA-Z]*|[0-9]+(?:\.[0-9]+)*/ AttributeValue = / diff --git a/openssl.gemspec b/openssl.gemspec index 042e2b25..55c3e57a 100644 --- a/openssl.gemspec +++ b/openssl.gemspec @@ -1,16 +1,16 @@ # coding: utf-8 lib = File.expand_path('../lib', __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) -require 'openssl/version' +require 'openssl' Gem::Specification.new do |spec| spec.name = "openssl" spec.version = OpenSSL::VERSION - spec.authors = ["SHIBATA Hiroshi"] - spec.email = ["hsbt@ruby-lang.org"] - spec.summary = %q{Write a short summary. Required.} - spec.description = %q{Write a longer description. Optional.} - spec.homepage = "" + spec.authors = ["Martin Bosslet", "SHIBATA Hiroshi", "Zachary Scott"] + spec.email = ["ruby-core@ruby-lang.org"] + spec.summary = %q{OpenSSL provides SSL, TLS and general purpose cryptography.} + spec.description = %q{It wraps the OpenSSL library.} + spec.homepage = "http://www.ruby-lang.org/" spec.files = `git ls-files -z`.split("\x0") spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) } |