pedump 0.3.0 → 0.3.1

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gem "rest-client", "~> 1.6.7"
+gem "multipart-post", "~> 1.1.4"
 gem "progressbar", "~> 0.9.2"
 
 # Add dependencies to develop your gem here.

data/Gemfile.lock

@@ -7,12 +7,10 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    mime-types (1.16)
+    multipart-post (1.1.4)
     progressbar (0.9.2)
     rake (0.9.2.2)
     rcov (0.9.11)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
@@ -28,7 +26,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
+  multipart-post (~> 1.1.4)
   progressbar (~> 0.9.2)
   rcov
-  rest-client (~> 1.6.7)
   rspec (~> 2.3.0)

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/pedump/cli.rb

@@ -100,6 +100,8 @@ class PEdump::CLI
   end
 
   class ProgressProxy
+    attr_reader :pbar
+
     def initialize file
       @file = file
       @pbar = ProgressBar.new("[.] uploading", file.size, STDOUT)
@@ -126,7 +128,7 @@ class PEdump::CLI
 
     require 'digest/md5'
     require 'open-uri'
-    require 'rest-client'
+    require 'net/http/post/multipart'
     require 'progressbar'
 
     stdout_sync = STDOUT.sync
@@ -134,12 +136,12 @@ class PEdump::CLI
 
     md5 = Digest::MD5.file(f.path).hexdigest
     @pedump.logger.info "[.] md5: #{md5}"
-    url = "#{URL_BASE}/#{md5}/"
+    file_url = "#{URL_BASE}/#{md5}/"
 
     @pedump.logger.info "[.] checking if file already uploaded.."
     begin
-      if (r=open(url).read) == "OK"
-        @pedump.logger.warn "[.] file already uploaded: #{url}"
+      if (r=open(file_url).read) == "OK"
+        @pedump.logger.warn "[.] file already uploaded: #{file_url}"
         return
       else
         raise "invalid server response: #{r}"
@@ -149,9 +151,15 @@ class PEdump::CLI
     end
 
     f.rewind
-    if (r=RestClient.post(URL_BASE, :file => ProgressProxy.new(f))) != "OK"
-      raise "invalid server response: #{r}"
-    end
+
+    # upload with progressbar
+    post_url = URI.parse(URL_BASE+'/')
+    uio = UploadIO.new(f, "application/octet-stream", File.basename(f.path))
+    ppx = ProgressProxy.new(uio)
+    req = Net::HTTP::Post::Multipart.new post_url.path, "file" => ppx
+    res = Net::HTTP.start(post_url.host, post_url.port){ |http| http.request(req) }
+    ppx.pbar.finish
+
     puts
     puts "[.] analyzing..."
 
@@ -159,7 +167,7 @@ class PEdump::CLI
       raise "invalid server response: #{r}"
     end
 
-    puts "[.] uploaded: #{url}"
+    puts "[.] uploaded: #{file_url}"
   ensure
     STDOUT.sync = stdout_sync
   end

data/pedump.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "pedump"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrey \"Zed\" Zaikin"]
-  s.date = "2011-12-11"
+  s.date = "2011-12-12"
   s.description = "dump headers, sections, extract resources of win32 PE exe,dll,etc"
   s.email = "zed.0xff@gmail.com"
   s.executables = ["pedump"]
@@ -43,14 +43,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rest-client>, ["~> 1.6.7"])
+      s.add_runtime_dependency(%q<multipart-post>, ["~> 1.1.4"])
       s.add_runtime_dependency(%q<progressbar>, ["~> 0.9.2"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<rest-client>, ["~> 1.6.7"])
+      s.add_dependency(%q<multipart-post>, ["~> 1.1.4"])
       s.add_dependency(%q<progressbar>, ["~> 0.9.2"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -58,7 +58,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rest-client>, ["~> 1.6.7"])
+    s.add_dependency(%q<multipart-post>, ["~> 1.1.4"])
     s.add_dependency(%q<progressbar>, ["~> 0.9.2"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pedump
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-11 00:00:00.000000000Z
+date: 2011-12-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: &70185231241440 !ruby/object:Gem::Requirement
+  name: multipart-post
+  requirement: &70170796571980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70185231241440
+  version_requirements: *70170796571980
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &70185231240020 !ruby/object:Gem::Requirement
+  requirement: &70170796565140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70185231240020
+  version_requirements: *70170796565140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70185231238140 !ruby/object:Gem::Requirement
+  requirement: &70170796564100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *70185231238140
+  version_requirements: *70170796564100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70185231228680 !ruby/object:Gem::Requirement
+  requirement: &70170796562840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70185231228680
+  version_requirements: *70170796562840
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70185231227000 !ruby/object:Gem::Requirement
+  requirement: &70170796562220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70185231227000
+  version_requirements: *70170796562220
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70185231225760 !ruby/object:Gem::Requirement
+  requirement: &70170796561460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70185231225760
+  version_requirements: *70170796561460
 description: dump headers, sections, extract resources of win32 PE exe,dll,etc
 email: zed.0xff@gmail.com
 executables:
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2723794485104812379
+      hash: 1927825518031609740
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: