libspotify 12.1.51.3 → 12.1.51.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64f9470bde55e71d13f1b167e925c68451188468
-  data.tar.gz: 8a3b373802f81ac0f72700582ef77bc30b1527ba
+  metadata.gz: 489be49afb2afe3540e2eef1b49e9d2bfaa085bd
+  data.tar.gz: 5ad6fe0c0a76a8ccadfb4511567278a5e7c2bb61
 SHA512:
-  metadata.gz: e6c92680114b654a85844e63fbab2fb14bb1f6468797df6a5624e8c2374f727939e4eac992cead155a033a77a517289f211faa873c7ba35cee4a4fdf34139f2a
-  data.tar.gz: d24dfce03eaf2b3a4328c9c9233bb1158c0866d708c9ffaedd4a17ed7a9b42d0d46bc4b2e668cdbcb8598f0db5fcfa0d25b21e05d8b8a45c3e28391f86aa9d40
+  metadata.gz: c7e06226a9a55bf95c30581c0255d1a2fff936c67ffa6254eade8b7a4ede9f60e6400b61f89236780753593b696b91457b57e41f3906c993b877b46836f0436d
+  data.tar.gz: 7db535f77197a5782746fd7c54b4051095f122bc6525053c321d12cf6914eb2c72fbae652f4165d6fa92e67156b8e721788612c180fa1d953f48be39b38bdd2e

data/Rakefile

@@ -11,27 +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",
-    "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" => "libspotify-12.1.51-Darwin-universal/libspotify.framework/Versions/Current/libspotify",
-    "i686-linux"       => "libspotify-12.1.51-Linux-i686-release/lib/libspotify.so",
+    "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,7 +50,7 @@ task :build do
       MSG
     else
       source_binaries.each do |binary|
-        src_name  = "bin/#{binaries[binary]}"
+        src_name  = "bin/#{binaries.fetch(binary)}"
         dest_name = "bin/#{binary}"
         FileUtils.cp(src_name, dest_name, verbose: true)
         spec.files << dest_name
@@ -76,7 +71,43 @@ task :build do
   end
 
   puts
-  puts "Do not forget to push to GitHub as well."
+  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."

data/lib/libspotify.rb

@@ -1,40 +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+)?/
-        v  = $1
+        "x86"
+      when /arm/
         hf = "hf" if hard_float?
-        "armv5#{hf}-linux"
+        "armv#{arm_version}#{hf}"
+      else
+        RbConfig::CONFIG["host_cpu"]
       end
-    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,4 +20,6 @@ Gem::Specification.new do |gem|
 
   gem.version       = Libspotify::GEM_VERSION
   gem.platform      = Gem::Platform::RUBY
+  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
 
@@ -67,7 +81,7 @@ describe Libspotify do
   end
 
   specify "GEM_VERSION" do
-    Libspotify::GEM_VERSION.should eq "12.1.51.2"
+    Libspotify::GEM_VERSION.should match(/\A#{Regexp.quote(Libspotify::VERSION)}/)
   end
 
   specify "VERSION" do

metadata

@@ -1,24 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: libspotify
 version: !ruby/object:Gem::Version
-  version: 12.1.51.3
+  version: 12.1.51.4
 platform: ruby
 authors:
 - Kim Burgestrand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-07 00:00:00.000000000 Z
-dependencies: []
-description: A binary ruby gem for distribution of libspotify.
+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: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        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
@@ -39,17 +70,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.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A binary ruby gem for distribution of libspotify.