hector 1.0.8 → 1.0.9

data/lib/hector/connection.rb

@@ -79,7 +79,13 @@ module Hector
   class SSLConnection < Connection
     def post_init
       log(:info, "opened SSL connection")
-      start_tls
+      start_tls(ssl_options)
     end
+
+    private
+      def ssl_options
+        { :cert_chain_file => Hector.ssl_certificate_path.to_s,
+          :private_key_file => Hector.ssl_certificate_key_path.to_s }
+      end
   end
 end

data/lib/hector/server.rb

@@ -1,6 +1,7 @@
 module Hector
   class << self
-    attr_accessor :server_name, :address, :port, :ssl_port
+    attr_accessor :server_name, :address, :port, :ssl_port, :ssl_certificate_path,
+      :ssl_certificate_key_path
 
     def start_server
       EventMachine.start_server(@address, @port, Connection)

data/lib/hector/version.rb

@@ -1,3 +1,3 @@
 module Hector
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

data/lib/hector/yaml_identity_adapter.rb

@@ -35,7 +35,9 @@ module Hector
     protected
       def load_identities
         ensure_file_exists
-        YAML.load_file(filename) || {}
+        File.open(filename, "r") do |io|
+          YAML.load(io) || {}
+        end
       end
 
       def store_identities(identities)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hector
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70191477589640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *70191477589640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.10
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70191477589160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +38,12 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *70191477589160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.9
 description: A private group chat server for people you trust. Implements a limited
   subset of the IRC protocol.
 email:
@@ -107,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.13
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Private group chat server