From 33431579f8d6c6233d5f24d7a52bfa91467a77ed Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Tue, 28 Oct 2014 17:51:27 -0700 Subject: [PATCH 01/11] Update authors, add summary and description, email and website should use ruby-lang.org. --- openssl.gemspec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openssl.gemspec b/openssl.gemspec index 042e2b25f..5644f8039 100644 --- a/openssl.gemspec +++ b/openssl.gemspec @@ -6,11 +6,11 @@ require 'openssl/version' 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) } From 309dafd3db19b4c2713de1dfe8afc505a00451e0 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Tue, 28 Oct 2014 18:08:10 -0700 Subject: [PATCH 02/11] Add .travis.yml for testing ruby-head --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..a1188ec50 --- /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 From 21ede415fe9fb328024dddca3b584f6d2e760635 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Tue, 28 Oct 2014 20:42:56 -0700 Subject: [PATCH 03/11] Add Build Status to README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a8fb5b898..3d9299bdc 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Openssl +* [![Build Status](https://travis-ci.org/zzak/openssl)](https://travis-ci.org/zzak/openssl) + TODO: Write a gem description ## Installation From dee97a0b7802e61b58302d414754efb773e78bf4 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Tue, 28 Oct 2014 20:44:07 -0700 Subject: [PATCH 04/11] Start at 1.0.0 --- lib/openssl/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/openssl/version.rb b/lib/openssl/version.rb index 7be268725..a776ffe47 100644 --- a/lib/openssl/version.rb +++ b/lib/openssl/version.rb @@ -1,3 +1,3 @@ module OpenSSL - VERSION = "0.0.1" + VERSION = "1.0.0" end From b77d27df6e19765eb44d565274782e187c1c1886 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Tue, 28 Oct 2014 21:06:29 -0700 Subject: [PATCH 05/11] Add gem description to README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3d9299bdc..38b89d9aa 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ * [![Build Status](https://travis-ci.org/zzak/openssl)](https://travis-ci.org/zzak/openssl) -TODO: Write a gem description +OpenSSL provides SSL, TLS and general purpose cryptography. It wraps the OpenSSL library. ## Installation From 64d053d7eab0b5c9f87765c407db40fad7677e45 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Tue, 28 Oct 2014 21:06:40 -0700 Subject: [PATCH 06/11] Update fork it url --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 38b89d9aa..2c4fd6545 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ 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`) From dd9f14e0bd221342dcb0734443008a67da133def Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Tue, 28 Oct 2014 21:08:35 -0700 Subject: [PATCH 07/11] Fix build status image url --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2c4fd6545..3060b1ce4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Openssl -* [![Build Status](https://travis-ci.org/zzak/openssl)](https://travis-ci.org/zzak/openssl) +* [![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. From 0ab87a38abe23a3d0bb9d55ebbcd91e99737a4d8 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Fri, 21 Nov 2014 17:38:42 -0800 Subject: [PATCH 08/11] Sync with ruby trunk Commit ruby/ruby@c1bad6040865d08a8f391b7e2beca6a6b66355e7 --- lib/openssl/x509.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/openssl/x509.rb b/lib/openssl/x509.rb index 10a088944..38b65c71c 100644 --- a/lib/openssl/x509.rb +++ b/lib/openssl/x509.rb @@ -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 = / From 1c0bc5ab7e8bac6cf3b0c9b3bc5f9cd8d5496e74 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Fri, 21 Nov 2014 17:39:05 -0800 Subject: [PATCH 09/11] Add doc for syncing with src, this should be a rake task or something --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 3060b1ce4..152bc8248 100644 --- a/README.md +++ b/README.md @@ -31,3 +31,10 @@ TODO: Write usage instructions here 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/. From b3572270cf618abe82736c64bebeccc4917c5390 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Fri, 21 Nov 2014 17:44:06 -0800 Subject: [PATCH 10/11] Fixed-font width --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 152bc8248..47f7a5333 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,9 @@ TODO: Write usage instructions here ## 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/. +``` From ff8ecf91c2fdf412592147ec2df2fc605d8a5cb0 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Fri, 21 Nov 2014 18:00:15 -0800 Subject: [PATCH 11/11] OpenSSL::VERSION is already defined --- lib/openssl/version.rb | 3 --- openssl.gemspec | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 lib/openssl/version.rb diff --git a/lib/openssl/version.rb b/lib/openssl/version.rb deleted file mode 100644 index a776ffe47..000000000 --- a/lib/openssl/version.rb +++ /dev/null @@ -1,3 +0,0 @@ -module OpenSSL - VERSION = "1.0.0" -end diff --git a/openssl.gemspec b/openssl.gemspec index 5644f8039..55c3e57af 100644 --- a/openssl.gemspec +++ b/openssl.gemspec @@ -1,7 +1,7 @@ # 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"