what_is_it_about 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a70ce8d8ffd2b68bfeb75df1cac06f47934dd4a
-  data.tar.gz: c0c047238da7055fe184e4fec462b6885fdc0267
+  metadata.gz: bc1d323e147bbc85db4eb4103db3e92ec1213fa6
+  data.tar.gz: 834de190243a099c414aed5910d9803171c55570
 SHA512:
-  metadata.gz: 3be5b608221675c91aed7b4693246fe3b833cabaa4df0fc0910392fd427f02ee28f08c6d0dee34a03899f94326336a981b08db0d42433d3f29700a1d1517bb27
-  data.tar.gz: 04a77b800817b1d12050bc0375e5b45b9d714b92be17d29d4cb83039488ff74f8a810468fe218c2dcb0e7a4402699fb04bb55e6a204f8f428a0eb284d470940c
+  metadata.gz: 5996f92c97cda653c1d4e99e62bc4744cb6db970bb73c237f45012fae3d04d038ff71db7bf39ed34f1dc0946ba3983fa7bb94ad5c1883ac0ac18da0fe3e01980
+  data.tar.gz: 01875162be31dbad054e9e7f447f0ffd23ca37392ca49e945dfb5f7635553e31fb4990d14e62b4d2fdbd378cb43af6d02f2937f86c73efae0ee3511bb770ff87

data/lib/what_is_it_about/cli.rb

@@ -35,11 +35,6 @@ module WhatIsItAbout
       report(old_content, new_content)
     end
 
-    desc 'set_github_token TOKEN', ''
-    def set_github_token(token)
-      WhatIsItAbout.config.set('github', 'token', token)
-    end
-
     private
 
     def report(old_content, new_content)

data/lib/what_is_it_about/config.rb

@@ -4,36 +4,44 @@ require 'yaml'
 
 module WhatIsItAbout
   def self.config
-    @@config = Config.new
+    @config ||=
+      begin
+        file = "#{Dir.home}/.what_is_it_about"
+        File.exist?(file) ? YAML.load_file(file) : {}
+      end
   end
 
-  class Config
-    def initialize(file = "#{Dir.home}/.what_is_it_about")
-      @file = file
-      @data = File.exist?(file) ? YAML.load_file(file) : {}
-    end
-
-    def get(*path)
-      data = @data
-      path.each do |branch|
-        data = data[branch]
-        return unless data
+  def self.gem_configs
+    @gem_configs ||= (config['gems'] || []).map! do |gem_config|
+      if gem_config['name']
+        gem_config['name'] = Regexp.compile gem_config['name']
+        gem_config
+      else
+        $stderr.puts "unspecified name in gems config #{gem_config}"
       end
-      data
-    end
+    end.compact
+  end
+
+  def self.gem_repo_from_config(name)
+    gem_configs.each do |gem_config|
+      match = gem_config['name'].match name
 
-    def set(*args)
-      val = args.pop
-      leaf = args.pop
-      data = @data
-      args.each do |branch|
-        data[branch] ||= {}
-        data = data[branch]
+      next unless match
+
+      url_template = "https://github.com/#{gem_config['github']}" if gem_config['github']
+
+      unless url_template
+        $stderr.puts "github repository not specified for #{gem_config['name']}"
+        next
       end
-      data[leaf] = val
-      File.open(@file, 'w') do |f|
-        f.puts YAML.dump(@data)
+
+      match.names.each do |var_name|
+        url_template.gsub!("${#{var_name}}", match[var_name])
       end
+
+      return url_template
     end
+
+    nil
   end
 end

data/lib/what_is_it_about/gem_summary.rb

@@ -1,11 +1,10 @@
-# coding: utf-8
-
 module WhatIsItAbout
   class GemSummary
     GITHUB_RX = %r{github\.com}
     REPO_RX = %r{[/:](?<user>[\w-]+)/(?<repo>[\w-]+)(?<suffix>\.git)?}
 
-    def initialize(old_spec, new_spec)
+    def initialize(old_spec, new_spec, compare_cache:)
+      @compare_cache = compare_cache
       @spec = {
         old: old_spec,
         new: new_spec
@@ -33,7 +32,7 @@ module WhatIsItAbout
     end
 
     def versions
-      spec_map do |spec|
+      spec_map do |_v, spec|
         spec.version.to_s
       end
     end
@@ -47,7 +46,7 @@ module WhatIsItAbout
     end
 
     def source_types
-      spec_map do |spec|
+      spec_map do |_v, spec|
         case spec.source
         when Bundler::Source::Git
           :git
@@ -64,7 +63,7 @@ module WhatIsItAbout
     end
 
     def paths
-      spec_map do |spec|
+      spec_map do |_v, spec|
         spec.source.path.to_s if spec.source.class == Bundler::Source::Path
       end
     end
@@ -74,7 +73,7 @@ module WhatIsItAbout
     end
 
     def source_repositories
-      spec_map do |spec|
+      spec_map do |_v, spec|
         spec.source.uri if spec.source.class == Bundler::Source::Git
       end
     end
@@ -84,7 +83,7 @@ module WhatIsItAbout
     end
 
     def source_branches
-      spec_map do |spec|
+      spec_map do |_v, spec|
         next unless spec.source.class == Bundler::Source::Git
         if spec.source.branch.to_s.empty?
           'master'
@@ -99,30 +98,33 @@ module WhatIsItAbout
     end
 
     def source_revisions
-      spec_map do |spec|
+      spec_map do |_v, spec|
         spec.source.revision if spec.source.class == Bundler::Source::Git
       end
     end
 
     def commits_log
+      return unless changed?
+
       @commits_log ||= {
-        added: added_compare,
-        removed: removed_compare
+        removed: removed_compare,
+        added: added_compare
       }
     end
 
+    def group
+      commits_log && commits_log[:added] && commits_log[:added][:commits].any? && commits_log[:added][:html_url]
+    end
+
     private
 
-    def spec_map(&block)
-      results = @spec.values.map do |spec|
-        next unless spec
-        block.call(spec)
-      end
+    attr_reader :compare_cache
 
-      {
-        old: results[0],
-        new: results[1]
-      }
+    def spec_map(&block)
+      @spec.map do |k, spec|
+        v = block.call(k, spec) if spec
+        [k, v]
+      end.to_h
     end
 
     def added_compare
@@ -130,9 +132,9 @@ module WhatIsItAbout
       return if p.values.compact.size < 2
       repo = "#{p[:old][:user]}/#{p[:old][:repo]}"
       start = p[:old][:revision]
-      end_ = "#{p[:new][:user]}:#{p[:new][:revision]}"
-      puts "downloading commits #{repo} #{start} => #{end_}"
-      WhatIsItAbout.github.client.compare repo, start, end_
+      end_ = p[:old][:user] == p[:new][:user] ? p[:new][:revision] : "#{p[:new][:user]}:#{p[:new][:revision]}"
+      puts "downloading commits #{repo} #{start} => #{end_}" if ENV['VERBOSE']
+      compare_cache[[repo, start, end_]] ||= WhatIsItAbout.github.client.compare repo, start, end_
     rescue Octokit::NotFound => e
       $stderr.puts e.inspect if ENV['VERBOSE']
     end
@@ -142,41 +144,42 @@ module WhatIsItAbout
       return if p.values.compact.size < 2
       repo = "#{p[:new][:user]}/#{p[:new][:repo]}"
       start = p[:new][:revision]
-      end_ = "#{p[:old][:user]}:#{p[:old][:revision]}"
-      puts "downloading commits #{repo} #{start} => #{end_}"
-      WhatIsItAbout.github.client.compare repo, start, end_
+      end_ = p[:old][:user] == p[:new][:user] ? p[:old][:revision] : "#{p[:old][:user]}:#{p[:old][:revision]}"
+      puts "downloading commits #{repo} #{start} => #{end_}" if ENV['VERBOSE']
+      compare_cache[[repo, start, end_]] ||= WhatIsItAbout.github.client.compare repo, start, end_
     rescue Octokit::NotFound => e
       $stderr.puts e.inspect if ENV['VERBOSE']
     end
 
     def github_compare_params
       @github_compare_params ||=
-        begin
-          spec_map do |spec|
-            v = @spec.key(spec)
-            source_uri, revision =
-              case spec.source
-              when Bundler::Source::Git
-                [source_repositories[v], source_revisions[v]]
-              when Bundler::Source::Rubygems
+        spec_map do |v, spec|
+          source_uri, revision =
+            case spec.source
+            when Bundler::Source::Git
+              [source_repositories[v], source_revisions[v]]
+            when Bundler::Source::Rubygems
+              uri = WhatIsItAbout.gem_repo_from_config(spec.name)
+              unless uri
                 uri = homepage(spec)
                 uri = rubygems_source_uri(spec) unless GITHUB_RX.match(uri)
-                [uri, "v#{versions[v]}"]
               end
 
-            next unless source_uri
-            next unless GITHUB_RX.match(source_uri)
+              [uri, "v#{versions[v]}"]
+            end
 
-            match = REPO_RX.match(source_uri)
+          next unless source_uri
+          next unless GITHUB_RX.match(source_uri)
 
-            next unless match
+          match = REPO_RX.match(source_uri)
 
-            {
-              user: match[:user],
-              repo: match[:repo],
-              revision: revision
-            }
-          end
+          next unless match
+
+          {
+            user: match[:user],
+            repo: match[:repo],
+            revision: revision
+          }
         end
     end
 
@@ -195,6 +198,9 @@ module WhatIsItAbout
           return fetcher.fetch_spec([spec.name, spec.version, spec.platform])
         rescue Bundler::Fetcher::FallbackError => _e
           next
+        rescue Bundler::HTTPError => e
+          $stderr.puts e.inspect
+          next
         end
       end
       nil
@@ -211,6 +217,7 @@ module WhatIsItAbout
       %w(source_code_uri project_uri homepage_uri).each do |field|
         val = specification[field]
         next unless val
+
         next unless GITHUB_RX.match(val)
         next unless REPO_RX.match(val)
         @rubygems_source_uri[spec.name] = val

data/lib/what_is_it_about/github.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'octokit'
 
 module WhatIsItAbout
@@ -10,8 +9,16 @@ module WhatIsItAbout
     attr_reader :client
 
     def initialize
-      token = WhatIsItAbout.config.get('github', 'token')
-      raise 'please do $ what_is_it_abouts set_github_token TOKEN' unless token
+      token = WhatIsItAbout.config['github']['token'] if WhatIsItAbout.config['github']
+      unless token
+        $stderr.puts <<-MESSAGE
+Set GITHUB TOKEN https://github.com/settings/tokens in ~/.what_is_it_about
+
+github:
+  token: <YOU GITHUB TOKEN>
+        MESSAGE
+        exit(1)
+      end
       @client = Octokit::Client.new(access_token: token)
     end
   end

data/lib/what_is_it_about/report.rb

@@ -8,42 +8,33 @@ module WhatIsItAbout
       end
 
       def to_s
-        lines = @summary.gems.each_with_object([]) do |gem, lines|
-          case
-          when gem.added?
-            lines << [
-              '+',
-              gem.name,
-              gem.versions[:new],
-              gem_source(gem, :new)
-            ].join(' ')
-          when gem.removed?
-            lines << [
-              '-',
-              gem.name,
-              gem.versions[:old],
-              gem_source(gem, :old)
-            ].join(' ')
-          when gem.changed?
-            version =
-              if gem.version_changed?
-                "#{gem.versions[:old]} => #{gem.versions[:new]}"
-              else
-                gem.versions[:old]
-              end
-            source =
-              if gem.source_changed?
-                "#{gem_source(gem, :old)} => #{gem_source(gem, :new)}"
-              else
+        lines = @summary.gem_groups.each_with_object([]) do |(_group, gems), lines|
+          gems.each do |gem|
+            if gem.added?
+              lines << [
+                '+',
+                gem.name,
+                gem.versions[:new],
+                gem_source(gem, :new)
+              ].join(' ')
+            elsif gem.removed?
+              lines << [
+                '-',
+                gem.name,
+                gem.versions[:old],
                 gem_source(gem, :old)
-              end
-            lines << [
-              'C',
-              gem.name,
-              version,
-              source
-            ].join(' ')
-            gem.commits_log.each do |type, log|
+              ].join(' ')
+            elsif gem.changed?
+              version_line = "#{gem_source(gem, :old)} => #{gem_source(gem, :new)}"
+              lines << [
+                'C',
+                gem.name,
+                version_line
+              ].join(' ')
+            end
+          end
+          if gems.first.changed?
+            gems.first.commits_log.each do |type, log|
               next unless log
               next if log[:commits].empty?
               padding = ' '*4
@@ -51,6 +42,7 @@ module WhatIsItAbout
               padding *= 2
               message_padding = padding * 2
               log[:commits].each do |commit|
+                next if commit[:parents].size == 2 # merge
                 lines << [
                   padding + commit[:commit][:author][:name],
                   commit[:html_url]
@@ -61,13 +53,6 @@ module WhatIsItAbout
                 lines << padded_message
               end
             end
-          else
-            lines << [
-              '=',
-              gem.name,
-              gem.versions[:old],
-              gem_source(gem, :old)
-            ].join(' ')
           end
         end
         lines.join("\n")
@@ -78,11 +63,11 @@ module WhatIsItAbout
       def gem_source(gem, version)
         case gem.source_types[version]
         when :rubygems
-          'rubygems'
+          gem.versions[version]
         when :path
           gem.paths[version]
         when :git
-          "#{gem.source_repositories[version]}##{gem.source_branches[version]}(#{gem.source_revisions[version]})"
+          "#{gem.source_branches[version]}##{gem.source_revisions[version]}"
         else
           raise "Unknown source type for #{gem.inspect}"
         end

data/lib/what_is_it_about/summary.rb

@@ -3,6 +3,7 @@
 module WhatIsItAbout
   class Summary
     def initialize(old_gemfile_lock_content, new_gemfile_lock_content)
+      @compare_cache = {}
       @old_definition = definition(old_gemfile_lock_content)
       @new_definition = definition(new_gemfile_lock_content)
     end
@@ -15,8 +16,16 @@ module WhatIsItAbout
         end
     end
 
+    def gem_groups
+      @gem_groups = gems.group_by do |gem|
+        gem.group || gem.name
+      end
+    end
+
     private
 
+    attr_reader :compare_cache
+
     def definition(gemfile_lock_content)
       Bundler::LockfileParser.new(gemfile_lock_content)
     end
@@ -24,7 +33,7 @@ module WhatIsItAbout
     def gem_summary(name)
       old_spec = @old_definition.specs.find { |spec| spec.name == name }
       new_spec = @new_definition.specs.find { |spec| spec.name == name }
-      GemSummary.new(old_spec, new_spec)
+      GemSummary.new(old_spec, new_spec, compare_cache: compare_cache)
     end
   end
 end

data/lib/what_is_it_about/version.rb

@@ -1,3 +1,3 @@
 module WhatIsItAbout
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/what_is_it_about.gemspec

@@ -19,11 +19,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'bundler'
-  spec.add_dependency 'octokit'
-  spec.add_dependency 'thor'
+  spec.add_dependency 'bundler', '1.15.4'
+  spec.add_dependency 'octokit', '4.7.0'
+  spec.add_dependency 'thor', '0.20.0'
 
-  spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,71 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: what_is_it_about
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dmitry Bochkarev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-26 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.15.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.15.4
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.7.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -141,9 +127,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Write a short summary, because Rubygems requires one.
 test_files: []
-has_rdoc: