cert_munger 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f3d57b7cab1e4d9a8e8e12854e7df697a67d4aa
-  data.tar.gz: 1b05487531aa24fe809d72b4042363702dc18a19
+  metadata.gz: cc7848d1decd68591525ba643fd8be3bb5979a86
+  data.tar.gz: b8a591e0183a08976a6ffde4f4875101ec60f3d7
 SHA512:
-  metadata.gz: bfeab5bd41b934d4838c42c6ecd83b3917eb3cb312eee4f1b689c95ae86474e8e92b5da0be7ec576e842453dc52e357ccabcd3c0273c6a79368c903edeb7a516
-  data.tar.gz: 8d2fa7bd0d5f54cab96cbae8d15bc546e23f09d4d573a7b750ddf2c35b58a69537ab2e3ad02bfe3e0dc52b3f11818c9daf5e2b8da3d404cfd3cef061d9e1aa70
+  metadata.gz: ba26f682f4dade354b79f8be9595e3564d981fcf7058e2eea70201f6947393f6dc221210784a72625cfc6ffee44d7a3104c3fdc4dece4ff4b1420f292f2083fd
+  data.tar.gz: 6766db9c810b9c6da996b4efb58a914f5ee20c123d91832fcafd5fdd77b266b8159d15b019f515d4c94583ee6657387daa00caae6a1c104b844214bc83f5a8f4

data/.travis.yml

@@ -3,9 +3,8 @@ cache: bundler
 
 rvm:
   - ruby-head
-  - jruby-head
-  - 2.1.2
-  - 2.1.1
+  - 2.2.3
+  - 2.1.6
   - 2.0.0
   - 1.9.3
 

data/README.md

@@ -1,6 +1,6 @@
 # CertMunger [![Gem Version](https://badge.fury.io/rb/cert_munger.png)](http://badge.fury.io/rb/cert_munger)
 
-[![Travis CI](https://travis-ci.org/stevenhaddox/cert_munger.svg?branch=master)](https://travis-ci.org/stevenhaddox/cert_munger) [![Dependency Status](https://gemnasium.com/stevenhaddox/cert_munger.png)](https://gemnasium.com/stevenhaddox/cert_munger) [![Coverage Status](https://coveralls.io/repos/stevenhaddox/cert_munger/badge.png)](https://coveralls.io/r/stevenhaddox/cert_munger) [![Code Climate](https://codeclimate.com/github/stevenhaddox/cert_munger/badges/gpa.svg)](https://codeclimate.com/github/stevenhaddox/cert_munger) [![Inline docs](http://inch-ci.org/github/stevenhaddox/cert_munger.svg?branch=master)](http://inch-ci.org/github/stevenhaddox/cert_munger)
+[![Travis CI](https://travis-ci.org/stevenhaddox/cert_munger.svg?branch=master)](https://travis-ci.org/stevenhaddox/cert_munger) [![Dependency Status](https://gemnasium.com/stevenhaddox/cert_munger.png)](https://gemnasium.com/stevenhaddox/cert_munger) [![Test Coverage](https://codeclimate.com/github/stevenhaddox/cert_munger/badges/coverage.svg)](https://codeclimate.com/github/stevenhaddox/cert_munger/coverage) [![Code Climate](https://codeclimate.com/github/stevenhaddox/cert_munger/badges/gpa.svg)](https://codeclimate.com/github/stevenhaddox/cert_munger) [![Inline docs](http://inch-ci.org/github/stevenhaddox/cert_munger.svg?branch=master)](http://inch-ci.org/github/stevenhaddox/cert_munger)
 
 A gem that takes string input for X509 certificates and attempts to reformat
 them into a valid certificate. This gem extends the core String class to add

data/Rakefile

@@ -1,10 +1,8 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
-require 'coveralls/rake/task'
-Coveralls::RakeTask.new
 
-task default: [:spec, :rubocop, 'coveralls:push']
+task default: [:spec, :rubocop]
 
 desc 'Run specs'
 RSpec::Core::RakeTask.new(:spec)

data/cert_munger.gemspec

@@ -23,13 +23,12 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'awesome_print', '~> 1.2'
   spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'coveralls', '~> 0.7'
+  spec.add_development_dependency 'codeclimate-test-reporter'
   spec.add_development_dependency 'rack', '~> 1.5'
   spec.add_development_dependency 'rack-test', '~> 0.6'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rubocop', '~> 0.27'
   spec.add_development_dependency 'rspec', '~> 3.1'
-  spec.add_development_dependency 'simplecov', '~> 0.9'
   spec.add_development_dependency 'yard', '~> 0.8'
 
   spec.cert_chain  = ['certs/stevenhaddox.pem']

data/lib/cert_munger/formatter.rb

@@ -63,12 +63,32 @@ module CertMunger
     # @param raw_cert [String] The string of text you wish to parse into a cert
     # @return [String] reformatted certificate body
     def one_line_contents(raw_cert)
-      cert_contents = raw_cert.split('\n')
-      cert_contents.pop
-      cert_contents.shift
+      # Detect if we have newlines, if not, split on spaces
+      if raw_cert.include?('\n')
+        cert_contents = raw_cert.split('\n')
+      else
+        cert_contents = parse_space_delimited_cert(raw_cert)
+      end
+      cert_contents.pop   # Remove -----BEGIN CERTIFICATE-----
+      cert_contents.shift # Remove -----END CERTIFICATE-----
+
       cert_contents.map! { |el| el.match('\W+[t|n|r](.*)')[1] }
     end
 
+    # Attempts to reformat one-line certificate bodies
+    #
+    # @param raw_cert [String] The string of text you wish to parse into a cert
+    # @return [Array] reformatted certificate content in Array format
+    def parse_space_delimited_cert(raw_cert)
+      cert_contents = raw_cert.split(' ')
+      # "-----BEGIN CERTIFICATE------" fix
+      cert_contents[0] += " #{cert_contents.delete_at(1)}"
+      # "-----END CERTIFICATE------" fix
+      cert_contents[-1] = "#{cert_contents[-2]} #{cert_contents.delete_at(-1)}"
+
+      cert_contents.map { |el| "\\t#{el}" } # Hack it to match expected syntax
+    end
+
     # Attempts to reformat multi-line certificate bodies
     #
     # @param raw_cert [String] The string of text you wish to parse into a cert

data/lib/cert_munger/version.rb

@@ -1,3 +1,3 @@
 module CertMunger
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/spec/certs/one_line_spaces.crt

@@ -0,0 +1 @@
+-----BEGIN CERTIFICATE----- MIIDQDCCAiigAwIBAgIBAjANBgkqhkiG9w0BAQsFADBCMRMwEQYKCZImiZPyLGQB GRYDb3JnMRkwFwYKCZImiZPyLGQBGRYJcnVieS1sYW5nMRAwDgYDVQQDDAdSdWJ5 IENBMB4XDTE0MTAyMTE0MTU0NFoXDTE1MTAyMTE0MTU0NFowUjETMBEGCgmSJomT 8ixkARkWA29yZzEZMBcGCgmSJomT8ixkARkWCXJ1YnktbGFuZzEgMB4GA1UEAwwX UnVieSBjZXJ0aWZpY2F0ZSByYmNlcnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw ggEKAoIBAQDA2Cb1QoNx7ghJv/q7yzAr89zyQbOr7wJN+X9/qfRTZi7o31JRrO21 4VFAQeLdf2InfH/yGcME/6dRm0Y9priOShPkRTrerxD8Xf7df/u/R2cUW6WcQUuB fFHp8f1FcYuwxsX2gFNpboukRfWSgIvkXG+BAl/HSUjPyjiEYYTk2nkjOUmFObA8 ip7xJ2n+ZyHl4SggvC+C8QmDQt3dBsZ3C2BovtJ6YQRMJjaEXGWl2fxJfgnJ94aq /M3TP5OUvnwDh8MJq4LuPNPc2PBAAvrQ0SFUaZxlxt9cWtnEGhT6jejBWrik8BNk YGrU9HIpYeg4a9i5GRDZ6s/xlZ4X+pjlAgMBAAGjMTAvMA4GA1UdDwEB/wQEAwIH gDAdBgNVHQ4EFgQUPGVKgxbUCl/OiPHnzeN3qR5BMe4wDQYJKoZIhvcNAQELBQAD ggEBAFnSbIvnYubRuEcGux5m1y2UlzSg/GyNDhnWsfPqQQ7FfolFTk6W8+xKuRSg foiuV2Od0n1nBMd9ePzoF5QabMHCK1Al2o/P7PkUPgmuAnWWdTLikNtt6H6v9WLe R9Ng37xv9jOVFOQjYCYvc94cJe1OBXW7ppkRY3kUQQbIrO7Imwi8gB8KT4qwu/Ld Xt53I/aFMQ0JSkqhJ4Bhff/Ol2RcDjEt4U6Hne6lRVB9qCAz0gE8MN4HagWOlS1U Nxd+cde+JIVBHuDz63gExGPCdLBRL/Mi3LORpZT41/ryw3JCqTir0dgPXsVTtJPr iMZ2EcsmShyBUKKj2AIok5gZzgM= -----END CERTIFICATE-----

data/spec/lib/cert_munger_spec.rb

@@ -15,6 +15,7 @@ describe CertMunger do
   let!(:certificate)          { OpenSSL::X509::Certificate.new(raw_cert) }
   let!(:malformed_cert)       { File.read("spec/certs/malformed.crt") }
   let!(:one_line_cert)        { File.read("spec/certs/one_line.crt") }
+  let!(:one_line_spaces_cert) { File.read("spec/certs/one_line_spaces.crt") }
   let!(:passenger_nginx_cert) { File.read("spec/certs/passenger.crt") }
 
   #
@@ -36,6 +37,11 @@ describe CertMunger do
       new_cert = subject.to_cert(one_line_cert)
       expect(new_cert.to_s).to eq(certificate.to_s)
     end
+
+    it "should parse a certificate with all content in one line, space delimited" do
+      new_cert = subject.to_cert(one_line_spaces_cert)
+      expect(new_cert.to_s).to eq(certificate.to_s)
+    end
   end
 
   describe "#to_cert" do

data/spec/spec_helper.rb

@@ -1,10 +1,5 @@
-require 'simplecov'
-require 'coveralls'
-SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-SimpleCov.start do
-  add_filter '/spec/'
-end
-# SimpleCov always comes before **anything** else
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
 
 require_relative '../lib/cert_munger'
 require 'awesome_print'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cert_munger
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Steven Haddox
@@ -30,7 +30,7 @@ cert_chain:
   42qdwEXvvkODZAD6KAIXPdmbMfBgPbcd+B/4eUA0PyKo+4dgL1NuqX4MPWToevIZ
   O8EKLF2X7NmC6FY1bOsSj/J8r1SOkx0rxgF+geRvY1P+hfNjDfxTsjU=
   -----END CERTIFICATE-----
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging
@@ -75,19 +75,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -158,20 +158,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -211,6 +197,7 @@ files:
 - spec/certs/create_spec_cert.rb
 - spec/certs/malformed.crt
 - spec/certs/one_line.crt
+- spec/certs/one_line_spaces.crt
 - spec/certs/passenger.crt
 - spec/certs/ruby_user.crt
 - spec/certs/ruby_user.pub
@@ -237,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Reformat commonly malformatted X509 strings.
@@ -245,6 +232,7 @@ test_files:
 - spec/certs/create_spec_cert.rb
 - spec/certs/malformed.crt
 - spec/certs/one_line.crt
+- spec/certs/one_line_spaces.crt
 - spec/certs/passenger.crt
 - spec/certs/ruby_user.crt
 - spec/certs/ruby_user.pub