Skip to content

Sync with fork #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Nov 22, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
script: "bundle exec rake test"

rvm:
- ruby-head

matrix:
allow_failures:
- rvm: ruby-head
fast_finish: true
15 changes: 13 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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/.
```
3 changes: 0 additions & 3 deletions lib/openssl/version.rb

This file was deleted.

2 changes: 1 addition & 1 deletion lib/openssl/x509.rb
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ module RFC2253DN
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 = /
Expand Down
12 changes: 6 additions & 6 deletions openssl.gemspec
Original file line number Diff line number Diff line change
@@ -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) }
Expand Down