提交: 2cd6fd5cb2041206779b68a8314bdc7c3bf81f7e - osdn-cli (git)

Commit MetaInfo

• 修訂: 2cd6fd5cb2041206779b68a8314bdc7c3bf81f7e (tree)
• 時間: 2016-07-01 15:53:43
• 作者: Tatsuki Sugiura <sugi@nemu...>
• Commiter: Tatsuki Sugiura

Log Message

Version 0.1.4: frs_uplaod, relfile: Allow multiple target arguments.

Change Summary

• modified: ChangeLog
• modified: lib/osdn/cli/command/frs_upload.rb
• modified: lib/osdn/cli/command/relfile.rb
• modified: lib/osdn/cli/overrides.rb
• modified: lib/osdn/cli/version.rb

差異

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
[phone]  Tatsuki Sugiura  <[e-mail]>
+
+	* Versino 0.1.4
+	* frs_upload, relfile: Add progress options.
+
 2016-05-26  Tatsuki Sugiura  <[e-mail]>
 
 	* Version 0.1.3

--- a/lib/osdn/cli/command/frs_upload.rb
+++ b/lib/osdn/cli/command/frs_upload.rb
@@ -10,6 +10,8 @@ module OSDN; module CLI; module Command
       puts "  -v --visibility=<public|private|hidden>"
       puts "                             Default visibility for newly created items"
       puts "      --force-digest         Calc local file digest forcely"
+      puts "      --progress             Force to show upload progress"
+      puts "      --no-progress          Force to hide upload progress"
     end
 
     def run
@@ -21,6 +23,8 @@ module OSDN; module CLI; module Command
         [ '--release', GetoptLong::REQUIRED_ARGUMENT ],
         [ '--visibility', '-v', GetoptLong::REQUIRED_ARGUMENT ],
         [ '--force-digest', GetoptLong::NO_ARGUMENT],
+        [ '--progress', GetoptLong::NO_ARGUMENT],
+        [ '--no-progress', GetoptLong::NO_ARGUMENT],
       )
       opts.each do |opt, arg|
         case opt
@@ -43,6 +47,10 @@ module OSDN; module CLI; module Command
           @force_digest = true
         when '--dry-run'
           @dry_run = true
+        when '--progress'
+          @show_progress = true
+        when '--no-progress'
+          @show_progress = false
         end
       end
 
@@ -182,7 +190,7 @@ module OSDN; module CLI; module Command
       if @dry_run
         finfo = Hashie::Mash.new id: '(dry-run)', url: '(dry-run)'
       else
-        logger.level <= Logger::INFO and
+        logger.level <= Logger::INFO && @show_progress != false || @show_progress and
           OSDN::CLI._show_progress = true
         fio = file.open
         logger.info "Starting upload #{file}..."

--- a/lib/osdn/cli/command/relfile.rb
+++ b/lib/osdn/cli/command/relfile.rb
@@ -15,6 +15,8 @@ module OSDN; module CLI; module Command
       puts "     --release=<release-id>  Target release (numeric id)"
       puts "  -v --visibility=<public|private|hidden>"
       puts "      --force-digest         Calc local file digest forcely"
+      puts "      --progress             Force to show upload progress"
+      puts "      --no-progress          Force to hide upload progress"
     end
 
     def self.description
@@ -29,6 +31,8 @@ module OSDN; module CLI; module Command
         [ '--release', GetoptLong::REQUIRED_ARGUMENT ],
         [ '--visibility', '-v', GetoptLong::REQUIRED_ARGUMENT ],
         [ '--force-digest', GetoptLong::NO_ARGUMENT],
+        [ '--progress', GetoptLong::NO_ARGUMENT],
+        [ '--no-progress', GetoptLong::NO_ARGUMENT],
       )
       opts.each do |opt, arg|
         case opt
@@ -52,6 +56,10 @@ module OSDN; module CLI; module Command
             exit
           end
           @visibility = arg
+        when '--progress'
+          @show_progress = true
+        when '--no-progress'
+          @show_progress = false
         end
       end
     end
@@ -105,7 +113,7 @@ module OSDN; module CLI; module Command
       end
 
       fio = file.open
-      logger.level <= Logger::INFO and
+      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

--- a/lib/osdn/cli/overrides.rb
+++ b/lib/osdn/cli/overrides.rb
@@ -23,6 +23,7 @@ module Typhoeus
       end
       if OSDN::CLI._show_progress
         Ethon::Curl.set_option(:noprogress, false, easy.handle)
+        
       else
         Ethon::Curl.set_option(:noprogress, true, easy.handle)
       end

--- a/lib/osdn/cli/version.rb
+++ b/lib/osdn/cli/version.rb
@@ -1,5 +1,5 @@
 module OSDN
   module CLI
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end