mind_meld 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1ac25de514d39eee769da86c1f0d789cabb7639
-  data.tar.gz: cdc4c4f0c76e580064315cdfbbeb7693017f07ca
+  metadata.gz: 965156ebbb57d0fbf56135e730dbaf5afd77e4a7
+  data.tar.gz: fc387114e2ead0065b6b9a17d637d91c45f77994
 SHA512:
-  metadata.gz: 6322833264086d34e0e87f42487938bce7dbdc226dd97648753bc7f6e7395fe0dbcb1f111c552096ebcb2194eb151e5c7fb06b5e0222cb3eb70a47246aaac158
-  data.tar.gz: 1d124d71efedbf8412d87fa1b17a32b0be4872ebf4b226be9455fcc7c7760184a81dfcf41de909afd8cbba0cf62f2cf8c47105b1443a114cd2db3842e025f46e
+  metadata.gz: ac135e252446ebedbedf5d3c0880a120508d7a492f11a91059c9e30cd0cd600df83616bde86c65c002199f33ab378acfa8a8cfe96921328e976f1bb4917a29fa
+  data.tar.gz: b1f6f0e9486b40a945988910487a7e626051efb538b9e7afa372b78283d9dd254cf4a00460cf6ebe6e3553ded2dd592169727f1273f6c7d998ea5af8a4ea30eb

data/lib/mind_meld.rb

@@ -9,11 +9,27 @@ class MindMeld
     if options[:url]
       uri = URI.parse(options[:url])
       @http = Net::HTTP.new(uri.host, uri.port)
-      if options.key?(:pem) and options[:pem]
-        pem = File.read(options[:pem])
+      
+      if options.key?(:cert) and options[:cert]
+        type = options[:cert].split('/').last.split('.').last == "p12" ? "p12" : "pem" 
+        if type == "pem" 
+          pem = File.read(options[:cert])
+          @http.cert = OpenSSL::X509::Certificate.new(pem)
+          @http.key = OpenSSL::PKey::RSA.new(pem)
+        elsif type == "p12" 
+          p12 = OpenSSL::PKCS12.new(File.binread(options[:cert]))
+          @http.cert = p12.certificate
+          @http.key = p12.key
+        end
         @http.use_ssl = true if uri.scheme == 'https'
+        @http.ca_file = options[:ca_file] if options.key?(:ca_file)
+        @http.verify_mode = options[:verify_mode] if options.key?(:verify_mode)
+      elsif options.key?(:pem) and options[:pem]
+        warn "['DEPRECATION'] Key [:pem] is deprecated in Mind Meld. Use [:cert] instead."
+        pem = File.read(options[:pem])
         @http.cert = OpenSSL::X509::Certificate.new(pem)
         @http.key = OpenSSL::PKey::RSA.new(pem)
+        @http.use_ssl = true if uri.scheme == 'https'
         @http.ca_file = options[:ca_file] if options.key?(:ca_file)
         @http.verify_mode = options[:verify_mode] if options.key?(:verify_mode)
       end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: mind_meld
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Joe Haig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.21'
 description: API for Hive Mind
@@ -61,11 +61,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- bin/mind_meld
-- lib/mind_meld.rb
 - lib/mind_meld/device.rb
 - lib/mind_meld/hive.rb
 - lib/mind_meld/tv.rb
+- lib/mind_meld.rb
+- bin/mind_meld
 homepage: https://github.org/bbc/mind_meld
 licenses:
 - MIT
@@ -76,17 +76,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: API for Hive Mind