From: Tatsuki Sugiura <sugi@nemui.org>
Date: Mon, 29 Oct 2018 10:28:41 +0000 (+0900)
Subject: Package and release command gets target from vars file.
X-Git-Tag: v0.1.11~1
X-Git-Url: http://git.osdn.net/view?p=osdn-codes%2Fosdn-cli.git;a=commitdiff_plain;h=9ffb4d214856f039b9177b3fad8a1160fe528fcc

Package and release command gets target from vars file.
---

diff --git a/lib/osdn/cli/command/package.rb b/lib/osdn/cli/command/package.rb
index b24b0f1..c8865f5 100644
--- a/lib/osdn/cli/command/package.rb
+++ b/lib/osdn/cli/command/package.rb
@@ -5,8 +5,8 @@ module OSDN; module CLI; module Command
     def help
       puts "#{$0} package [opts] [list]"
       puts "#{$0} package [opts] create <new-package-name>"
-      puts "#{$0} package [opts] update <numeric-package-id> [name]"
-      puts "#{$0} package [opts] delete <numeric-package-id>"
+      puts "#{$0} package [opts] update [numeric-package-id] [name]"
+      puts "#{$0} package [opts] delete [numeric-package-id]"
       puts "Options:"
       puts "  -f --format=<pretty|json>  Set output format"
       puts "  -p --project=<project>     Target project (numeric id or name)"
@@ -65,20 +65,29 @@ module OSDN; module CLI; module Command
     end
 
     def update
-      target_id = ARGV.shift
-      args = {name: ARGV.shift}
+      _set_package_id
+      args = {}
+      if ARGV[1].to_s != ""
+        args[:name] = ARGV[1]
+      end
       if @visibility
         args[:visibility] = @visibility
       end
-      p = api.update_package target_proj, target_id, args
-      logger.info "Package #{target_id} has been updated."
+      logger.debug "Updating package #{target_package} as #{args.inspect}"
+      p = api.update_package target_proj, target_package, args
+      logger.info "Package #{target_package} has been updated."
       puts format_package(p)
     end
 
     def delete
-      target_id = ARGV.shift
-      p = api.delete_package target_proj, target_id
-      logger.info "Package #{target_id} has been deleted."
+      _set_package_id
+      p = api.delete_package target_proj, target_package
+      logger.info "Package #{target_package} has been deleted."
+    end
+
+    def _set_package_id
+      return if ARGV[0].to_i == 0
+      @target_package = ARGV[0].to_i
     end
 
   end
diff --git a/lib/osdn/cli/command/release.rb b/lib/osdn/cli/command/release.rb
index 84e64fe..ee3e882 100644
--- a/lib/osdn/cli/command/release.rb
+++ b/lib/osdn/cli/command/release.rb
@@ -5,8 +5,8 @@ module OSDN; module CLI; module Command
     def help
       puts "#{$0} release [opts] [list]"
       puts "#{$0} release [opts] create <new-release-name>"
-      puts "#{$0} release [opts] update <numeric-release-id> [name]"
-      puts "#{$0} release [opts] delete <numeric-release-id>"
+      puts "#{$0} release [opts] update [numeric-release-id] [name]"
+      puts "#{$0} release [opts] delete [numeric-release-id]"
       puts "Options:"
       puts "  -f --format=<pretty|json>  Set output format"
       puts "  -p --project=<project>     Target project (numeric id or name)"
@@ -71,21 +71,29 @@ module OSDN; module CLI; module Command
     end
 
     def update
-      target_id = ARGV.shift
-      args = {name: ARGV.shift}
+      _set_release_id
+      args = {}
+      if ARGV[1].to_s != ""
+        args[:name] = ARGV.shift
+      end
       if @visibility
         args[:visibility] = @visibility
       end
-      r = api.update_release target_proj, target_package, target_id, args
-      logger.info "Release #{target_id} has been updated."
+      logger.debug "Updating release #{target_release} as #{args.inspect}"
+      r = api.update_release target_proj, target_package, target_release, args
+      logger.info "Release #{target_release} has been updated."
       puts format_release(r)
     end
 
     def delete
-      target_id = ARGV.shift
-      r = api.delete_release target_proj, target_package, target_id
-      logger.info "Release #{target_id} has been deleted."
+      _set_release_id
+      r = api.delete_release target_proj, target_package, target_release
+      logger.info "Release #{target_release} has been deleted."
     end
 
+    def _set_release_id
+      return if ARGV[0].to_i == 0
+      @target_release = ARGV[0].to_i
+    end
   end
 end; end; end