vpsmatrix 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72c161a134c74fe3af5b21abcfcde1975f95e017
-  data.tar.gz: d41715644f3009c2c67b1e9a808f49bf9dd32ab1
+  metadata.gz: e5c44d6702d8412d093a5ad411a7af24fd932fb2
+  data.tar.gz: 1b911c4a5e518261526e17ca1ef4f5b70336dc6e
 SHA512:
-  metadata.gz: 5d83c10ad596f91a2af58b9ad9af19c2954d6ba403955bf3455dbdca429b12f9d4a4ecacbefe6c75f645c26796a1b22d1415cb0ffdd8ef95fbfa3b2a2ae6dd9b
-  data.tar.gz: cc07abe804ff98f2a43ab1694a557984cd009433e29750c066a03b7763c2fac2139e5e2aa063afa99e8199059e18231ad9f2992db57e12cc2d566ab82f83ca5c
+  metadata.gz: c6ae55af26be0c293572570600c5c4ad3cedeae4928fa5f3857e38f4c9cbfa92d2ec7cce3c9a673012d9466772701521cad056edc433dd10ef424b21ffb138f0
+  data.tar.gz: c3634168223dcfeb6a67fddc1d198ab212c546aad961517a67fef794d773a2622b297afef28917e169d94e9690e237e1912c3d13038cf953ad436e0a2b578dcb

data/lib/vpsmatrix/config.rb

@@ -3,9 +3,9 @@ require 'yaml'
 class Config
 
   def initialize
-    @file_path = ".vps_matrix/config.yml"
+    @file_path = "config/vpsx.yml"
     unless File.exists? @file_path
-      Dir.mkdir ".vps_matrix"
+      Dir.mkdir "config" unless Dir.exists? "config"
       File.open(@file_path, 'w') do |file|
         file.write "comment: 'Config file for VPS Matrix services'"
       end

data/lib/vpsmatrix/starter.rb

@@ -3,6 +3,7 @@ require 'net/http'
 require 'uri'
 require 'securerandom'
 require_relative 'config'
+require_relative 'upload_progress'
 
 class Starter
 
@@ -25,33 +26,18 @@ class Starter
 
   def demo_deploy
 
-    ##
-    # check SSH key in .vpsmatrix dir, else generate new
-      # generate ~/.vpsmatrix/config.yml
-      # generate ~/.vpsmatrix/id_rsa.pub
-
-    ## check for .vpsmatrix_config
-    ## no?
-      # generate .vpsmatrix_config.yml
-      # ask for API KEY
-      # write it to .vpsmatrix_config.yml
-    ## yes?
-      # read API KEY
-
-
-    # there should be only one SSH key for all apps right? So dir in home with general config and SSH key
-    # then one config file in app folder?
-    unless File.exists? ".vpsmatrix/id_rsa.pub"
-      # Generate SSH key
-      ssh_key = 'HFKNGEWIUHENINHSLN867G5867BDI7BOQ8YWQF9YFN9QWF'
+    unless Config.new.content['ssh_key']
+      Config.new.write 'ssh_key', SecureRandom.hex
     end
 
     @app_name = Dir.pwd.split(File::SEPARATOR).last
-    unless Config.new.content['api_key']
+    unless Config.new.content['api_key'] && Config.new.content['api_key'].length == 32
       # ask for it to server
       # TODO check if server returns api_key
-      api_key = send_get_request "https://api.vpsmatrix.net/uploads/get_api_key", {ssh_key: ssh_key}
-      Config.new.write 'api_key', api_key
+      api_key = send_get_request "https://api.vpsmatrix.net/uploads/get_api_key"
+      if api_key.response.code == '200'
+        Config.new.write 'api_key', api_key.response.body
+      end
     end
 
     #register_email
@@ -112,17 +98,24 @@ class Starter
       # stream version
       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("Content-Type","multipart/form-data; boundary=#{@multipart_boundary}; ssh_key=#{Config.new.content['ssh_key']}; api_key=#{Config.new.content['api_key']}")
         req.add_field('Transfer-Encoding', 'chunked')
         req.basic_auth("test_app", "test_app")
-        req.body_stream = File.open("tmp/files_to_send")
-
-        http.request req do |response|
-          # puts response
-          response.read_body do |chunk|
-            puts chunk
+        File.open('tmp/files_to_send', 'rb') do |io|
+          req.content_length = io.size
+          req.body_stream = io
+          puts DateTime.now
+          UploadProgress.new(req) do |progress|
+            print "uploaded so far: #{ progress.upload_size }/#{ io.size }\r"
+            $stdout.flush
+          end
+          http.request req do |response|
+            puts ""
+            response.read_body do |chunk|
+              print chunk
+            end
+            puts response.code
           end
-          puts response.code
         end
       end
     end

data/lib/vpsmatrix/upload_progress.rb

@@ -0,0 +1,23 @@
+#the code is used from gem 'net-http-uploadprogress'
+
+class UploadProgress
+  attr_reader :upload_size
+
+  def initialize(req, &block)
+    @req = req
+    @callback = block
+    @upload_size = 0
+    @io = req.body_stream
+    req.body_stream = self
+  end
+
+  def readpartial(maxlen, outbuf)
+    begin
+      str = @io.readpartial(maxlen, outbuf)
+    ensure
+      @callback.call(self) unless @upload_size.zero?
+    end
+    @upload_size += str.length
+    str
+  end
+end

data/lib/vpsmatrix/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vpsmatrix
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - mousse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +53,7 @@ files:
 - lib/vpsmatrix.rb
 - lib/vpsmatrix/config.rb
 - lib/vpsmatrix/starter.rb
+- lib/vpsmatrix/upload_progress.rb
 - lib/vpsmatrix/version.rb
 - vpsmatrix.gemspec
 homepage: http://www.vpsmatrix.co.uk
@@ -74,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Gem for easy deployment to VPS Matrix servers.