pcapr 0.0.3 → 0.0.4

data/lib/pcapr/pcapr.rb

@@ -2,6 +2,7 @@ require 'logger'
 require 'nokogiri'
 require 'patron'
 require 'digest'
+require 'timeout'
 
 require 'fileutils'
 
@@ -51,9 +52,12 @@ class Pcapr
   
   #获取该数据包文件
   def pcap_file(pcap_url, file)
+    # set cookie
     @driver.get(pcap_url)
-    #~ file = @driver.get_file("/view/download", "d:/ok.pcap", "Referer"=>@driver.base_url + pcap_url)
-    file = @driver.get_file("/view/download", file)
+    res = @driver.get("/view/download")
+    File.open(file,"wb") do |f|
+      f.write(res.body)
+    end
   end
   
   def run(dir)
@@ -67,10 +71,14 @@ class Pcapr
         file = File.join( proto_dir, File.basename(pcap_url).gsub(/\.html$/,"").tr("\\/:*?\"<>|"," ") )
         logger.info "  pcap file: #{file} save at '#{file}'"
         begin
-          pcap_file(pcap_url, file)
+          Timeout.timeout(60 * 60 * 2) do
+            pcap_file(pcap_url, file)
+          end
           logger.debug "  save ok"
         rescue =>e
-          logger.error " save fail: #{$!}"
+          logger.error "  save fail: #{$!}"
+        rescue Timeout::Error
+          logger.error "  save fail: timeout in 2 hours"
         end
       end
     end

data/lib/pcapr/version.rb

@@ -1,3 +1,3 @@
 class Pcapr
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/pcapr_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+require 'digest'
+
 describe Pcapr do
   before(:each) do
     user= "bocycn@gmail.com"
@@ -46,13 +48,14 @@ describe Pcapr do
     File.delete(file) if File.exist?(file)
     @o.pcap_file(pcap_url,file)
     File.should be_exist(file)
-    #~ File.size(file).should == File.size(base)
+    File.size(file).should == File.size(base)
+    Digest::MD5.hexdigest(File.read(file)).should == Digest::MD5.hexdigest(File.read(base))
     File.delete(file) if File.exist?(file)
   end
   
-  it "run try" do
-    @o.run( File.join($helper_dir,"me") )
-  end
+  #~ it "run try" do
+    #~ @o.run( File.join($helper_dir,"me") )
+  #~ end
   
   
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - yafei LI