gistory 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: d0a07bc173fd96849fa0660f4641d9945896f3329ec3cc467be6ceb4383a75eb
-  data.tar.gz: cee8b211779dc04c1f0d11af49496aaf3745d4763e618ef74cb3ca88f09b016a
+SHA1:
+  metadata.gz: 2d3139f7b6f07fd2b6de135eb63c8ada4baaa1c4
+  data.tar.gz: 95de85e6a6f1b4809295db975d33449d12dd23cd
 SHA512:
-  metadata.gz: ad8f8841415791d29292e5ab2ad7057d763e5fc59de7fa7cf42e574aea9a959241ac7e526e062a9dc9863974e15ee52b3aef96be5567c625de9ff5b44dea96e2
-  data.tar.gz: cacb17ab10b572b74bf760ab98690e55afa6d93f6de207df04bc2774e1d924db8eb533bbacc1a660e0d9ec17556fe54aa6031f0132eaaac25c249221a07a0893
+  metadata.gz: f8eae6a6a4b52a452b45f837594646b8a57c6aa4f101c86612b56462a1234025355861c8a6fe0bb22de55c54908c9d422c15634c92c0c22b5ed52b6c5f6ebb21
+  data.tar.gz: cb9c8bd90a5f722217a792b4b3890394894ed23a242d95e1453470ab408f86ba83c145364a8c2f47367552900635ad56d9299809ee64ff76f179ea35f29538b6

data/lib/gistory.rb

@@ -11,6 +11,7 @@ require 'gistory/errors'
 require 'gistory/commit'
 require 'gistory/version_change'
 require 'gistory/git_repo'
+require 'gistory/lockfile_parser'
 require 'gistory/change_log'
 
 module Gistory

data/lib/gistory/change_log.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require 'bundler'
-
 module Gistory
   class ChangeLog
-    LOCKFILE = 'Gemfile.lock'.freeze
+    LOCKFILE = 'Gemfile.lock'
 
     def initialize(repo:)
       @repo = repo
@@ -18,37 +16,35 @@ module Gistory
       return [] if lockfile_changes.empty?
 
       previous_commit = lockfile_changes.shift
-      previous_gem_spec = gem_spec_at_commit_hash(previous_commit.short_hash, gem_name)
+      previous_gem_spec = gem_version_at_commit_hash(previous_commit.short_hash, gem_name)
       # only one change to the lockfile was found and the gem was not there
       return [] if previous_gem_spec.nil?
 
       lockfile_changes.each do |current_commit|
-        current_gem_spec = gem_spec_at_commit_hash(current_commit.short_hash, gem_name)
+        current_gem_spec = gem_version_at_commit_hash(current_commit.short_hash, gem_name)
 
         # we reached the end, the gem didn't exist back then
         # TODO: what if it was added then removed and then added again?
         break if current_gem_spec.nil?
 
-        if current_gem_spec.version.to_s != previous_gem_spec.version.to_s
-          version_changes << VersionChange.new(commit: previous_commit, version: previous_gem_spec.version)
+        if current_gem_spec != previous_gem_spec
+          version_changes << VersionChange.new(commit: previous_commit, version: previous_gem_spec)
         end
 
         previous_gem_spec = current_gem_spec
         previous_commit = current_commit
       end
 
-      version_changes << VersionChange.new(commit: previous_commit, version: previous_gem_spec.version)
+      version_changes << VersionChange.new(commit: previous_commit, version: previous_gem_spec)
 
       version_changes
     end
 
     private
 
-    def gem_spec_at_commit_hash(commit_hash, gem_name)
+    def gem_version_at_commit_hash(commit_hash, gem_name)
       lockfile_content = @repo.file_content_at_commit(commit_hash, LOCKFILE)
-      lockfile = Bundler::LockfileParser.new(lockfile_content)
-      gem_spec = lockfile.specs.find { |spec| spec.name == gem_name }
-      gem_spec
+      LockfileParser.new(lockfile_content: lockfile_content).gem_version(gem_name)
     end
   end
 end

data/lib/gistory/cli/arg_parser.rb

@@ -18,8 +18,8 @@ module Gistory
         parse_gem_name
         @io.error("extra parameters ignored: #{@args}") unless @args.count.zero?
         @config
-      rescue OptionParser::InvalidOption => err
-        raise(Gistory::ParserError, err.message)
+      rescue OptionParser::InvalidOption => e
+        raise(Gistory::ParserError, e.message)
       end
 
       def to_s

data/lib/gistory/cli/main.rb

@@ -14,11 +14,11 @@ module Gistory
         parser = Cli::ArgParser.new(args: @args, io: @io)
         config = parser.parse
         history(repo, config.gem_name)
-      rescue Gistory::ParserError => error
-        @io.error error.message
+      rescue Gistory::ParserError => e
+        @io.error e.message
         @io.puts parser
-      rescue Gistory::Error => error
-        @io.error error.message
+      rescue Gistory::Error => e
+        @io.error e.message
       end
 
       private

data/lib/gistory/lockfile_parser.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'bundler'
+
+module Gistory
+  class LockfileParser
+    def initialize(lockfile_content:)
+      @lockfile_content = lockfile_content
+    end
+
+    def gem_version(gem_name)
+      lockfile = Bundler::LockfileParser.new(@lockfile_content)
+      gem_spec = lockfile.specs.find { |spec| spec.name == gem_name }
+      gem_spec ? gem_spec.version.to_s : nil
+    rescue Bundler::LockfileError => _e
+      # bundler could not parse the lockfile
+      # f.i. it could have been committed with merge conflicts
+      # try to parse it with a regex
+      # gem version looks like "    byebug (9.0.6)"
+      # TODO: what if the gem was in the merge conflict?
+      regexp = /\n\s{4}#{gem_name} \((?<version>.+)\)\n/
+      matches = @lockfile_content.match(regexp)
+      matches ? matches[:version] : nil
+    end
+  end
+end

data/lib/gistory/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gistory
-  VERSION = '0.1.7'.freeze
+  VERSION = '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gistory
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Sergio Medina
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2019-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,7 @@ files:
 - lib/gistory/configuration.rb
 - lib/gistory/errors.rb
 - lib/gistory/git_repo.rb
+- lib/gistory/lockfile_parser.rb
 - lib/gistory/version.rb
 - lib/gistory/version_change.rb
 homepage: https://www.github.com/serch/gistory
@@ -119,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: 'Gistory: Know exactly when a gem was updated in your Gemfile.lock'