tqdm 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a133210c842f8c1c583898dbf792545371bc69fe
-  data.tar.gz: 5718d34d881d6cf1b00d7fda4fe5386db526537b
+SHA256:
+  metadata.gz: cfebca388873f5a48c60d396d7111a339f488e6b8dd5dd7f178616164bd5bcd0
+  data.tar.gz: 79f8f7213f5f63b69f8293bae71163922ed29801975d187cf6a097385ca1b0fe
 SHA512:
-  metadata.gz: aa94d7a905513ca26e45d712db7b63bf1ddc503915e99f728bda5eef4475b916a99bbf969fae97511bc656d8cfd173664cdd16f9ef95b4a8ecf5fcd0263497ae
-  data.tar.gz: 491b60be374b5fa7c4ff2fa473f4359c6aa7130942197ea3e43b74c4e301d2f0ed348ffcc271c50b29d0a8334f81a60bc1c04ffa6ce14d4cabc22e1b4bf40ca9
+  metadata.gz: 1e9f372b270f9c914e8d3f5206105a702c25373d2f7a56aec7488468f2c593dfc3077ffa4b0d0cd19ce73f99c3d15b39728a82ce3157150277c8a50268624fc3
+  data.tar.gz: 80ebc6f10d9f2cad69ee96f210cd8bb8c48667fb537c2d2616e679e0c34cd9afc867df5787e30cf191ebbce7e2ce477d0202ebba912db6a56113dccecca67ad8

data/.github/workflows/ruby-ci.yml

@@ -0,0 +1,38 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby-CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['1.9', '2.0', '2.6', '2.7', '3.0', '3.1']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@ee2113536afb7f793eed4ce60e8d3b26db912da4 # v1.127.0
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake spec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2016 Theodore Pak
+Copyright (c) 2022 Theodore Pak
 
 MIT License
 

data/README.md

@@ -1,5 +1,5 @@
 # tqdm-ruby
-[![Build Status](https://travis-ci.org/powerpak/tqdm-ruby.svg?branch=master)](https://travis-ci.org/powerpak/tqdm-ruby) [![Gem Version](https://badge.fury.io/rb/tqdm.svg)](https://badge.fury.io/rb/tqdm)
+[![Build Status](https://github.com/powerpak/tqdm-ruby/actions/workflows/ruby-ci.yml/badge.svg?branch=master&event=push)](https://github.com/powerpak/tqdm-ruby/actions/workflows/ruby-ci.yml?query=event%3Apush+branch%3Amaster) [![Gem Version](https://badge.fury.io/rb/tqdm.svg?version=0.4.0)](https://badge.fury.io/rb/tqdm)
 
 tqdm-ruby allows you to add a progress indicator to your loops with minimal effort.
 
@@ -29,7 +29,7 @@ It works equally well from within irb, [pry](http://pryrepl.org/), and [iRuby no
 
 Install it globally from [Rubygems](https://rubygems.org/gems/tqdm):
 
-    $ gem install tqdm    # (might need sudo on OS X)
+    $ gem install tqdm    # (might need sudo for a system ruby)
 
 *or* add this line to your application's Gemfile:
 

data/lib/tqdm/decorator.rb

@@ -1,6 +1,11 @@
 require 'tqdm/printer'
 
+CLONE_UNFROZEN_SUPPORTED = RUBY_VERSION.split('.')[0..1].join('.').to_f >= 2.4
+
 module Tqdm
+  
+  class DecoratorError < StandardError
+  end
 
   # Decorates the #each method of an `Enumerable` by wrapping it so that each
   # iteration produces a pretty progress bar printed to the console or a file handle.
@@ -44,6 +49,7 @@ module Tqdm
       @min_iterations = options[:min_iters] || 1
       @min_interval = options[:min_interval] || 0.5
       @leave = options[:leave] || false
+      @force_refreeze = false
     end
 
     # Starts the textual progress bar.
@@ -87,6 +93,7 @@ module Tqdm
     #   progress bar.
     def enhance
       decorate_enumerable_each
+      enhanced.freeze if @force_refreeze
       enhanced
     end
 
@@ -96,8 +103,8 @@ module Tqdm
       tqdm = self
       enhanced.define_singleton_method(:each) do |*args, &block|
         tqdm.start!
-        result = super(*args) do |item|
-          block.call item if block
+        result = super(*args) do |*items|
+          block.call *items if block
           tqdm.increment!
         end
         tqdm.finish!
@@ -106,7 +113,27 @@ module Tqdm
     end
 
     def enhanced
-      @enhanced ||= enumerable.clone
+      @enhanced ||= enumerable_unfrozen
+    end
+
+    # Uses progressively more invasive techniques to return an unfrozen copy of @enumerable
+    def enumerable_unfrozen
+      to_unfreeze = CLONE_UNFROZEN_SUPPORTED ? enumerable.clone(freeze: false) : enumerable.clone
+      return to_unfreeze unless to_unfreeze.frozen?
+      to_unfreeze = to_unfreeze.dup
+      return to_unfreeze unless to_unfreeze.frozen?
+      
+      # Significantly, for some classes like Sequel::Dataset, both #clone and #dup re-freeze
+      # the object before returning it, so we have to drop back to Object#clone to avoid this
+      @force_refreeze = true
+      if CLONE_UNFROZEN_SUPPORTED
+        to_unfreeze = Object.instance_method(:clone).bind(enumerable).call(freeze: false)
+      end
+      if Object.instance_method(:frozen?).bind(to_unfreeze).call
+        raise DecoratorError.new("could not create an unfrozen clone")
+      end
+      
+      to_unfreeze
     end
 
     def total!

data/lib/tqdm/version.rb

@@ -1,4 +1,4 @@
 module Tqdm
   # The version of this module and gem by the same name.
-  VERSION = "0.3.0"
+  VERSION = "0.4.1"
 end

data/spec/sequel_spec.rb

@@ -38,6 +38,18 @@ describe 'When enumerating over a Sequel dataset' do
           "\r                                                                   " \
           "\r"
       end
+
+      it 'returns a re-frozen object' do
+        enhanced = nil
+        with_stderr { enhanced = timecop_loop(database[:items]) }
+        expect(enhanced.frozen?).to be_truthy
+      end
+
+      it 'returns an object inheriting from Sequel::Dataset' do
+        enhanced = nil
+        with_stderr { enhanced = timecop_loop(database[:items]) }
+        expect(enhanced).to be_kind_of(Sequel::Dataset)
+      end
     end
     
     context 'with leave: true' do

data/tqdm.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "sequel"
   spec.add_development_dependency "sqlite3"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tqdm
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Theodore Pak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2023-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -102,9 +102,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby-ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - ".yardopts"
 - Gemfile
 - LICENSE.txt
@@ -140,8 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Enhances Enumerables to show progress while iterating.

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-rvm:
- - "1.9.2"
- - "1.9.3"
- - "2.0.0"
- - "2.1.8"
- - "2.2.4"
- - rbx