vpsmatrix 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afded7fd885dfdc8278a33fc8de70910cc7d03ee
-  data.tar.gz: 380d795e363890d61db609b159e8c92074703321
+  metadata.gz: 72c161a134c74fe3af5b21abcfcde1975f95e017
+  data.tar.gz: d41715644f3009c2c67b1e9a808f49bf9dd32ab1
 SHA512:
-  metadata.gz: b92a221065b57ba25103400c4c3e70f51fcccf25f8ad03a665aee278a9e813d196a7f544f923ed331d05f698f5ea42a00ad01dfbc9af50860fb0406d4470ffd8
-  data.tar.gz: d0ee500900f8a37dff48ae8c44abb49ba8b922242673b43427de89285972c837bd3bc5628a291e681d9854762f933a086e12b001d2c5d8b4250e65ab084127c7
+  metadata.gz: 5d83c10ad596f91a2af58b9ad9af19c2954d6ba403955bf3455dbdca429b12f9d4a4ecacbefe6c75f645c26796a1b22d1415cb0ffdd8ef95fbfa3b2a2ae6dd9b
+  data.tar.gz: cc07abe804ff98f2a43ab1694a557984cd009433e29750c066a03b7763c2fac2139e5e2aa063afa99e8199059e18231ad9f2992db57e12cc2d566ab82f83ca5c

data/lib/vpsmatrix/starter.rb

@@ -1,6 +1,7 @@
 require 'digest'
 require 'net/http'
 require 'uri'
+require 'securerandom'
 require_relative 'config'
 
 class Starter
@@ -53,9 +54,9 @@ class Starter
       Config.new.write 'api_key', api_key
     end
 
-    register_email
-    #read_files
-    #stream_file
+    #register_email
+    read_files
+    stream_file
 
     # https://api.vpsmatrix.net/uploads/get_new_files
 
@@ -76,21 +77,31 @@ class Starter
   end
 
     def read_files
+      @multipart_boundary = '-'*16 + SecureRandom.hex(32)
 
       puts 'Writing files to temporary file'
       # TODO check size of directory
       working_dir = Dir.pwd
       list_of_files = Dir.glob "#{working_dir}/**/*"
-      list_of_files.reject! {|path| path =~ /\/log|\/tmp/}
-      File.open("files_to_send", 'w') do |temp_file|
+      list_of_files.reject! {|path| path =~ /#{working_dir}\/log|#{working_dir}\/tmp/}
+      unless Dir.exists?("tmp")
+       Dir.mkdir("tmp")
+      end
+      File.open("tmp/files_to_send", 'w') do |temp_file|
+        temp_file.write "#{@multipart_boundary}\n"
         list_of_files.each do |file|
           if File.file? file
-            file_content = File.read(file)
-            temp_file.write "#{file}\n"
+            file_content = File.read(file, mode: 'rb')
+            temp_file.write "#{working_dir.split('/').last + file.split(working_dir).last}\n"
+            temp_file.write "#{file_content.size}\n"
             temp_file.write "#{file_content}\n"
             temp_file.write "#{Digest::SHA256.hexdigest(file_content)}\n"
+          else
+            temp_file.write "#{working_dir.split('/').last + file.split(working_dir).last}\n"
+            temp_file.write "DIR\n"
           end
         end
+        temp_file.write "#{@multipart_boundary}\n"
       end
     end
 
@@ -99,17 +110,19 @@ class Starter
       uri = URI.parse("https://api.vpsmatrix.net/uploads/send_new_files")
 
       # stream version
-      Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+      Net::HTTP.start(uri.host, uri.port, use_ssl: true, :read_timeout => 500) do |http|
         req = Net::HTTP::Put.new(uri)
+        req.add_field("Content-Type","multipart/form-data; boundary=#{@multipart_boundary}")
         req.add_field('Transfer-Encoding', 'chunked')
         req.basic_auth("test_app", "test_app")
-        req.body_stream = File.open("files_to_send")
+        req.body_stream = File.open("tmp/files_to_send")
 
         http.request req do |response|
           # puts response
           response.read_body do |chunk|
             puts chunk
           end
+          puts response.code
         end
       end
     end
@@ -121,7 +134,7 @@ class Starter
       Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
         request = Net::HTTP::Put.new(uri.request_uri)
         request.basic_auth("test_app", "test_app")
-        request.set_form_data({"file" => File.read("files_to_send")})
+        request.set_form_data({"file" => File.read("tmp/files_to_send")})
         http.request request
       end
     end

data/lib/vpsmatrix/version.rb

@@ -1,3 +1,3 @@
 module Vpsmatrix
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vpsmatrix
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - mousse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler