mb-discid 0.1.0 → 0.1.1

data/README

@@ -9,9 +9,22 @@ to find the release entry for your CD in the MusicBrainz database.
 Before installing rdiscid make sure you have libdiscid installed. See
 http://musicbrainz.org/doc/libdiscid for more information on how to do this.
 
-=== Install with gem
+=== Installation with RubyGems
  gem install mb-discid
  
+== Installation on Windows operating systems.
+For Windows a binary gem "mb-discid-0.1.1-mswin32.gem" is available. To install
+it follow the instructions below:
+
+1. Make sure you have at least Ruby 1.8.6 installed.
+2. Install RubyGems, if you don't already have it.
+3. Download "libdiscid-0.1.1-win32bin.zip" from
+   http://musicbrainz.org/doc/libdiscid.
+4. Copy the file "discid.dll" from "libdiscid-0.1.1-win32bin.zip" to your Ruby
+   bin directory (normally "C:\ruby\bin".
+5. Run "gem install mb-discid" to install MB-DiscID.
+6. To test the installation try to run "discid.rb" in the examples directory.
+ 
 === Installing from source
  rake install
 

data/Rakefile

@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Rakefile 69 2007-06-03 14:14:25Z phw $
 # Copyright (c) 2007, Philipp Wolfer
 # All rights reserved.
 # See LICENSE for permissions.
@@ -15,7 +15,7 @@ end
 # Packaging tasks: -------------------------------------------------------
 
 PKG_NAME     = 'mb-discid'
-PKG_VERSION  = '0.1.0'
+PKG_VERSION  = '0.1.1'
 PKG_SUMMARY  = 'Ruby bindings for libdiscid.'
 PKG_AUTHOR   = 'Philipp Wolfer'
 PKG_EMAIL    = 'phw@rubyforge.org'
@@ -27,19 +27,27 @@ EOF
 PKG_FILES = FileList[
   'Rakefile', 'LICENSE', 'README',
   'examples/**/*',
-  'ext/**/*.{c,rb}'
+  'ext/**/*.{c,rb}',
+  'lib/**/*.rb'
 ]
 
 spec = Gem::Specification.new do |spec|
-  spec.platform = Gem::Platform::RUBY
   spec.name = PKG_NAME
   spec.version = PKG_VERSION
   spec.summary = PKG_SUMMARY
+  if ENV['BINARY_GEM'] == 'win32'
+    spec.platform = Gem::Platform::WIN32
+    spec.files = PKG_FILES << 'ext/MB_DiscID.so'
+    spec.bindir = 'bin'
+    spec.required_ruby_version = ">= #{RUBY_VERSION}"
+  else
+    spec.platform = Gem::Platform::RUBY
+    spec.files = PKG_FILES
+    spec.extensions << 'ext/extconf.rb'
+  end
   spec.requirements << 'libdiscid (http://musicbrainz.org/doc/libdiscid)'
-  spec.require_path = 'lib'
+  spec.require_paths = ['lib', 'ext']
   spec.autorequire = spec.name
-  spec.files = PKG_FILES
-  spec.extensions << 'ext/extconf.rb'
   spec.description = PKG_DESCRIPTION
   spec.author = PKG_AUTHOR
   spec.email = PKG_EMAIL

data/examples/discid.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'DiscID'
+require 'mb-discid'
 
 # Read the device name from the command line or use the default.
 device = $*[0] ? $*[0] : MusicBrainz::DiscID.default_device

data/ext/extconf.rb

@@ -1,9 +1,13 @@
 #!/usr/bin/env ruby
+# $Id: extconf.rb 69 2007-06-03 14:14:25Z phw $
 
 require 'mkmf'
 
-if have_library('discid', 'discid_new')
-  create_makefile('DiscID')
+if have_library('discid', 'discid_new') or
+   have_library('discid.dll', 'discid_new')
+  # Remove -MD from compiler flags on Windows.
+  $CFLAGS.sub!('-MD', '') if RUBY_PLATFORM.include? 'win32'
+  create_makefile('MB_DiscID')
 else
   puts 'Required library libdiscid not found.'
 end

data/ext/{discid.c → mb_discid.c}

@@ -1,5 +1,5 @@
 /*---------------------------------------------------------------------------
- $Id: discid.c 55 2007-06-01 19:18:12Z phw $
+ $Id: mb_discid.c 67 2007-06-03 14:09:23Z phw $
  Copyright (c) 2007, Philipp Wolfer
  All rights reserved.
  See LICENSE for permissions.
@@ -30,11 +30,13 @@ static VALUE mb_discid_id(VALUE self)
 {
 	if (rb_iv_get(self, "@read") == Qfalse)
 		return Qnil;
-	
-	DiscId *disc;
-	Data_Get_Struct(self, DiscId, disc);
-	
-	return rb_str_new2(discid_get_id(disc));
+	else
+	{
+		DiscId *disc;
+		Data_Get_Struct(self, DiscId, disc);
+		
+		return rb_str_new2(discid_get_id(disc));
+	}
 }
 
 /**
@@ -46,11 +48,13 @@ static VALUE mb_discid_submission_url(VALUE self)
 {
 	if (rb_iv_get(self, "@read") == Qfalse)
 		return Qnil;
-	
-	DiscId *disc;
-	Data_Get_Struct(self, DiscId, disc);
-	
-	return rb_str_new2(discid_get_submission_url(disc));
+	else
+	{
+		DiscId *disc;
+		Data_Get_Struct(self, DiscId, disc);
+		
+		return rb_str_new2(discid_get_submission_url(disc));
+	}
 }
 
 /**
@@ -62,11 +66,13 @@ static VALUE mb_discid_freedb_id(VALUE self)
 {
 	if (rb_iv_get(self, "@read") == Qfalse)
 		return Qnil;
-	
-	DiscId *disc;
-	Data_Get_Struct(self, DiscId, disc);
-	
-	return rb_str_new2(discid_get_freedb_id(disc));
+	else
+	{
+		DiscId *disc;
+		Data_Get_Struct(self, DiscId, disc);
+		
+		return rb_str_new2(discid_get_freedb_id(disc));
+	}
 }
 
 /**
@@ -78,11 +84,13 @@ static VALUE mb_discid_first_track_num(VALUE self)
 {
 	if (rb_iv_get(self, "@read") == Qfalse)
 		return Qnil;
-	
-	DiscId *disc;
-	Data_Get_Struct(self, DiscId, disc);
-	
-	return INT2FIX(discid_get_first_track_num(disc));
+	else
+	{
+		DiscId *disc;
+		Data_Get_Struct(self, DiscId, disc);
+		
+		return INT2FIX(discid_get_first_track_num(disc));
+	}
 }
 
 /**
@@ -94,11 +102,13 @@ static VALUE mb_discid_last_track_num(VALUE self)
 {
 	if (rb_iv_get(self, "@read") == Qfalse)
 		return Qnil;
-	
-	DiscId *disc;
-	Data_Get_Struct(self, DiscId, disc);
-	
-	return INT2FIX(discid_get_last_track_num(disc));
+	else
+	{
+		DiscId *disc;
+		Data_Get_Struct(self, DiscId, disc);
+		
+		return INT2FIX(discid_get_last_track_num(disc));
+	}
 }
 
 /**
@@ -110,11 +120,13 @@ static VALUE mb_discid_sectors(VALUE self)
 {
 	if (rb_iv_get(self, "@read") == Qfalse)
 		return Qnil;
-	
-	DiscId *disc;
-	Data_Get_Struct(self, DiscId, disc);
-	
-	return INT2FIX(discid_get_sectors(disc));
+	else
+	{
+		DiscId *disc;
+		Data_Get_Struct(self, DiscId, disc);
+		
+		return INT2FIX(discid_get_sectors(disc));
+	}
 }
 
 /**
@@ -130,31 +142,37 @@ static VALUE mb_discid_tracks(VALUE self)
 {
 	if (rb_iv_get(self, "@read") == Qfalse)
 		return Qnil;
-	
-	DiscId *disc;
-	Data_Get_Struct(self, DiscId, disc);
-	
-	VALUE result = rb_ary_new(); // Array of all [offset, length] tuples
-	VALUE tuple; // Array to store one [offset, length] tuple.
-	int track = discid_get_first_track_num(disc); // Track number
-	while (track <= discid_get_last_track_num(disc))
+	else
 	{
-		tuple = rb_ary_new3(2,
-			INT2FIX(discid_get_track_offset(disc, track)),
-			INT2FIX(discid_get_track_length(disc, track)) );
+		DiscId *disc;
+		Data_Get_Struct(self, DiscId, disc);
 		
-	   	if (rb_block_given_p())
-			rb_yield(tuple);
-		else
-			rb_ary_push(result, tuple);
+		{ // Stupid MS compiler.
+		
+		VALUE result = rb_ary_new(); // Array of all [offset, length] tuples
+		VALUE tuple; // Array to store one [offset, length] tuple.
+		int track = discid_get_first_track_num(disc); // Track number
+		while (track <= discid_get_last_track_num(disc))
+		{
+			tuple = rb_ary_new3(2,
+				INT2FIX(discid_get_track_offset(disc, track)),
+				INT2FIX(discid_get_track_length(disc, track)) );
 			
-		track++;
+		   	if (rb_block_given_p())
+				rb_yield(tuple);
+			else
+				rb_ary_push(result, tuple);
+				
+			track++;
+		}
+		
+		if (rb_block_given_p())
+			return Qnil;
+		else
+			return result;
+		
+		} // Stupid MS compiler.
 	}
-	
-	if (rb_block_given_p())
-		return Qnil;
-	else
-		return result;
 }
 
 /**
@@ -167,6 +185,8 @@ static VALUE mb_discid_read(int argc, VALUE *argv, VALUE self)
 	DiscId *disc;
 	Data_Get_Struct(self, DiscId, disc);
 	
+	{ // Stupid MS compiler.
+	
 	VALUE device = Qnil; // The device string as a Ruby string.
 	char* cdevice;       // The device string as a C string.
 	
@@ -190,6 +210,8 @@ static VALUE mb_discid_read(int argc, VALUE *argv, VALUE self)
 		rb_iv_set(self, "@read", Qtrue);
 	
 	return Qnil;
+	
+	} // Stupid MS compiler.
 }
 
 /**
@@ -227,7 +249,7 @@ VALUE mb_discid_default_device(VALUE class)
 /**
  * Initialize the DiscID class and make it available in Ruby.
  */
-void Init_DiscID() {
+void Init_MB_DiscID() {
 	mMusicBrainz = rb_define_module("MusicBrainz");
   	cDiscID = rb_define_class_under(mMusicBrainz, "DiscID", rb_cObject);
 	rb_define_singleton_method(cDiscID, "new", mb_discid_new, -1);

data/lib/mb-discid.rb

@@ -0,0 +1,12 @@
+# $Id: mb-discid.rb 67 2007-06-03 14:09:23Z phw $
+# Copyright (c) 2007, Philipp Wolfer
+# All rights reserved.
+# See LICENSE for permissions.
+
+# Just a helper file to allow loading the MB-DiscID library with
+# <tt>require 'mb-discid'</tt>, which is the only recommended way
+# to load the library.
+# This file may even provide extensions to the library in the future
+# to avoid to have to write everything in C.
+
+require 'MB_DiscID.so'

metadata

@@ -3,11 +3,12 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: mb-discid
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-06-02 00:00:00 +02:00
+  version: 0.1.1
+date: 2007-06-03 00:00:00 +02:00
 summary: Ruby bindings for libdiscid.
 require_paths: 
 - lib
+- ext
 email: phw@rubyforge.org
 homepage: http://rbrainz.rubyforge.org
 rubyforge_project: rbrainz
@@ -33,8 +34,9 @@ files:
 - LICENSE
 - README
 - examples/discid.rb
-- ext/discid.c
+- ext/mb_discid.c
 - ext/extconf.rb
+- lib/mb-discid.rb
 test_files: []
 
 rdoc_options: []