Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'release/1.1.1'

  • Loading branch information...
commit c24f51998dffae47c2ccdbdd0c574438f2c4c25c 2 parents cc6c6db + 7b29bd7
@benlangfeld benlangfeld authored
View
8 .travis.yml
@@ -1,10 +1,14 @@
language: ruby
rvm:
- - 1.9.2
- 1.9.3
- 2.0.0
- - rbx-19mode
+ - 2.1.0
- jruby-19mode
+ - rbx-2.1.1
- ruby-head
+matrix:
+ allow_failures:
+ - rvm: rbx-2.1.1
+ - rvm: ruby-head
notifications:
irc: "irc.freenode.org#adhearsion"
View
3  CHANGELOG.md
@@ -1,5 +1,8 @@
# develop
+# 1.1.1
+ * CS: Remove explicit dependency on json, since we only support Ruby > 1.9 and JSON support is bundled.
+
# 1.1.0
* Feature: Allow specifying an event mask (other than 'ALL') when connecting
* CS: Minor performance improvements from removing repeated regex compilation
View
5 README.md
@@ -14,9 +14,8 @@ stream = RubyFS::Stream.new '127.0.0.1', 8021, 'ClueCon', lambda { |e| p e }
stream.run
-stream.api 'originate sofia/mydomain.com/ext@yourvsp.com 1000' do |response|
- puts "Originate response was #{response.inspect}"
-end
+response = stream.api 'originate sofia/mydomain.com/ext@yourvsp.com 1000'
+puts "Originate response was #{response.inspect}"
```
## Links
View
2  lib/ruby_fs.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
%w{
logger
celluloid/io
View
2  lib/ruby_fs/command_reply.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
require 'ruby_fs/response'
module RubyFS
View
2  lib/ruby_fs/event.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
require 'ruby_fs/response'
module RubyFS
View
2  lib/ruby_fs/lexer.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
module RubyFS
class Lexer
ContentLengthPattern = /Content-length:\s*(\d+)/i
View
2  lib/ruby_fs/response.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
module RubyFS
class Response
attr_reader :headers, :content
View
4 lib/ruby_fs/stream.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
require 'json'
require 'ruby_fs/lexer'
@@ -39,7 +41,7 @@ def run
loop { receive_data @socket.readpartial(4096) }
rescue EOFError, IOError, Errno::ECONNREFUSED => e
logger.info "Client socket closed due to (#{e.class}) #{e.message}!"
- terminate
+ async.terminate
end
#
View
4 lib/ruby_fs/version.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
module RubyFS
- VERSION = "1.1.0"
+ VERSION = "1.1.1"
end
View
1  ruby_fs.gemspec
@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
s.require_paths = ["lib"]
s.add_runtime_dependency %q<celluloid-io>, ["~> 0.13"]
- s.add_runtime_dependency %q<json>
s.add_development_dependency %q<bundler>, ["~> 1.0"]
s.add_development_dependency %q<rspec>, ["~> 2.5"]
View
2  spec/ruby_fs/command_reply_spec.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
require 'spec_helper'
module RubyFS
View
2  spec/ruby_fs/event_spec.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
require 'spec_helper'
module RubyFS
View
2  spec/ruby_fs/response_spec.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
require 'spec_helper'
module RubyFS
View
2  spec/ruby_fs/stream_spec.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
require 'spec_helper'
require 'timeout'
View
2  spec/spec_helper.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
require 'ruby_fs'
Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
View
2  spec/support/mock_server.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
MockServer = Class.new
class ServerMock
Please sign in to comment.
Something went wrong with that request. Please try again.