detektorfm 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b40905daed6ecb1f2052b99af8293ee3cf4605ff
-  data.tar.gz: 35c12e104e7a0e893384172b80774520475f76e2
+  metadata.gz: 4c4780b04d432a97dfcdd0c3ced30ae48c93c302
+  data.tar.gz: ef496b3efc9afd68153408d83ce8b3c5fbef569a
 SHA512:
-  metadata.gz: c07a7f76a8780b62b296c42642b2bfb83cf6558fba3f72d593c994348456bc81442e5692848a5cacd8262223f4ac37f41c7c0036eefeda0f2027ac4951052597
-  data.tar.gz: c9028c695be6e5770a57726e89c91262653a3bea74432e3d8994b29b1ce28a8e01a92322e2722572198186772bc4d7a770006672308c466e0cd161a087b9effb
+  metadata.gz: f8772607368a82bedd5f71330f28d19c78510646677958fe7bf08b83fc48257896ccee929a245496b90de0078a30ce089f73b9a5158bbd66aa06453d646cc6d9
+  data.tar.gz: e03a5f79581cf6becd190f435b2bf453a5a5a00572b3103aa6e362a19ab1bdf86370776f0d534568f8f23f909215cbafa721d48e869c75b636c39be69da9624e

data/.gitignore

@@ -1,3 +1,17 @@
 *.gem
+*.rbc
+.bundle
+.config
+.yardoc
 Gemfile.lock
-
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/README.md

@@ -2,14 +2,17 @@
 
 Library for the **detektor.fm** website.
 
+The gem includes the following executables:
+
+* detektorfm.player 
+* detektorfm.playlist
+
 Features:
 
 * querying last played songs 
 * most played artist in last 7 weeks
 * ... to be extended ... 
 
-For example implementations, see [awidegreen/detektorfm-tools](https://github.com/awidegreen/detektorfm-tools)
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -24,7 +27,7 @@ Or install it yourself as:
 
     $ gem install detektorfm
 
-## Usage
+## Library usage
 
 Get an instance of  `DetektorFm::MusikStream` or `DetektorFm::WortStream` and 
 start querying the playlist with `played()` or get specific stream url
@@ -40,6 +43,37 @@ start querying the playlist with `played()` or get specific stream url
   end
 ```
 
+## Executables
+Some reference implementations.
+
+Use `-h` for help. 
+
+### detektorfm.playlist
+
+Query last played songs (default 3) from wortstream and musikstream:
+
+    detektorfm.playlist -m -w
+
+Query last 15 last played songs from musikstream:
+
+    detektorfm.playlist -m -l15
+
+Query most played artists form the last 7 days, overall (both streams)
+
+    detektorfm.playlist -p
+
+
+### detektorfm.player
+
+Requires *mplayer* to be installed.
+
+Play the musikstream 
+
+    detektorfm.player musik
+
+Play the wortstream 
+
+    detektorfm.player wort
 
 ## Contributing
 
@@ -53,5 +87,4 @@ start querying the playlist with `played()` or get specific stream url
 Licensed under BSD (2-Clause), see LICENSE.txt
 
 
-
 [awidegreen](http://github.com/awidegreen)

data/Rakefile

@@ -1,25 +1,5 @@
-require "rubygems"
-require "rake"
-require 'detektorfm/version'
-
-desc "Build gem from gemspec"
-task :build do
-  system "gem build detektorfm.gemspec"
-end
-
-desc "Install locally build gem"
-task :install do
-  ["build"].each do |t|
-    system "gem install ./detektorfm-#{DetektorFm::VERSION}.gem"
-  end
-end
-
-desc "Deploy gem to rubygems.org"
-task :deploy do
-  ["build"].each do |t|
-    system "gem push detektorfm-#{DetektorFm::VERSION}.gem"
-  end
-end
+require "bundler/gem_tasks"
+require "detektorfm/version"
 
 desc "Tag git repo with release"
 task :tag do
@@ -32,10 +12,3 @@ task :push_tags do
   system "git push --tags origin master"
 end
 
-#desc "Release new version: build, deploy, and tag"
-#task :release do
-  #["build", "deploy", "tag", "push_tags"].each do |t|
-    #Rake::Task[t].reenable
-    #Rake::Task[t].invoke
-  #end
-#end

data/bin/detektorfm.player

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby 
+
+require 'detektorfm'
+require 'optparse'
+
+### options
+options = { }
+
+g_optparser = OptionParser.new do |opts|
+  opts.banner = "detektor.player [options]"
+
+  opts.on("-t", "--type", "Stream type") do |o|
+    options[:stream_type] = o
+  end
+end
+
+sub_cmds = {
+  "musik" => Proc.new { options[:stream] = DetektorFm::MusikStream.new } ,
+  "wort"  => Proc.new { options[:stream] = DetektorFm::WortStream.new }
+}
+
+g_optparser.order!
+command = ARGV.shift
+if sub_cmds.has_key?(command)
+  sub_cmds[command].call
+else 
+  puts "That subcommand does not exists!"
+  exit
+end
+
+begin 
+  stream = options[:stream]
+  player_pid = Process.spawn("mplayer #{stream.get_stream_url} >& /dev/null")
+  Process.detach(player_pid)
+  puts "Player started with #{stream.get_name}!"
+  loop do 
+    stream.played(1) do |time, a, title|
+      puts time + ": " + a + " - " + title
+    end
+    sleep 120
+  end
+rescue SystemExit, Interrupt 
+  Process.kill("KILL", player_pid)
+  puts "Player killed!"
+end

data/bin/detektorfm.playlist

@@ -0,0 +1,57 @@
+#!/usr/bin/env ruby 
+
+require 'detektorfm'
+require 'optparse'
+
+### options
+options = {
+  :streams => [],
+  :most_played => false,
+  :limit => 3
+}
+
+OptionParser.new do |opts|
+  opts.banner = "detektor.playlist [options]"
+
+  opts.on("-w", "--wort", "Only Wortstream") do |o|
+    options[:streams] << DetektorFm::WortStream.new
+  end
+  
+  opts.on("-m", "--musik", "Only Musikstream") do |o|
+    options[:streams] << DetektorFm::MusikStream.new
+  end
+
+  opts.on("-l LIMIT", Integer, "Limit displayed entries") do |limit|
+    options[:limit] = limit
+  end
+
+  opts.on("-p", "--most-played", "Most played artists last 7 days.") do |o|
+    options[:most_played] = o
+  end
+end.parse!
+
+
+### main
+
+options[:streams].each do |stream|
+  puts stream.get_name
+  stream.played(options[:limit]) do |time, artist, title|
+    printf "   %20s   %s - %s\n", time, artist, title
+  end
+
+  # most played handling
+  if options[:most_played]
+    puts " Most played artists last 7 days"
+    stream.most_played_artist().each do |a|
+      puts "   " + a
+    end
+  end
+end
+
+if options[:most_played]
+  puts "Most played artists last 7 days (overall)"
+  DetektorFm::most_played_artist_overall.each do |a|
+    puts "   " + a
+  end
+end
+

data/detektorfm.gemspec

@@ -6,9 +6,8 @@ require 'detektorfm/version'
 Gem::Specification.new do |s|
   s.name         = 'detektorfm'
   s.version       = DetektorFm::VERSION
-  s.date         = '2013-09-24'
-  s.summary      = 'detektorfm library'
-  s.description  = 'Interfacing (Querying) the detektor.fm (webradio) website.'
+  s.summary      = %q{detektorfm library and tools}
+  s.description  = %q{Interfacing (Querying) the detektor.fm (webradio) website.}
   s.authors      = ["Armin Widegreen"]
   s.email        = 'armin.widegreen@gmail.com'
   s.homepage     = 'http://github.com/awidegreen/detektorfm'

data/lib/detektorfm/version.rb

@@ -1,3 +1,3 @@
 module DetektorFm
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: detektorfm
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Armin Widegreen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -54,7 +54,9 @@ dependencies:
         version: '0'
 description: Interfacing (Querying) the detektor.fm (webradio) website.
 email: armin.widegreen@gmail.com
-executables: []
+executables:
+- detektorfm.player
+- detektorfm.playlist
 extensions: []
 extra_rdoc_files: []
 files:
@@ -63,6 +65,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/detektorfm.player
+- bin/detektorfm.playlist
 - detektorfm.gemspec
 - lib/detektorfm.rb
 - lib/detektorfm/version.rb
@@ -89,5 +93,5 @@ rubyforge_project:
 rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
-summary: detektorfm library
+summary: detektorfm library and tools
 test_files: []