osdn-cli 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3376886c75658394fda1f814ebdfe379058ae405
-  data.tar.gz: d7c42b6e4e49cf484bdf5f26e6d9a937e89dcda6
+  metadata.gz: 4aa4a8b62253ab0ed65d450c8d525306d2e2d99a
+  data.tar.gz: 6d7f94ca2a2b67534dab98e754d84e36d187f41e
 SHA512:
-  metadata.gz: 294713c7170970f465d9cfffda467b81eee659666ad1dcecc418e139e61800e626cbdaa724e5e918c20a128fb0025ab85987470c71b06749701f497f35c7d630
-  data.tar.gz: 5ce41536e44564b935bb6a87dbb38d3558836fa2b915c935f98a78807fc5bc548a60f4499898948e89c84dc2457cfa9319e8c91dceb1923e8e6dd97c66a2bdf0
+  metadata.gz: f027851b7fe92c2bc9a18a84c573acb661f3726daec977245650d50f7d768670acb8f8d00a25dd531a949498c60109625cc5ccf2d402c6fa528958fb6fc924e1
+  data.tar.gz: a12bb95e117c22e5cb61c5d884cdea10c3a881f0b3ccd15a6e1fa958d1398285d04a7276050b7f74ed04455d9a4ad09ccbb1144be72c48398e057b607c27f9ab

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

@@ -36,13 +36,21 @@ module OSDN; module CLI; module Command
       logger.debug "Making each package directry"
 
       packages.each do |package|
-        logger.info "Making directory for package #{package.name}"
-        pdir = target_dir + package.name
+        pname = fsname(package.name)
+        if pname != package.name
+          logger.warn "Package name '#{package.name}' is not suitable for filesystem, using '#{pname}'."
+        end
+        logger.info "Making directory for package #{pname}"
+        pdir = target_dir + pname
         FileUtils.mkdir_p(pdir)
         update_variables pdir, package_id: package.id
         package.releases.each do |release|
-          logger.info "Making directory for release #{release.name}"
-          rdir = pdir + release.name
+          rname = fsname(release.name)
+          if rname != release.name
+            logger.warn "Release name '#{release.name}' is not suitable for filesystem, using '#{rname}'."
+          end
+          logger.info "Making directory for release #{rname}"
+          rdir = pdir + rname
           FileUtils.mkdir_p(rdir)
           update_variables rdir, release_id: release.id
         end
@@ -66,5 +74,13 @@ module OSDN; module CLI; module Command
     def api
       OSDNClient::ProjectApi.new
     end
+
+    def fsname(name)
+      name = name.to_s.tr('/', '-')
+      if name.empty?
+        name = '(no-name)'
+      end
+      name
+    end
   end
 end; end; end

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

@@ -1,3 +1,5 @@
+require 'digest'
+
 module OSDN; module CLI; module Command
   class FrsUpload < Base
     def help
@@ -47,8 +49,12 @@ module OSDN; module CLI; module Command
       Pathname.glob(@target_dir+'*').each do |pdir|
         unless load_variables(pdir).package_id
           logger.info "Createing new package '#{pdir.basename}'"
-          pinfo = api.create_package target_proj, pdir.basename, visibility: @visibility
-          update_variables pdir, package_id: pinfo.id
+          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
 
@@ -59,13 +65,12 @@ module OSDN; module CLI; module Command
             rinfo = api.get_release target_proj, target_package(rdir), target_release(rdir)
           else vars.release_id
             logger.info "Createing new release '#{rdir.basename}'"
-            rinfo = nil
-            if api.respond_to? :create_reelase # TODO: remove, just typo...
-              rinfo = api.create_reelase target_proj, target_package(rdir), rdir.basename, visibility: @visibility
+            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
-            update_variables rdir, release_id: rinfo.id
             $stdout.puts "New release '#{rinfo.name}' has been created; #{rinfo.url}"
           end
           
@@ -75,13 +80,27 @@ module OSDN; module CLI; module Command
               next
             end
 
-            if rinfo.files.find { |f| f.name == file.basename.to_s }
+            digests = {
+              sha256: hexdigest(Digest::SHA256, file),
+              sha1:   hexdigest(Digest::SHA1, file),
+              md5:    hexdigest(Digest::MD5, file),
+            }
+            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}'"
             else
               logger.info "Uploading file #{file} (#{file.size} bytes)"
-              # TODO: show progress bar!
-              finfo = api.create_release_file target_proj, target_package(rdir), target_release(rdir), file.open, visibility: @visibility
-              logger.info "Upload completed."
+              if @dry_run
+                finfo = Hashie::Mash.new id: '(dry-run)', url: '(dry-run)'
+              else
+                # TODO: show progress bar!
+                fio = file.open
+                finfo = api.create_release_file target_proj, target_package(rdir), target_release(rdir), fio, visibility: @visibility
+                fio.close
+                logger.info "Upload completed."
+              end
               $stdout.puts "New file '#{file}' has been uploaded; #{finfo.url}"
             end
           end
@@ -124,5 +143,15 @@ 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

@@ -4,7 +4,7 @@ module OSDN; module CLI; module Command
       logger.debug "Trying login"
       scope = %w(profile group group_write)
 
-      auth_url = "https://osdn.jp/account/oauth2ui/authorize?client_id=#{CLI.client_id}&state=cli#{Time.now.to_i}&response_type=code&scope=#{scope.join('%20')}"
+      auth_url = "https://#{OSDNClient.configure.host}/account/oauth2ui/authorize?client_id=#{CLI.client_id}&state=cli#{Time.now.to_i}&response_type=code&scope=#{scope.join('%20')}"
 
       launch_brwoser auth_url
       puts

data/lib/osdn/cli/runner.rb

@@ -11,6 +11,12 @@ module OSDN
         @logger.formatter = proc { |severity, time, progname, msg|
           "[%s] %s\n" % [severity, msg]
         }
+        OSDNClient.configure do |config|
+          ENV['OSDN_API_OVERRIDE_HOST'] and
+            config.host = ENV['OSDN_API_OVERRIDE_HOST']
+          ENV['OSDN_API_SKIP_SSL_VERIFY'].to_s =~ /^(1|t(rue)?|y(es)?)$/ and
+            config.verify_ssl = false
+        end
       end
       attr_reader :logger
       

data/lib/osdn/cli/version.rb

@@ -1,5 +1,5 @@
 module OSDN
   module CLI
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osdn-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - OSDN
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,16 @@ dependencies:
   name: osdn-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.20160304
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.20160304
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement