lightio 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 924070966457c426a62607d4273deb386f2717bd
-  data.tar.gz: e12903fe1825a6076d076e369a9a3e9c84d9281d
+  metadata.gz: d60e525147d0be04ceecef1b5d5707dbaeeba6d1
+  data.tar.gz: 69c611c348c2837484857e850834e6bc93fc6c44
 SHA512:
-  metadata.gz: e7e4b6081e60112ed2d077439b13a2a3786c6e76dd6366262597dc656192e78e6b36514035943813b684aa308cf92ade03129d68c6cdfca86b1a8b695987c716
-  data.tar.gz: 8bff2669c62c7b0ee425dc82ad2a32a0c64809b9caf3e4e29f2d30c46c142677102981fb73183a528f22b94259cbef2f5524128fa61f80ad6881371e4cc72c81
+  metadata.gz: a53025d4e89dcfab86d8c41af53b0a8ac078d86d9a220549a364638be22be4da133c303ce3e738a910b6a9844907a5c4ee506f27fa041728930770ea0ac1ea61
+  data.tar.gz: 60e88d7aed7cf946368cc1f2aa6786d644c00d30fa9f2c0855b5cb9fb1c41d4837e0e98b52beb85fbaa761af9c39beaa92dda8cfcbdea6afb584b0859bcc831f

data/.ruby-version

@@ -0,0 +1 @@
+2.5.0-dev

data/.travis.yml

@@ -16,5 +16,4 @@ matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-9.1.15.0
-    - rvm: 2.5.0
   fast_finish: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lightio (0.4.1)
+    lightio (0.4.2)
       nio4r (~> 2.2)
 
 GEM
@@ -96,4 +96,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.16.0
+   1.16.1

data/README.md

@@ -8,28 +8,63 @@
 
 LightIO provide green thread to ruby. Like Golang's goroutine, or Crystal's fiber. In LightIO it called beam. 
 
+Example:
+
+``` ruby
+require 'lightio'
+
+start = Time.now
+
+beams = 1000.times.map do
+  # LightIO::Beam is green-thread, use it instead Thread
+  LightIO::Beam.new do
+    # do some io operations in beam
+    LightIO.sleep(1)
+  end
+end
+
+beams.each(&:join)
+seconds = Time.now - start
+puts "1000 beams take #{seconds - 1} seconds to create"
+
+```
+
+
 LightIO ship ruby stdlib compatible library under `LightIO` or `LightIO::Library` namespace, 
 these libraries provide ability to schedule LightIO beams when IO operations occur.
 
-See [Examples](/examples) for detail.
 
 LightIO also provide a monkey patch, it replace ruby `Thread` with `LightIO::Thread`, and also replace `IO` related classes.
 
 Example:
 
 ``` ruby
+require 'lightio'
+# apply monkey patch at beginning
 LightIO::Monkey.patch_all!
-# now you can just write normal ruby code
+
+require 'net/http'
+
+host = 'github.com'
+port = 443
+
 start = Time.now
+
 10.times.map do
   Thread.new do
-    `sleep 1`
+    Net::HTTP.start(host, port, use_ssl: true) do |http|
+      res = http.request_get('/ping')
+      p res.code
+    end
   end
 end.each(&:join)
-puts Time.now - start
+
+puts "#{Time.now - start} seconds"
 
 ``` 
 
+See [Examples](/examples) for detail.
+
 ### You Should Know
 
 In fact ruby core team already plan to implement `Thread::Green` in core language, see https://bugs.ruby-lang.org/issues/13618

data/lib/lightio/library/io.rb

@@ -42,7 +42,7 @@ module LightIO::Library
               return outbuf
             end
           else
-            return length.nil? ? outbuf : nil
+            return outbuf.empty? && length ? nil : outbuf
           end
         end
       end

data/lib/lightio/module/base.rb

@@ -4,9 +4,15 @@ module LightIO::Module
       def find_library_class(klass)
         return LightIO::Library::Base.send(:nameless_classes)[klass] if klass.name.nil?
         name = klass.name
-        namespace_index = name.rindex("::")
-        class_name = namespace_index.nil? ? name : name[(namespace_index + 2)..-1]
-        LightIO::Library.const_get(class_name)
+        begin
+          LightIO::Library.const_get(name)
+        rescue NameError
+          # retry without namespace
+          namespace_index = name.rindex("::")
+          raise if namespace_index.nil?
+          class_name = name[(namespace_index + 2)..-1]
+          LightIO::Library.const_get(class_name)
+        end
       end
     end
 

data/lib/lightio/module/io.rb

@@ -12,10 +12,18 @@ module LightIO::Module
         unless io.respond_to?(:to_io)
           raise TypeError, "no implicit conversion of #{io.class} into IO"
         end
-        to_io = io.to_io
+        to_io = io.is_a?(LightIO::Library::IO) ? io : io.to_io
         unless to_io.is_a?(LightIO::Library::IO)
-          raise TypeError, "can't process raw IO, use LightIO::IO._wrap(obj) to wrap it" if to_io.is_a?(::IO)
-          raise TypeError, "can't convert #{io.class} to IO (#{io.class}#to_io gives #{to_io.class})"
+          raise TypeError, "can't convert #{io.class} to IO (#{io.class}#to_io gives #{to_io.class})" unless to_io.is_a?(::IO)
+
+          # try wrap raw io instead of raise error
+          wrapped_io = to_io.instance_variable_get(:@_lightio_wrapped_io)
+          unless wrapped_io
+            wrapped_io = LightIO::Library::IO._wrap(to_io)
+            to_io.instance_variable_set(:@_lightio_wrapped_io, wrapped_io)
+          end
+          to_io = wrapped_io
+          # raise TypeError, "can't process raw IO, use LightIO::IO._wrap(obj) to wrap it"
         end
         to_io
       end
@@ -51,10 +59,30 @@ module LightIO::Module
             r.close
           end
         end
-        # [r, w]
         [wrap_to_library(r), wrap_to_library(w)]
       end
 
+      def copy_stream(*args)
+        raise ArgumentError, "wrong number of arguments (given #{args.size}, expected 2..4)" unless (2..4).include?(args.size)
+        src, dst, copy_length, src_offset = args
+        src = src.respond_to?(:to_io) ? src.to_io : LightIO::Library::File.open(src, 'r') unless src.is_a?(IO)
+        dst = dst.respond_to?(:to_io) ? dst.to_io : LightIO::Library::File.open(dst, 'w') unless dst.is_a?(IO)
+        buf_size = 4096
+        copy_chars = 0
+        buf_size = [buf_size, copy_length].min if copy_length
+        src.seek(src_offset) if src_offset
+        while (buf = src.read(buf_size))
+          size = dst.write(buf)
+          copy_chars += size
+          if copy_length
+            copy_length -= size
+            break if copy_length.zero?
+            buf_size = [buf_size, copy_length].min
+          end
+        end
+        copy_chars
+      end
+
       def select(read_fds, write_fds=nil, _except_fds=nil, timeout=nil)
         timer = timeout && Time.now
         read_fds ||= []

data/lib/lightio/monkey.rb

@@ -10,6 +10,13 @@ module LightIO
 
     class << self
       def patch_all!
+        # Fix https://github.com/socketry/lightio/issues/7
+        begin
+          require 'ffi'
+        rescue LoadError
+          nil
+        end
+
         patch_thread!
         patch_io!
         patch_kernel!

data/lib/lightio/version.rb

@@ -1,3 +1,3 @@
 module LightIO
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lightio
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Jiang Jinyang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-10 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r
@@ -77,6 +77,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -152,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: LightIO is a ruby networking library, that combines ruby fiber and fast IO