xmfun 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 932fc6fda59787b6b88e1f62c3a1034bae61ac60
-  data.tar.gz: 93965c8ab3a8dac6bbec723e2409cd9815ada775
+  metadata.gz: de89583de84a2110acc2701dd3db6fbd0d3ca430
+  data.tar.gz: 6dd726088e668911d797cdd1123b51d369ed6469
 SHA512:
-  metadata.gz: a742a339d225638d8e15b2570b993fde8da9cca484a1ce01b7d61aace7c7b0e39bdf2ef19785e0d7f27d4bb943d012cea7157a7b54eac56733c6346c49d223f0
-  data.tar.gz: 137c2b70396da5739e5b50b730e53108084f5493a14d12ed2dc8091f7f4f76b61ee1308178fe637cec97d49e3b2514e47203b93eb9eca1a3573c66b156fc226b
+  metadata.gz: e94f58c108707782a0ad8f33ab730cfeae0439a8323c14b09342e8794025b11a0c3dc6a20c6723ce0c23924b34131d5f005a1b0432a8c95d68568b906d40ef36
+  data.tar.gz: 9332f94f499ce495d44c1b536d1aaf6b50006d48c7e2b2ab3f19fbf06f4bfa3f4d1a4ccbab2925c2632bbe577f44b2069f18d4a692bef570d2fb291d9bc74475

data/.gitignore

@@ -16,3 +16,5 @@ test/tmp
 test/version_tmp
 tmp
 .DS_Store
+.idea
+*.mp3

data/.hound.yml

@@ -0,0 +1,4 @@
+LineLength:
+  Max: 160
+StringLiterals:
+  Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.1.2

data/.travis.yml

@@ -1,5 +1,21 @@
 language: ruby
 rvm:
+  - ruby-head
   - 2.1.2
   - 2.0.0
   - 1.9.3
+  - jruby
+  - rbx
+matrix:
+  allow_failures:
+    - rvm: jruby
+    - rvm: rbx
+    - rvm: ruby-head
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/2a376ca4981aeb2a81ca
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: false     # default: false
+script: CODECLIMATE_REPO_TOKEN=d819a1100b1567adf763b9f6b0e1af83dcb59a4bf5c3534748ed32e3bb6818f4 bundle exec rake

data/Gemfile

@@ -1,3 +1,5 @@
 source "https://rubygems.org"
 
 gemspec
+
+gem 'codeclimate-test-reporter', group: :test, require: nil

data/README.md

@@ -1,10 +1,9 @@
 # XMfun
-[![Gem
-Version](https://badge.fury.io/rb/xmfun.svg)](http://badge.fury.io/rb/xmfun)
-[![Build
-Status](https://travis-ci.org/ipmsteven/xmfun.svg?branch=master)](https://travis-ci.org/ipmsteven/xmfun)
-[![Code
-Climate](https://codeclimate.com/github/ipmsteven/xmfun/badges/gpa.svg)](https://codeclimate.com/github/ipmsteven/xmfun)
+[![Gem Version](https://badge.fury.io/rb/xmfun.svg)](http://badge.fury.io/rb/xmfun)
+[![Build Status](https://travis-ci.org/xmfun/xmfun.svg?branch=master)](https://travis-ci.org/xmfun/xmfun)
+[![Test Coverage](https://codeclimate.com/github/ipmsteven/xmfun/badges/coverage.svg)](https://codeclimate.com/github/ipmsteven/xmfun)
+[![Code Climate](https://codeclimate.com/github/ipmsteven/xmfun/badges/gpa.svg)](https://codeclimate.com/github/ipmsteven/xmfun)
+[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/ipmsteven/xmfun?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 Yet Another Xiami Music Downloader
 
@@ -27,11 +26,22 @@ Or install it yourself as:
 ## Usage
 
 ```
-xmfun
-  -u url  -- url on xiami website
-  -d path -- path to save your music
-  -v      -- show version
-  -h      -- show help message
+Usage: xmfun <command> [<args>]
+
+  -v, --version       Print the version
+  -h, --help          Print this help
+
+Common commands:
+  download            Download the mp3 files given an arg of url
+  update              Update xmfun to the newest version
+  version             Print the version
+  help                Print this help
+
+Example:
+  xmfun download http://www.xiami.com/song/3378080
+
+More info:
+  xmfun <command> -h
 ```
 
 ## Contributing

data/Rakefile

@@ -1,9 +1,15 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'cucumber'
+require 'cucumber/rake/task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+Cucumber::Rake::Task.new(:features) do |t|
+  t.cucumber_opts = "--format pretty"
+end
+
+task :default => [:spec, :features]
 
 task :console do
   exec "pry -r xmfun -I ./lib"

data/bin/xmfun

@@ -1,15 +1,4 @@
 #!/usr/bin/env ruby
-
-require 'clap'
 require 'xmfun'
 
-url = ''
-dst = '.'
-
-Clap.run ARGV,
-  "-u" => lambda { |xm_url| url = Xmfun::Util::UrlParser.parse(xm_url) },
-  "-d" => lambda { |d| dst = d },
-  "-v" => lambda { puts Xmfun::VERSION },
-  "-h" => lambda { puts Xmfun.help }
-
-Xmfun::Downloader.download(url, dst) unless url.empty?
+Xmfun::CLI.start(ARGV)

data/lib/xmfun.rb

@@ -5,21 +5,6 @@ require 'xmfun/mp3/track'
 require 'xmfun/mp3/mp3_tagger'
 require 'xmfun/util/url_parser'
 require 'xmfun/util/decoder'
-require 'xmfun/downloader'
-
-
-
-module Xmfun
-  def self.help
-<<-HELP
-Usage: ruby xmfun.rb
-  -u url  -- url on xiami website
-  -d path -- path to save your music
-  -v      -- show version
-  -h      -- show help message
-
-Example:  Download song from "http://www.xiami.com/song/383221" and save to 'xuwei' folder
-          xmfun -u http://www.xiami.com/song/383221 -d xuwei
-HELP
-  end
-end
+require 'xmfun/util/downloader'
+require 'xmfun/util/helper'
+require 'xmfun/cli'

data/lib/xmfun/cli.rb

@@ -0,0 +1,50 @@
+# -*- encoding : utf-8 -*-
+
+require 'clap'
+
+module Xmfun
+  class CLI
+    extend Xmfun::Util::Helper
+
+    def self.start(argv)
+      if argv.empty?
+        puts main_help
+        exit
+      end
+
+      url = ''
+      dst = '.'
+
+      download_proc = lambda do |option|
+        if option == '-h'
+          puts download_help
+        else
+          unless(url = Xmfun::Util::UrlParser.parse(option))
+            puts "\e[31mPlease provide valid URL\e[0m"
+            exit
+          end
+        end
+      end
+
+      begin
+        Clap.run argv,
+          "download"   => download_proc,
+          "update"     => lambda { system("gem update xmfun") },
+          "help"       => lambda { puts main_help; exit },
+          "--help"     => lambda { puts main_help; exit },
+          "version"    => lambda { puts Xmfun::VERSION; exit },
+          "--version"  => lambda { puts Xmfun::VERSION; exit },
+
+          "-u" => lambda { |xmurl|  url = Xmfun::Util::UrlParser.parse(xm_url) },
+          "-v" => lambda { puts Xmfun::VERSION; exit},
+          "-h" => lambda { puts main_help; exit},
+          "-d" => lambda { |d| dst = d }
+      rescue ArgumentError
+        puts "\e[31mInvalid Usage\e[0m"
+        puts main_help
+      end
+
+      Xmfun::Util::Downloader.download(url, dst) unless url.empty?
+    end
+  end
+end

data/lib/xmfun/mp3/mp3_tagger.rb

@@ -1,7 +1,8 @@
 # -*- encoding : utf-8 -*-
 
-require 'open-uri'
-require 'mp3info'
+require "open-uri"
+require "mp3info"
+require "cgi"
 
 module Xmfun
   module Mp3
@@ -12,10 +13,21 @@ module Xmfun
           m.tag.title  = track.title
           m.tag.album  = track.album
 
+          m.tag2["USLT"] = get_lyric(track.lyric)
           m.tag2.remove_pictures
-          m.tag2.add_picture(open(track.album_pic).read)
+          m.tag2.add_picture(get_data(track.album_pic))
         end
       end
+
+      private
+
+      def self.get_lyric(url)
+        CGI.unescapeHTML(get_data(url)).force_encoding("UTF-8")
+      end
+
+      def self.get_data(url)
+        open(url).read rescue ''
+      end
     end
   end
 end

data/lib/xmfun/util/decoder.rb

@@ -10,7 +10,9 @@ module Xmfun
         row, text = strtok(input)
 
         tmp = text.in_groups(row).transpose.join
-        CGI::unescape(tmp).gsub('^', '0')
+        CGI::unescape(tmp).gsub("^", "0")
+      rescue ArgumentError
+        false
       end
 
       def self.strtok(s)

data/lib/xmfun/util/downloader.rb

@@ -0,0 +1,80 @@
+# -*- encoding : utf-8 -*-
+
+require 'open-uri'
+require 'nokogiri'
+require 'nori'
+require 'parallel'
+require 'ruby-progressbar'
+
+module Xmfun
+  module Util
+    class Downloader
+      def self.download(url, dst = ".")
+        make_dst(dst)
+
+        tracks = Nokogiri::XML(open(url, "Client-IP" => "220.181.111.168")).css("track")
+
+        if tracks.size > 1
+          download_collect(tracks)
+        else
+          download_song(tracks[0])
+        end
+      end
+
+      private
+      def self.make_dst(dst)
+        if Dir.exist?(dst)
+          Dir.chdir(dst)
+        else
+          Dir.mkdir(dst)
+          Dir.chdir(dst)
+        end
+      end
+
+      def self.make_progress_bar(size)
+        ProgressBar.create( :title => "Progress",
+                           :total => size,
+                           :format => '%a %bᗧ%i %p%% %t',
+                           :progress_mark  => ' ',
+                           :remainder_mark => '･' )
+      end
+
+      def self.download_collect(collect)
+        progress = make_progress_bar(collect.size)
+
+        Parallel.map( collect, :in_threads => Parallel.processor_count, :finish => lambda { |item, i, result| progress.increment } ) do |track|
+
+          track = Xmfun::Mp3::Track.new(Nori.new.parse(track.to_s)['track'])
+
+          URI.parse(track.location).open do |f|
+            File.open(track.file_name, 'w') { |mp3| mp3.write(f.read) }
+          end
+
+          Xmfun::Mp3::Mp3Tagger.tag(track)
+        end
+      end
+
+      def self.download_song(song)
+        track = Xmfun::Mp3::Track.new(Nori.new.parse(song.to_s)['track'])
+        progress = nil
+
+        content_length_lambda = lambda do |content_length|
+          if content_length && 0 < content_length
+            progress = make_progress_bar content_length
+          end
+        end
+
+        progress_lambda = lambda { |size| progress.progress = size if progress }
+
+        uri = URI.parse(track.location)
+
+        uri.open( :content_length_proc => content_length_lambda,
+                 :progress_proc       => progress_lambda ) do |f|
+          File.open(track.file_name, 'w') { |mp3| mp3.write(f.read) }
+        end
+
+        Xmfun::Mp3::Mp3Tagger.tag(track)
+      end
+    end
+  end
+end

data/lib/xmfun/util/helper.rb

@@ -0,0 +1,40 @@
+# -*- encoding : utf-8 -*-
+
+module Xmfun
+  module Util
+    module Helper
+      def main_help
+        <<-EOS
+Usage: xmfun <command> [<args>]
+
+  -v, --version       Print the version
+  -h, --help          Print this help
+
+Common commands:
+  download            Download the mp3 files given an arg of url
+  update              Update xmfun to the newest version
+  version             Print the version
+  help                Print this help
+
+Example:
+  xmfun download http://www.xiami.com/song/3378080
+
+More info:
+  xmfun <command> -h
+        EOS
+      end
+
+      def download_help
+        <<-EOS
+Usage:
+  xmfun download URL
+  xmfun download URL -d DESINATION_FOLDER
+
+Example:
+  xmfun download http://www.xiami.com/song/3378080
+  xmfun download http://www.xiami.com/song/3378080 -d pink
+        EOS
+      end
+    end
+  end
+end

data/lib/xmfun/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 
 module Xmfun
-  VERSION = "0.0.5"
+  VERSION = '0.0.7'
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: xmfun
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - ipmsteven
+- Polo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clap
@@ -72,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.8.5
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +165,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.18.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.18.0
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.9.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.9.3
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.17
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.17
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -187,7 +244,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rspec"
+- ".hound.yml"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -195,15 +253,14 @@ files:
 - Rakefile
 - bin/xmfun
 - lib/xmfun.rb
-- lib/xmfun/downloader.rb
+- lib/xmfun/cli.rb
 - lib/xmfun/mp3/mp3_tagger.rb
 - lib/xmfun/mp3/track.rb
 - lib/xmfun/util/decoder.rb
+- lib/xmfun/util/downloader.rb
+- lib/xmfun/util/helper.rb
 - lib/xmfun/util/url_parser.rb
 - lib/xmfun/version.rb
-- spec/spec_helper.rb
-- spec/xmfun/decode_spec.rb
-- xmfun.gemspec
 homepage: https://github.com/ipmsteven/xmfun
 licenses:
 - MIT
@@ -228,6 +285,4 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Yet another xiami music downloader
-test_files:
-- spec/spec_helper.rb
-- spec/xmfun/decode_spec.rb
+test_files: []

data/.rspec

@@ -1,2 +0,0 @@
---color
---format progress

data/lib/xmfun/downloader.rb

@@ -1,78 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-require 'open-uri'
-require 'nokogiri'
-require 'nori'
-require 'parallel'
-require 'ruby-progressbar'
-
-module Xmfun
-  class Downloader
-    def self.download(url, dst)
-      make_dst(dst)
-
-      tracks = Nokogiri::XML(open(url, "Client-IP" => "220.181.111.168")).css("track")
-
-      if tracks.size > 1
-        download_collect(tracks)
-      else
-        download_song(tracks[0])
-      end
-    end
-
-    private
-    def self.make_dst(dst)
-      if Dir.exist?(dst)
-        Dir.chdir(dst)
-      else
-        Dir.mkdir(dst)
-        Dir.chdir(dst)
-      end
-    end
-
-    def self.make_progress_bar(size)
-      ProgressBar.create( :title => "Progress",
-                         :total => size,
-                         :format => '%a %bᗧ%i %p%% %t',
-                         :progress_mark  => ' ',
-                         :remainder_mark => '･' )
-    end
-
-    def self.download_collect(collect)
-      progress = make_progress_bar(collect.size)
-
-      Parallel.map( collect, :in_threads => Parallel.processor_count, :finish => lambda { |item, i, result| progress.increment } ) do |track|
-
-        track = Xmfun::Mp3::Track.new(Nori.new.parse(track.to_s)['track'])
-
-        URI.parse(track.location).open do |f|
-          File.open(track.file_name, 'w') { |mp3| mp3.write(f.read) }
-        end
-
-        Xmfun::Mp3::Mp3Tagger.tag(track)
-      end
-    end
-
-    def self.download_song(song)
-      track = Xmfun::Mp3::Track.new(Nori.new.parse(song.to_s)['track'])
-      progress = nil
-
-      content_length_lambda = lambda do |content_length|
-        if content_length && 0 < content_length
-          progress = make_progress_bar content_length
-        end
-      end
-
-      progress_lambda = lambda { |size| progress.progress = size if progress }
-
-      uri = URI.parse(track.location)
-
-      uri.open( :content_length_proc => content_length_lambda,
-               :progress_proc       => progress_lambda ) do |f|
-        File.open(track.file_name, 'w') { |mp3| mp3.write(f.read) }
-      end
-
-      Xmfun::Mp3::Mp3Tagger.tag(track)
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,19 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'xmfun'
-
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper"` to ensure that it is only
-# loaded once.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-RSpec.configure do |config|
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = 'random'
-end

data/spec/xmfun/decode_spec.rb

@@ -1,26 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'spec_helper'
-
-module Xmfun
-  describe Util::Decoder do
-    before do
-      @decoder  = Xmfun::Util::Decoder
-    end
-
-    it "#should return a decoded url" do
-      location = "8h2fmF%2956mtDe%fc185utFii12F%65ph3e5d24%Elt%l.%F35233_%4Ece%5-lp2ec272E74%k57e235E%%F.oF1%%123eE2eefE%53mxm16527_Fyd%6ab75EA5i%69EF_la%c52d88E-%.a29%333.u38E6a-8%n"
-      url      = "http://m5.file.xiami.com/1/169/7169/320390/3562717_365342_l.mp3?auth_key=30dc8ee47200ee626fdc2eadac2e3fb8-1407888000-0-null"
-      expect(@decoder.decode(location)).to eq(url)
-
-      location = "10h%i5F1t2.%18tFn23.pfeF2m%1t11p3.%183Ax23_%iF312a3%3Fm522"
-      url = "http://f1.xiami.net/355/1133/13218_13218.mp3"
-      expect(@decoder.decode(location)).to eq(url)
-    end
-
-    it "#should raise an error when decoding an invalid url" do
-      location   = "this_is_invalid_url"
-      expect_msg = "invalid input #{location}"
-      expect { @decoder.decode(location) }.to raise_error(ArgumentError, expect_msg)
-    end
-  end
-end

data/xmfun.gemspec

@@ -1,36 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'xmfun/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "xmfun"
-  spec.version       = Xmfun::VERSION
-  spec.authors       = ["ipmsteven"]
-  spec.email         = ["steven.lyl147@gmail.com"]
-  spec.description   = %q{Yet another xiami music downloader}
-  spec.summary       = %q{Yet another xiami music downloader}
-  spec.homepage      = "https://github.com/ipmsteven/xmfun"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "clap", "~> 1.0.0"
-  spec.add_dependency "nori", "~> 2.4.0"
-  spec.add_dependency "nokogiri", "~> 1.6.3.1"
-  spec.add_dependency "parallel", "~> 1.2.2"
-  spec.add_dependency "ruby-mp3info", "~> 0.8.4"
-  spec.add_dependency "activesupport", "~> 4.1.5"
-  spec.add_dependency "ruby-progressbar", "~> 1.5.1"
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", "~> 10.3.2"
-  spec.add_development_dependency "rspec", "~> 3.0.0"
-  spec.add_development_dependency "pry", "~> 0.10.0"
-  if RUBY_VERSION =~ /^2\./
-    spec.add_development_dependency "pry-byebug", "~> 1.3.3"
-  end
-end