ruby_fs 0.3.0 → 0.3.1

data/.gitignore

@@ -8,6 +8,5 @@ pkg/*
 doc
 coverage
 spec/reports
-features/reports
 vendor
 *.swp

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # develop
 
+# 0.3.1
+  * Bugfix: Disconnect notices are successfully handled
+
 # 0.3.0
   * Feature/Change: Switch command methods from yielding the result asynchronously to returning it synchronously. Allows for better actor usage (async/futures)
 

data/lib/ruby_fs/stream.rb

@@ -161,6 +161,8 @@ module RubyFS
         command "auth #{@secret}" do
           command! "event json ALL" if @events
         end
+      when 'text/disconnect-notice'
+        terminate
       else
         raise "Unknown request type received (#{headers.inspect})"
       end

data/lib/ruby_fs/version.rb

@@ -1,3 +1,3 @@
 module RubyFS
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/ruby_fs.rb

@@ -1,8 +1,5 @@
 %w{
-  uuidtools
-  future-resource
   logger
-  countdownlatch
   celluloid/io
 }.each { |f| require f }
 

data/{ruby_ami.gemspec → ruby_fs.gemspec}

@@ -13,15 +13,12 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "ruby_fs"
 
-  s.files         = `git ls-files`.split("\n") << 'lib/ruby_fs/lexer.rb'
+  s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency %q<uuidtools>, [">= 0"]
   s.add_runtime_dependency %q<celluloid-io>, ["~> 0.11.0"]
-  s.add_runtime_dependency %q<future-resource>, [">= 0"]
-  s.add_runtime_dependency %q<countdownlatch>, ["~> 1.0"]
   s.add_runtime_dependency %q<json>
 
   s.add_development_dependency %q<bundler>, ["~> 1.0"]

data/spec/ruby_fs/stream_spec.rb

@@ -4,6 +4,10 @@ module RubyFS
   describe Stream do
     let(:server_port) { 50000 - rand(1000) }
 
+    def client
+      @client ||= mock('Client')
+    end
+
     before do
       def client.message_received(message)
         @messages ||= Queue.new
@@ -306,6 +310,17 @@ Reply-Text: +OK accepted
       end
     end
 
+    context 'when receiving a disconnect notice' do
+      it 'puts itself in the stopped state and fires a disconnected event' do
+        expect_connected_event
+        expect_disconnected_event
+        mocked_server(0, lambda { |server| server.send_data "Content-Type: text/disconnect-notice\n\n" }) do |val, server|
+          @stream.stopped?.should be false
+        end
+        @stream.alive?.should be false
+      end
+    end
+
     it 'puts itself in the stopped state and fires a disconnected event when unbound' do
       expect_connected_event
       expect_disconnected_event

data/spec/spec_helper.rb

@@ -13,7 +13,6 @@ end
 
 require 'ruby_fs'
 require 'mocha'
-require 'countdownlatch'
 
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 
@@ -23,9 +22,4 @@ RSpec.configure do |config|
   config.mock_with :mocha
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
-
-  config.before :each do
-    uuid = UUIDTools::UUID.random_create
-    UUIDTools::UUID.stubs :random_create => uuid
-  end
 end

data/spec/support/mock_server.rb

@@ -39,7 +39,3 @@ class ServerMock
     @clients.each { |client| client.write data }
   end
 end
-
-def client
-  @client ||= mock('Client')
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_fs
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-26 00:00:00.000000000 Z
+date: 2012-07-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: uuidtools
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
@@ -43,38 +27,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.11.0
-- !ruby/object:Gem::Dependency
-  name: future-resource
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: countdownlatch
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -274,7 +226,7 @@ files:
 - lib/ruby_fs/response.rb
 - lib/ruby_fs/stream.rb
 - lib/ruby_fs/version.rb
-- ruby_ami.gemspec
+- ruby_fs.gemspec
 - spec/ruby_fs/command_reply_spec.rb
 - spec/ruby_fs/event_spec.rb
 - spec/ruby_fs/response_spec.rb
@@ -295,7 +247,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1007735488205713228
+      hash: -2203910716731016508
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -304,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1007735488205713228
+      hash: -2203910716731016508
 requirements: []
 rubyforge_project: ruby_fs
 rubygems_version: 1.8.24