osdn-cli 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 661a7bc947152bf778ac0fa53730e720ca9ea2d6
-  data.tar.gz: 11e3150a71086335a9f24af05d25319d2c74e3ed
+  metadata.gz: 69b1dbd8621213ebdb69f94647d544e5cc7fa333
+  data.tar.gz: a52207094f25c588a729ea815dfb0e5004e2e86b
 SHA512:
-  metadata.gz: 8da57715c805c083613bab7d34c09078f89128b7ff3abe3ac208a8ea9023d1f29d2ff314c4b5c067bd043c79d15ac2a7cc9f5973c49fbdd9cc536ca33b0bf6e9
-  data.tar.gz: bb29906480917dfe61582fccc9623cea8a8897a62694bf772cda235324cc7e79af60e567a621df5c5ddc23703b24453732d98f86faae3c5cafa1f3296506fb8f
+  metadata.gz: 25e1712b2292dd07c6c757fcf0e12ac4640471b29d862ef6260c3a87e7f645da76e6fc6fe9f9f8d94c581bb4bf7b77d35b94b1aa91bcc7b81d8c352dd66da38d
+  data.tar.gz: a1e05a3cc8e2acd8a15b73a66fc607825887e306e05bd8ec9971815a1b2b5b180e4e35f794d382f8e082a6814552469b5359377accaf8db6144a67bb8673e778

data/ChangeLog

@@ -1,11 +1,16 @@
+2016-07-27  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version 0.1.6
+	* frs_upload, relfile: Auto retry on upload error.
+
 2016-07-20  Tatsuki Sugiura  <sugi@nemui.org>
 
-	* Versino 0.1.5
+	* Version 0.1.5
 	* frs_upload, relfile: Add bandwidth limit option.
 
 2016-07-01  Tatsuki Sugiura  <sugi@nemui.org>
 
-	* Versino 0.1.4
+	* Version 0.1.4
 	* frs_upload, relfile: Add progress options.
 
 2016-05-26  Tatsuki Sugiura  <sugi@nemui.org>

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

@@ -199,9 +199,27 @@ module OSDN; module CLI; module Command
           OSDN::CLI._show_progress = true
         fio = file.open
         logger.info "Starting upload #{file}..."
-        finfo = api.create_release_file target_proj, target_package(rdir), target_release(rdir), fio, visibility: @visibility
-        fio.close
-        OSDN::CLI._show_progress = false
+        max_upload_tries = 5
+        upload_tries = 0
+        begin
+          upload_tries += 1
+          finfo = api.create_release_file target_proj, target_package(rdir), target_release(rdir), fio, visibility: @visibility
+        rescue OSDNClient::ApiError => e
+          if max_upload_tries - upload_tries <= 0 
+            logger.error "Max upload attempts (#{max_upload_tries}) has been exceeded, give up!"
+            raise e
+          elsif [0, 100, 502].member?(e.code.to_i)
+            fio.rewind
+            logger.error "Upload error (#{e.code} #{e.message}), retrying (#{upload_tries}/#{max_upload_tries})..."
+            sleep 10
+            retry
+          else
+            raise e
+          end
+        ensure
+          OSDN::CLI._show_progress = false
+          fio.close
+        end
         if digests.find { |type, dig| dig != finfo.send("digest_#{type}") }
           logger.error "File digests are mismatch! Upload file #{file} may be broken! Please check."
         else

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

@@ -121,9 +121,29 @@ module OSDN; module CLI; module Command
       logger.level <= Logger::INFO && @show_progress != false || @show_progress and
         OSDN::CLI._show_progress = true
       logger.info "Starting upload #{file}..."
-      f = api.create_release_file target_proj, target_package, target_release, fio, visibility: @visibility
-      fio.close
-      OSDN::CLI._show_progress = false
+      max_upload_tries = 5
+      upload_tries = 0
+      f = nil
+      begin
+        upload_tries += 1
+        f = api.create_release_file target_proj, target_package, target_release, fio, visibility: @visibility
+      rescue OSDNClient::ApiError => e
+        if max_upload_tries - upload_tries <= 0 
+          logger.error "Max upload attempts (#{max_upload_tries}) has been exceeded, give up!"
+          raise e
+        elsif [0, 100, 502].member?(e.code.to_i)
+          fio.rewind
+          logger.error "Upload error (#{e.code} #{e.message}), retrying (#{upload_tries}/#{max_upload_tries})..."
+          sleep 10
+          retry
+        else
+          raise e
+        end
+      ensure
+        fio.close
+        OSDN::CLI._show_progress = false
+      end
+      
       if digests.find { |type, dig| dig != f.send("digest_#{type}") }
         logger.error "File digests are mismatch! Upload file #{file} may be broken! Please check."
       else

data/lib/osdn/cli/runner.rb

@@ -80,6 +80,10 @@ module OSDN
         command = get_command_class(command_name).new(logger)
         logger.debug "Run command #{command_name}"
         begin
+          Signal.trap "INT" do
+            puts :INT
+            exit
+          end
           command.run
         rescue OSDNClient::ApiError => e
           begin
@@ -92,7 +96,7 @@ module OSDN
               logger.fatal "Command failed by ApiError: #{e.response_body}"
             end
           rescue
-            logger.fatal "Command failed: #{e.inspect}"
+            logger.fatal "Command failed: #{e.inspect} #{e.message} (#{e.code}): #{e.response_body} #{e.response_headers}"
           end
         end
       end

data/lib/osdn/cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osdn-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - OSDN
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler