libspotify 12.1.51.3-x86-mingw32 → 12.1.51.4-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0419e8e6af87adb386ce0fc1c70082945c37a6ba
-  data.tar.gz: d011b15df251bd84dc742ad7a53479ebd17839b7
+  metadata.gz: 9fa437ddd34703a65b9de201d4dd97b365bf100f
+  data.tar.gz: 8e8c1610c71647c999115d4b98cfc8d24fdb3ed9
 SHA512:
-  metadata.gz: c39e9c8b51680257200fcfdafd3d1e2bed93b2e2652c6149e9a0a207596a000961bcf4b3c12d39d04b4ab61c03ed36ff670b236817472ef279145d8f81c265ae
-  data.tar.gz: 03a992880845928d1073052059fd6fd5f7bbe61a0595be7e1d77723bf42ebb69fc3dc98bcedc90e461fb072be31e47d4410f9b1e065713d980b2672e9797a71b
+  metadata.gz: d43c34234b2251464552e5b7052978edea59bd4eaf6f91c5bb95802525e6fe1ae8a2b627202d07f409b4a04240ebed292e39cff64c7f5d4e94513760451d5c06
+  data.tar.gz: c1662feeaa26aaaaa6f5e78d855d81c64ed5d5176bc32c1feac3c632086f9c99968d30500ca94298c5288691c0ec0ce5a9f5cdf0e4a22973f72adf37e71ff619

data/Rakefile

@@ -11,29 +11,22 @@ task :build do
   # We want the right binary location.
   require_relative "lib/libspotify"
 
-  # Maps platform to libspotify binary name.
-  platforms =
-  {
-    "universal-darwin"  => %w"universal-darwin",
-    "i686-linux"        => %w"i686-linux",
-    "x86_64-linux"      => %w"x86_64-linux",
-    "arm-linux"         => %w"armv5-linux",
-    "x86-mingw32"       => %w"windows.dll",
-    "universal-java"    => %w"universal-darwin i686-linux x86_64-linux armv5-linux",
-    Gem::Platform::RUBY => [], # fallback platform
-  }
+  platforms = Libspotify::PLATFORMS.dup
+  platforms[Gem::Platform::RUBY] = [] # fallback platform
+  platforms["universal-java"] = platforms.values.flatten.uniq
 
   # Maps binaries to system path.
   binaries =
   {
-    "universal-darwin" => "bin/libspotify-12.1.51-Darwin-universal/libspotify.framework/Versions/Current/libspotify",
-    "i686-linux"       => "bin/libspotify-12.1.51-Linux-i686-release/lib/libspotify.so",
-    "x86_64-linux"     => "bin/libspotify-12.1.51-Linux-x86_64-release/lib/libspotify.so",
-    "armv5-linux"      => "bin/libspotify-12.1.51-Linux-armv5-release/lib/libspotify.so",
-    "windows.dll"      => "bin/libspotify-12.1.51-win32-release/lib/libspotify.dll",
+    "universal-darwin" => "libspotify-12.1.51-Darwin-universal/libspotify-12.1.51-Darwin-universal/libspotify.framework/Versions/Current/libspotify",
+    "x86-linux"        => "libspotify-12.1.51-Linux-i686-release/lib/libspotify.so",
+    "x86_64-linux"     => "libspotify-12.1.51-Linux-x86_64-release/lib/libspotify.so",
+    "armv5-linux"      => "libspotify-12.1.51-Linux-armv5-release/lib/libspotify.so",
+    "armv6hf-linux"    => "libspotify-12.1.103-Linux-armv6-bcm2708hardfp-release/lib/libspotify.so",
     # armv5 works on both armv6 and armv7, so we always use armv5.
-    # "armv6-linux"      => "libspotify-12.1.51-Linux-armv6-release/lib/libspotify.so",
-    # "armv7-linux"      => "libspotify-12.1.51-Linux-armv7-release/lib/libspotify.so",
+    "armv6-linux"      => "libspotify-12.1.51-Linux-armv6-release/lib/libspotify.so",
+    "armv7-linux"      => "libspotify-12.1.51-Linux-armv7-release/lib/libspotify.so",
+    "x86-windows.dll"  => "libspotify-12.1.51-win32-release/lib/libspotify.dll",
   }
 
   # Load our gem specification.
@@ -55,12 +48,9 @@ task :build do
         If you are on ARM (e.g. Raspberry PI), you might want to install the gem with explicit --platform:
         $> gem install libspotify --platform arm-linux
       MSG
-    elsif source_binaries.none? { |binary| File.exists?(binaries[binary]) }
-      puts "Skipping #{platform} build. Binaries missing."
-      next
     else
       source_binaries.each do |binary|
-        src_name  = binaries[binary]
+        src_name  = "bin/#{binaries.fetch(binary)}"
         dest_name = "bin/#{binary}"
         FileUtils.cp(src_name, dest_name, verbose: true)
         spec.files << dest_name
@@ -72,10 +62,10 @@ task :build do
     File.join(pkgs, File.basename(gemname)).tap do |gempath|
       FileUtils.mv(gemname, gempath, verbose: true)
     end
-  end.compact
+  end
 
   puts
-  puts "Gems successfully built. To publish, do:"
+  puts "All gems successfully built. To publish, do:"
   gempaths.each do |path|
     puts "  gem push pkg/#{File.basename(path)}"
   end
@@ -84,6 +74,42 @@ task :build do
   puts "Do not forget to tag and push to GitHub as well."
 end
 
+desc "Download all known libspotify releases and unpack them"
+task :download do
+  urls = %w[
+    https://developer.spotify.com/download/libspotify/libspotify-12.1.64-iOS-universal.zip
+    https://developer.spotify.com/download/libspotify/libspotify-12.1.51-Android-arm-release.tar.gz
+    https://developer.spotify.com/download/libspotify/libspotify-12.1.51-win32-release.zip
+    https://developer.spotify.com/download/libspotify/libspotify-12.1.51-Darwin-universal.zip
+    https://developer.spotify.com/download/libspotify/libspotify-12.1.51-Linux-i686-release.tar.gz
+    https://developer.spotify.com/download/libspotify/libspotify-12.1.51-Linux-x86_64-release.tar.gz
+    https://developer.spotify.com/download/libspotify/libspotify-12.1.51-Linux-armv5-release.tar.gz
+    https://developer.spotify.com/download/libspotify/libspotify-12.1.51-Linux-armv6-release.tar.gz
+    https://developer.spotify.com/download/libspotify/libspotify-12.1.51-Linux-armv7-release.tar.gz
+    https://developer.spotify.com/download/libspotify/libspotify-12.1.103-Linux-armv6-bcm2708hardfp-release.tar.gz
+  ]
+
+  Dir.chdir "bin" do
+    urls.map do |url|
+      Thread.new do
+        unless File.exist?(File.basename(url))
+          sh "curl", "-O", "-s", url
+        else
+          puts "Skipping #{url}."
+        end
+      end
+    end.map(&:join)
+
+    Dir["./*.zip"].each do |zipfile|
+      sh "unzip", zipfile, "-d", File.basename(zipfile, ".zip")
+    end
+
+    Dir["./*.tar.gz"].each do |tarfile|
+      sh "tar", "xvfz", tarfile
+    end
+  end
+end
+
 desc "Launch an IRB console with the gem loaded."
 task :console do
   exec "irb -Ilib -rlibspotify"

data/lib/libspotify.rb

@@ -1,41 +1,96 @@
 module Libspotify
   VERSION = "12.1.51"
-  GEM_VERSION = "#{VERSION}.3"
+  GEM_VERSION = "#{VERSION}.4"
 
-  module_function
+  # Maps platform to libspotify binary name.
+  PLATFORMS = {
+    "universal-darwin" => %w"universal-darwin",
+    "x86-linux"        => %w"x86-linux",
+    "x86_64-linux"     => %w"x86_64-linux",
+    "arm-linux"        => %w"armv6-linux armv6hf-linux",
+    "x86-mingw32"      => %w"x86-windows.dll",
+  }
 
-  # @return [String] full path to libspotify binary.
-  def binary_path
-    File.expand_path("../bin/#{release_name}", File.dirname(__FILE__))
-  end
+  class << self
+    # @return [String] full path to libspotify binary.
+    def binary_path
+      File.expand_path("../bin/#{release_name}", File.dirname(__FILE__))
+    end
+
+    # @return [String] name of libspotify binary.
+    def release_name
+      host_platform = Gem::Platform.new(host_string)
+
+      _, binaries = PLATFORMS.find do |platform, _|
+        Gem::Platform.new(platform) === host_platform
+      end
+
+      binaries ||= []
+
+      binary = if binaries.length == 1
+        binaries[0]
+      elsif host_cpu =~ /armv(\d+)(hf)?/
+        host_version = $1.to_i
+        host_hf = $2
+
+        matches = PLATFORMS["arm-linux"].select do |bin|
+          version, hf = bin.match(/armv(\d+)(hf)?/)[1..2]
+          hf == host_hf && version.to_i <= host_version
+        end
+
+        matches.max_by { |bin| bin[/armv(\d+)/, 1].to_i }
+      else
+        nil # no rules for matching binaries, what to do?
+      end
+
+      binary || host_string
+    end
+
+    private
+
+    # @return [String] platform name of the host, even on jruby
+    def host_string
+      "#{host_cpu}-#{host_os}"
+    end
 
-  # @api private
-  # @return [String] name of libspotify binary.
-  def release_name
-    case RbConfig::CONFIG["host_os"]
-    when /darwin/
-      "universal-darwin"
-    when /linux/
+    # @return [String] host cpu, even on jruby
+    def host_cpu
       case RbConfig::CONFIG["host_cpu"]
       when /86_64/
-        "x86_64-linux"
+        "x86_64"
       when /86/
-        "i686-linux"
-      when /armv(\d+)?/
+        "x86"
+      when /arm/
         hf = "hf" if hard_float?
-        "armv5#{hf}-linux"
+        "armv#{arm_version}#{hf}"
+      else
+        RbConfig::CONFIG["host_cpu"]
       end
-    when /mingw|mswin/
-      "windows.dll"
-    else
-      "unknown-%s-%s" % RbConfig::CONFIG.values_at("host_cpu", "host_os")
     end
-  end
 
-  # @api private
-  # @return [Boolean] true if on a hard floating point OS of arm
-  def hard_float?
-    `readelf -a #{RbConfig.ruby}`.match(/Tag_ABI_VFP_args/)
+    # @return [String] host os, even on jruby
+    def host_os
+      case RbConfig::CONFIG["host_os"]
+      when /darwin/
+        "darwin"
+      when /linux/
+        "linux"
+      when /mingw|mswin/
+        "mingw32"
+      else
+        RbConfig::CONFIG["host_os"]
+      end
+    end
+
+    # @return [Integer, nil] ARM instruction set version
+    def arm_version
+      File.read("/proc/cpuinfo")[/ARMv(\d+)/i, 1].to_i
+    end
+
+    # @return [Boolean] true if on a hard floating point OS of arm
+    def hard_float?
+      `readelf -a #{RbConfig.ruby}`.match(/Tag_ABI_VFP_args/)
+    end
   end
 end
 

data/libspotify.gemspec

@@ -6,7 +6,13 @@ Gem::Specification.new do |gem|
   gem.authors       = ["Kim Burgestrand"]
   gem.email         = ["kim@burgestrand.se"]
   gem.summary       = %q{A binary ruby gem for distribution of libspotify.}
-  gem.description   = gem.summary
+
+  gem.description   = <<-DESCRIPTION
+libspotify is a ruby gem for distribution of libspotify binaries. It allows
+download of libspotify through the rubygems package manager, and provides an
+API for retrieving the binary file path.
+DESCRIPTION
+
   gem.homepage      = "https://github.com/Burgestrand/libspotify"
   gem.require_paths = ["lib"]
   gem.files         = `git ls-files`.split($/)
@@ -14,5 +20,6 @@ Gem::Specification.new do |gem|
 
   gem.version       = Libspotify::GEM_VERSION
   gem.platform      = Gem::Platform::RUBY
-  gem.add_development_dependency "rspec"
+  gem.add_development_dependency "rspec", "~> 2.0"
+  gem.add_development_dependency "rake", "~> 10.0"
 end

data/spec/libspotify_spec.rb

@@ -18,26 +18,33 @@ describe Libspotify do
     end
 
     specify "linux-gnu:i686" do
-      release_name.should eq "i686-linux"
+      release_name.should eq "x86-linux"
     end
 
     specify "linux-gnu:x86_64" do
       release_name.should eq "x86_64-linux"
     end
 
+    specify "mingw32:i686" do
+      release_name.should eq "x86-windows.dll"
+    end
+
     context "soft float" do
       before { Libspotify.stub(hard_float?: false) }
 
       specify "linux-gnueabi:armv5l" do
+        Libspotify.stub(arm_version: 5)
         release_name.should eq "armv5-linux"
       end
 
       specify "linux-gnueabi:armv6l" do
-        release_name.should eq "armv5-linux"
+        Libspotify.stub(arm_version: 6)
+        release_name.should eq "armv6-linux"
       end
 
       specify "linux-gnueabi:armv7l" do
-        release_name.should eq "armv5-linux"
+        Libspotify.stub(arm_version: 7)
+        release_name.should eq "armv6-linux"
       end
     end
 
@@ -45,20 +52,27 @@ describe Libspotify do
       before { Libspotify.stub(hard_float?: true) }
 
       specify "linux-gnueabi:armv5l" do
+        Libspotify.stub(arm_version: 5)
         release_name.should eq "armv5hf-linux"
       end
 
       specify "linux-gnueabi:armv6l" do
-        release_name.should eq "armv5hf-linux"
+        Libspotify.stub(arm_version: 6)
+        release_name.should eq "armv6hf-linux"
       end
 
       specify "linux-gnueabi:armv7l" do
-        release_name.should eq "armv5hf-linux"
+        Libspotify.stub(arm_version: 7)
+        release_name.should eq "armv6hf-linux"
       end
     end
 
+    specify "linux:weird-cpu" do
+      release_name.should eq "weird-cpu-linux"
+    end
+
     specify "weird-os:weird-cpu" do
-      release_name.should eq "unknown-weird-cpu-weird-os"
+      release_name.should eq "weird-cpu-weird-os"
     end
   end
 

metadata

@@ -1,46 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: libspotify
 version: !ruby/object:Gem::Version
-  version: 12.1.51.3
+  version: 12.1.51.4
 platform: x86-mingw32
 authors:
 - Kim Burgestrand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-09 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: A binary ruby gem for distribution of libspotify.
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+description: |
+  libspotify is a ruby gem for distribution of libspotify binaries. It allows
+  download of libspotify through the rubygems package manager, and provides an
+  API for retrieving the binary file path.
 email:
 - kim@burgestrand.se
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - README.md
 - Rakefile
 - bin/.gitkeep
+- bin/x86-windows.dll
 - lib/libspotify.rb
 - libspotify.gemspec
 - spec/libspotify_spec.rb
-- bin/windows.dll
 homepage: https://github.com/Burgestrand/libspotify
 licenses:
 - MIT
@@ -51,17 +68,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A binary ruby gem for distribution of libspotify.