object-stream 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e70a5ef105176bf1d61a80ee9727899de4f703a
-  data.tar.gz: d7efa5256bd009b19d7cf28d33c784efc293b506
+  metadata.gz: 5dc85fe1bb49ec72198087e251a3d2f82236944b
+  data.tar.gz: d7b30be75c5360a6916b6d4d7108c4c20971532a
 SHA512:
-  metadata.gz: 1bc6cd6aafe8112f3a9dcef83d564b74a048bc7ac67dfb6bbe1abe4a08dccec68832faec1f002c95d35acbd5977a2f533a46eb2a667f8e2ea96946f663eb6ffe
-  data.tar.gz: 39701fd0ff324763827d156224014eb27893541f55d31611be1a29b048c688f0d582629fcffa4a57918aadac3e26eeb6585c75de474cb335db266d1d610b9b23
+  metadata.gz: 243bb0063699a7419ff4f21982351c212702e68181650886efd5f513f54d77d35d8656d54777a1c75b599983a60192d3411187bc05a3639ddeb52d0b8c8328a4
+  data.tar.gz: bbec7c970e8f0e0840185b52a8f051d9c12be78327b4b77aeb7fbd71a6bec16fac471cf9bff78ab84ccbad5991e443aa545abda637fe6948bce87e064884092b

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 2013, Joel VanderWerf, vjoel@users.sourceforge.net
+Copyright (c) 2013-2014, Joel VanderWerf, vjoel@users.sourceforge.net
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/Rakefile

@@ -1,12 +1,20 @@
 require 'rake'
 require 'rake/testtask'
 
+PRJ = "object-stream"
+
 def version
-  require 'object-stream'
-  @version ||= ObjectStream::VERSION
+  @version ||= begin
+    require 'object-stream'
+    v = ObjectStream::VERSION
+    warn "ObjectStream::VERSION not a string" unless v.kind_of? String
+    v
+  end
 end
 
-prj = "object-stream"
+def tag
+  @tag ||= "#{PRJ}-#{version}"
+end
 
 desc "Run tests"
 Rake::TestTask.new :test do |t|
@@ -15,27 +23,43 @@ Rake::TestTask.new :test do |t|
   t.test_files = FileList["test/**/*.rb"]
 end
 
-desc "commit, tag, and push repo; build and push gem"
-task :release do
+desc "Commit, tag, and push repo; build and push gem"
+task :release => "release:is_new_version" do
   require 'tempfile'
   
-  tag = "#{prj}-#{version}"
-
-  sh "gem build #{prj}.gemspec"
+  sh "gem build #{PRJ}.gemspec"
 
   file = Tempfile.new "template"
   begin
     file.puts "release #{version}"
     file.close
-    sh "git commit -a -v -t #{file.path}"
+    sh "git commit --allow-empty -a -v -t #{file.path}"
   ensure
     file.close unless file.closed?
     file.unlink
   end
 
-  sh "git tag #{prj}-#{version}"
+  sh "git tag #{tag}"
   sh "git push"
   sh "git push --tags"
   
-  sh "gem push #{prj}-#{version}.gem"
+  sh "gem push #{tag}.gem"
+end
+
+namespace :release do
+  desc "Diff to latest release"
+  task :diff do
+    latest = `git describe --abbrev=0 --tags --match '#{PRJ}-*'`.chomp
+    sh "git diff #{latest}"
+  end
+
+  desc "Log to latest release"
+  task :log do
+    latest = `git describe --abbrev=0 --tags --match '#{PRJ}-*'`.chomp
+    sh "git log #{latest}.."
+  end
+
+  task :is_new_version do
+    abort "#{tag} exists; update version!" unless `git tag -l #{tag}`.empty?
+  end
 end

data/lib/object-stream-wrapper.rb

@@ -63,6 +63,8 @@ class ObjectStreamWrapper
     else
       obj
     end
+  rescue => ex
+    raise StreamError, "cannot convert to expected class: #{obj.inspect}: #{ex}"
   end
   private :convert_to_expected
 

data/lib/object-stream.rb

@@ -10,7 +10,7 @@
 module ObjectStream
   include Enumerable
   
-  VERSION = "0.3"
+  VERSION = "0.4"
   
   # The IO through which the stream reads and writes serialized object data.
   attr_reader :io
@@ -33,6 +33,9 @@ module ObjectStream
   # Raised when maxbuf exceeded.
   class OverflowError < StandardError; end
 
+  # Raised when incoming data is unreadable.
+  class StreamError < StandardError; end
+
   @stream_class_map =
     Hash.new {|h,type| raise ArgumentError, "unknown type: #{type.inspect}"}
   @mutex = Mutex.new
@@ -80,13 +83,21 @@ module ObjectStream
   def read
     if block_given?
       read_from_inbox {|obj| yield obj}
-      read_from_stream {|obj| yield obj}
+      checked_read_from_stream {|obj| yield obj}
       return nil
     else
       read_one
     end
   end
 
+  def checked_read_from_stream
+    read_from_stream {|obj| yield obj}
+  rescue IOError, SystemCallError, OverflowError
+    raise
+  rescue => ex
+    raise StreamError, "unreadble stream: #{ex}"
+  end
+
   # Read one object from the stream, blocking if necessary. Returns the object.
   # Raises EOFError at the end of the stream.
   def read_one

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: object-stream
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Joel VanderWerf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-20 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Stream objects over IO using Marshal, JSON, YAML, or Msgpack.
@@ -46,27 +46,27 @@ extra_rdoc_files:
 - README.md
 - COPYING
 files:
-- README.md
 - COPYING
+- README.md
 - Rakefile
-- lib/object-stream-wrapper.rb
-- lib/object-stream.rb
 - bench/pipe-socket.rb
-- examples/read-without-block.rb
-- examples/socket.rb
-- examples/pipe.rb
-- examples/maxbuf.rb
-- examples/custom-class.rb
-- examples/udp.rb
 - examples/basic-usage.rb
+- examples/custom-class.rb
+- examples/maxbuf.rb
 - examples/outbox.rb
+- examples/pipe.rb
+- examples/read-without-block.rb
 - examples/slow-sender.rb
-- test/test-maxbuf.rb
-- test/test-outbox.rb
+- examples/socket.rb
+- examples/udp.rb
+- lib/object-stream-wrapper.rb
+- lib/object-stream.rb
 - test/test-basic.rb
 - test/test-consume.rb
-- test/test-inbox.rb
 - test/test-expect.rb
+- test/test-inbox.rb
+- test/test-maxbuf.rb
+- test/test-outbox.rb
 - test/test-slow-sender.rb
 homepage: https://github.com/vjoel/object-stream
 licenses:
@@ -74,37 +74,37 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --quiet
-- --line-numbers
-- --inline-source
-- --title
+- "--quiet"
+- "--line-numbers"
+- "--inline-source"
+- "--title"
 - object-stream
-- --main
+- "--main"
 - README.md
 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.0.4
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Stream objects over IO using Marshal, JSON, YAML, or Msgpack
 test_files:
-- test/test-maxbuf.rb
-- test/test-outbox.rb
 - test/test-basic.rb
+- test/test-outbox.rb
 - test/test-consume.rb
+- test/test-maxbuf.rb
 - test/test-inbox.rb
-- test/test-expect.rb
 - test/test-slow-sender.rb
+- test/test-expect.rb
 has_rdoc: