webview 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71067f7cf653b0246423225eedfcf954ca345d14b3d180698cdea616d7f237ae
-  data.tar.gz: 135bed20ebfc2cbd0710d01a0198918c68d01bdf51b630dc5415ef651569647e
+  metadata.gz: 1358c823e6ab0054271f98c44f79c14b1044ac734c1236db84385068e806583e
+  data.tar.gz: 6168d576afdb5ed4dadf25e3570215d54558e6f460b403b07ba43b8b626b232e
 SHA512:
-  metadata.gz: 20da9dcdd1a136e08b493407fb4311b300a1fc167c3f32b1b936385c9459e1542953a8c7487e85e65158a097d2e7f962dadfd7a287e2d134889e0a1e611beedc
-  data.tar.gz: 906ae1b839bb19dc1421e7f5b9b66f77ad79232a3d291373c605a6b76e3ce05b60068a8c46f54e44940e8431f9680a07585501472bdb0e13c1e49a742be1e06e
+  metadata.gz: cbb2e2692d2d0783e56775a727236ba6112002b4543df5ca792f7059dff2370e46cb6936dfe247924aece81910c3039bffe092cb8caf40d4d85eab8bf437b498
+  data.tar.gz: effe7f13a840a1cd5cf0aa1a8a2d9344c421b527849ad7c36d9cc24c6f78d6e6b10e22675a392c118cdc42f062ae543879797807a2fb7c4721091011a1de5057

data/.travis.yml

@@ -13,10 +13,7 @@ before_install:
   - sudo apt-get update
   - sudo apt-get install libwebkit2gtk-4.0-dev -y
 
-  - cd ext
-  - ruby extconf.rb
-  - make && make install
-  - cd ..
+  - bin/build_ext
 
 script:
   - bundle exec rspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    webview (0.1.0)
+    webview (0.1.3)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -104,6 +104,11 @@ Some ways:
 
 When I finish my application, I will make a gem of the framework.
 
+
+## TODO
+
+Test golang code by golang
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/Rakefile

@@ -3,4 +3,7 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task :test do
+  system("cd ext && ruby extconf.rb && make clean && make && make install")
+  Rake::Task[:spec].invoke
+end

data/bin/build_ext

@@ -0,0 +1,10 @@
+#! /bin/bash
+
+set -ex
+
+cd ext
+ruby extconf.rb
+make clean
+make
+make install
+

data/ext/Makefile

@@ -10,5 +10,5 @@ install:
 	mv webview/webview ./webview_app
 
 clean:
-	rm webview_app
-	rm ext_package
+	rm -f webview_app
+	rm -f ext_package

data/lib/webview/app.rb

@@ -21,10 +21,7 @@ module Webview
 
     def open(url)
       return true if @app_process
-      cmd = [
-        File.expand_path('ext/webview_app', ROOT_PATH),
-        "-url '#{url}'"
-      ]
+      cmd = [executable, "-url '#{url}'"]
       @options.each do |k, v|
         case v
         when true, false then cmd << "-#{k}" if v
@@ -42,7 +39,10 @@ module Webview
       pid = app_process.pid
       signal('QUIT')
       begin
-        Timeout.timeout(3) { Process.wait(pid) }
+        Timeout.timeout(3) do
+          Process.wait(pid)
+        rescue Errno::ECHILD, Errno::ESRCH
+        end
       rescue Timeout::Error
         kill
       end
@@ -53,7 +53,7 @@ module Webview
     def join
       return unless app_process && app_process.alive?
       Process.wait(app_process.pid)
-    rescue Errno::ECHILD
+    rescue Errno::ECHILD, Errno::ESRCH
     end
 
     def kill
@@ -70,6 +70,10 @@ module Webview
 
     private
 
+    def executable
+      File.expand_path('ext/webview_app', ROOT_PATH)
+    end
+
     def exec_cmd(cmd)
       app_in, @app_out, @app_err, @app_process = Open3.popen3(cmd)
       app_in.close

data/lib/webview/version.rb

@@ -1,3 +1,3 @@
 module Webview
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webview
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - jiangzhi.xie
@@ -68,6 +68,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/build_ext
 - bin/console
 - bin/setup
 - ext/Makefile