osdn-cli 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4701f982fd5c1699eb693d696ab1fbd7351233fc
-  data.tar.gz: f5046cd39d77dc412f8f030088b6fbba589114ff
+  metadata.gz: b112818b94a14506ce16587ecca79060d8fd447e
+  data.tar.gz: 15c6f3d06ca910ebae2dda3abd5d8b22c1c2169b
 SHA512:
-  metadata.gz: 2bf16853bc8860cb220885b68ed3a4e89d81d6fd7d0cc28cc662558cb038191fe1821c0506690be0cd7d2b2a704c63f436e37ad74e69e73642e250a2d3b0e9b5
-  data.tar.gz: b25246d8bff81023221afc632cb983b3eff8b39ed9b16f6f2c6d1d53997148e4701922cc8e11bd8cf759e3d56d3dd394f8c2a65507315ad6f835521c542dbf86
+  metadata.gz: 4820389e4c6957b86eaec4f07707764560a29d7b586c1419208a881b3b323dba5517fad4716470ffb4a81310ca507d3a277d421594baa4f76de76870e03cb583
+  data.tar.gz: 6650387119977cda48219b8e1c75d685d0591d3fbd78220e4d845986529caabc32d5badbdc77d49b89ed1c6e4427f9bd7ae497d99bf0afc5a88e52ea23a3ace9

data/ChangeLog

@@ -1,3 +1,8 @@
+2016-03-25  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version 0.1.0
+	* frs_uplaod: Add check for vanishing server package or release.
+
 2016-03-23  Tatsuki Sugiura  <sugi@nemui.org>
 
 	* Version 0.0.8

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

@@ -51,6 +51,10 @@ module OSDN; module CLI; module Command
           end
           logger.info "Making directory for release #{rname}"
           rdir = pdir + rname
+          if rdir.exist? && !rdir.directory?
+            logger.error "'#{rdir}' exists but it is not a directory. Please check and delete it."
+            next
+          end
           FileUtils.mkdir_p(rdir)
           update_variables rdir, release_id: release.id
         end

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

@@ -49,7 +49,23 @@ module OSDN; module CLI; module Command
       proj_info = api.get_project target_proj # check project existance
 
       Pathname.glob(@target_dir+'*').sort.each do |pdir|
-        unless load_variables(pdir).package_id
+        if cur_pkgid = load_variables(pdir).package_id
+          # check package existance on server
+          begin
+            api.get_package target_proj, target_package(pdir)
+          rescue OSDNClient::ApiError => e
+            begin
+              err = JSON.parse(e.response_body)
+            rescue
+              raise e
+            end
+            if err['status'] == 404
+              logger.warn "Package ##{cur_pkgid} has been deleted on server and local directory '#{pdir}' remains. You can delete the local directory or delete '#{pdir}/.osdn.vars' file to create a package again with new ID."
+              next
+            end
+            raise e
+          end
+        else
           logger.info "Createing new package '#{pdir.basename}'"
           if @dry_run
             pinfo = Hashie::Mash.new id: '(dry-run)', name: pdir.basename, url: '(dry-run)'
@@ -69,7 +85,20 @@ module OSDN; module CLI; module Command
           vars = load_variables(rdir)
           rinfo = nil
           if vars.release_id
-            rinfo = api.get_release target_proj, target_package(rdir), target_release(rdir)
+            begin
+              rinfo = api.get_release target_proj, target_package(rdir), target_release(rdir)
+            rescue OSDNClient::ApiError => e
+              begin
+                err = JSON.parse(e.response_body)
+              rescue
+                raise e
+              end
+              if err['status'] == 404
+                logger.warn "Release ##{vars.release_id} has been deleted on server and local directory '#{rdir}' remains. You can delete the local directory or delete '#{rdir}/.osdn.vars' file to create a release again with new ID."
+                next
+              end
+              raise e
+            end
           else vars.release_id
             logger.info "Createing new release '#{rdir.basename}'"
             if @dry_run

data/lib/osdn/cli/version.rb

@@ -1,5 +1,5 @@
 module OSDN
   module CLI
-    VERSION = "0.0.9"
+    VERSION = "0.1.0"
   end
 end

metadata

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