gem_fresh 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 889bacc2aaf73f34a96a60eb81f64ac11b3a6282
-  data.tar.gz: 10b2f31c5c0948b64e9e7e1ec13766629b04088f
+  metadata.gz: 1f2733babeb742036bb0c5f44ca989e134c9e3d1
+  data.tar.gz: 13578767e4031328f1d254c6031637d0bb8a5a01
 SHA512:
-  metadata.gz: 68436a8406863783bd9105e82eccb2f319d8b5a5edee200d22b8012571038ee1c1b79f256c3435d1833d5ef34168b2c2daa71a6b3a112d3befe65aa46f06f507
-  data.tar.gz: 1fb5f4e100cacc8d1bab875550b7f6c867bfef3cf02752626d1805e0f73ee7860d28b17157245573243380896b2ce550146b1efcab9abad6a67f01b8ec3cc13b
+  metadata.gz: 491cc3b12198368dfaf858ed87b862f0a931bb433e0c3f121e677f4ef3ae20d9233e56b8dd7212fd114dc1649200d607d2f26f4c5be4b0f70b735b82f3981133
+  data.tar.gz: 6e4e72337ca1fff60ee28f349bea9ce89892c96b7cf0924cda9824630fd085e6c50fa82a455fa96c9ac43874c129e96f59e5bf6be73124b37871f597e173dd4f

data/gemfresh.gemspec

@@ -6,8 +6,8 @@ require 'gem_fresh/version'
 Gem::Specification.new do |spec|
   spec.name          = "gem_fresh"
   spec.version       = GemFresh::VERSION
-  spec.authors       = ["Anne Geiersbach"]
-  spec.email         = ["annasazi@gmail.com"]
+  spec.authors       = ["Anne Geiersbach", "Parker Morse"]
+  spec.email         = ["annasazi@gmail.com", "flashesofpanic@gmail.com"]
 
   spec.summary       = %q{Quantifying the freshness of your gems.}
   spec.homepage      = "https://github.com/dmcouncil/gem_fresh"
@@ -18,6 +18,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.9"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency "bundler", "~> 1.9"
+  spec.add_dependency "rake", "~> 10.0"
 end

data/lib/gem_fresh/outdated.rb

@@ -4,6 +4,7 @@ module GemFresh
     attr_reader :gem_info
 
     def initialize
+      @bundler_version = GemVersion.new(::Bundler::VERSION)
       figure_out_outdated_gems
     end
 
@@ -12,54 +13,62 @@ module GemFresh
     def figure_out_outdated_gems
       @gem_info ={}
       raw_gem_info_from_bundler.each do |line|
-        line =~ /\A\s*\*\s+(\S+)\s+\((.+)\).*\Z/
-        gem_name = $1
-        version_data = $2
-        @gem_info[gem_name] = extract_versions(version_data)
+        if @bundler_version.major <= 1 && @bundler_version.minor < 12
+          line =~ /\A\s*\*\s+(\S+)\s+\((.+)\).*\Z/
+          gem_name = $1
+          version_data = $2
+          if @bundler_version.minor < 10
+            @gem_info[gem_name] = extract_older_bundler_data(version_data)
+          else
+            @gem_info[gem_name] = extract_newer_bundler_data(version_data)
+          end
+        else
+          # Output from the --porcelain flag is simpler
+          line =~ /\A(\S+)\s+\((.+)\).*\Z/
+          gem_name = $1
+          version_data = $2
+          @gem_info[gem_name] = extract_newer_bundler_data(version_data)
+        end
       end
     end
 
-    def extract_versions(data_string)
-      # It looks like Bundler changed the format of the data
-      # returned by `bundle outdated` in version 1.10.
-      # Potential future refactor: decide which extraction
-      # method to use by actually asking Bundler which version
-      # it is and using the appropriate method for that version.
-      # Also: Bundler 1.12 will support `bundle outdated --parseable`
-      # which looks custom-made for this use case.
-      if data_string.include?("newest")
-        #
-        # Sample lines from `bundle outdated` look like this:
-        #
-        # * rspec-rails (newest 3.4.0, installed 3.2.3, requested ~> 3.2.3) in groups "development, test"
-        # * zeus (newest 0.15.4, installed 0.13.3) in group "test"
-        # * websocket-driver (newest 0.6.3, installed 0.5.4)
-        #
-        versions = data_string.split(', ').map(&:strip).map(&:split) # [["newest", "4.2.5"], ["installed", "3.2.22"], ["requested", "=", "3.2.22"]]
-        version_hash = {}
-        versions.each { |v| version_hash[v.first.to_sym] = v.last unless v.size > 2 }
-        return { available_version: GemVersion.new(version_hash[:newest]),
-                  current_version: GemVersion.new(version_hash[:installed]) }
-      else
-        #
-        # Sample lines from `bundle outdated` look like this:
-        #
-        #   * airbrake (4.1.0 > 3.1.3)
-        #   * annotate (2.6.5 > 2.6.0.beta2) Gemfile specifies "= 2.6.0.beta2"
-        #   * bootstrap-multiselect-rails (0.9.5 > 0.0.4)
-        #   * byebug (3.5.1 > 2.5.0)
-        #   * enum_field (0.2.0 bff7873 > 0.2.0)
-        #
-        versions = data_string.split(" > ").map(&:strip)  # ["0.2.0 bff7873", "0.2.0"]
-        versions = versions.map{|v| v.split(/\s/).first} # ["0.2.0", "0.2.0"]
-        return { available_version: GemVersion.new(versions.first),
-                  current_version: GemVersion.new(versions.last) }
-      end
+    def extract_newer_bundler_data(version_data)
+      #
+      # Sample lines from `bundle outdated` look like this (without the leading * in some versions):
+      #
+      # * rspec-rails (newest 3.4.0, installed 3.2.3, requested ~> 3.2.3) in groups "development, test"
+      # * zeus (newest 0.15.4, installed 0.13.3) in group "test"
+      # * websocket-driver (newest 0.6.3, installed 0.5.4)
+      #
+      versions = version_data.split(', ').map(&:strip).map(&:split) # [["newest", "4.2.5"], ["installed", "3.2.22"], ["requested", "=", "3.2.22"]]
+      version_hash = {}
+      versions.each { |v| version_hash[v.first.to_sym] = v.last unless v.size > 2 }
+      return { available_version: GemVersion.new(version_hash[:newest]),
+                current_version: GemVersion.new(version_hash.try(:installed, version_hash[:newest])) }
+    end
+
+    def extract_older_bundler_data(version_data)
+      #
+      # Sample lines from `bundle outdated` look like this:
+      #
+      #   * airbrake (4.1.0 > 3.1.3)
+      #   * annotate (2.6.5 > 2.6.0.beta2) Gemfile specifies "= 2.6.0.beta2"
+      #   * bootstrap-multiselect-rails (0.9.5 > 0.0.4)
+      #   * byebug (3.5.1 > 2.5.0)
+      #   * enum_field (0.2.0 bff7873 > 0.2.0)
+      #
+      versions = version_data.split(" > ").map(&:strip)  # ["0.2.0 bff7873", "0.2.0"]
+      versions = versions.map{|v| v.split(/\s/).first} # ["0.2.0", "0.2.0"]
+      return { available_version: GemVersion.new(versions.first),
+                current_version: GemVersion.new(versions.last) }
     end
 
     def raw_gem_info_from_bundler
-      output = %x{ bundle outdated }
-      just_the_gem_lines = output.split("\n").map(&:strip).select do |line|
+      if @bundler_version.major > 1 || (@bundler_version.major == 1 && @bundler_version.minor >= 12)
+        # All lines are useful when using the --porcelain flag
+        return %x{ bundle outdated --porcelain }
+      end
+      just_the_gem_lines = %x{ bundle outdated }.split("\n").map(&:strip).select do |line|
         line =~ /\A\s*\*\s+\w/
       end
       just_the_gem_lines

data/lib/gem_fresh/version.rb

@@ -1,3 +1,3 @@
 module GemFresh
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: gem_fresh
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Anne Geiersbach
+- Parker Morse
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,7 +18,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -31,7 +32,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -41,13 +42,13 @@ dependencies:
 description: 
 email:
 - annasazi@gmail.com
+- flashesofpanic@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md

data/.travis.yml

@@ -1,3 +0,0 @@
-language: ruby
-rvm:
-  - 2.0.0