ruby-echonest 0.1.1 → 0.1.2

data/Rakefile

@@ -1,109 +1,42 @@
 require 'rubygems'
 require 'rake'
-require 'rake/clean'
-require 'rake/testtask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/contrib/sshpublisher'
-require 'spec/rake/spectask'
-require 'fileutils'
-include FileUtils
 
-$LOAD_PATH.unshift "lib"
-require "echonest"
-
-NAME              = "ruby-echonest"
-AUTHOR            = "youpy"
-EMAIL             = "youpy@buycheapviagraonlinenow.com"
-DESCRIPTION       = "An Ruby interface for Echo Nest Developer API"
-RUBYFORGE_PROJECT = "ruby-echonest"
-HOMEPATH          = "http://github.com/youpy/ruby-echonest"
-BIN_FILES         = %w(  )
-VERS              = Echonest::VERSION
-
-REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
-CLEAN.include ['**/.*.sw?', '*.gem', '.config']
-RDOC_OPTS = [
-  '--title', "#{NAME} documentation",
-  "--charset", "utf-8",
-  "--opname", "index.html",
-  "--line-numbers",
-  "--main", "README.rdoc",
-  "--inline-source",
-]
-
-task :default => [:spec]
-task :package => [:clean]
-
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/*_spec.rb']
-  t.rcov = true
-end
-
-spec = Gem::Specification.new do |s|
-  s.name              = NAME
-  s.version           = VERS
-  s.platform          = Gem::Platform::RUBY
-  s.has_rdoc          = true
-  s.extra_rdoc_files  = ["README.rdoc", "ChangeLog"]
-  s.rdoc_options     += RDOC_OPTS + ['--exclude', '^(examples|extras)/']
-  s.summary           = DESCRIPTION
-  s.description       = DESCRIPTION
-  s.author            = AUTHOR
-  s.email             = EMAIL
-  s.homepage          = HOMEPATH
-  s.executables       = BIN_FILES
-  s.rubyforge_project = RUBYFORGE_PROJECT
-  s.bindir            = "bin"
-  s.require_path      = "lib"
-  s.test_files        = Dir["test/test_*.rb"]
-
-  s.add_dependency('libxml-ruby')
-  s.add_dependency('httpclient')
-  s.add_dependency('hashie')
-  #s.required_ruby_version = '>= 1.8.2'
-
-  s.files = %w(README.rdoc ChangeLog Rakefile) +
-    Dir.glob("{bin,doc,spec,test,lib,templates,generator,extras,website,script}/**/*") + 
-    Dir.glob("ext/**/*.{h,c,rb}") +
-    Dir.glob("examples/**/*.rb") +
-    Dir.glob("tools/*.rb")
-
-  s.extensions = FileList["ext/**/extconf.rb"].to_a
+begin
+  $LOAD_PATH.unshift "lib"
+  require 'echonest'
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "ruby-echonest"
+    gem.version = Echonest::VERSION
+    gem.summary = "An Ruby interface for Echo Nest Developer API"
+    gem.description = "An Ruby interface for Echo Nest Developer API"
+    gem.email = "youpy@buycheapviagraonlinenow.com"
+    gem.homepage = "http://github.com/youpy/ruby-echonest"
+    gem.authors = ["youpy"]
+    gem.add_development_dependency "rspec", ">= 2.0.0"
+    gem.add_dependency "httpclient"
+    gem.add_dependency "hashie"
+    gem.add_dependency "libxml-ruby"
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-Rake::GemPackageTask.new(spec) do |p|
-  p.need_tar = true
-  p.gem_spec = spec
-end
+require 'rspec/core/rake_task'
 
-task :install do
-  name = "#{NAME}-#{VERS}.gem"
-  sh %{rake package}
-  sh %{sudo gem install pkg/#{name}}
+RSpec::Core::RakeTask.new(:core) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
 end
 
-task :uninstall => [:clean] do
-  sh %{sudo gem uninstall #{NAME}}
-end
+task :core => :check_dependencies
+task :default => :core
 
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'html'
-  rdoc.options += RDOC_OPTS
-  rdoc.template = "resh"
-  #rdoc.template = "#{ENV['template']}.rb" if ENV['template']
-  if ENV['DOC_FILES']
-    rdoc.rdoc_files.include(ENV['DOC_FILES'].split(/,\s*/))
-  else
-    rdoc.rdoc_files.include('README', 'ChangeLog')
-    rdoc.rdoc_files.include('lib/**/*.rb')
-    rdoc.rdoc_files.include('ext/**/*.c')
-  end
-end
-
-desc "Show information about the gem"
-task :debug_gem do
-  puts spec.to_ruby
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "echonest %s" % Echonest::VERSION
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/lib/echonest/analysis.rb

@@ -8,7 +8,11 @@ module Echonest
     end
 
     def self.new_from_url(url)
-      new(open(url).read)
+      if OpenURI::Options.has_key? :ssl_verify_mode
+        new(open(url, 'r', { :ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE }).read)
+      else
+        new(open(url).read)
+      end
     end
 
     def tempo

data/lib/echonest/version.rb

@@ -1,3 +1,3 @@
 module Echonest
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/ruby-echonest.gemspec

@@ -0,0 +1,39 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{ruby-echonest}
+  s.version = "0.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["youpy"]
+  s.date = %q{2010-08-24}
+  s.description = %q{An Ruby interface for Echo Nest Developer API}
+  s.email = %q{youpy@buycheapviagraonlinenow.com}
+  s.extra_rdoc_files = ["README.rdoc", "ChangeLog"]
+  s.files = ["README.rdoc", "ChangeLog", "Rakefile", "spec/analysis_spec.rb", "spec/api_spec.rb", "spec/echonest_spec.rb", "spec/fixtures", "spec/fixtures/analysis.json", "spec/fixtures/profile.json", "spec/fixtures/profile_failure.json", "spec/fixtures/profile_unknown.json", "spec/fixtures/sample.mp3", "spec/response_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/track_spec.rb", "lib/echonest", "lib/echonest/analysis.rb", "lib/echonest/api.rb", "lib/echonest/element", "lib/echonest/element/bar.rb", "lib/echonest/element/beat.rb", "lib/echonest/element/loudness.rb", "lib/echonest/element/section.rb", "lib/echonest/element/segment.rb", "lib/echonest/element/tatum.rb", "lib/echonest/response.rb", "lib/echonest/traditional_api_methods.rb", "lib/echonest/version.rb", "lib/echonest.rb"]
+  s.homepage = %q{http://github.com/youpy/ruby-echonest}
+  s.rdoc_options = ["--title", "ruby-echonest documentation", "--charset", "utf-8", "--opname", "index.html", "--line-numbers", "--main", "README.rdoc", "--inline-source", "--exclude", "^(examples|extras)/"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{ruby-echonest}
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{An Ruby interface for Echo Nest Developer API}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<libxml-ruby>, [">= 0"])
+      s.add_runtime_dependency(%q<httpclient>, [">= 0"])
+      s.add_runtime_dependency(%q<hashie>, [">= 0"])
+    else
+      s.add_dependency(%q<libxml-ruby>, [">= 0"])
+      s.add_dependency(%q<httpclient>, [">= 0"])
+      s.add_dependency(%q<hashie>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<libxml-ruby>, [">= 0"])
+    s.add_dependency(%q<httpclient>, [">= 0"])
+    s.add_dependency(%q<hashie>, [">= 0"])
+  end
+end

data/spec/analysis_spec.rb

@@ -2,8 +2,6 @@ $:.unshift File.dirname(__FILE__)
 
 require 'spec_helper'
 
-include SpecHelper
-
 describe Echonest::Analysis do
   before do
     @analysis = Echonest::Analysis.new(open(fixture('analysis.json')).read)

data/spec/api_spec.rb

@@ -1,9 +1,6 @@
 $:.unshift File.dirname(__FILE__)
 
 require 'spec_helper'
-require "echonest"
-
-include SpecHelper
 
 describe Echonest::Api do
   before do

data/spec/echonest_spec.rb

@@ -1,9 +1,6 @@
 $:.unshift File.dirname(__FILE__)
 
 require 'spec_helper'
-require "echonest"
-
-include SpecHelper
 
 describe Echonest do
   it "should return an instance of Echonest::Api" do

data/spec/response_spec.rb

@@ -2,8 +2,6 @@ $:.unshift File.dirname(__FILE__)
 
 require 'spec_helper'
 
-include SpecHelper
-
 describe Echonest::Response do
   before do
     @success = Echonest::Response.new(open(fixture('profile.json')).read)

data/spec/spec_helper.rb

@@ -2,10 +2,8 @@ $:.unshift File.dirname(__FILE__) + '/../lib/'
 
 require 'echonest'
 
-module SpecHelper
+RSpec.configure do |config|
   def fixture(filename)
     File.dirname(__FILE__) + '/fixtures/' + filename
   end
 end
-
-

data/spec/track_spec.rb

@@ -1,9 +1,6 @@
 $:.unshift File.dirname(__FILE__)
 
 require 'spec_helper'
-require "echonest"
-
-include SpecHelper
 
 describe Echonest::ApiMethods::Track do
   before do

metadata

@@ -1,83 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-echonest
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 0.1.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - youpy
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-30 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: libxml-ruby
+date: 2011-11-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70182523091860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70182523091860
+- !ruby/object:Gem::Dependency
   name: httpclient
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: &70182523106840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70182523106840
+- !ruby/object:Gem::Dependency
   name: hashie
+  requirement: &70182523106220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70182523106220
+- !ruby/object:Gem::Dependency
+  name: libxml-ruby
+  requirement: &70182523105580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70182523105580
 description: An Ruby interface for Echo Nest Developer API
 email: youpy@buycheapviagraonlinenow.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files:
 - ChangeLog
-files: 
 - README.rdoc
+files:
+- .rspec
 - ChangeLog
+- README.rdoc
 - Rakefile
-- spec/analysis_spec.rb
-- spec/api_spec.rb
-- spec/echonest_spec.rb
-- spec/fixtures/analysis.json
-- spec/fixtures/profile.json
-- spec/fixtures/profile_failure.json
-- spec/fixtures/profile_unknown.json
-- spec/fixtures/sample.mp3
-- spec/response_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/track_spec.rb
+- lib/echonest.rb
 - lib/echonest/analysis.rb
 - lib/echonest/api.rb
 - lib/echonest/element/bar.rb
@@ -89,47 +79,40 @@ files:
 - lib/echonest/response.rb
 - lib/echonest/traditional_api_methods.rb
 - lib/echonest/version.rb
-- lib/echonest.rb
-has_rdoc: true
+- ruby-echonest.gemspec
+- spec/analysis_spec.rb
+- spec/api_spec.rb
+- spec/echonest_spec.rb
+- spec/fixtures/analysis.json
+- spec/fixtures/profile.json
+- spec/fixtures/profile_failure.json
+- spec/fixtures/profile_unknown.json
+- spec/fixtures/sample.mp3
+- spec/response_spec.rb
+- spec/spec_helper.rb
+- spec/track_spec.rb
 homepage: http://github.com/youpy/ruby-echonest
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --title
-- ruby-echonest documentation
-- --charset
-- utf-8
-- --opname
-- index.html
-- --line-numbers
-- --main
-- README.rdoc
-- --inline-source
-- --exclude
-- ^(examples|extras)/
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: ruby-echonest
-rubygems_version: 1.3.6
+rubyforge_project: 
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: An Ruby interface for Echo Nest Developer API
 test_files: []
-