uvrb 0.1.0 → 0.1.1

data/lib/uv/types/windows.rb

@@ -1,4 +1,16 @@
 module UV
+  typedef :uint32_t, :in_addr_t
+  typedef :uint16, :in_port_t
+  typedef :int, :mode_t
+
+  module WS2
+    extend FFI::Library
+    ffi_lib('Ws2_32.dll').first  # this is for ntohs
+    attach_function :ntohs, [:ushort], :ushort, :blocking => true
+  end
+  def_delegators :WS2, :ntohs
+  module_function :ntohs
+
   # win32 has a different uv_buf_t layout to everything else.
   class UvBuf < FFI::Struct
     layout :len, :ulong, :base, :pointer

data/lib/uv/version.rb

@@ -1,3 +1,3 @@
 module UV
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/uv/work.rb

@@ -0,0 +1,41 @@
+module UV
+  class Work
+    include Resource, Listener
+
+    def initialize(loop, work, callback = nil)
+      @loop, @work, @callback = loop, work, callback
+      @complete = false
+
+      @pointer = UV.create_request(:uv_work)
+      begin
+        check_result! UV.queue_work(@loop, @pointer, callback(:on_work), callback(:on_complete))
+      rescue StandardError => e
+        UV.free(@pointer)
+        @complete = true
+        raise e
+      end
+    end
+
+    def cancel
+      if not @complete
+        check_result! UV.cancel(@pointer)
+        @complete = true
+      end
+    end
+
+    def completed?
+      return @complete
+    end
+
+    private
+    def on_complete(req)
+      @complete = true
+      UV.free(req)
+      @callback.call unless @callback.nil?
+    end
+
+    def on_work(req)
+      @work.call
+    end
+  end
+end

data/spec/uv/loop_spec.rb

@@ -26,20 +26,12 @@ describe UV::Loop do
 
   describe "#run" do
     it "calls UV.run" do
-      UV.should_receive(:run).with(loop_pointer)
+      UV.should_receive(:run).with(loop_pointer, :UV_RUN_DEFAULT)
 
       subject.run
     end
   end
 
-  describe "#run_once" do
-    it "calls UV.run_once" do
-      UV.should_receive(:run_once).with(loop_pointer)
-
-      subject.run_once
-    end
-  end
-
   describe "#update_time" do
     it "calls UV.update_time" do
       UV.should_receive(:update_time).with(loop_pointer)
@@ -62,11 +54,10 @@ describe UV::Loop do
     let(:error) { double() }
 
     it "calls UV.last_error" do
-      UV.should_receive(:last_error).with(loop_pointer).and_return(error)
       UV.should_receive(:err_name).with(error).and_return("EINVAL")
       UV.should_receive(:strerror).with(error).and_return("invalid argument")
 
-      subject.last_error.should == UV::Error::EINVAL.new("invalid argument")
+      subject.lookup_error(error).should == UV::Error::EINVAL.new("invalid argument")
     end
   end
 

data/spec/uv/pipe_spec.rb

@@ -20,7 +20,11 @@ describe UV::Pipe do
   end
 
   describe "#bind" do
-    let(:name) { "/tmp/filename.ipc" }
+    let(:name) {
+      name = "/tmp/filename.ipc"
+      name = subject.send :windows_path, name if FFI::Platform.windows?
+      name
+    }
 
     it "calls UV.pipe_bind" do
       UV.should_receive(:pipe_bind).with(pointer, name)
@@ -30,7 +34,11 @@ describe UV::Pipe do
   end
 
   describe "#connect" do
-    let(:name) { "/tmp/filename.ipc" }
+    let(:name) {
+      name = "/tmp/filename.ipc"
+      name = subject.send :windows_path, name if FFI::Platform.windows?
+      name
+    }
     let(:connect_request) { double() }
 
     it "requires a block" do

data/uvrb.gemspec

@@ -11,18 +11,45 @@ Gem::Specification.new do |gem|
   gem.description   = "UV is Ruby OOP bindings for libuv"
 
   gem.requirements << 'libuv'
+  gem.extensions << "ext/Rakefile"
 
   gem.required_ruby_version = '>= 1.9.2'
+  gem.require_paths = ["lib"]
+
+  gem.add_runtime_dependency     'ffi', '~> 1.9'
+  gem.add_development_dependency 'rspec', '~> 2.14'
+  gem.add_development_dependency 'cucumber', '~> 1.3'
+  gem.add_development_dependency 'aruba', '~> 0.5'
+  gem.add_development_dependency 'rake', '~> 10.1'
+  gem.add_development_dependency 'rdoc', '~> 4.0'
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency     'ffi', '~> 1.0'
-  gem.add_development_dependency 'rspec', '~> 2.6'
-  gem.add_development_dependency 'cucumber', '~> 1.2'
-  gem.add_development_dependency 'aruba', '~> 0.4'
-  gem.add_development_dependency 'rake', '~> 0.9'
-  gem.add_development_dependency 'rdoc', '~> 3.1'
-end
+  relative_path = File.expand_path("../", __FILE__) + '/'
+  `git submodule --quiet foreach pwd`.split($\).each do |submodule_path|
+
+    if (ENV['OS'] == 'Windows_NT') && submodule_path[0] == '/'
+      # Detect if cygwin path is being used by git
+      submodule_path = submodule_path[1..-1]
+      submodule_path.insert(1, ':')
+    end
+
+    # for each submodule, change working directory to that submodule
+    Dir.chdir(submodule_path) do
+      # Make the submodule path relative
+      submodule_path = submodule_path.gsub(/#{relative_path}/i, '')
+ 
+      # issue git ls-files in submodule's directory
+      submodule_files = `git ls-files`.split($\)
+ 
+      # prepend the submodule path to create relative file paths
+      submodule_files_paths = submodule_files.map do |filename|
+        File.join(submodule_path, filename)
+      end
+ 
+      # add relative paths to gem.files
+      gem.files += submodule_files_paths
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uvrb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,12 +106,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 description: UV is Ruby OOP bindings for libuv
 email:
 - mallluhuct@gmail.com
 executables: []
-extensions: []
+extensions:
+- ext/Rakefile
 extra_rdoc_files: []
 files:
 - .gitignore
@@ -137,6 +138,7 @@ files:
 - examples/tcp_example_plain.rb
 - examples/tty_example.rb
 - ext/README.md
+- ext/Rakefile
 - features/async.feature
 - features/idle.feature
 - features/pipe.feature
@@ -175,6 +177,7 @@ files:
 - lib/uv/types/windows.rb
 - lib/uv/udp.rb
 - lib/uv/version.rb
+- lib/uv/work.rb
 - lib/uvrb.rb
 - spec/shared_examples/handle.rb
 - spec/shared_examples/stream.rb
@@ -214,11 +217,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2524694776609682679
+      hash: 1356397277929985480
 requirements:
 - libuv
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: libuv bindings for Ruby