image_optim_pack 0.5.3-x86-darwin → 0.5.5-x86-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44634909aef9c8d1dab455bb675b68fa3f0689b53973a76cb9df1819d5c31803
-  data.tar.gz: 06a34b77d5904475c674fe44cd6fcb6db26fc79f92e1047dc96307da20bc1323
+  metadata.gz: 3cac00814e56651b491ebd408d157a873723b7b020a46745e63ad5a13ef5f8c2
+  data.tar.gz: 7bcdba4fa1914b4110ac60ac4db52981cfafcfe200d245c440150f82c351ce4e
 SHA512:
-  metadata.gz: f7f41d94a1f187d634795e192b472ae1e5a93cc7793997f09713047372d403605f95f9e7b75291e112dcd5e675b8f39a7be30bc71d5b49c415b5a9a9493beb98
-  data.tar.gz: c648b5b7d58045a850ba7c6a995a00fb9be7879eacb2eee99901656cec0b38e2354e000685130f22f50c30fe3f73cc4833f8ecfd72766ed6b5f4f683a2a6bffb
+  metadata.gz: 1c4a1ba43b3af9c6d35bfd52a09e0799622a70457ec2981ea8531c3e8995731ef022e2892c73fcf599aedf83a4e769375e4f4d84e6075360c36c813fe50c0366
+  data.tar.gz: 536d9b096bfe75854eafc7b9aa1b84bf492f282cd15804029770d18db3e36695eaa3379c33ccc0a9ed56ac5109b5c6eda8938fd81f9bfe05b70ced6ebfcce1a5

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: x86-darwin
 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
@@ -163,7 +164,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: []