gemirro 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87f41903a6fc72f5282ec7d6f707736bc11a07d5856fe9b6390568942f39b6a2
-  data.tar.gz: 68b8d3d5709f95f732891fd041a48a3c98d7ad28057fd0f4ec356af0cd478236
+  metadata.gz: 743376753a6202cadfe4fb780411c3b1a5c13b551aed1025abca32ec98bb8d0d
+  data.tar.gz: 9b251517b641c81a708c1d66e15c300d2e159d8024512107de2366418f638927
 SHA512:
-  metadata.gz: f49439dcef571151c9ed97618de886ca9601001ea527fb75fae4decd9cede92cf3f6f5f636a54c0a7cacfcbfe8128174cab3ab069e9c4d7e352086797a4e97f3
-  data.tar.gz: 234f1e30e1c46900fc1c407c5896da6554a713cef8ef57704f8db6d9662497541ac4e877360a4ce68d0571281c31ea25078604aa3aba8ff1b26ca095dc51769e
+  metadata.gz: 2d2bf4a45e5d4128ddfe0fe392bf326d8f35afbdb98ddbdca27edd3be53ff8841e51e6e96b7bc95a99b1a44a259a535453b2d6b28a6583a6d4cf6f46d2226bf1
+  data.tar.gz: 6a3eebf032d60e1eaf61b55fba14c0988d85e27b80d4a90ea69cbeb50c6e7a81cb73d648bd61144e46be42600af01e5c9ae30ef350a41674c8f1a92374ee1c30

data/.rubocop.yml

@@ -9,6 +9,7 @@ AllCops:
     - files/**/*
     - templates/**/*
     - spec/**/*
+    - vendor/**/*
 
 Naming/FileName:
   Exclude:

data/lib/gemirro/configuration.rb

@@ -162,7 +162,7 @@ module Gemirro
     # @return [Hash]
     #
     def ignored_gems
-      @ignored_gems ||= Hash.new { |hash, key| hash[key] = [] }
+      @ignored_gems ||= Hash.new { |hash, key| hash[key] = {} }
     end
 
     ##
@@ -171,9 +171,10 @@ module Gemirro
     # @param [String] name
     # @param [String] version
     #
-    def ignore_gem(name, version)
-      ignored_gems[name] ||= []
-      ignored_gems[name] << version
+    def ignore_gem(name, version, platform)
+      ignored_gems[platform] ||= {}
+      ignored_gems[platform][name] ||= []
+      ignored_gems[platform][name] << version
     end
 
     ##
@@ -183,8 +184,12 @@ module Gemirro
     # @param [String] version
     # @return [TrueClass|FalseClass]
     #
-    def ignore_gem?(name, version)
-      ignored_gems[name].include?(version)
+    def ignore_gem?(name, version, platform)
+      if ignored_gems[platform][name]
+        ignored_gems[platform][name].include?(version)
+      else
+        false
+      end
     end
 
     ##

data/lib/gemirro/gems_fetcher.rb

@@ -105,12 +105,13 @@ module Gemirro
                   end
       name = gem.name
 
-      if gem_exists?(filename) || ignore_gem?(name, version) || !satisfied
+      if gem_exists?(filename) || ignore_gem?(name, version, gem.platform) ||
+         !satisfied
         Utils.logger.debug("Skipping #{filename}")
         return
       end
 
-      Utils.configuration.ignore_gem(gem.name, version)
+      Utils.configuration.ignore_gem(gem.name, version, gem.platform)
       Utils.logger.info("Fetching #{filename}")
 
       fetch_from_source(filename, gem, version)
@@ -133,7 +134,7 @@ module Gemirro
         Utils.logger.error("Failed to retrieve #{filename}: #{e.message}")
         Utils.logger.debug("Adding #{filename} to the list of ignored Gems")
 
-        Utils.configuration.ignore_gem(gem.name, version)
+        Utils.configuration.ignore_gem(gem.name, version, gem.platform)
       end
 
       data

data/lib/gemirro/version.rb

@@ -1,4 +1,4 @@
 # Gemirro Version
 module Gemirro
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/spec/gemirro/configuration_spec.rb

@@ -68,10 +68,10 @@ module Gemirro
 
     it 'should return ignored gems' do
       expect(@config.ignored_gems).to eq({})
-      expect(@config.ignore_gem?('rake', '1.0.0')).to be_falsy
-      expect(@config.ignore_gem('rake', '1.0.0')).to eq(['1.0.0'])
-      expect(@config.ignored_gems).to eq('rake' => ['1.0.0'])
-      expect(@config.ignore_gem?('rake', '1.0.0')).to be_truthy
+      expect(@config.ignore_gem?('rake', '1.0.0', 'ruby')).to be_falsy
+      expect(@config.ignore_gem('rake', '1.0.0', 'ruby')).to eq(['1.0.0'])
+      expect(@config.ignored_gems).to eq('ruby' => {'rake' => ['1.0.0']})
+      expect(@config.ignore_gem?('rake', '1.0.0', 'ruby')).to be_truthy
     end
 
     it 'should add and return source' do

data/spec/gemirro/gems_fetcher_spec.rb

@@ -34,9 +34,9 @@ module Gemirro
     it 'should ignore gem' do
       allow(Utils.logger).to receive(:info)
         .once.with('Fetching gemirro-0.0.1.gem')
-      expect(@fetcher.ignore_gem?('gemirro', '0.0.1')).to be_falsy
-      Utils.configuration.ignore_gem('gemirro', '0.0.1')
-      expect(@fetcher.ignore_gem?('gemirro', '0.0.1')).to be_truthy
+      expect(@fetcher.ignore_gem?('gemirro', '0.0.1', 'ruby')).to be_falsy
+      Utils.configuration.ignore_gem('gemirro', '0.0.1', 'ruby')
+      expect(@fetcher.ignore_gem?('gemirro', '0.0.1', 'ruby')).to be_truthy
     end
 
     it 'should log error when fetch gem failed' do
@@ -44,7 +44,7 @@ module Gemirro
         .once.with('Fetching gemirro-0.0.1.gem')
       gem = Gem.new('gemirro')
       version = ::Gem::Version.new('0.0.1')
-      Utils.configuration.ignore_gem('gemirro', '0.0.1')
+      Utils.configuration.ignore_gem('gemirro', '0.0.1', 'ruby')
       allow(@source).to receive(:fetch_gem)
         .once.with('gemirro', version).and_raise(ArgumentError)
       allow(Utils.logger).to receive(:error)
@@ -53,7 +53,7 @@ module Gemirro
         .once.with(/Adding (.*) to the list of ignored Gems/)
 
       expect(@fetcher.fetch_gem(gem, version)).to be_nil
-      expect(@fetcher.ignore_gem?('gemirro', '0.0.1')).to be_truthy
+      expect(@fetcher.ignore_gem?('gemirro', '0.0.1', 'ruby')).to be_truthy
     end
 
     it 'should fetch gem' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemirro
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Pierre Rambaud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2019-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -317,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Gem for easily creating your own gems mirror.