github-safegem 0.2.2 → 0.2.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 2
-:patch: 2
+:patch: 3

data/bin/safegem

@@ -21,109 +21,113 @@ end
 
 post '/' do
   puts "-> #{params.merge('data' => params[:data].size).inspect}"
-  r, w = IO.pipe
+  op = proc do
+    r, w = IO.pipe
 
-  pid = nil
-  begin
-    repo     = params[:repo]
-    data     = params[:data]
-    callback = params[:callback]
-    token    = params[:token]
-    tmpdir   = "tmp/#{repo}"
-    spec     = nil
+    pid = nil
+    begin
+      repo     = params[:repo]
+      data     = params[:data]
+      callback = params[:callback]
+      token    = params[:token]
+      tmpdir   = "tmp/#{repo}"
+      spec     = nil
 
-    Timeout::timeout(300) do
-      t = time { `git clone --depth 1 git://github.com/#{repo} #{tmpdir}` }
-      puts "-- cloned #{repo} in #{t}s"
+      Timeout::timeout(300) do
+        t = time { `git clone --depth 1 git://github.com/#{repo} #{tmpdir}` }
+        puts "-- cloned #{repo} in #{t}s"
 
-      t1 = Time.now
-      pid = fork do
-        begin
-          r.close
+        t1 = Time.now
+        pid = fork do
+          begin
+            r.close
 
-          require 'safegem/security'
-          require 'safegem/lazy_dir'
-          Dir.chdir(tmpdir) do
-            thread = Thread.new do
-              eval <<-EOE
-                BEGIN { # First in first out. Get this one exec'ed before the code below.
-                  Object.class_eval do
-                    remove_const :OrigDir rescue nil
-                    OrigDir = Dir
-                    remove_const :Dir
-                    Dir = LazyDir
-                  end
-                  $SAFE = 3
-                  OrigDir.set_safe_level
-                }
-                BEGIN { # This forces Ruby to ignore nested END {} blocks
-                  begin
-                    params = tmpdir = data = spec = repo = nil
-                    # Pass data out using TLS
-                    Thread.current[:spec] = (#{data})
-                  ensure
+            require 'safegem/security'
+            require 'safegem/lazy_dir'
+            Dir.chdir(tmpdir) do
+              thread = Thread.new do
+                eval <<-EOE
+                  BEGIN { # First in first out. Get this one exec'ed before the code below.
                     Object.class_eval do
+                      remove_const :OrigDir rescue nil
+                      OrigDir = Dir
                       remove_const :Dir
-                      Dir = OrigDir
+                      Dir = LazyDir
                     end
-                  end
-                }
-              EOE
-            end.join
-            Dir.set_safe_level
-            spec = thread[:spec]
-            spec.rubygems_version = Gem::RubyGemsVersion # make sure validation passes
-            spec.validate
-          end
+                    $SAFE = 3
+                    OrigDir.set_safe_level
+                  }
+                  BEGIN { # This forces Ruby to ignore nested END {} blocks
+                    begin
+                      params = tmpdir = data = spec = repo = nil
+                      # Pass data out using TLS
+                      Thread.current[:spec] = (#{data})
+                    ensure
+                      Object.class_eval do
+                        remove_const :Dir
+                        Dir = OrigDir
+                      end
+                    end
+                  }
+                EOE
+              end.join
+              Dir.set_safe_level
+              spec = thread[:spec]
+              spec.rubygems_version = Gem::RubyGemsVersion # make sure validation passes
+              spec.validate
+            end
 
-          payload = Base64.encode64(Zlib::Deflate.deflate(YAML.dump(spec)))
-          w.write payload
-          w.close
-        rescue Object
-          puts $!, $@
+            payload = Base64.encode64(Zlib::Deflate.deflate(YAML.dump(spec)))
+            w.write payload
+            w.close
+          rescue Object
+            puts $!, $@
 
-          w.write "ERROR: #$!"
-          w.close
+            w.write "ERROR: #$!"
+            w.close
+          end
         end
-      end
 
-      w.close
-      Process.wait(pid)
-      yaml = r.read
-      r.close
-      puts "-- converted to yaml in #{Time.now - t1}s"
+        w.close
+        Process.wait(pid)
+        yaml = r.read
+        r.close
+        puts "-- converted to yaml in #{Time.now - t1}s"
 
-      res = nil
-      t = time do
-        payload = {'token' => token, 'yaml' => yaml}
-        puts "<- [#{callback}] #{payload.merge('yaml' => payload['yaml'].size).inspect}"
-        res = Net::HTTP.post_form(URI.parse(callback), payload)
-      end
-      puts "-> #{res.body.inspect} in #{t}s"
+        res = nil
+        t = time do
+          payload = {'token' => token, 'yaml' => yaml}
+          puts "<- [#{callback}] #{payload.merge('yaml' => payload['yaml'].size).inspect}"
+          res = Net::HTTP.post_form(URI.parse(callback), payload)
+        end
+        puts "-> #{res.body.inspect} in #{t}s"
 
-      # uri = URI.parse(callback)
-      # http = Net::HTTP.new(uri.host)
-      # http.set_debug_output $stdout
-      # http.start do |http|
-      #   req = Net::HTTP::Post.new(uri.path)
-      #   payload = {'token' => token, 'yaml' => yaml}
-      #   req.set_form_data(payload)
-      #   res = http.request(req)
-      #   p res.value
-      # end
+        # uri = URI.parse(callback)
+        # http = Net::HTTP.new(uri.host)
+        # http.set_debug_output $stdout
+        # http.start do |http|
+        #   req = Net::HTTP::Post.new(uri.path)
+        #   payload = {'token' => token, 'yaml' => yaml}
+        #   req.set_form_data(payload)
+        #   res = http.request(req)
+        #   p res.value
+        # end
 
-      packet = {'result' => "Successfully converted #{repo} gemspec to YAML.", 'error' => nil}
+        packet = {'result' => "Successfully converted #{repo} gemspec to YAML.", 'error' => nil}
+        puts "<- #{packet.inspect}"
+        packet.to_json
+      end
+    rescue Exception => e
+      Process.kill(9, pid) rescue nil
+      packet = {'error' => e.to_hash}
       puts "<- #{packet.inspect}"
       packet.to_json
+    ensure
+      `rm -rf #{tmpdir}` if tmpdir
     end
-  rescue Exception => e
-    Process.kill(9, pid) rescue nil
-    packet = {'error' => e.to_hash}
-    puts "<- #{packet.inspect}"
-    packet.to_json
-  ensure
-    `rm -rf #{tmpdir}` if tmpdir
   end
+  EM.defer(op, proc { })
+  {'result' => 'Success', 'error' => nil}.to_json
 end
 
 if $0 != __FILE__

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: github-safegem
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - PJ Hyett