marcato 0.0.2 → 0.0.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/README.md +1 -1
  2. data/marcato.rb +3 -2
  3. metadata +19 -9
data/README.md CHANGED
@@ -22,7 +22,7 @@ Playlists can be made on the fly via searching:
22
22
  % marcato muse
23
23
  muse_super-massive-black-hole.mp3
24
24
  muse_starlight.mp3
25
- % mplayer -playlist <(marcato muse)
25
+ % mplayer `marcato muse`
26
26
 
27
27
  Playlists are just yaml, each line is a search term:
28
28
 
data/marcato.rb CHANGED
@@ -2,7 +2,7 @@ require 'rubygems'
2
2
  require 'yaml'
3
3
 
4
4
  class Marcato
5
- VERSION = '0.0.2'
5
+ VERSION = '0.0.3'
6
6
  MARCATO_FILE = ENV['MARCATO_FILE'] || "#{ENV['HOME']}/.marcato"
7
7
  MARCATO_MUSIC = File.expand_path(ENV['MARCATO_MUSIC'] || '.')
8
8
  EDITOR = ENV['EDITOR'] || 'vi'
@@ -21,11 +21,12 @@ class Marcato
21
21
 
22
22
  def play(query = '')
23
23
  searches = query.split(/\s+/)
24
+ searches = [''] if searches.empty?
24
25
  playlists.select { |k,v| searches.include?(k) }.each do |name, terms|
25
26
  searches += terms
26
27
  end
27
28
  files = searches.map do |search|
28
- Dir.glob(File.join(MARCATO_MUSIC, "*#{search}*"))
29
+ Dir.glob(File.join(MARCATO_MUSIC, "**/*#{search}*"))
29
30
  end.flatten.uniq
30
31
  files = @random ? files.sort_by { rand } : files.sort
31
32
  puts files.join("\n") if !files.empty?
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: marcato
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.2
4
+ version: 0.0.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: .
11
11
  cert_chain: []
12
- date: 2012-03-03 00:00:00.000000000 Z
12
+ date: 2012-06-05 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: minitest
16
- requirement: &81719930 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
21
21
  version: '0'
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *81719930
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ! '>='
28
+ - !ruby/object:Gem::Version
29
+ version: '0'
25
30
  - !ruby/object:Gem::Dependency
26
31
  name: mocha
27
- requirement: &81719450 !ruby/object:Gem::Requirement
32
+ requirement: !ruby/object:Gem::Requirement
28
33
  none: false
29
34
  requirements:
30
35
  - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
32
37
  version: '0'
33
38
  type: :development
34
39
  prerelease: false
35
- version_requirements: *81719450
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ! '>='
44
+ - !ruby/object:Gem::Version
45
+ version: '0'
36
46
  description: Provides a command line tool for creating playlists that work with mplayer.
37
47
  email:
38
48
  - hugh@hughbien.com
@@ -41,10 +51,10 @@ executables:
41
51
  extensions: []
42
52
  extra_rdoc_files: []
43
53
  files:
44
- - marcato.rb
45
54
  - marcato_test.rb
46
- - README.md
55
+ - marcato.rb
47
56
  - LICENSE.md
57
+ - README.md
48
58
  - marcato
49
59
  - ./marcato
50
60
  homepage: https://github.com/hughbien/marcato
@@ -67,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
67
77
  version: 1.3.6
68
78
  requirements: []
69
79
  rubyforge_project:
70
- rubygems_version: 1.8.15
80
+ rubygems_version: 1.8.23
71
81
  signing_key:
72
82
  specification_version: 3
73
83
  summary: Playlist manager for mplayer