diffend 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0a5718a6d7b90225e8a9d3dd8aff55c3bc8e84dced09b84f6a575a4decf002f
-  data.tar.gz: '006843f27693e587008b3bf25676203050329460814e9f94ffd6f4af1cc4a8df'
+  metadata.gz: 0f18edf14b16e7f2ec3ce0c574ade976e78e3eac84f8395e45fc53595a8e3f91
+  data.tar.gz: 292e755dac0d191787b77fb8556b5e2f90f9e040ee9e28486de90601b2c2a67c
 SHA512:
-  metadata.gz: 6040014adc4dac35c1f42fd663c5ad95a96a5b68e5b4591387c9be4d91840312ed1b8c4fe9fab17f6c410b225b11c31236f66bb131986c09d0f28538ac2e6ea7
-  data.tar.gz: bf93737d117bc09a8fc9698b9b431459f6805dd4c4a35757d3a1c8e1a02c442cf53a2a782008349342a09faa6cf8659e7ceddcd128ba73c4c9665cfb41f13c42
+  metadata.gz: 73326da64425debc8c27ad1dd216df34313a45795a2c6f555d0e5df067dfc17977ae9ee6e8307ab1df33af58a87ca23511ed3920eaa9c0bcec566fef602c30c3
+  data.tar.gz: eabf666e6c1ef7a08afaadf519011edac2416f0a2fa13152a9112b898b94dde1f598f23866a9823220be308aa091d9dab6b6d03e95191f3d22ba43509d3933fa

data/.github/workflows/ci.yml

@@ -3,6 +3,7 @@ name: ci
 jobs:
   specs:
     runs-on: ubuntu-latest
+
     strategy:
       fail-fast: false
       matrix:
@@ -11,8 +12,15 @@ jobs:
         include:
           - ruby: '2.7'
             coverage: 'true'
+
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-
       - name: Install package dependencies
         run: "[ -e $APT_DEPS ] || sudo apt-get install -y --no-install-recommends $APT_DEPS"
       - name: Set up Ruby
@@ -22,10 +30,9 @@ jobs:
       - name: Install latest bundler
         run: |
           gem install bundler --no-document
-          bundle config set without 'tools benchmarks docs'
       - name: Bundle install
         run: |
-          bundle config set without development
+          bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
       - name: Run all tests
         env:

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased][master]
 
+## [0.2.19] (2020-08-18)
+
+- better detection of gem sources ([#13](https://github.com/diffend-io/diffend-ruby/pull/13))
+
 ## [0.2.18] (2020-08-05)
 
 - use `Etc.getpwuid` instead of `Etc.getlogin` for fetching host user ([#11](https://github.com/diffend-io/diffend-ruby/pull/11))
@@ -18,6 +22,8 @@
 
 - initial release
 
-[master]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.17...HEAD
+[master]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.19...HEAD
+[0.2.19]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.18...v0.2.19
+[0.2.18]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.17...v0.2.18
 [0.2.17]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.16...v0.2.17
 [0.2.16]: https://github.com/diffend-io/diffend-ruby/compare/v0.2.15...v0.2.16

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    diffend (0.2.18)
+    diffend (0.2.19)
 
 GEM
   remote: https://rubygems.org/

data/lib/diffend.rb

@@ -22,7 +22,7 @@
 # Diffend main namespace
 module Diffend
   # Current plugin version
-  VERSION = '0.2.18'
+  VERSION = '0.2.19'
   # Diffend homepage
   HOMEPAGE = 'https://diffend.io'
 

data/lib/diffend/voting/versions/local.rb

@@ -13,17 +13,22 @@ module Diffend
           Bundler::Source::Gemspec,
           Bundler::Source::Path
         ].freeze
-        DEPENDENCIES = {
+        # List of dependency types
+        DEPENDENCIES_TYPES = {
           direct: 0,
-          dep: 1
+          dependency: 1
         }.freeze
-        SOURCES = {
+        # List of sources types
+        SOURCES_TYPES = {
           valid: 0,
           multiple_primary: 1
         }.freeze
-        GEM_SOURCES = {
+        # List of gem sources types
+        GEM_SOURCES_TYPES = {
           local: 0,
-          gemfile: 1
+          gemfile_source: 1,
+          gemfile_git: 2,
+          gemfile_path: 3
         }.freeze
 
         class << self
@@ -54,6 +59,9 @@ module Diffend
           @locked_specs = @definition.locked_gems ? @definition.locked_gems.specs : []
         end
 
+        # Build install specification
+        #
+        # @return [Hash]
         def build_install
           hash = build_main
 
@@ -75,7 +83,9 @@ module Diffend
           hash
         end
 
-        # @param definition [Bundler::Definition] definition for your source
+        # Build update specification
+        #
+        # @return [Hash]
         def build_update
           hash = build_main
 
@@ -97,6 +107,9 @@ module Diffend
 
         private
 
+        # Build default specification
+        #
+        # @return [Hash]
         def build_main
           {
             'dependencies' => {},
@@ -106,6 +119,12 @@ module Diffend
           }
         end
 
+        # Build gem versions
+        #
+        # @param spec [Bundler::StubSpecification, Bundler::LazySpecification, Gem::Specification]
+        # @param locked_spec [Bundler::LazySpecification, Gem::Specification, NilClass]
+        #
+        # @return [Array<String>]
         def build_versions(spec, locked_spec = nil)
           locked_spec ? [locked_spec.version.to_s, spec.version.to_s] : [spec.version.to_s]
         end
@@ -115,45 +134,105 @@ module Diffend
         #
         # @return [Boolean] dependency type
         def build_dependency_type(name)
-          @direct_dependencies.key?(name) ? DEPENDENCIES[:direct] : DEPENDENCIES[:dep]
+          if @direct_dependencies.key?(name)
+            DEPENDENCIES_TYPES[:direct]
+          else
+            DEPENDENCIES_TYPES[:dependency]
+          end
         end
 
+        # Build gem platform
+        #
+        # @param spec [Bundler::StubSpecification, Bundler::LazySpecification, Gem::Specification]
+        #
+        # @return [String]
         def build_spec_platform(spec)
           spec.platform || spec.send(:generic_local_platform)
         end
 
+        # Build gem source type
+        #
+        # @param source [Bundler::Source] gem source type
+        #
+        # @return [Integer] internal gem source type
+        def build_spec_gem_source_type(source)
+          case source
+          when Bundler::Source::Metadata
+            GEM_SOURCES_TYPES[:local]
+          when Bundler::Source::Rubygems
+            GEM_SOURCES_TYPES[:gemfile_source]
+          when Bundler::Source::Git
+            GEM_SOURCES_TYPES[:gemfile_git]
+          when Bundler::Source::Path
+            GEM_SOURCES_TYPES[:gemfile_path]
+          else
+            raise ArgumentError, "unknown source #{source.class}"
+          end
+        end
+
+        # Build gem source
+        #
+        # @param spec [Bundler::StubSpecification, Bundler::LazySpecification, Gem::Specification]
+        #
+        # @return [Hash]
         def build_spec_source(spec)
-          if @direct_dependencies.key?(spec.name)
-            dep_spec = @direct_dependencies[spec.name]
+          source = source_for_spec(spec)
 
-            if dep_spec.source
-              { 'type' => GEM_SOURCES[:gemfile], 'url' => source_name_from_source(dep_spec.source) }
-            else
-              { 'type' => GEM_SOURCES[:gemfile], 'url' => source_name_from_source(@main_source) }
-            end
+          {
+            'type' => build_spec_gem_source_type(source),
+            'value' => source_name_from_source(source)
+          }
+        end
+
+        # Figure out source for gem
+        #
+        # @param spec [Bundler::StubSpecification, Bundler::LazySpecification, Gem::Specification]
+        #
+        # @return [Bundler::Source] gem source type
+        def source_for_spec(spec)
+          if @direct_dependencies.key?(spec.name)
+            @direct_dependencies[spec.name].source || @main_source
           else
-            if spec.source.respond_to?(:remotes)
-              { 'type' => GEM_SOURCES[:gemfile], 'url' => source_name_from_source(spec.source) }
-            else
-              { 'type' => GEM_SOURCES[:local], 'url' => '' }
-            end
+            spec.source
           end
         end
 
+        # Build gem source name
+        #
+        # @param source [Bundler::Source] gem source type
+        #
+        # @return [String]
         def source_name_from_source(source)
-          source_name(source.remotes.first)
+          case source
+          when Bundler::Source::Metadata
+            ''
+          when Bundler::Source::Rubygems
+            source_name(source.remotes.first)
+          when Bundler::Source::Git
+            source.uri
+          when Bundler::Source::Path
+            source.path
+          else
+            raise ArgumentError, "unknown source #{source.class}"
+          end
         end
 
+        # @param name [Bundler::URI]
+        #
+        # @return [String] cleaned source name
         def source_name(name)
           name.to_s[0...-1]
         end
 
+        # Build sources used in the Gemfile
+        #
+        # @return [Array<Hash>]
         def build_sources
           sources = @definition.send(:sources).rubygems_sources
           hash = []
 
           sources.each do |source|
-            type = source.remotes.count > 1 ? SOURCES[:multiple_primary] : SOURCES[:valid]
+            type = build_source_type(source.remotes)
 
             source.remotes.each do |src|
               hash << { 'name' => source_name(src), 'type' => type }
@@ -163,30 +242,29 @@ module Diffend
           hash
         end
 
+        # Build gem source type
+        #
+        # @param remotes [Array<Bundler::URI>]
+        #
+        # @return [Integer] internal source type
+        def build_source_type(remotes)
+          remotes.count > 1 ? SOURCES_TYPES[:multiple_primary] : SOURCES_TYPES[:valid]
+        end
+
         # Checks if we should skip a source
         #
-        # @param source [Bundler::Source::Git, Bundler::Source::Rubygems]
+        # @param source [Bundler::Source] gem source type
         #
         # @return [Boolean] true if we should skip this source, false otherwise
         def skip?(source)
-          return true if git?(source)
           return true if me?(source)
 
           false
         end
 
-        # Checks if it's a git source
-        #
-        # @param source [Bundler::Source::Git, Bundler::Source::Rubygems]
-        #
-        # @return [Boolean] true if it's a git source, false otherwise
-        def git?(source)
-          source.instance_of?(Bundler::Source::Git)
-        end
-
         # Checks if it's a self source, this happens for repositories that are a gem
         #
-        # @param source [Bundler::Source::Path,Bundler::Source::Git,Bundler::Source::Rubygems]
+        # @param source [Bundler::Source] gem source type
         #
         # @return [Boolean] true if it's a self source, false otherwise
         def me?(source)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffend
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - Tomasz Pajor
@@ -34,7 +34,7 @@ cert_chain:
   9MmF6uCQa1EjK2p8tYT0MnbHrFkoehxdX4VO9y99GAkhZyJNKPYPtyAUFV27sT2V
   LfCJRk4ifKIN/FUCwDSn8Cz0m6oH265q0p6wdzI6qrWOjP8tGOMBTA==
   -----END CERTIFICATE-----
-date: 2020-08-05 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,7 +80,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
-- LICENSE
+- LICENSE.md
 - README.md
 - bin/bundle
 - bin/byebug