gemfury 0.10.0 → 0.11.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7ad8af7e2f9db42d44a05360c28f3e691607c272b4d11a4de88047d7fd37eb2
-  data.tar.gz: 113e1ffe15573f136a79f27fe8606a9b65568d8905128ea6beebd0d5d0748416
+  metadata.gz: d70b381f57a4b0bdaa62c9cf441eaa42bbd5c0fbb6ff3317ef2a396fbbf65217
+  data.tar.gz: 4a2869a2f1b62c3bbb9326dc4dcf73b8086a0ac4d4f6a75925c90a4fb8e8fe75
 SHA512:
-  metadata.gz: 57e3be83d8d4f0c121273b137655f363af2c5b9e5cd2cb036b02c8a9cdc6ec025b75380b19a7c45ad544c5beb772bb6e8cc0e220bffa547aacdfe10f8139d7b8
-  data.tar.gz: ab16b83e43abacaf44a274ea6d78c216a98fb3ff1bde3596ddf4c41f75046dd1f4a31bd614a49c5d91a81a05e1a66b00b9fed71c78498bdd8cd18de11f23d1d3
+  metadata.gz: 5c7eb18d8f1660c10ef60c7eabe1f218ab02ccbdc28d7f79d59f15d0d827452ef53b238cc7d4e523be9b38f6f10626142dfca7ab789e3d55e9c7d535d4311923
+  data.tar.gz: 2f135047469572a771c67a24b47d113b3710154ed421319148e5439bf8b7196854d8d9366ee6ab5cdb8474b9ed36f25761bbdcbea85de279e5a21508e99273a6

data/lib/gemfury/command/app.rb

@@ -1,3 +1,6 @@
+require 'progressbar'
+require 'delegate'
+
 class Gemfury::Command::App < Thor
   include Gemfury::Command::Authorization
   UserAgent = "Gemfury CLI #{Gemfury::VERSION}".freeze
@@ -15,6 +18,7 @@ class Gemfury::Command::App < Thor
 
   ### PACKAGE MANAGEMENT ###
   option :public, :type => :boolean, :desc => "Create as public package"
+  option :quiet, :type => :boolean, :aliases => "-q", :desc => "Do not show progress bar", :default => false
   desc "push FILE", "Upload a new version of a package"
   def push(*gems)
     with_checks_and_rescues do
@@ -46,10 +50,10 @@ class Gemfury::Command::App < Thor
       shell.say "\n*** #{gem_name.capitalize} Versions ***\n\n"
 
       va = []
-      va = [ %w{ version uploaded uploaded_by } ]
+      va = [ %w{ version uploaded_by uploaded } ]
       versions.each do |v|
-        uploaded = Time.parse(v['created_at']).strftime('%F %R %z')
-        va << [ v['version'], uploaded, v['created_by']['name'] ]
+        uploaded = time_ago(Time.parse(v['created_at']).getlocal)
+        va << [ v['version'], v['created_by']['name'], uploaded ]
       end
 
       shell.print_table(va)
@@ -114,16 +118,25 @@ class Gemfury::Command::App < Thor
   desc "sharing", "List collaborators"
   def sharing
     with_checks_and_rescues do
-      me = client.account_info['username']
+      account_info = client.account_info
+      me = account_info['username']
+
       collaborators = client.list_collaborators
       if collaborators.empty?
-        shell.say "You (#{me}) are the only collaborator", :green
+        shell.say %Q(You (#{me}) are the only collaborator\n), :green
       else
         shell.say %Q(\n*** Collaborators for "#{me}" ***\n), :green
-        usernames = [me] + collaborators.map { |c| c['username'] }
-        shell.say usernames.join("\n")
+
+        va = [ %w{ username permission } ]
+
+        if account_info['type'] == 'user'
+          va << [ me, 'owner' ]
+        end
+
+        collaborators.each { |c| va << [ c['username'], c['permission'] ] }
+
+        shell.print_table(va)
       end
-      shell.say "\n"
     end
   end
 
@@ -248,6 +261,10 @@ private
       g.is_a?(String) ? File.new(g) : g rescue nil
     end.compact
 
+    if !options[:quiet] && !shell.mute? && $stdout.tty?
+      files = files.map { |g| ProgressIO.new(g) }
+    end
+
     if files.empty?
       die!("Problem: No valid packages found", nil, command)
     end
@@ -259,11 +276,23 @@ private
 
     error_ex = nil
 
-    # Let's get uploading
     files.each do |file|
+      show_bar = file.is_a?(ProgressIO) && file.show_bar?
+      title = "Uploading #{File.basename(file.path)} "
+
       begin
-        shell.say "Uploading #{File.basename(file.path)} "
-        client.push_gem(file, push_options)
+        if show_bar
+          begin
+            client.push_gem(file, push_options)
+          ensure
+            shell.say "\e[A\e[0K", nil, false
+            shell.say title
+          end
+        else
+          shell.say title
+          client.push_gem(file, push_options)
+        end
+
         shell.say "- done"
       rescue Gemfury::CorruptGemFile => e
         shell.say "- problem processing this package", :red
@@ -286,10 +315,77 @@ private
     end
   end
 
+  C50K = 50000
+
+  class ProgressIO < SimpleDelegator
+    attr_reader :content_type, :original_filename, :local_path
+
+    def initialize(filename_or_io, content_type = 'application/octet-stream', fname = nil)
+      io = filename_or_io
+      local_path = ''
+
+      if io.respond_to? :read
+        local_path = filename_or_io.respond_to?(:path) ? filename_or_io.path : 'local.path'
+      else
+        io = File.open(filename_or_io)
+        local_path = filename_or_io
+      end
+
+      fname ||= local_path
+
+      @content_type = content_type
+      @original_filename = File.basename(fname)
+      @local_path = local_path
+
+      if io.respond_to? :size
+        filesize = io.size
+      else
+        filesize = io.stat.size
+      end
+
+      if filesize > C50K
+        title = 'Uploading %s ' % File.basename(fname)
+        @bar = ProgressBar.create(:title => title, :total => filesize)
+      else
+        @bar = nil
+      end
+
+      super(io)
+    end
+
+    def show_bar?
+      @bar != nil
+    end
+
+    def read(length)
+      buf = __getobj__.read(length)
+      unless @bar.nil? || buf.nil?
+        @bar.progress += buf.bytesize
+      end
+
+      buf
+    end
+  end
+
   def die!(msg, err = nil, command = nil)
     shell.say msg, :red
     help(command) if command
     shell.say %Q(#{err.class.name}: #{err}\n#{err.backtrace.join("\n")}) if err && ENV['DEBUG']
     exit(1)
   end
+
+  def time_ago(tm)
+    ago = tm.strftime('%F %R')
+
+    in_secs = Time.now - tm
+    if in_secs < 60
+      ago += ' (~ %ds ago)' % in_secs
+    elsif in_secs < 3600
+      ago += ' (~ %sm ago)' % (in_secs / 60).floor
+    elsif in_secs < (3600 * 24)
+      ago += ' (~ %sh ago)' % (in_secs / 3600).floor
+    end
+
+    ago
+  end
 end

data/lib/gemfury/version.rb

@@ -1,3 +1,3 @@
 module Gemfury
-  VERSION = '0.10.0'
+  VERSION = '0.11.0.rc1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemfury
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0.rc1
 platform: ruby
 authors:
 - Michael Rykov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-20 00:00:00.000000000 Z
+date: 2019-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -104,6 +104,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.1.0.pre
+- !ruby/object:Gem::Dependency
+  name: progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.1
 description: 'Hosted repo for your public and private packages at https://gemfury.com
 
 '
@@ -165,9 +179,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.8