ruby_fs 1.0.2 → 1.0.3

data/.gitignore

@@ -10,3 +10,4 @@ coverage
 spec/reports
 vendor
 *.swp
+tmp

data/.travis.yml

@@ -2,8 +2,8 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
-  - jruby-19mode
   - rbx-19mode
+  - jruby-19mode
   - ruby-head
 notifications:
   irc: "irc.freenode.org#adhearsion"

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # develop
 
+# 1.0.3
+  * Bugfix: JRuby compatability
+
 # 1.0.2
   * Bugfix: Interpret API responses correctly
 

data/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec', :version => 2, :cli => '--format documentation' do
+guard 'rspec', :cli => '--format documentation' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec/" }

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Ben Langfeld
+Copyright (c) 2012 Adhearsion Foundation Inc
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -35,4 +35,4 @@ end
 
 ## Copyright
 
-Copyright (c) 2012 Ben Langfeld. MIT licence (see LICENSE for details).
+Copyright (c) 2012 Adhearsion Foundation Inc. MIT licence (see LICENSE for details).

data/Rakefile

@@ -2,14 +2,12 @@ require 'bundler/gem_tasks'
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
-require 'ci/reporter/rake/rspec'
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rspec_opts = '--color'
 end
 
-task :default => [:spec]
-task :ci => ['ci:setup:rspec', :spec]
+task :default => :spec
 
 require 'yard'
 YARD::Rake::YardocTask.new

data/lib/ruby_fs/stream.rb

@@ -35,8 +35,8 @@ module RubyFS
       @socket = TCPSocket.from_ruby_socket ::TCPSocket.new(@host, @port)
       post_init
       loop { receive_data @socket.readpartial(4096) }
-    rescue EOFError, IOError, Errno::ECONNREFUSED
-      logger.info "Client socket closed!"
+    rescue EOFError, IOError, Errno::ECONNREFUSED => e
+      logger.info "Client socket closed due to (#{e.class}) #{e.message}!"
       terminate
     end
 
@@ -113,13 +113,12 @@ module RubyFS
 
     #
     # Shutdown the stream and disconnect from the socket
-    def shutdown
-      @socket.close if @socket
-    end
+    alias :shutdown :terminate
 
     # @private
     def finalize
       logger.debug "Finalizing stream"
+      @socket.close if @socket
       @state = :stopped
       fire_event Disconnected.new
     end

data/lib/ruby_fs/version.rb

@@ -1,3 +1,3 @@
 module RubyFS
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/ruby_fs.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = RubyFS::VERSION
   s.authors     = ["Ben Langfeld"]
   s.email       = ["ben@langfeld.me"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/adhearsion/ruby_fs"
   s.summary     = %q{Wrapping FreeSWITCH EventSocket for rubyists}
   s.description = %q{A Ruby client library for the FreeSWITCH EventSocket API built on Celluloid.}
 
@@ -23,12 +23,8 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency %q<bundler>, ["~> 1.0"]
   s.add_development_dependency %q<rspec>, [">= 2.5.0"]
-  s.add_development_dependency %q<ci_reporter>, [">= 1.6.3"]
-  s.add_development_dependency %q<yard>, ["~> 0.6.0"]
+  s.add_development_dependency %q<yard>, ["~> 0.6"]
   s.add_development_dependency %q<rake>, [">= 0"]
-  s.add_development_dependency %q<mocha>, [">= 0"]
-  s.add_development_dependency %q<simplecov>, [">= 0"]
-  s.add_development_dependency %q<simplecov-rcov>, [">= 0"]
   s.add_development_dependency %q<guard-rspec>
-  s.add_development_dependency %q<ruby_gntp>
+  s.add_development_dependency %q<rb-fsevent>, ['~> 0.9']
 end

data/spec/ruby_fs/stream_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'timeout'
 
 module RubyFS
   describe Stream do
@@ -30,22 +31,24 @@ module RubyFS
 
     def mocked_server(times = nil, fake_client = nil, &block)
       mock_target = MockServer.new
-      mock_target.expects(:receive_data).send(*(times ? [:times, times] : [:at_least, 1])).with &block
+      mock_target.should_receive(:receive_data).send(*(times ? [:exactly, times] : [:at_least, 1])).with &block
       s = ServerMock.new '127.0.0.1', server_port, mock_target
       @stream = Stream.new '127.0.0.1', server_port, secret, lambda { |m| client.message_received m }, events
       @stream.run!
       sleep 0.1
       fake_client.call s if fake_client.respond_to? :call
       Celluloid::Actor.join s
-      Celluloid::Actor.join @stream
+      Timeout.timeout 5 do
+        Celluloid::Actor.join @stream
+      end
     end
 
     def expect_connected_event
-      client.expects(:message_received).with Stream::Connected.new
+      client.should_receive(:message_received).with Stream::Connected.new
     end
 
     def expect_disconnected_event
-      client.expects(:message_received).with Stream::Disconnected.new
+      client.should_receive(:message_received).with Stream::Disconnected.new
     end
 
     before { @sequence = 1 }

data/spec/spec_helper.rb

@@ -1,25 +1,9 @@
-require 'simplecov'
-require 'simplecov-rcov'
-class SimpleCov::Formatter::MergedFormatter
-  def format(result)
-     SimpleCov::Formatter::HTMLFormatter.new.format(result)
-     SimpleCov::Formatter::RcovFormatter.new.format(result)
-  end
-end
-SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
-SimpleCov.start do
-  add_filter "/vendor/"
-end
-
 require 'ruby_fs'
-require 'mocha'
 
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 
-include RubyFS
-
 RSpec.configure do |config|
-  config.mock_with :mocha
+  config.mock_with :rspec
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_fs
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2012-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
@@ -75,22 +75,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.5.0
-- !ruby/object:Gem::Dependency
-  name: ci_reporter
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.3
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -123,54 +107,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov-rcov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -188,21 +124,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby_gntp
+  name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 description: A Ruby client library for the FreeSWITCH EventSocket API built on Celluloid.
 email:
 - ben@langfeld.me
@@ -233,7 +169,7 @@ files:
 - spec/ruby_fs/stream_spec.rb
 - spec/spec_helper.rb
 - spec/support/mock_server.rb
-homepage: ''
+homepage: https://github.com/adhearsion/ruby_fs
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -247,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3964546558106237063
+      hash: 402976620045827430
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -256,10 +192,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3964546558106237063
+      hash: 402976620045827430
 requirements: []
 rubyforge_project: ruby_fs
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Wrapping FreeSWITCH EventSocket for rubyists
@@ -270,3 +206,4 @@ test_files:
 - spec/ruby_fs/stream_spec.rb
 - spec/spec_helper.rb
 - spec/support/mock_server.rb
+has_rdoc: