pcapr 0.0.6 → 0.0.7

data/lib/pcapr/pcapr.rb

@@ -77,11 +77,10 @@ class Pcapr
     base_dir = dir
     login
     protos.each do |proto|
-      proto_dir = File.join(base_dir, proto.tr("\\/:*?\"<>|"," "))
-      FileUtils.mkdir_p(proto_dir) unless File.directory?(proto_dir)
+      proto_dir = proto2dir_and_create(base_dir, proto)
       logger.info "proto: #{proto}, downloading...(pcap save as: #{proto_dir}"
       pcap_urls(proto).each do |pcap_url|
-        file = File.join( proto_dir, File.basename(pcap_url).gsub(/\.html$/,"").tr("\\/:*?\"<>|"," ") )
+        file = pcap2file(proto_dir, pcap_url)
         logger.info "  pcap file: #{pcap_url} save at '#{file}'"
         begin
           pcap_file(pcap_url, file)
@@ -109,6 +108,14 @@ class Pcapr
     end
   end
   
+  def proto2dir_and_create(base_dir, proto)
+    #must use strip to cut because mkdir_p ignore the space at last
+    proto_dir = File.join(base_dir, proto.tr("\\/:*?\"<>|"," ")).strip
+    FileUtils.mkdir_p(proto_dir) unless File.directory?(proto_dir)
+    proto_dir
+  end
   
-  
+  def pcap2file(proto_dir, pcap_url)
+    File.join( proto_dir, File.basename(pcap_url).gsub(/\.html$/,"").tr("\\/:*?\"<>|"," ") )
+  end
 end

data/lib/pcapr/version.rb

@@ -1,3 +1,3 @@
 class Pcapr
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/pcapr_spec.rb

@@ -57,15 +57,15 @@ describe Pcapr do
     @o.pcap_urls("dns").should be_include("/view/siim/2011/11/3/7/capture.pcap.html")
   end
   
-  #~ it "should have pcap files more than 3000(excute slow)" do
-    #~ @o.login
-    #~ files = []
-    #~ @o.protos.each_with_index do |proto,i|
-      #~ @o.logger.info("proto: #{proto}, index=#{i}")
-      #~ files += @o.pcap_urls(proto)
-    #~ end
-    #~ files.should >= 3085
-  #~ end
+  it "should mkdir success when convert pcap url to dir name" do
+    ["gtp <ftp>", "gtp <ftp-data>", "gtp", "gtp icmp", "tacacs+", "wtp+wsp"].each do |proto|
+      dir = @o.send(:proto2dir_and_create, $helper_dir, proto)
+      File.should be_directory(dir)
+      file = @o.send(:pcap2file, dir, "http://www.pcapr.net/view/nos/2011/3/1/13/QoS_DL_40kbps.pcap.html")
+      lambda { File.open(file,"w"){} }.should_not raise_error
+      FileUtils.rm_rf(dir)
+    end
+  end
   
   it "file get it but timeout" do
     begin

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - yafei LI
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-14 00:00:00 +08:00
+date: 2012-03-15 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency