osdn-cli 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b112818b94a14506ce16587ecca79060d8fd447e
-  data.tar.gz: 15c6f3d06ca910ebae2dda3abd5d8b22c1c2169b
+  metadata.gz: 3759e4938c466aabe1fe7785b08a4ca5f4a806bd
+  data.tar.gz: 4c43e36f2d32cc72b762ac806ad671a94253c690
 SHA512:
-  metadata.gz: 4820389e4c6957b86eaec4f07707764560a29d7b586c1419208a881b3b323dba5517fad4716470ffb4a81310ca507d3a277d421594baa4f76de76870e03cb583
-  data.tar.gz: 6650387119977cda48219b8e1c75d685d0591d3fbd78220e4d845986529caabc32d5badbdc77d49b89ed1c6e4427f9bd7ae497d99bf0afc5a88e52ea23a3ace9
+  metadata.gz: 7bdf87b13b4232df6fe9adc06156d6ea715b626d170b4dc783311751a51650781be4c76005e82b3a03cf9b319f2fe7932fa85e9752c72582c5f981c6ccd3ccbe
+  data.tar.gz: 153e2c964252820c5050972c0ea138afb8730a4e8fd55814237d844cfc89d85381aedfc5e6ca3dc99e36e8fe86ad82a34832290c04e63071cd8125c9d422b1f0

data/ChangeLog

@@ -1,3 +1,8 @@
+2016-05-10  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version 0.1.1
+	* frs_uplaod: Support partial upload.
+
 2016-03-25  Tatsuki Sugiura  <sugi@nemui.org>
 
 	* Version 0.1.0

data/README.md

@@ -49,3 +49,8 @@ To get command list use help.
 
 Bug reports and pull requests are welcome on OSDN at https://osdn.jp/projects/osdn-codes/ticket/
 
+## License
+
+Copyright (c) 2016 OSDN
+
+Source files and gem are distributed under MIT License.

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

@@ -5,8 +5,8 @@ module OSDN; module CLI; module Command
       puts "Options:"
       puts "  -n --dry-run               Do noting (use with global -v to inspect)"
       puts "  -p --project=<project>     Target project (numeric id or name)"
-      #puts "     --package=<project>     Target package (numeric id)"
-      #puts "     --release=<project>     Target release (numeric id)"
+      puts "     --package=<package-id>  Target package (numeric id)"
+      puts "     --release=<release-id>  Target release (numeric id)"
       puts "  -v --visibility=<public|private|hidden>"
       puts "                             Default visibility for newly created items"
       puts "      --force-digest         Calc local file digest forcely"
@@ -17,7 +17,8 @@ module OSDN; module CLI; module Command
       opts = GetoptLong.new(
         [ '--dry-run', '-n', GetoptLong::NO_ARGUMENT ],
         [ '--project', '-p', GetoptLong::REQUIRED_ARGUMENT ],
-        [ '--release', '-r', GetoptLong::REQUIRED_ARGUMENT ],
+        [ '--package', GetoptLong::REQUIRED_ARGUMENT ],
+        [ '--release', GetoptLong::REQUIRED_ARGUMENT ],
         [ '--visibility', '-v', GetoptLong::REQUIRED_ARGUMENT ],
         [ '--force-digest', GetoptLong::NO_ARGUMENT],
       )
@@ -26,12 +27,12 @@ module OSDN; module CLI; module Command
         when '--project'
           arg.empty? or
             @target_proj = arg
-        #when '--release'
-        #  arg.empty? or
-        #    @target_release = arg
-        #when '--package'
-        #  arg.empty? or
-        #    @target_package = arg
+        when '--release'
+          arg.empty? or
+            @target_release = arg
+        when '--package'
+          arg.empty? or
+            @target_package = arg
         when '--visibility'
           unless %w(public private hidden).member?(arg)
             logger.fatal "Invalid visibility status: #{arg}"
@@ -48,127 +49,147 @@ module OSDN; module CLI; module Command
       @target_dir = Pathname.new(ARGV.shift || '.')
       proj_info = api.get_project target_proj # check project existance
 
-      Pathname.glob(@target_dir+'*').sort.each do |pdir|
-        if cur_pkgid = load_variables(pdir).package_id
-          # check package existance on server
+      vars = load_variables(@target_dir)
+
+      if @target_release || vars.release_id
+        process_release(@target_dir)
+      elsif @target_package || vars.package_id
+        process_package(@target_dir)
+      else
+        Pathname.glob(@target_dir+'*').sort.each do |pdir|
+          process_package(pdir)
+        end
+      end
+    end
+
+    def self.description
+      "Upload local file tree and create package/release implicitly."
+    end
+
+    def process_package(pdir)
+      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
-            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
+            err = JSON.parse(e.response_body)
+          rescue
             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)'
-          else
-            pinfo = api.create_package target_proj, pdir.basename, visibility: @visibility
-            update_variables pdir, package_id: pinfo.id
+          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."
+            return false
           end
-          $stdout.puts "New package '#{pinfo.name}' has been created; #{pinfo.url}"
+          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)'
+        else
+          pinfo = api.create_package target_proj, pdir.basename, visibility: @visibility
+          update_variables pdir, package_id: pinfo.id
+        end
+        $stdout.puts "New package '#{pinfo.name}' has been created; #{pinfo.url}"
+      end
 
-        Pathname.glob(pdir + '*').sort.each do |rdir|
-          if !rdir.directory?
-            logger.warn "Skip normal file '#{rdir}' in release level"
-            next
-          end
+      Pathname.glob(pdir + '*').sort.each do |rdir|
+        process_release(rdir)
+      end
+    end
+
+    def process_release(rdir)
+      if !rdir.directory?
+        logger.warn "Skip normal file '#{rdir}' in release level"
+        return false
+      end
 
-          vars = load_variables(rdir)
-          rinfo = nil
-          if vars.release_id
-            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
-              rinfo = Hashie::Mash.new id: '(dry-run)', name: rdir.basename, url: '(dry-run)', files: []
-            else
-              rinfo = api.create_release target_proj, target_package(rdir), rdir.basename, visibility: @visibility
-              update_variables rdir, release_id: rinfo.id
-            end
-            $stdout.puts "New release '#{rinfo.name}' has been created; #{rinfo.url}"
+      vars = load_variables(rdir)
+      rinfo = nil
+      if vars.release_id
+        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
-          
-          Pathname.glob(rdir + '*').sort.each do |file|
-            if file.directory?
-              logger.error "Skip direcotry #{file}"
-              next
-            end
-
-            vars = load_variables(rdir)
-            digests = nil
-            if !@force_digest && vars.local_file_info &&
-               vars.local_file_info[file.basename.to_s]
-              finfo = vars.local_file_info[file.basename.to_s]
-              if finfo[:size] == file.size && finfo.mtime == file.mtime
-                digests = vars.local_file_info[file.basename.to_s].digests
-              end
-            end
-
-            unless digests
-              logger.info "Calculating digest for #{file}..."
-              digests = {
-                sha256: hexdigest(Digest::SHA256, file),
-                sha1:   hexdigest(Digest::SHA1, file),
-                md5:    hexdigest(Digest::MD5, file),
-              }
-              update_variables rdir, {local_file_info: {file.basename.to_s => {digests: digests, mtime: file.mtime, size: file.size}}}
-            end
-            if remote_f = rinfo.files.find { |f| f.name == file.basename.to_s }
-              if digests.find { |type, dig| dig != remote_f.send("digest_#{type}") }
-                logger.error "#{file} was changed from remote file! Please delete remote file before uploading new one."
-              end
-              logger.info "Skip already uploaded file '#{file}'"
-            else
-              logger.info "Uploading file #{file} (#{file.size} bytes)"
-              if @dry_run
-                finfo = Hashie::Mash.new id: '(dry-run)', url: '(dry-run)'
-              else
-                logger.level <= Logger::INFO and
-                  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
-                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 complete."
-                end
-              end
-              $stdout.puts "New file '#{file}' has been uploaded; #{finfo.url}"
-            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."
+            return false
           end
+          raise e
         end
+      else vars.release_id
+        logger.info "Createing new release '#{rdir.basename}'"
+        if @dry_run
+          rinfo = Hashie::Mash.new id: '(dry-run)', name: rdir.basename, url: '(dry-run)', files: []
+        else
+          rinfo = api.create_release target_proj, target_package(rdir), rdir.basename, visibility: @visibility
+          update_variables rdir, release_id: rinfo.id
+        end
+        $stdout.puts "New release '#{rinfo.name}' has been created; #{rinfo.url}"
+      end
+      Pathname.glob(rdir + '*').sort.each do |file|
+        process_file(file, rdir, rinfo)
       end
     end
 
-    def self.description
-      "Upload local file tree and create package/release implicitly."
-    end
+    def process_file(file, rdir, rinfo)
+      if file.directory?
+        logger.error "Skip direcotry #{file}"
+        return false
+      end
+
+      vars = load_variables(rdir)
+      digests = nil
+      if !@force_digest && vars.local_file_info &&
+         vars.local_file_info[file.basename.to_s]
+        finfo = vars.local_file_info[file.basename.to_s]
+        if finfo[:size] == file.size && finfo.mtime == file.mtime
+          digests = vars.local_file_info[file.basename.to_s].digests
+        end
+      end
+
+      unless digests
+        logger.info "Calculating digest for #{file}..."
+        digests = {
+          sha256: hexdigest(Digest::SHA256, file),
+          sha1:   hexdigest(Digest::SHA1, file),
+          md5:    hexdigest(Digest::MD5, file),
+        }
+        update_variables rdir, {local_file_info: {file.basename.to_s => {digests: digests, mtime: file.mtime, size: file.size}}}
+      end
+      if remote_f = rinfo.files.find { |f| f.name == file.basename.to_s }
+        if digests.find { |type, dig| dig != remote_f.send("digest_#{type}") }
+          logger.error "#{file} was changed from remote file! Please delete remote file before uploading new one."
+        end
+        logger.info "Skip already uploaded file '#{file}'"
+        return
+      end
 
+      logger.info "Uploading file #{file} (#{file.size} bytes)"
+      if @dry_run
+        finfo = Hashie::Mash.new id: '(dry-run)', url: '(dry-run)'
+      else
+        logger.level <= Logger::INFO and
+          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
+        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 complete."
+        end
+      end
+      $stdout.puts "New file '#{file}' has been uploaded; #{finfo.url}"
+    end
+    
     private
     def target_proj
       @target_proj and return @target_proj

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

@@ -10,7 +10,7 @@ module OSDN; module CLI; module Command
       puts "Options:"
       puts "  -f --format=<pretty|json>  Set output format"
       puts "  -p --project=<project>     Target project (numeric id or name)"
-      puts "     --package=<project>     Target package (numeric id)"
+      puts "     --package=<package-id>  Target package (numeric id)"
       puts "  -v --visibility=<public|private|hidden>"
     end
 

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

@@ -11,8 +11,8 @@ module OSDN; module CLI; module Command
       puts "Options:"
       puts "  -f --format=<pretty|json>  Set output format"
       puts "  -p --project=<project>     Target project (numeric id or name)"
-      puts "     --package=<project>     Target package (numeric id)"
-      puts "     --release=<project>     Target release (numeric id)"
+      puts "     --package=<package-id>  Target package (numeric id)"
+      puts "     --release=<release-id>  Target release (numeric id)"
       puts "  -v --visibility=<public|private|hidden>"
       puts "      --force-digest         Calc local file digest forcely"
     end

data/lib/osdn/cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osdn-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - OSDN
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.20160304
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,6 +69,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.20160304
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +110,8 @@ files:
 - lib/osdn/cli/runner.rb
 - lib/osdn/cli/version.rb
 homepage: https://osdn.jp/projects/osdn-codes/wiki/CommandLineInterface
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []