yadisk 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 404736ac791c10402f7c3aa6dbc6c32e5df4598297301081101764db491a8495
-  data.tar.gz: 941696ff4e49895f5949ac96d7a1e0c5b9c3f1c55c9e471bd48b2c4144c039d9
+  metadata.gz: 6dad6b4c4a02ce2b8a582bded7d9828b98b568e0dfa3b67d93bb2387e6bd9441
+  data.tar.gz: f603b1744363d545f916895aba2ca0c56814f3f549dc28af5c703a83d33d7e88
 SHA512:
-  metadata.gz: 49f7b97c24fdd0aeb31e845f18e06e1bbb490a82c1e05d16ee6c3048caf598830aa5d3e6e909a6d53b547694a961af08ab2b1837547da5eb0cb92f616634ad9b
-  data.tar.gz: 58afcac2974b54ece72ec09c1074d96355692b39007c9bd3fcdede6393dae0bc7186e45a69007126d68374fb6fb047e8b1e530cb44e2683e6b37c6688eda9eec
+  metadata.gz: f8f05f1e5d4b4291979983d28173b53a6c282bd17ffa6d0b3697dd7123dad3df32db2bd60031f697efe23a4e051ad61a8d270db52f87f2c11843b546a4921c02
+  data.tar.gz: dec7fce5eaf4642de3a0bcdd6102e622b2b21bbc7eaa9092db7b277d43714eed95c68ab8eda862258df7b193296c9cde94481d8f2a95d808869774fe45d7831c

data/lib/yadisk.rb

@@ -7,18 +7,31 @@ require 'io/console'
 require 'json'
 require 'net/http'
 
+require 'yadisk/os'
+
 module Yadisk
   class Main
     BASE_URL = 'https://cloud-api.yandex.net:443/v1/disk/public/resources/download?public_key='
-    def download(url, folder: './', wget_options: nil)
+    def download(url, folder: ".#{File::SEPARATOR}", wget_options: nil)
       enc_url = CGI::escape(url)
       response = Net::HTTP.get(URI("#{BASE_URL}#{enc_url}"))
       json_res = JSON.parse(response)
       download_url = json_res['href']
       filename = CGI::parse(URI(download_url).query)["filename"][0]
-      folder = folder + "/" if not folder.end_with?('/')
+      folder = folder + File::SEPARATOR if not folder.end_with?(File::SEPARATOR)
+      download_path = folder + filename
+
+      wget_options = (wget_options || "") + "--no-check-certificate" if Yadisk::OS.windows?
+      system("wget #{esc(download_url)} -O #{esc(download_path)} #{wget_options}")
+    end
+
+    private
+    def esc(str)
+      "#{escape_symbol}#{str}#{escape_symbol}"
+    end
 
-      system("wget '#{download_url}' -O '#{folder}#{filename}' #{wget_options}")
+    def escape_symbol
+      Yadisk::OS.windows? ? '"' : "'"
     end
   end
 end

data/lib/yadisk/check_runtime.rb

@@ -1,13 +1,25 @@
-require "io/console"
+# encoding: utf-8
+
+require 'io/console'
+
+require 'yadisk/os'
 
 module Yadisk
   class CheckRuntime
     def self.check_wget
-      output = IO.popen("which wget").read
-      if output.empty?
-        puts "Please install wget or add it to 'PATH' and try again\n"
-        abort
+      if Yadisk::OS.windows?
+        output = IO.popen("where wget").read
+        abort! unless $?.to_i == 0
+        return
       end
+
+      output = IO.popen("which wget").read
+      abort! if output.empty?
+    end
+    
+    def self.abort!
+      puts "Please install wget or add it to 'PATH' and try again\n"
+      abort
     end
   end
 end

data/lib/yadisk/os.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+module Yadisk
+  class OS
+    def self.windows?
+      RUBY_PLATFORM =~ /win|mingw/
+    end
+  end
+end

data/lib/yadisk/version.rb

@@ -1,3 +1,3 @@
 module Yadisk
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yadisk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Artem Yegorov
@@ -54,6 +54,7 @@ files:
 - bin/yadisk
 - lib/yadisk.rb
 - lib/yadisk/check_runtime.rb
+- lib/yadisk/os.rb
 - lib/yadisk/version.rb
 homepage: https://github.com/yegorov/yadisk
 licenses:
@@ -74,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Download file from Yandex.Disk through share link