osdn-cli 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7cabfb7a82998ea400feade8d3a62de41fc26f7
-  data.tar.gz: d1d280af262c85a053a73bb772d2e457e9ccbfb6
+  metadata.gz: 661a7bc947152bf778ac0fa53730e720ca9ea2d6
+  data.tar.gz: 11e3150a71086335a9f24af05d25319d2c74e3ed
 SHA512:
-  metadata.gz: 4ddd94491e5a9db49a608ed6c15f1cb53c92f7ab1fd3d49543135acdcd3b948b09fcf81dcdfccd181540bca463802012f75a735988b1df4aa0f1213d08fee06c
-  data.tar.gz: 1db6bde4eff9778ec36057a6176854c770c25174c851423d1a29cc3ef962612e0e3743e08b467e06b14e6071344b9cb70744e23736cb090c3554366cbc845f1e
+  metadata.gz: 8da57715c805c083613bab7d34c09078f89128b7ff3abe3ac208a8ea9023d1f29d2ff314c4b5c067bd043c79d15ac2a7cc9f5973c49fbdd9cc536ca33b0bf6e9
+  data.tar.gz: bb29906480917dfe61582fccc9623cea8a8897a62694bf772cda235324cc7e79af60e567a621df5c5ddc23703b24453732d98f86faae3c5cafa1f3296506fb8f

data/ChangeLog

@@ -1,3 +1,8 @@
+2016-07-20  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Versino 0.1.5
+	* frs_upload, relfile: Add bandwidth limit option.
+
 2016-07-01  Tatsuki Sugiura  <sugi@nemui.org>
 
 	* Versino 0.1.4

data/lib/osdn/cli.rb

@@ -30,8 +30,17 @@ module OSDN
       @@_show_progress = v
     end
 
+    @@_rate_limit = nil
+    def _rate_limit
+      @@_rate_limit
+    end
+    def _rate_limit=(v)
+      @@_rate_limit = v
+    end
+
     module_function :client_id, :client_secret,
-                    :_show_progress, :_show_progress=
+                    :_show_progress, :_show_progress=,
+                    :_rate_limit, :_rate_limit=
     
     module Command
       autoload :Login,     'osdn/cli/command/login'
@@ -92,7 +101,7 @@ module OSDN
             return
           end
 
-          logger.debug "Access token has been expired. Refresh access token..."
+          logger.debug "Access token has been expired. Trying to refresh token..."
           api = OSDNClient::DefaultApi.new
           begin
             set_credential api.token(CLI.client_id, CLI.client_secret, grant_type: 'refresh_token', refresh_token: credential.refresh_token)
@@ -106,7 +115,7 @@ module OSDN
             logger.fatal "Please login again."
             return
           end
-          logger.debug "Access token refreshed successfully."
+          logger.debug "Access token is refreshed successfully."
         end
 
         def set_credential(token, update_expires = true)

data/lib/osdn/cli/command/frs_upload.rb

@@ -12,6 +12,7 @@ module OSDN; module CLI; module Command
       puts "      --force-digest         Calc local file digest forcely"
       puts "      --progress             Force to show upload progress"
       puts "      --no-progress          Force to hide upload progress"
+      puts "      --bwlimit=RATE         Limit bandwidth (in KB)"
     end
 
     def run
@@ -25,6 +26,7 @@ module OSDN; module CLI; module Command
         [ '--force-digest', GetoptLong::NO_ARGUMENT],
         [ '--progress', GetoptLong::NO_ARGUMENT],
         [ '--no-progress', GetoptLong::NO_ARGUMENT],
+        [ '--bwlimit', GetoptLong::REQUIRED_ARGUMENT ],
       )
       opts.each do |opt, arg|
         case opt
@@ -51,6 +53,9 @@ module OSDN; module CLI; module Command
           @show_progress = true
         when '--no-progress'
           @show_progress = false
+        when '--bwlimit'
+          arg.to_i != 0 and
+            OSDN::CLI._rate_limit = arg.to_i * 1024
         end
       end
 

data/lib/osdn/cli/command/relfile.rb

@@ -17,6 +17,7 @@ module OSDN; module CLI; module Command
       puts "      --force-digest         Calc local file digest forcely"
       puts "      --progress             Force to show upload progress"
       puts "      --no-progress          Force to hide upload progress"
+      puts "      --bwlimit=RATE         Limit bandwidth (in KB)"
     end
 
     def self.description
@@ -33,6 +34,7 @@ module OSDN; module CLI; module Command
         [ '--force-digest', GetoptLong::NO_ARGUMENT],
         [ '--progress', GetoptLong::NO_ARGUMENT],
         [ '--no-progress', GetoptLong::NO_ARGUMENT],
+        [ '--bwlimit', GetoptLong::REQUIRED_ARGUMENT ],
       )
       opts.each do |opt, arg|
         case opt
@@ -60,6 +62,9 @@ module OSDN; module CLI; module Command
           @show_progress = true
         when '--no-progress'
           @show_progress = false
+        when '--bwlimit'
+          arg.to_i != 0 and
+            OSDN::CLI._rate_limit = arg.to_i * 1024
         end
       end
     end

data/lib/osdn/cli/overrides.rb

@@ -5,6 +5,7 @@ module Typhoeus
     alias_method :get_orig, :get
     def get(*args)
       easy = get_orig(*args)
+
       if ENV['CURL_CA_BUNDLE']
         Ethon::Curl.set_option(:cainfo, ENV['CURL_CA_BUNDLE'], easy.handle)
       else
@@ -21,12 +22,18 @@ module Typhoeus
           Ethon::Curl.set_option(:cainfo, ca, easy.handle)
         end
       end
+
       if OSDN::CLI._show_progress
         Ethon::Curl.set_option(:noprogress, false, easy.handle)
-        
       else
         Ethon::Curl.set_option(:noprogress, true, easy.handle)
       end
+
+      if OSDN::CLI._rate_limit
+        Ethon::Curl.set_option(:max_send_speed_large, OSDN::CLI._rate_limit, easy.handle)
+        Ethon::Curl.set_option(:max_recv_speed_large, OSDN::CLI._rate_limit, easy.handle)
+      end
+
       easy
     end
   end

data/lib/osdn/cli/runner.rb

@@ -16,6 +16,7 @@ module OSDN
             config.host = ENV['OSDN_API_OVERRIDE_HOST']
           ENV['OSDN_API_SKIP_SSL_VERIFY'].to_s =~ /^(1|t(rue)?|y(es)?)$/i and
             config.verify_ssl = false
+            config.verify_ssl_host = false
         end
       end
       attr_reader :logger

data/lib/osdn/cli/version.rb

@@ -1,5 +1,5 @@
 module OSDN
   module CLI
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osdn-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - OSDN
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.20160304
+        version: 0.0.20160711
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -68,7 +68,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.20160304
+        version: 0.0.20160711
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0