osdn-cli 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aa4a8b62253ab0ed65d450c8d525306d2e2d99a
-  data.tar.gz: 6d7f94ca2a2b67534dab98e754d84e36d187f41e
+  metadata.gz: 442f23ffc9e17733a2fe7270c3a88406ae35f921
+  data.tar.gz: 8b31d0791ab11179aa4a76931a6cf605b42373d3
 SHA512:
-  metadata.gz: f027851b7fe92c2bc9a18a84c573acb661f3726daec977245650d50f7d768670acb8f8d00a25dd531a949498c60109625cc5ccf2d402c6fa528958fb6fc924e1
-  data.tar.gz: a12bb95e117c22e5cb61c5d884cdea10c3a881f0b3ccd15a6e1fa958d1398285d04a7276050b7f74ed04455d9a4ad09ccbb1144be72c48398e057b607c27f9ab
+  metadata.gz: c749f17520f2dafeb21c820c530c94cddf38ccf01f35112ff50cb1c40134d281bc8e819772b23142f03fc68a77d54d46e25c1fc8e29fdcb620f32d78d0be78fb
+  data.tar.gz: d1032019115a40a9a1f549c9c9939cd546e4a8c6803ce1f3c3ec75a16ee0157fa1519f5957f4131b38a8a417c666d418b69a67ae434ad2c4d210561cf3a766dd

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

@@ -1,4 +1,45 @@
 require 'digest'
+require 'ethon'
+
+module OSDN; module CLI; module Command
+  class FrsUpload < Base
+    @@_show_progress = false
+    def self._show_progress
+      @@_show_progress
+    end
+    def self._show_progress=(v)
+      need_reset = (!!@@_show_progress != !!v)
+      @@_show_progress = v
+      need_reset and _reset_all_typhoeus_pool
+    end
+
+    def self._reset_all_typhoeus_pool
+      first_easyid = nil
+      while true
+        e = Typhoeus::Pool.get
+        Typhoeus::Pool.release(e)
+        e.__id__ == first_easyid and break
+        first_easyid ||= e.__id__
+      end
+    end
+  end
+end; end; end
+
+module Ethon
+  class Easy
+    module Callbacks
+      alias_method :set_callbacks_orig, :set_callbacks
+      def set_callbacks
+        set_callbacks_orig
+        if OSDN::CLI::Command::FrsUpload._show_progress
+          Curl.set_option(:noprogress, false, handle)
+        else
+          Curl.set_option(:noprogress, true, handle)
+        end
+      end
+    end
+  end
+end
 
 module OSDN; module CLI; module Command
   class FrsUpload < Base
@@ -80,6 +121,7 @@ module OSDN; module CLI; module Command
               next
             end
 
+            logger.debug "Calculating digest for #{file}..."
             digests = {
               sha256: hexdigest(Digest::SHA256, file),
               sha1:   hexdigest(Digest::SHA1, file),
@@ -95,11 +137,18 @@ module OSDN; module CLI; module Command
               if @dry_run
                 finfo = Hashie::Mash.new id: '(dry-run)', url: '(dry-run)'
               else
-                # TODO: show progress bar!
+                logger.level <= Logger::INFO and
+                  self.class._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
-                logger.info "Upload completed."
+                self.class._show_progress = false
+                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
+                  logger.info "Upload completed."
+                end
               end
               $stdout.puts "New file '#{file}' has been uploaded; #{finfo.url}"
             end
@@ -153,5 +202,6 @@ module OSDN; module CLI; module Command
       fio.close
       dig.hexdigest
     end
+
   end
 end; end; end

data/lib/osdn/cli/version.rb

@@ -1,5 +1,5 @@
 module OSDN
   module CLI
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osdn-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - OSDN
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler