bundleup 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cdcf23602e29ab6ba90b1595932e66128998669
-  data.tar.gz: 18f6f50cc591ee28556dd02b6d49e17ac59bf1f3
+  metadata.gz: 937fb9c6fe224775034f3b171ba144c66d219ecd
+  data.tar.gz: 125b8152261a96af8e11ae5a194d6c3b086996fd
 SHA512:
-  metadata.gz: 4aad6eeb2689aa6e4497773eb121a49a4fa0e76b60b74f7b0093b934d6bc078026076c3fbfb351a3364896a101ec108a43bc479e3cf9a8be6ea7bf8642588274
-  data.tar.gz: e1858b619e1df3213996abd4da0ad6d27b8ecf8b0ced37bf487baf21412c43ef2d6418d791d7569b0b5ff02e1bdb5e7c2615c86d3d9c94f0536cdf2ade089d5b
+  metadata.gz: f270281d398bf180238623faf7e7dd7f7fe049ed6ec700a68ddbb128cc7178c007d3f21e18bacf118d52d1d6153313dad16c3ad2b92c9cfa11377f976d7b4bff
+  data.tar.gz: 32cef2ce2c943d5b71a194423a006bb734855eb6e6a0654b219250cb8eee54f7d99baa3739f8dd538ee78019914a32df2e2d0bc69167616bcc31fcdbe15f62b0

data/.rubocop.yml

@@ -2,6 +2,9 @@ AllCops:
   Exclude:
     - "*.gemspec"
 
+Layout/SpaceAroundEqualsInParameterDefault:
+  EnforcedStyle: no_space
+
 Metrics/AbcSize:
   Exclude:
     - "test/**/*"
@@ -29,8 +32,5 @@ Style/DoubleNegation:
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
-Style/SpaceAroundEqualsInParameterDefault:
-  EnforcedStyle: no_space
-
 Style/StringLiterals:
   EnforcedStyle: double_quotes

data/.travis.yml

@@ -3,4 +3,5 @@ rvm:
   - 2.1
   - 2.2
   - 2.3.0
-before_install: gem install bundler -v 1.11.2
+  - 2.4.0
+before_install: gem install bundler -v 1.13.7

data/CHANGELOG.md

@@ -8,6 +8,10 @@ bundleup is in a pre-1.0 state. This means that its APIs and behavior are subjec
 
 * Your contribution here!
 
+## [0.6.0][] (2017-11-06)
+
+* [#1](https://github.com/mattbrictson/bundleup/issues/1): If a Gemfile has an inline or prefix comment for a particular gem, and that gem is being held back due to a pin, then print the comment along with the pin information in bundleup's output.
+
 ## [0.5.0][] (2016-04-01)
 
 * You can now pass command-line arguments to bundleup, which will in turn be
@@ -44,7 +48,8 @@ bundleup is in a pre-1.0 state. This means that its APIs and behavior are subjec
 * Initial release
 
 [Semver]: http://semver.org
-[Unreleased]: https://github.com/mattbrictson/bundleup/compare/v0.5.0...HEAD
+[Unreleased]: https://github.com/mattbrictson/bundleup/compare/v0.6.0...HEAD
+[0.6.0]: https://github.com/mattbrictson/bundleup/compare/v0.5.0...v0.6.0
 [0.5.0]: https://github.com/mattbrictson/bundleup/compare/v0.4.0...v0.5.0
 [0.4.0]: https://github.com/mattbrictson/bundleup/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/mattbrictson/bundleup/compare/v0.2.0...v0.3.0

data/Rakefile

@@ -12,4 +12,4 @@ end
 RuboCop::RakeTask.new
 
 task "release:rubygem_push" => "chandler:push"
-task :default => [:test, :rubocop]
+task :default => %i[test rubocop]

data/bundleup.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "chandler"
-  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "coveralls", "~> 0.8.19"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "minitest-reporters"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rubocop", ">= 0.37.2"
+  spec.add_development_dependency "minitest-reporters", "~> 1.1"
+  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rubocop", "0.51.0"
 end

data/lib/bundleup.rb

@@ -2,5 +2,6 @@ require "bundleup/version"
 require "bundleup/console"
 require "bundleup/bundle_commands"
 require "bundleup/gem_status"
+require "bundleup/gemfile"
 require "bundleup/upgrade"
 require "bundleup/cli"

data/lib/bundleup/bundle_commands.rb

@@ -5,15 +5,15 @@ module Bundleup
     include Console
 
     def outdated
-      run(%w(bundle outdated), true)
+      run(%w[bundle outdated], true)
     end
 
     def show
-      run(%w(bundle show))
+      run(%w[bundle show])
     end
 
     def update(args=[])
-      run(%w(bundle update) + args)
+      run(%w[bundle update] + args)
     end
 
     private

data/lib/bundleup/cli.rb

@@ -60,17 +60,25 @@ module Bundleup
         [g.name, g.old_version || "(new)", "→", g.new_version || "(removed)"]
       end
       upgrades.zip(rows).each do |g, row|
-        color(g.color, row)
+        puts color(g.color, row)
       end
     end
 
     def print_pins_table
       rows = tableize(pins) do |g|
-        pin_operator, pin_version = g.pin.split(" ", 2)
-        reason = [":", "pinned at", pin_operator.rjust(2), pin_version]
-        [g.name, g.new_version, "→", g.newest_version, *reason]
+        [g.name, g.new_version, "→", g.newest_version, *pin_reason(g)]
       end
       puts rows.join("\n")
     end
+
+    def pin_reason(gem)
+      notes = color(:gray, gemfile.gem_comment(gem.name))
+      pin_operator, pin_version = gem.pin.split(" ", 2)
+      [":", "pinned at", pin_operator.rjust(2), pin_version, notes]
+    end
+
+    def gemfile
+      @gemfile ||= Gemfile.new
+    end
   end
 end

data/lib/bundleup/console.rb

@@ -9,17 +9,17 @@ module Bundleup
     }.freeze
 
     def ok(message)
-      color(:green, "✔ #{message}")
+      puts color(:green, "✔ #{message}")
     end
 
     def attention(message)
-      color(:yellow, message)
+      puts color(:yellow, message)
     end
 
     def color(color_name, message)
       code = ANSI_CODES[color_name]
       return puts(message) if code.nil?
-      puts "\e[0;#{code};49m#{message}\e[0m"
+      "\e[0;#{code};49m#{message}\e[0m"
     end
 
     def confirm(question)
@@ -29,7 +29,7 @@ module Bundleup
 
     # Runs a block in the background and displays a spinner until it completes.
     def progress(message, &block)
-      spinner = %w(/ - \\ |).cycle
+      spinner = %w[/ - \\ |].cycle
       print "\e[90m#{message}... \e[0m"
       result = observing_thread(block, 0.5, 0.1) do
         print "\r\e[90m#{message}... #{spinner.next} \e[0m"

data/lib/bundleup/gem_status.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Metrics/BlockLength
 module Bundleup
   GemStatus = Struct.new(:name,
                          :old_version,

data/lib/bundleup/gemfile.rb

@@ -0,0 +1,27 @@
+module Bundleup
+  class Gemfile
+    def initialize(path="Gemfile")
+      @contents = IO.read(path)
+    end
+
+    def gem_comment(gem_name)
+      inline_comment(gem_name) || prefix_comment(gem_name)
+    end
+
+    private
+
+    attr_reader :contents
+
+    def inline_comment(gem_name)
+      contents[/#{gem_declaration_re(gem_name)}.*(#\s*\S+.*)/, 1]
+    end
+
+    def prefix_comment(gem_name)
+      contents[/^\s*(#\s*\S+.*)\n#{gem_declaration_re(gem_name)}/, 1]
+    end
+
+    def gem_declaration_re(gem_name)
+      /^\s*gem\s+["']#{Regexp.escape(gem_name)}["']/
+    end
+  end
+end

data/lib/bundleup/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Bundleup
-  VERSION = "0.5.0".freeze
+  VERSION = "0.6.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundleup
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.19
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.19
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -70,44 +70,44 @@ dependencies:
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.37.2
+        version: 0.51.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.37.2
+        version: 0.51.0
 description: 
 email:
 - bundleup@mattbrictson.com
@@ -135,6 +135,7 @@ files:
 - lib/bundleup/cli.rb
 - lib/bundleup/console.rb
 - lib/bundleup/gem_status.rb
+- lib/bundleup/gemfile.rb
 - lib/bundleup/upgrade.rb
 - lib/bundleup/version.rb
 - sample.png
@@ -158,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A friendlier command-line interface for Bundler’s `update` and `outdated`