vkpd 1.0.1 → 1.1.0

data/README

@@ -1,8 +1,5 @@
 vkpd [options] [search request]
 
-Requirements:
-   vkpd requires mpc to work and sinatra to authenticate
-
 Options:
 
   -c, --count=n
@@ -21,17 +18,17 @@ Options:
        Add songs to current playlist instead of replacing it
 
 Some examples:
-        vkpd Beatles # replaces current mpd playlist with The Beatles' songs and starts playing
-        vkpd play Beatles # the same
-        vkpd add Beatles # adds found songs to playlist and starts playing
-        vkpd -c 5 Beatles # get just first five search results
-        vkpd -c 5 -o 5 beatles # get second five results
-        vkpd --count 5 --offset=5 beatles # the same
-        vkpd user 3885655 # plays user's songs
-        vkpd user 3885655 -c 3 # plays last three songs added by user
-        vkpd user # current user's songs
-        vkpd user -c 1 # current user's last added song
-        vkpd group 1 # plays songs from group with id = 1
-        vkpd --no-fix Beetles # prevents from searching for Beatles
-        vkpd -nf Beetles # same as above
-        vkpd -s 1 Beatles # sorted by length. 0 to sort by popularity, 2 to sort by upload date
+    vkpd Beatles # replaces current mpd playlist with The Beatles' songs and starts playing
+    vkpd play Beatles # the same
+    vkpd add Beatles # adds found songs to playlist and starts playing
+    vkpd -c 5 Beatles # get just first five search results
+    vkpd -c 5 -o 5 beatles # get second five results
+    vkpd --count 5 --offset=5 beatles # the same
+    vkpd user 3885655 # plays user's songs
+    vkpd user 3885655 -c 3 # plays last three songs added by user
+    vkpd user # current user's songs
+    vkpd user -c 1 # current user's last added song
+    vkpd group 1 # plays songs from group with id = 1
+    vkpd --no-fix Beetles # prevents from searching for Beatles
+    vkpd -nf Beetles # same as above
+    vkpd -s 1 Beatles # sorted by length. 0 to sort by popularity, 2 to sort by upload date

data/README.md

@@ -0,0 +1,40 @@
+#VKPD
+
+VKPD searches for music on social network vk.com and adds/plays it with MPD.
+[![Gem Version](https://badge.fury.io/rb/vkpd.png)](http://badge.fury.io/rb/vkpd)
+
+##Run
+    vkpd [options] [search request]
+
+##Options
+
+    -c, --count=n
+         Limit songs count
+    -o, --offset=n
+         Drop first n results
+    -s, --sort=n
+         Sort by: 0 - popularity, 1 - length, 2 - upload date
+    -nf, --no-fix, --exact
+         Do not try to fix typos
+    user [user_id]
+         Load user songs. If user_id not supplied use current user's id
+    group <group_id>
+         Load group songs
+    add
+         Add songs to current playlist instead of replacing it
+
+##Some examples
+    vkpd Beatles # replaces current mpd playlist with The Beatles' songs and starts playing
+    vkpd play Beatles # the same
+    vkpd add Beatles # adds found songs to playlist and starts playing
+    vkpd -c 5 Beatles # get just first five search results
+    vkpd -c 5 -o 5 beatles # get second five results
+    vkpd --count 5 --offset=5 beatles # the same
+    vkpd user 3885655 # plays user's songs
+    vkpd user 3885655 -c 3 # plays last three songs added by user
+    vkpd user # current user's songs
+    vkpd user -c 1 # current user's last added song
+    vkpd group 1 # plays songs from group with id = 1
+    vkpd --no-fix Beetles # prevents from searching for Beatles
+    vkpd -nf Beetles # same as above
+    vkpd -s 1 Beatles # sorted by length. 0 to sort by popularity, 2 to sort by upload date

data/lib/vkpd.rb

@@ -1,11 +1,12 @@
 # -*- coding: utf-8; mode: ruby -*-
-require "net/http"
-require "net/https"
-require "cgi"
-require "yaml"
-require "json"
-require "pathname"
-require "sinatra/base"
+require 'net/http'
+require 'net/https'
+require 'cgi'
+require 'yaml'
+require 'json'
+require 'pathname'
+require 'sinatra/base'
+require 'ruby-mpd'
 require 'vkpd/version'
 require 'vkpd/cli'
 require 'vkpd/auth'

data/lib/vkpd/cli.rb

@@ -11,10 +11,12 @@ module Vkpd
   
     # main CLI method
     def main
+      mpd = MPD.new 'localhost'
+      mpd.connect
       method = "audio.search"
       params = {}
-      action_before = 'mpc clear'
-      action_after  = 'mpc play'
+      do_clear = true
+      do_play = true
       params["auto_complete"] = '1'
   
       if ARGV.empty?
@@ -50,8 +52,8 @@ module Vkpd
           method = 'audio.get'
           params['gid'] = ARGV.shift
         when 'add'
-          action_before = ''
-          action_after = ''
+          do_clear = false
+          do_play = false
         when '-nf','--no-fix', '--exact'
           params["auto_complete"] = '0'
         when 'auth'
@@ -74,11 +76,11 @@ module Vkpd
       if method.match /search/
         response.shift
       end
-      run action_before
+      mpd.clear if do_clear
       response.each do |song|
-        run "mpc add #{song["url"]}"
+        mpd.add song["url"]
       end
-      run action_after
+      mpd.play if do_play
     end
 
     private

data/lib/vkpd/version.rb

@@ -1,3 +1,3 @@
 module Vkpd
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/vkpd.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "sinatra"
+  spec.add_dependency "ruby-mpd", ">= 0.2.4"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vkpd
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-mpd
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +88,7 @@ files:
 - Gemfile
 - LICENSE.txt
 - README
+- README.md
 - Rakefile
 - bin/vkpd
 - lib/vkpd.rb