safe_update 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2691acf87593613225b1c53fc4786d330791082c
-  data.tar.gz: ed8afd4d7c0508445a1f2f37d847cfac7a647bba
+  metadata.gz: a34ecfbe5b686673a2abc202136461330aaa4f2f
+  data.tar.gz: ebea4606b6853cf0f3e27747eb3eebea8b7fd574
 SHA512:
-  metadata.gz: 76fa5e5858e0a02595dc15f7f459ca310187e05cf73d80a9d452e5aa56a64489b30912dae3e1756f122d0bd2a89bf214640ca2d6f173804e92d4f1183dca0a14
-  data.tar.gz: 9edfaab5bb002051bc1cc9fa135f930a5585b55de794ec1db7ab35012a58b159a0627eac3ffdf74d38c21a6f1b93b57863b390f0095abe31c2c04ebb71440676
+  metadata.gz: fc7aa962362fc264c326369a662f2e5e2a75bae8b6c5b196c4747cf48e9f0c49e7f73cf90eabc8bf3ee29bef75dd6e5d49b65446d4a5e5ff2fa4deb365d01724
+  data.tar.gz: 172d61cd95fcd536f9494ba89887e8d10f1fd94a00cd90826b04afcd250925a68860ebd62a0d4970e7152f39ebab454ec7a21c4c0d629e45f558ebf248b6f28e

data/lib/safe_update/bundle_outdated_parser.rb

@@ -0,0 +1,60 @@
+# This class runs `bundle outdated` and parses the output
+# into a workable data structure in Ruby.
+module SafeUpdate
+  class BundleOutdatedParser
+    def call
+      @outdated_gems = []
+      # Yes, I know about `bundle outdated --parseable` but old versions
+      # don't support it and it's really not THAT much more parseable anyway
+      # and parseable still sometimes has lines that aren't relevant
+      @output = `bundle outdated`
+      @output.split(/\n+/).each do |line|
+        process_single_line(line)
+      end
+      return @outdated_gems
+    end
+
+    private
+
+    def process_single_line(line)
+      # guard clause for output that's not an outdated gem
+      return if !line.include?(' (newest')
+      # get rid of leading *, eg in '  * poltergeist (newest 1.9.0, installed 1.8.1)'
+      line.strip!
+      line.gsub!(/^\*/, '')
+      line.strip!
+
+      @outdated_gems << OutdatedGem.new(
+        gem_name: gem_name(line),
+        newest: newest(line),
+        installed: installed(line),
+        requested: requested(line)
+      )
+    end
+
+    def gem_name(line)
+      string_between(line, '', ' (newest')
+    end
+
+    def newest(line)
+      string_between(line, ' (newest ', ', installed')
+    end
+
+    def requested(line)
+      string_between(line, ', requested ', ')')
+    end
+
+    def installed(line)
+      if line.index('requested')
+        string_between(line, ', installed ', ', requested')
+      else
+        string_between(line, ', installed ', ')')
+      end
+    end
+
+    # returns the section of string that resides between marker1 and marker2
+    def string_between(string, marker1, marker2)
+      string[/#{Regexp.escape(marker1)}(.*?)#{Regexp.escape(marker2)}/m, 1]
+    end
+  end
+end

data/lib/safe_update/outdated_gem.rb

@@ -1,26 +1,22 @@
 module SafeUpdate
   class OutdatedGem
-    attr_reader :newest, :installed, :requested
-
-    # line is a line from bundle outdated --parseable
-    # eg. react-rails (newest 1.6.0, installed 1.5.0, requested ~> 1.0)
-    # or. react-rails (newest 1.6.0, installed 1.5.0)
-    def initialize(line, git_repo = nil)
-      @line = line
-      @git_repo = git_repo || GitRepo.new
-      if name.to_s.empty?
-        fail "Unexpected output from `bundle outdated --parseable`: #{@line}"
-      end
+    attr_reader :gem_name, :newest, :installed, :requested
+    def initialize(opts = {})
+      @gem_name  = opts[:gem_name]
+      @newest    = opts[:newest]
+      @installed = opts[:installed]
+      @requested = opts[:requested]
+      @git_repo  = opts[:git_repo] || GitRepo.new
     end
 
     def attempt_update(test_command = nil)
       puts '-------------'
-      puts "OUTDATED GEM: #{name}"
-      puts "   Newest: #{newest}. "
-      puts "Installed: #{installed}."
-      puts "Running `bundle update #{name}`..."
+      puts "OUTDATED GEM: #{@gem_name}"
+      puts "   Newest: #{@newest}. "
+      puts "Installed: #{@installed}."
+      puts "Running `bundle update #{@gem_name}`..."
 
-      `bundle update #{name}`
+      `bundle update #{@gem_name}`
 
       # sometimes the gem may be outdated, but it's matching the
       # version required by the gemfile, so bundle update does nothing
@@ -43,35 +39,10 @@ module SafeUpdate
       @git_repo.commit_gemfile_lock(commit_message)
     end
 
-    def name
-      string_between(@line, '', ' (newest')
-    end
-
-    def newest
-      string_between(@line, ' (newest ', ', installed')
-    end
-
-    def requested
-      string_between(@line, ', requested ', ')')
-    end
-
-    def installed
-      if @line.index('requested')
-        string_between(@line, ', installed ', ', requested')
-      else
-        string_between(@line, ', installed ', ')')
-      end
-    end
-
     private
 
     def commit_message
-      "update gem: #{name}"
-    end
-
-    # returns the section of string that resides between marker1 and marker2
-    def string_between(string, marker1, marker2)
-      string[/#{Regexp.escape(marker1)}(.*?)#{Regexp.escape(marker2)}/m, 1]
+      "update gem: #{@gem_name}"
     end
   end
 end

data/lib/safe_update/updater.rb

@@ -29,26 +29,7 @@ module SafeUpdate
     private
 
     def outdated_gems
-      return @outdated_gems if @outdated_gems
-
-      @outdated_gems = []
-      bundle_outdated_parseable.split(/\n+/).each do |line|
-        @outdated_gems << OutdatedGem.new(line, @git_repo)
-      end
-      return @outdated_gems
-    end
-
-    def bundle_outdated_parseable
-      output = `bundle outdated --parseable`
-      if output.strip == "Unknown switches '--parseable'"
-        # pre-1.12.0 version of bundler
-        output = `bundle outdated`
-        output.gsub!(/(\n|.)*Outdated gems included in the bundle:/, '')
-        output.gsub!(/  \* /, '')
-        output.gsub!(/ in group.*/, '')
-      end
-
-      output.strip
+      BundleOutdatedParser.new.call
     end
 
     def display_finished_message

data/lib/safe_update/version.rb

@@ -1,3 +1,3 @@
 module SafeUpdate
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/lib/safe_update.rb

@@ -8,6 +8,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'safe_update/version'
 require 'safe_update/updater'
 require 'safe_update/outdated_gem'
+require 'safe_update/bundle_outdated_parser'
 require 'safe_update/git_repo'
 
 module SafeUpdate

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safe_update
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Joshua Paling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,7 @@ files:
 - bin/setup
 - exe/safe_update
 - lib/safe_update.rb
+- lib/safe_update/bundle_outdated_parser.rb
 - lib/safe_update/git_repo.rb
 - lib/safe_update/outdated_gem.rb
 - lib/safe_update/updater.rb