yadisk 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 404736ac791c10402f7c3aa6dbc6c32e5df4598297301081101764db491a8495
-  data.tar.gz: 941696ff4e49895f5949ac96d7a1e0c5b9c3f1c55c9e471bd48b2c4144c039d9
+  metadata.gz: 97c83d9c7b5300337ae2ce74d9074fbdeff05415547da1d8971429655d3eb9c9
+  data.tar.gz: 771b27f1b7f51ecf99aa6a716c53ca39340bf72a8d11406c9936cc0b68b60044
 SHA512:
-  metadata.gz: 49f7b97c24fdd0aeb31e845f18e06e1bbb490a82c1e05d16ee6c3048caf598830aa5d3e6e909a6d53b547694a961af08ab2b1837547da5eb0cb92f616634ad9b
-  data.tar.gz: 58afcac2974b54ece72ec09c1074d96355692b39007c9bd3fcdede6393dae0bc7186e45a69007126d68374fb6fb047e8b1e530cb44e2683e6b37c6688eda9eec
+  metadata.gz: 1bb0df189317862d8346b55d8529ce39a122d5f5641f89f56102827e3b26520875c31ce15a49a7adccbe7da07f5a18440d6733cf59f355a21cbe4bbf8b9c5130
+  data.tar.gz: 175d39680dc345592f4fc99e8a614453511ceff37c300903cea728a6ef991e81ced13c2144bcbe51df2117fb0d2f5fbe737c35779cecbeaa23239f1d581c5c1d

data/bin/yadisk

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-require 'yadisk'
+require 'yadisk/main'
 require 'yadisk/check_runtime'
 require 'optparse'
 

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/main.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+
+require 'cgi'
+require 'cgi/util'
+require 'uri'
+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: ".#{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 + 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
+
+    def escape_symbol
+      Yadisk::OS.windows? ? '"' : "'"
+    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.3.0'
 end

data/lib/yadisk.rb

@@ -1,24 +1,4 @@
 # encoding: utf-8
 
-require 'cgi'
-require 'cgi/util'
-require 'uri'
-require 'io/console'
-require 'json'
-require 'net/http'
-
 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)
-      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?('/')
-
-      system("wget '#{download_url}' -O '#{folder}#{filename}' #{wget_options}")
-    end
-  end
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: yadisk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Artem Yegorov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2018-01-25 00:00:00.000000000 Z
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: '3.9'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: '3.9'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -54,12 +54,14 @@ files:
 - bin/yadisk
 - lib/yadisk.rb
 - lib/yadisk/check_runtime.rb
+- lib/yadisk/main.rb
+- lib/yadisk/os.rb
 - lib/yadisk/version.rb
 homepage: https://github.com/yegorov/yadisk
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -74,8 +76,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Download file from Yandex.Disk through share link
 test_files: []