image_optim_pack 0.5.3 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d3d4f1bcc49c6cc8b1590cd9eda18c6f100d2a07ed068550df85ea20ac9f94c
-  data.tar.gz: 3353b4a0d2cb438e5cf56a9491e7af7c7e1a8b14711cc6d22c1c3056579fc2f4
+  metadata.gz: bb718bfa967c2762d627c86b3ae0469851f271170c4baa04621f44370c6c5746
+  data.tar.gz: f5b303beeccb93521944676b1b515174ae634ae1277c017e087461ae198dc90f
 SHA512:
-  metadata.gz: 6219572d5e78914b12ad52e3698af0e328bc4c0c8f0d712a7989a21337ac13cf431ecb85ea8961d42e858182f329679b025986fbecc46eb784dd1f9195449f6d
-  data.tar.gz: 9bb93ac43056d9b4d8f6df03784376918fa6e6e305a83e970f92a432476900b818cb2e18256ee63dae99ad4e0ee4d3b8ae78fdd9629ee5e3b183a65a827c8474
+  metadata.gz: 78d43df6c2190a5b1e71b8923efd18b59f008f35b5e6c274a220df836b282d60762f5fc5df6219112bcf07949188b7df43b70bb5f36510e34910a31e2e180bcd
+  data.tar.gz: 1b452d83e53e15225dc64f17122aca50ba9ac36f8b93e4660eca64cc427c3e7268f667c5b130e3799c0d51c1fb2e9568548ed46e78a50713c39bb0ec7d1a8657

data/CHANGELOG.markdown

@@ -2,6 +2,14 @@
 
 ## unreleased
 
+## v0.5.5 (2019-07-14)
+
+* Fix specifying platform in gemspec for platform specific gems [@toy](https://github.com/toy)
+
+## v0.5.4 (2019-07-14)
+
+* Remove deprecated `rubyforge_project` attribute from gemspec [rubygems/rubygems#2436](https://github.com/rubygems/rubygems/pull/2436) [@toy](https://github.com/toy)
+
 ## v0.5.3 (2019-05-25)
 
 * pngquant 2.12.3 [@toy](https://github.com/toy)

data/image_optim_pack-darwin-x86.gemspec

@@ -1,3 +1,3 @@
 # encoding: UTF-8
 
-eval "gem_platform = 'x86-darwin'; #{File.read('image_optim_pack.gemspec')}"
+eval "gemspec_path = #{__FILE__.inspect}; #{File.read('image_optim_pack.gemspec')}"

data/image_optim_pack-darwin-x86_64.gemspec

@@ -1,3 +1,3 @@
 # encoding: UTF-8
 
-eval "gem_platform = 'x86_64-darwin'; #{File.read('image_optim_pack.gemspec')}"
+eval "gemspec_path = #{__FILE__.inspect}; #{File.read('image_optim_pack.gemspec')}"

data/image_optim_pack-fake-x42.gemspec

@@ -0,0 +1,3 @@
+# encoding: UTF-8
+
+eval "gemspec_path = #{__FILE__.inspect}; #{File.read('image_optim_pack.gemspec')}"

data/image_optim_pack-freebsd-amd64.gemspec

@@ -1,3 +1,3 @@
 # encoding: UTF-8
 
-eval "gem_platform = 'amd64-freebsd'; #{File.read('image_optim_pack.gemspec')}"
+eval "gemspec_path = #{__FILE__.inspect}; #{File.read('image_optim_pack.gemspec')}"

data/image_optim_pack-freebsd-x86.gemspec

@@ -1,3 +1,3 @@
 # encoding: UTF-8
 
-eval "gem_platform = 'x86-freebsd'; #{File.read('image_optim_pack.gemspec')}"
+eval "gemspec_path = #{__FILE__.inspect}; #{File.read('image_optim_pack.gemspec')}"

data/image_optim_pack-linux-x86.gemspec

@@ -1,3 +1,3 @@
 # encoding: UTF-8
 
-eval "gem_platform = 'x86-linux'; #{File.read('image_optim_pack.gemspec')}"
+eval "gemspec_path = #{__FILE__.inspect}; #{File.read('image_optim_pack.gemspec')}"

data/image_optim_pack-linux-x86_64.gemspec

@@ -1,3 +1,3 @@
 # encoding: UTF-8
 
-eval "gem_platform = 'x86_64-linux'; #{File.read('image_optim_pack.gemspec')}"
+eval "gemspec_path = #{__FILE__.inspect}; #{File.read('image_optim_pack.gemspec')}"

data/image_optim_pack-openbsd-x86.gemspec

@@ -1,3 +1,3 @@
 # encoding: UTF-8
 
-eval "gem_platform = 'x86-openbsd'; #{File.read('image_optim_pack.gemspec')}"
+eval "gemspec_path = #{__FILE__.inspect}; #{File.read('image_optim_pack.gemspec')}"

data/image_optim_pack-openbsd-x86_64.gemspec

@@ -1,3 +1,3 @@
 # encoding: UTF-8
 
-eval "gem_platform = 'x86_64-openbsd'; #{File.read('image_optim_pack.gemspec')}"
+eval "gemspec_path = #{__FILE__.inspect}; #{File.read('image_optim_pack.gemspec')}"

data/image_optim_pack.gemspec

@@ -2,14 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim_pack'
-  s.version     = '0.5.3'
+  s.version     = '0.5.5'
   s.summary     = %q{Precompiled binaries for image_optim: advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegtran, optipng, pngcrush, pngquant}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
   s.license     = 'MIT'
 
-  s.rubyforge_project = s.name
-
   s.metadata = {
     'bug_tracker_uri'   => "https://github.com/toy/#{s.name}/issues",
     'changelog_uri'     => "https://github.com/toy/#{s.name}/blob/master/CHANGELOG.markdown",
@@ -18,17 +16,31 @@ Gem::Specification.new do |s|
   }
 
   s.files         = `git ls-files`.split("\n")
-  if defined?(gem_platform)
-    s.platform = gem_platform
-
-    vendor_dir = {
-      'x86-linux' => 'linux-i686',
-      'x86_64-openbsd' => 'openbsd-amd64',
-    }[gem_platform] || begin
-      gem_platform.sub(/^x86-/, 'i386-').split('-').reverse.join('-')
+  if defined?(gemspec_path)
+    gem_os, gem_cpu = File.basename(gemspec_path, File.extname(gemspec_path)).split('-').drop(1)
+
+    s.platform = Gem::Platform.new([gem_cpu, gem_os])
+
+    cpu_aliases = {
+      'x86' => %w[i386 i686],
+      'x86_64' => %w[x86_64 amd64],
+    }[gem_cpu] || [gem_cpu]
+
+    possible_vendor_dirs = cpu_aliases.map do |cpu_alias|
+      "#{gem_os}-#{cpu_alias}"
     end
-    vendor_path = File.join('vendor', vendor_dir)
-    fail "#{vendor_path} is not a dir" unless File.directory?(vendor_path)
+
+    existing_vendor_dirs = possible_vendor_dirs.select do |vendor_dir|
+      File.directory?(File.join('vendor', vendor_dir))
+    end
+
+    vendor_dir = if existing_vendor_dirs.length == 1
+      existing_vendor_dirs.first
+    else
+      message = existing_vendor_dirs.empty? ? 'no vendor dir' : 'multiple vendor dirs'
+      fail "#{message} found for os #{gem_os} and cpu #{gem_cpu} out of: #{possible_vendor_dirs.join(', ')}"
+    end
+
     s.files.reject! do |path|
       parts = path.split('/')
       parts[0] == 'vendor' && parts[1] != vendor_dir

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim_pack
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.5
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-25 00:00:00.000000000 Z
+date: 2019-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_optim
@@ -130,6 +130,7 @@ files:
 - checksums.mk
 - image_optim_pack-darwin-x86.gemspec
 - image_optim_pack-darwin-x86_64.gemspec
+- image_optim_pack-fake-x42.gemspec
 - image_optim_pack-freebsd-amd64.gemspec
 - image_optim_pack-freebsd-x86.gemspec
 - image_optim_pack-linux-x86.gemspec
@@ -169,6 +170,7 @@ files:
 - vendor/darwin-x86_64/optipng
 - vendor/darwin-x86_64/pngcrush
 - vendor/darwin-x86_64/pngquant
+- vendor/fake-x42/.gitkeep
 - vendor/freebsd-amd64/advpng
 - vendor/freebsd-amd64/gifsicle
 - vendor/freebsd-amd64/jhead
@@ -247,7 +249,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/toy/image_optim_pack/issues
   changelog_uri: https://github.com/toy/image_optim_pack/blob/master/CHANGELOG.markdown
-  documentation_uri: https://www.rubydoc.info/gems/image_optim_pack/0.5.3
+  documentation_uri: https://www.rubydoc.info/gems/image_optim_pack/0.5.5
   source_code_uri: https://github.com/toy/image_optim_pack
 post_install_message: 
 rdoc_options: []