osdn-cli 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15620596e4be4a22b244d898375468629fac7e6a
-  data.tar.gz: c78f3fc74f01743d248fb186e81f03ac64f8cd97
+  metadata.gz: ff7266f193439e9ad64523af16d9e3564381440d
+  data.tar.gz: d359081a75b1a0442f7cf6f1d27e987de68639e2
 SHA512:
-  metadata.gz: 4406e92748c0a7604e36881c60416817c1d47150befd9894c59f30be5f67219e473c53120c95dd2cc070821b6cbe0291804966f1ea4802356550e7a328d4afd7
-  data.tar.gz: 1a00dadd7ca9103e737c38ecdfefd066ed42e3b87e35a102459166e37cf7b11f2dd683ea416caf7df88c9b7b9bfd15b95f86b30d3ff41609fb0d0370e03705cc
+  metadata.gz: b8729f64fd407d96ffe265dee88b5b13e4ee77724e14220b55949ac17eebd6b0ace27b429db96b682f4cd56fd7383749e998a0d1c172af6c8ad403a3c77bcc39
+  data.tar.gz: 8862640ebc555996e644674bbbfdf5e2c3a105116dc15c3a89da62587dc6f5993ea7fda4a43c28351f4c13cf3998a71fd1f63c63a7143930eb1aa050d81eeb3a

data/ChangeLog

@@ -0,0 +1,44 @@
+2016-03-23  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version 0.0.8
+	* frs_upload: Save local file digest to vars
+	* relfile: Save local file digest to vars
+
+2016-03-22  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version 0.0.7
+	* Enable SSL validation again, search some major CA bundle paths.
+
+2016-03-16  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version 0.0.6
+	* Disable SSL validation temporarily.
+
+2016-03-16  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version 0.0.5
+	* Default loglevel has been changed to INFO.
+	* Add release and relfile command.
+	* frs_upload: sort files in alphabetical order.
+
+2016-03-15  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version 0.0.4
+	* login: stop to launch web browser on non-X11 environment.
+
+2016-03-15  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version 0.0.3
+	* frs_upload: show upload progres in verbose mode.
+	* frs_upload: validates file digest after upload.
+
+2016-03-14  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version 0.0.2
+	* frs_upload: Implement dry-run mode option.
+	* frs_upload: check file digest.
+	* frs_mkdirs: mangle non-suitable chars for local filesystem.
+
+2016-03-11  Tatsuki Sugiura  <sugi@osdn.jp>
+
+	* Initial Version (0.0.1)

data/README.md

@@ -0,0 +1,51 @@
+# OSDN Command Line Interface
+
+OSDN command line interface using REST API.
+
+## Requirement
+
+* ruby (>= 1.9.3)
+* gem build environment or pre-build ffi gem
+* libcurl 
+
+On debian (ubuntu) system, you can install with following packages.
+
+    $ sudo apt-get install ruby ruby-ffi libcurl3
+
+## Installation
+
+You can install by rubygem, type following on terminal. 
+
+    $ gem install osdn-cli
+
+## Usage
+
+First you need to login to API with 'login' subcommand.
+
+    $ osdn login
+
+To get command list use help.
+
+    $ osdn help
+    osdn [global-options] <command> [command-options] [args]
+    osdn help <command>
+    Global Options:
+      -h --help      Show help message. use 'help <command>' for specific command. 
+      -v --verbose   Increase log level (multiple)
+      -q --quiet     Decrease log level (multiple)
+    Avaiable Commands:
+      help
+      login          Login and save access token.
+      package        Manipulate frs packages of project
+      release        Manipulate frs releases of project
+      relfile        Manipulate frs files of project
+      frs_mkdirs     Make directory tree for current project release
+      frs_upload     Upload local file tree and create package/release implicitly.
+      ping           Test API request.
+      vars           Get/set request environment variable.
+
+
+## Contributing
+
+Bug reports and pull requests are welcome on OSDN at https://osdn.jp/projects/osdn-codes/ticket/
+

data/lib/osdn/cli.rb

@@ -169,7 +169,7 @@ module OSDN
         end
 
         def update_variables(dir, vars)
-          write_variables(load_variables(dir, false).merge(vars), dir)
+          write_variables(load_variables(dir, false).deep_merge(vars), dir)
         end
 
         private

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

@@ -26,7 +26,7 @@ module OSDN; module CLI; module Command
     def target_proj
       @target_proj and return @target_proj
       vars = load_variables
-      vars.project && !vars.project.empty? and
+      vars.project && !vars.project.to_s.empty? and
         return vars.project
       logger.fatal "No target project is specified."
       exit
@@ -35,7 +35,7 @@ module OSDN; module CLI; module Command
     def target_package
       @target_package and return @target_package
       vars = load_variables
-      vars.package_id && !vars.package_id.empty? and
+      vars.package_id && !vars.package_id.to_s.empty? and
         return vars.package_id
       logger.fatal "No target package is specified."
       exit
@@ -44,7 +44,7 @@ module OSDN; module CLI; module Command
     def target_release
       @target_release and return @target_release
       vars = load_variables
-      vars.release_id && !vars.release_id.empty? and
+      vars.release_id && !vars.release_id.to_s.empty? and
         return vars.release_id
       logger.fatal "No target release is specified."
       exit

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

@@ -9,6 +9,7 @@ module OSDN; module CLI; module Command
       #puts "     --release=<project>     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"
     end
 
     def run
@@ -18,6 +19,7 @@ module OSDN; module CLI; module Command
         [ '--project', '-p', GetoptLong::REQUIRED_ARGUMENT ],
         [ '--release', '-r', GetoptLong::REQUIRED_ARGUMENT ],
         [ '--visibility', '-v', GetoptLong::REQUIRED_ARGUMENT ],
+        [ '--force-digest', GetoptLong::NO_ARGUMENT],
       )
       opts.each do |opt, arg|
         case opt
@@ -36,6 +38,8 @@ module OSDN; module CLI; module Command
             exit
           end
           @visibility = arg
+        when '--force-digest'
+          @force_digest = true
         when '--dry-run'
           @dry_run = true
         end
@@ -57,6 +61,11 @@ module OSDN; module CLI; module Command
         end
 
         Pathname.glob(pdir + '*').sort.each do |rdir|
+          if !rdir.directory?
+            logger.warn "Skip normal file '#{rdir}' in release level"
+            next
+          end
+
           vars = load_variables(rdir)
           rinfo = nil
           if vars.release_id
@@ -78,17 +87,30 @@ 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),
-              md5:    hexdigest(Digest::MD5, file),
-            }
+            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.warn "Skip already uploaded file '#{file}'"
+              logger.info "Skip already uploaded file '#{file}'"
             else
               logger.info "Uploading file #{file} (#{file.size} bytes)"
               if @dry_run

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

@@ -14,6 +14,7 @@ module OSDN; module CLI; module Command
       puts "     --package=<project>     Target package (numeric id)"
       puts "     --release=<project>     Target release (numeric id)"
       puts "  -v --visibility=<public|private|hidden>"
+      puts "      --force-digest         Calc local file digest forcely"
     end
 
     def self.description
@@ -27,6 +28,7 @@ module OSDN; module CLI; module Command
         [ '--package', GetoptLong::REQUIRED_ARGUMENT ],
         [ '--release', GetoptLong::REQUIRED_ARGUMENT ],
         [ '--visibility', '-v', GetoptLong::REQUIRED_ARGUMENT ],
+        [ '--force-digest', GetoptLong::NO_ARGUMENT],
       )
       opts.each do |opt, arg|
         case opt
@@ -42,6 +44,8 @@ module OSDN; module CLI; module Command
         when '--release'
           arg.empty? or
             @target_release = arg
+        when '--force-digest'
+          @force_digest = true
         when '--visibility'
           unless %w(public private hidden).member?(arg)
             logger.fatal "Invalid visibility status: #{arg}"
@@ -73,11 +77,27 @@ module OSDN; module CLI; module Command
       end
       file = Pathname('.') + filename
       logger.debug "Calculating digest for #{file}..."
-      digests = {
-        sha256: hexdigest(Digest::SHA256, file),
-        sha1:   hexdigest(Digest::SHA1, file),
-        md5:    hexdigest(Digest::MD5, file),
-      }
+
+      vars = load_variables(file.dirname)
+      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 file.dirname, {local_file_info: {file.basename.to_s => {digests: digests, mtime: file.mtime, size: file.size}}}
+      end
+
       fio = file.open
       logger.level <= Logger::INFO and
         OSDN::CLI._show_progress = true

data/lib/osdn/cli/version.rb

@@ -1,5 +1,5 @@
 module OSDN
   module CLI
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osdn-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - OSDN
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,6 +88,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ChangeLog
+- README.md
 - exe/osdn
 - lib/osdn-cli.rb
 - lib/osdn/cli.rb