osdn-cli 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac966ae43ca339709481cd8e974dfc87b774f8cb
-  data.tar.gz: 5db0f3f4af00ee2f02050a47792f340dc43d677b
+  metadata.gz: 32c466e6ff582c2e2ae91f4e1fc455e34630828e
+  data.tar.gz: 66080054808d8d1e077b95955e0dddac754159d0
 SHA512:
-  metadata.gz: 2410cbbf83e311af1565d2bb4c6180642d6e46a3d87f46e68017755388c52bf3aa46a9570122863c80827f6d8c3faa9b74b96e255d8ac0260e3ea7efcebb17af
-  data.tar.gz: b5472f3405bd5d7ac1c8f0cd37ed32e78d8c7cccbf3af81d22795aa1b42674d6f6b56ccd2c05d0538b4000c6e66f122c9a745b2f74e0fd47a41bfafb47ef7bfd
+  metadata.gz: 82f165bb2dd2afda2f954fbbeb228e498b41fd9e723dd593bb01c6a4f62724b940bc3058a82e2fb0801c4672959bd5c8b407f5b192ab444eb2f5725b75b815c3
+  data.tar.gz: 2302b89c7b4cb842b798cbb72103183c8a17078163c1387eacbf29a3b09775eee17b7a500a5e382f0252394ef9cfb9c2acb952456934029b1e560f3a57d9e6cb

data/lib/osdn/cli.rb

@@ -1,5 +1,6 @@
 require "osdn/cli/version"
 require "osdn/cli/runner"
+require "osdn/cli/overrides"
 require 'getoptlong'
 require 'logger'
 require 'pathname'
@@ -8,6 +9,7 @@ require 'fileutils'
 require 'osdn-client'
 require 'hashie'
 require 'json'
+require 'digest'
 
 module OSDN
   module CLI
@@ -19,13 +21,23 @@ module OSDN
     def client_secret
       @@client_secret
     end
-    module_function :client_id, :client_secret
+
+    @@_show_progress = false
+    def _show_progress
+      @@_show_progress
+    end
+    def _show_progress=(v)
+      @@_show_progress = v
+    end
+
+    module_function :client_id, :client_secret,
+                    :_show_progress, :_show_progress=
     
     module Command
       autoload :Login,     'osdn/cli/command/login'
       autoload :Package,   'osdn/cli/command/package'
-      #autoload :Release,   'osdn/cli/command/release'
-      #autoload :FrsFile,   'osdn/cli/command/frs_file'
+      autoload :Release,   'osdn/cli/command/release'
+      autoload :Relfile,   'osdn/cli/command/relfile'
       autoload :FrsMkdirs, 'osdn/cli/command/frs_mkdirs'
       autoload :FrsUpload, 'osdn/cli/command/frs_upload'
       
@@ -155,6 +167,18 @@ module OSDN
         def update_variables(dir, vars)
           write_variables(load_variables(dir, false).merge(vars), dir)
         end
+
+        private
+        def hexdigest(klass, file)
+          fio = file.open
+          dig = klass.new
+          while buf = fio.read(1024*1024) and buf.length > 0
+            dig << buf
+          end
+          fio.close
+          dig.hexdigest
+        end
+        
       end
 
       class Ping < Base

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

@@ -0,0 +1,80 @@
+module OSDN; module CLI; module Command
+  class FrsBase < Base
+    def run
+      update_token
+      process_options
+      command = ARGV.shift || 'list'
+      if !command || command.empty?
+        logger.fatal "subcommand is missing."
+        help
+        return
+      end
+      if self.respond_to? command
+        self.send command
+      else
+        logger.fatal "Invalid subcommand: #{command}"
+        help
+        return
+      end
+    end
+
+    def process_options
+      raise NotImplementedError
+    end
+
+    private
+    def target_proj
+      @target_proj and return @target_proj
+      vars = load_variables
+      vars.project && !vars.project.empty? and
+        return vars.project
+      logger.fatal "No target project is specified."
+      exit
+    end
+
+    def target_package
+      @target_package and return @target_package
+      vars = load_variables
+      vars.package_id && !vars.package_id.empty? and
+        return vars.package_id
+      logger.fatal "No target package is specified."
+      exit
+    end
+
+    def target_release
+      @target_release and return @target_release
+      vars = load_variables
+      vars.release_id && !vars.release_id.empty? and
+        return vars.release_id
+      logger.fatal "No target release is specified."
+      exit
+    end
+
+    def api
+      OSDNClient::ProjectApi.new
+    end
+
+    def format_object(o, children = nil)
+      if format == 'json'
+        o.to_hash.to_json
+      else
+        children_str = ''
+        children and
+          children_str = ", #{[*o.send(children)].count} #{children}"
+        "##{o.id} #{o.name} (#{o.visibility}#{children_str})\n  #{o.url}"
+       end
+    end
+    
+    def format_release(r)
+      format_object(r, :files)
+    end
+
+    def format_package(p)
+      format_object(p, :releases)
+    end
+
+    def format_file(f)
+      format_object(f)
+    end
+  end
+end; end; end

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

@@ -33,7 +33,7 @@ module OSDN; module CLI; module Command
 
       logger.debug "Getting Package list..."
       packages = api.list_packages target_proj
-      logger.debug "Making each package directry"
+      logger.debug "Making each package directory"
 
       packages.each do |package|
         pname = fsname(package.name)

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

@@ -1,46 +1,3 @@
-require 'digest'
-require 'ethon'
-
-module OSDN; module CLI; module Command
-  class FrsUpload < Base
-    @@_show_progress = false
-    def self._show_progress
-      @@_show_progress
-    end
-    def self._show_progress=(v)
-      need_reset = (!!@@_show_progress != !!v)
-      @@_show_progress = v
-      need_reset and _reset_all_typhoeus_pool
-    end
-
-    def self._reset_all_typhoeus_pool
-      first_easyid = nil
-      while true
-        e = Typhoeus::Pool.get
-        Typhoeus::Pool.release(e)
-        e.__id__ == first_easyid and break
-        first_easyid ||= e.__id__
-      end
-    end
-  end
-end; end; end
-
-module Ethon
-  class Easy
-    module Callbacks
-      alias_method :set_callbacks_orig, :set_callbacks
-      def set_callbacks
-        set_callbacks_orig
-        if OSDN::CLI::Command::FrsUpload._show_progress
-          Curl.set_option(:noprogress, false, handle)
-        else
-          Curl.set_option(:noprogress, true, handle)
-        end
-      end
-    end
-  end
-end
-
 module OSDN; module CLI; module Command
   class FrsUpload < Base
     def help
@@ -87,7 +44,7 @@ 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+'*').each do |pdir|
+      Pathname.glob(@target_dir+'*').sort.each do |pdir|
         unless load_variables(pdir).package_id
           logger.info "Createing new package '#{pdir.basename}'"
           if @dry_run
@@ -99,7 +56,7 @@ module OSDN; module CLI; module Command
           $stdout.puts "New package '#{pinfo.name}' has been created; #{pinfo.url}"
         end
 
-        Pathname.glob(pdir + '*').each do |rdir|
+        Pathname.glob(pdir + '*').sort.each do |rdir|
           vars = load_variables(rdir)
           rinfo = nil
           if vars.release_id
@@ -115,7 +72,7 @@ module OSDN; module CLI; module Command
             $stdout.puts "New release '#{rinfo.name}' has been created; #{rinfo.url}"
           end
           
-          Pathname.glob(rdir + '*').each do |file|
+          Pathname.glob(rdir + '*').sort.each do |file|
             if file.directory?
               logger.error "Skip direcotry #{file}"
               next
@@ -138,16 +95,16 @@ module OSDN; module CLI; module Command
                 finfo = Hashie::Mash.new id: '(dry-run)', url: '(dry-run)'
               else
                 logger.level <= Logger::INFO and
-                  self.class._show_progress = true
+                  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
-                self.class._show_progress = false
+                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 completed."
+                  logger.info "Upload complete."
                 end
               end
               $stdout.puts "New file '#{file}' has been uploaded; #{finfo.url}"
@@ -192,16 +149,5 @@ module OSDN; module CLI; module Command
     def api
       OSDNClient::ProjectApi.new
     end
-
-    def hexdigest(klass, file)
-      fio = file.open
-      dig = klass.new
-      while buf = fio.read(1024*1024) and buf.length > 0
-        dig << buf
-      end
-      fio.close
-      dig.hexdigest
-    end
-
   end
 end; end; end

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

@@ -30,7 +30,7 @@ module OSDN; module CLI; module Command
     end
 
     def launch_brwoser(url)
-      puts "Access follwoing URL to get auth code;\n#{url}"
+      puts "Access following URL to get auth code;\n#{url}"
       if ENV['DISPLAY']
         %w(/usr/bin/xdg-open /usr/bin/X11/xdg-open /usr/local/bin/xdg-open
                /usr/bin/x-www-browser /usr/bin/firefox /usr/local/bin/firefox

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

@@ -1,6 +1,8 @@
+require 'osdn/cli/command/frs_base'
+
 module OSDN; module CLI; module Command
-  class Package < Base
-    def self.help
+  class Package < FrsBase
+    def help
       puts "#{$0} package [opts] [list]"
       puts "#{$0} package [opts] create <new-package-name>"
       puts "#{$0} package [opts] update <numeric-package-id> [name]"
@@ -15,8 +17,7 @@ module OSDN; module CLI; module Command
       "Manipulate release package of project"
     end
 
-    def run
-      update_token
+    def process_options
       opts = GetoptLong.new(
         [ '--format', '-f', GetoptLong::REQUIRED_ARGUMENT ],
         [ '--project', '-p', GetoptLong::REQUIRED_ARGUMENT ],
@@ -38,25 +39,12 @@ module OSDN; module CLI; module Command
           @visibility = arg
         end
       end
-      command = ARGV.shift || 'list'
-      if !command || command.empty?
-        logger.fatal "subcommand is missing."
-        help
-        return
-      end
-      if self.respond_to? command
-        self.send command
-      else
-        logger.fatal "Invalid subcommand: #{command}"
-        help
-        return
-      end
     end
 
     def list
       list = api.list_packages target_proj
       if format == 'json'
-        puts list.to_json
+        puts list.map{|i| i.to_hash}.to_json
       else
         list.each do |p|
           puts format_package(p)
@@ -93,26 +81,5 @@ module OSDN; module CLI; module Command
       logger.info "Package #{target_id} has been deleted."
     end
 
-    private
-    def target_proj
-      @target_proj and return @target_proj
-      vars = load_variables
-      vars.project && !vars.project.empty? and
-        return vars.project
-      logger.fatal "No target project is specified."
-      exit
-    end
-
-    def api
-      OSDNClient::ProjectApi.new
-    end
-
-    def format_package(p)
-      if format == 'json'
-        p.to_json
-      else
-        "##{p.id} #{p.name} (#{p.visibility}, #{[*p.releases].count} releases)\n  #{p.url}"
-      end
-    end
   end
 end; end; end

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

@@ -0,0 +1,91 @@
+require 'osdn/cli/command/frs_base'
+
+module OSDN; module CLI; module Command
+  class Release < FrsBase
+    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 "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 "  -v --visibility=<public|private|hidden>"
+    end
+
+    def self.description
+      "Manipulate release (includes by package) of project"
+    end
+
+    def process_options
+      opts = GetoptLong.new(
+        [ '--format', '-f', GetoptLong::REQUIRED_ARGUMENT ],
+        [ '--project', '-p', GetoptLong::REQUIRED_ARGUMENT ],
+        [ '--package', GetoptLong::REQUIRED_ARGUMENT ],
+        [ '--visibility', '-v', GetoptLong::REQUIRED_ARGUMENT ],
+      )
+      opts.each do |opt, arg|
+        case opt
+        when '--format'
+          arg == 'json' and
+            self.format = arg
+        when '--project'
+          arg.empty? or
+            @target_proj = arg
+        when '--package'
+          arg.empty? or
+            @target_package = arg
+        when '--visibility'
+          unless %w(public private hidden).member?(arg)
+            logger.fatal "Invalid visibility status: #{arg}"
+            exit
+          end
+          @visibility = arg
+        end
+      end
+    end
+
+    def list
+      package = api.get_package target_proj, target_package
+      list = package.releases
+      if format == 'json'
+        puts list.map{|i| i.to_hash}.to_json
+      else
+        list.each do |r|
+          puts format_release(r)
+        end
+      end
+    end
+
+    def create
+      name = ARGV.shift
+      if !name
+        logger.fatal "Release name is missing."
+        help
+        return
+      end
+      r = api.create_release target_proj, target_package, name, visibility: @visibility
+      logger.info "New release has been created."
+      puts format_release(r)
+    end
+
+    def update
+      target_id = ARGV.shift
+      args = {name: ARGV.shift}
+      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."
+      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."
+    end
+
+  end
+end; end; end

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

@@ -0,0 +1,123 @@
+require 'osdn/cli/command/frs_base'
+require 'pathname'
+
+module OSDN; module CLI; module Command
+  class Relfile < FrsBase
+    def help
+      puts "#{$0} relfile [opts] [list]"
+      puts "#{$0} relfile [opts] create <target-file>"
+      puts "#{$0} relfile [opts] update <numeric-file-id>"
+      puts "#{$0} relfile [opts] delete <numeric-file-id>"
+      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 "  -v --visibility=<public|private|hidden>"
+    end
+
+    def self.description
+      "Manipulate release (includes by package) of project"
+    end
+
+    def process_options
+      opts = GetoptLong.new(
+        [ '--format', '-f', GetoptLong::REQUIRED_ARGUMENT ],
+        [ '--project', '-p', GetoptLong::REQUIRED_ARGUMENT ],
+        [ '--package', GetoptLong::REQUIRED_ARGUMENT ],
+        [ '--release', GetoptLong::REQUIRED_ARGUMENT ],
+        [ '--visibility', '-v', GetoptLong::REQUIRED_ARGUMENT ],
+      )
+      opts.each do |opt, arg|
+        case opt
+        when '--format'
+          arg == 'json' and
+            self.format = arg
+        when '--project'
+          arg.empty? or
+            @target_proj = arg
+        when '--package'
+          arg.empty? or
+            @target_package = arg
+        when '--release'
+          arg.empty? or
+            @target_release = arg
+        when '--visibility'
+          unless %w(public private hidden).member?(arg)
+            logger.fatal "Invalid visibility status: #{arg}"
+            exit
+          end
+          @visibility = arg
+        end
+      end
+    end
+    
+    def list
+      release = api.get_release target_proj, target_package, target_release
+      list = release.files
+      if format == 'json'
+        puts list.map{|i| i.to_hash}.to_json
+      else
+        list.each do |f|
+          puts format_file(f)
+        end
+      end
+    end
+
+    def create
+      filename = ARGV.shift
+      if !filename
+        logger.fatal "Target filename is missing."
+        help
+        return
+      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),
+      }
+      fio = file.open
+      logger.level <= Logger::INFO 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
+      fio.close
+      OSDN::CLI._show_progress = false
+      if digests.find { |type, dig| dig != f.send("digest_#{type}") }
+        logger.error "File digests are mismatch! Upload file #{file} may be broken! Please check."
+      else
+        logger.info "Upload complete."
+      end
+      puts format_file(f)
+    end
+
+    def update
+      target_id = ARGV.shift
+      if !target_id
+        logger.fatal "Target file ID is missing."
+        help
+        return
+      end
+      if @visibility.nil?
+        logger.fatal "Visibility status is missing. Use '-v <public|private|hidden>'."
+        return
+      end
+      f = api.update_release_file target_proj, target_package, target_release, target_id, visibility: @visibility
+      logger.info "file #{target_id} has been updated."
+      puts format_file(f)
+    end
+
+    def delete
+      target_id = ARGV.shift
+      if !target_id
+        logger.fatal "Target file ID is missing."
+        help
+        return
+      end
+      f = api.delete_release_file target_proj, target_package, target_release, target_id
+      logger.info "file #{target_id} has been deleted."
+    end
+  end
+end; end; end

data/lib/osdn/cli/overrides.rb

@@ -0,0 +1,16 @@
+require 'typhoeus/easy_factory'
+
+module Typhoeus
+  class EasyFactory
+    alias_method :get_orig, :get
+    def get(*args)
+      easy = get_orig(*args)
+      if OSDN::CLI._show_progress
+        Ethon::Curl.set_option(:noprogress, false, easy.handle)
+      else
+        Ethon::Curl.set_option(:noprogress, true, easy.handle)
+      end
+      easy
+    end
+  end
+end

data/lib/osdn/cli/runner.rb

@@ -7,7 +7,7 @@ module OSDN
     class Runner
       def initialize
         @logger = Logger.new(STDERR)
-        @logger.level = Logger::WARN
+        @logger.level = Logger::INFO
         @logger.formatter = proc { |severity, time, progname, msg|
           "[%s] %s\n" % [severity, msg]
         }
@@ -88,7 +88,7 @@ module OSDN
             elsif err["error_description"]
               logger.fatal err["error_description"]
             else
-              logger.fatal "Command failed: #{e.inspect}"
+              logger.fatal "Command failed by ApiError: #{e.response_body}"
             end
           rescue
             logger.fatal "Command failed: #{e.inspect}"

data/lib/osdn/cli/version.rb

@@ -1,5 +1,5 @@
 module OSDN
   module CLI
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osdn-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - OSDN
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,11 +91,14 @@ files:
 - exe/osdn
 - lib/osdn-cli.rb
 - lib/osdn/cli.rb
+- lib/osdn/cli/command/frs_base.rb
 - lib/osdn/cli/command/frs_mkdirs.rb
 - lib/osdn/cli/command/frs_upload.rb
 - lib/osdn/cli/command/login.rb
 - lib/osdn/cli/command/package.rb
-- lib/osdn/cli/common.rb
+- lib/osdn/cli/command/release.rb
+- lib/osdn/cli/command/relfile.rb
+- lib/osdn/cli/overrides.rb
 - lib/osdn/cli/runner.rb
 - lib/osdn/cli/version.rb
 homepage: https://osdn.jp/projects/osdn-codes/wiki/CommandLineInterface

data/lib/osdn/cli/common.rb

@@ -1,6 +0,0 @@
-module OSDN
-  module CLI
-    module Common
-    end
-  end
-end