cute_print 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0d855507092404371d5759b32d04a2ad2a7f62d4
-  data.tar.gz: 4fbd0367d14891b9f44cc06c5a618aabaa739c30
+SHA256:
+  metadata.gz: afe267ce9b44683e2dae746f7ff91468761ae694c54654c5b6e1478eec1913a9
+  data.tar.gz: 9c3fe451cbf354c890975d43576b7b4ea2e2489162592602b99c686a242d19df
 SHA512:
-  metadata.gz: 54b25a6c26cb97acc2e294aa46121c0a2884ac1e25fcff8e39a37b22adc801d3300ccd4711f03bd514877261b9eb3f69b13d61f0791effe2f9f906c2ee4ecd11
-  data.tar.gz: eec06862739df60c376cbd6a7a087e3d11f078fd4eecd5a6a1ebee576ff8d5b3268b9ed5bf98a246a73e649ea511bd35216052c69349991cd9f1d29c5a85e42c
+  metadata.gz: e316c0edb7b2f36e246a92126a64da7d7c6e8c0bd0055d87278a807a0e479d0c844a4583a586958ec0c935e2bc2a77a4551072035f4790551c73b67a0718c8b4
+  data.tar.gz: 69d5d45f49c02afddd967c4112be0971a3e706c5be06d2c4406f44bb3ecc3d0f868b1656dfeaf5905fe191c36365e3ea16faa6c894baba8c74f7aee7e74b4a4f

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-# 1.1.5 - 2017-07-25
+# 1.3.0 - 2018-03-13
+
+* Rubies prior to 2.2 are no longer supported.
+* Update gems
+* No longer require hirb gem
+* Removed warnings in Rubies 2.4 and 2.5
+
+# 1.2.0 - 2017-07-25
 
 * Remove jeweler gem as a development dependency
 * Added CutePrint::Release with version and release date constants
@@ -7,7 +14,7 @@
 # 1.1.4 - 2016-06-15
 
 * Update gems
-	
+
 # 1.1.3 - 2016-02-22
 
 * Update gems

data/LICENSE

@@ -18,3 +18,9 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----
+
+Portions of cute_print were extracted from the hirb gem.  hirb is
+Copyright (c) 2010 by Gabrier Horner, which is also under the MIT
+License.

data/README.md

@@ -184,14 +184,20 @@ methods:
 
 The "tap" methods are not available when using CutePrint this way.
 
-## Rubies supported
+## Ruby versions
 
-This gem is known to work with these Rubies:
+As of version 1.1.6, cute_print works with these versions of Ruby:
 
-* ruby-1.9.3
-* ruby-2.0
-* ruby-2.1
-* ruby-2.2
+* ruby-2.5.0
+* ruby-2.4.3
+* ruby-2.3.6
+* ruby-2.2.9
+
+For older versions of Ruby, use cute_print version 1.2.0, which works
+with:
+
+* ruby-2.1.10
+* ruby-1.9.3 (tests pass but with warnings)
 
 ## Platforms supported
 

data/cute_print.gemspec

@@ -67,53 +67,20 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "cute_print.gemspec",
-    "lib/cute_print.rb",
-    "lib/cute_print/configure.rb",
-    "lib/cute_print/core.rb",
-    "lib/cute_print/core_ext.rb",
-    "lib/cute_print/core_ext/irb.rb",
-    "lib/cute_print/core_ext/object.rb",
-    "lib/cute_print/cute_print.rb",
-    "lib/cute_print/finds_foreign_caller.rb",
-    "lib/cute_print/format.rb",
-    "lib/cute_print/format/inspect.rb",
-    "lib/cute_print/format/pretty_print.rb",
-    "lib/cute_print/formatter.rb",
-    "lib/cute_print/inline_labeler.rb",
-    "lib/cute_print/labeler.rb",
-    "lib/cute_print/location.rb",
-    "lib/cute_print/location_label.rb",
-    "lib/cute_print/location_label/filename.rb",
-    "lib/cute_print/location_label/path.rb",
-    "lib/cute_print/mixin.rb",
-    "lib/cute_print/outline_labeler.rb",
-    "lib/cute_print/printer.rb",
-    "lib/cute_print/ruby_generator.rb",
-    "lib/cute_print/ruby_parser.rb",
-    "lib/cute_print/ruby_parser/block.rb",
-    "lib/cute_print/ruby_parser/method_call.rb",
-    "lib/cute_print/ruby_parser/parsed_code.rb",
-    "lib/cute_print/ruby_parser/wraps_sexp.rb",
-    "lib/cute_print/source_label.rb",
-    "lib/cute_print/stderr_out.rb",
-    "lib/cute_print/term_width.rb",
-    "lib/cute_print/term_width/detected.rb",
-    "lib/cute_print/term_width/static.rb",
-    "lib/cute_print/values.rb",
   ]
   s.files += Dir["lib/**/*.rb"]
   s.homepage = "http://github.com/wconrad/cute_print"
   s.licenses = ["MIT"]
+  s.required_ruby_version = ">= 1.9.3"
   s.rubygems_version = "2.5.1"
   s.summary = "print debug to stderr, with flair"
   s.specification_version = 4
-  s.add_development_dependency("cucumber", "~> 2.0")
+  s.add_development_dependency("cucumber", "~> 3.0")
   s.add_development_dependency("rake", "~> 12.0")
   s.add_development_dependency("redcarpet", "~> 3.2")
   s.add_development_dependency("rspec", "~> 3.1")
   s.add_development_dependency("rspec-given", "~> 3.5")
   s.add_development_dependency("yard", "~> 0.9.9")
-  s.add_runtime_dependency("hirb", "~> 0.7")
   s.add_runtime_dependency("ruby2ruby", "~> 2.1")
   s.add_runtime_dependency("ruby_parser", "~> 3.6")
 end

data/lib/cute_print/release.rb

@@ -6,8 +6,8 @@ module CutePrint
   # by the library as well.
   module Release
 
-    VERSION = "1.2.0"
-    DATE = "2017-07-25"
+    VERSION = "1.3.0"
+    DATE = "2018-03-13"
 
   end
 end

data/lib/cute_print/term_width/detected.rb

@@ -1,5 +1,3 @@
-require "hirb"
-
 module CutePrint
   class TermWidth
 
@@ -24,7 +22,7 @@ module CutePrint
 
       def detect_width
         return width_override_for_tests if width_override_for_tests
-        width, _height = Hirb::Util.detect_terminal_size
+        width, _height = detect_terminal_size
         # Hirb returns nil if it can't determine the terminal width.
         # Program run in Emacs have an apparent terminal width of "0".
         width = FALLBACK_WIDTH if width.nil? || width == 0
@@ -36,6 +34,34 @@ module CutePrint
         n && Integer(n)
       end
 
+      # This function extracted from hirb version 0.7.3.  hirb is
+      # copyright (c) 2010 by Gabriel Horner and licensed under the
+      # MIT License.  This gem also uses the MIT License, so there is
+      # no problem with moving that function into here.
+      #
+      # The project: https://github.com/cldwalker/hirb
+      # The specific file:
+      # https://github.com/cldwalker/hirb/blob/master/lib/hirb/util.rb#L59
+      #
+      # We extracted the function because hirb is no longer maintained
+      # and now causes warnings with ruby-2.4.0 or greater.
+
+      # Returns [width, height] of terminal when detected, nil if not detected.
+      # Think of this as a simpler version of Highline's Highline::SystemExtensions.terminal_size()
+      def detect_terminal_size
+        if (ENV['COLUMNS'] =~ /^\d+$/) && (ENV['LINES'] =~ /^\d+$/)
+          [ENV['COLUMNS'].to_i, ENV['LINES'].to_i]
+        elsif (RUBY_PLATFORM =~ /java/ || (!STDIN.tty? && ENV['TERM'])) && command_exists?('tput')
+          [`tput cols`.to_i, `tput lines`.to_i]
+        elsif STDIN.tty? && command_exists?('stty')
+          `stty size`.scan(/\d+/).map { |s| s.to_i }.reverse
+        else
+          nil
+        end
+      rescue
+        nil
+      end
+
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cute_print
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Wayne Conrad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.9
-- !ruby/object:Gem::Dependency
-  name: hirb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: ruby2ruby
   requirement: !ruby/object:Gem::Requirement
@@ -198,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -206,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: print debug to stderr, with flair