ampt 0.2.0 → 0.2.1

data/README.rdoc

@@ -72,7 +72,7 @@ configuration.
 
 == INSTALL:
 
-    $ sudo gem install ampt --pre
+    $ sudo gem install ampt
 
 == TODO:
 * Fix error handling when getting invalid data from the server.

data/ampt.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ampt}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rich"]

data/lib/ampt.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'trollop'
 
 module Ampt
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
     # This is the module that holds the API for the current music player. Defined in
     # ampt_api/acoustics.rb
     module API

data/lib/ampt_api/acoustics.rb

@@ -80,6 +80,18 @@ module Ampt
             song_list req 'random', 'amount' => amt || '20'
         end
 
+        # Brings song to the top.
+        def vote_to_top id
+            auth
+            player_status req 'vote_to_top', 'song_id' => id
+        end
+
+        # Shuffles your votes. Great for bogosort.
+        def shuffle_votes
+            auth
+            player_status req 'shuffle_votes'
+        end
+
         # Performs a request with given mode and params.
         def req mode=nil, params = nil
             c = Curl::Easy.new

data/lib/ampt_cfg/default.rb

@@ -91,6 +91,26 @@ def pp_time len
     str << format(":%02d", len % 60)
 end
 
+def select_interactively l
+    s = []
+    Tempfile.open("ampt") do |tempfile|
+        songs_to_file(l, tempfile)
+        tempfile.fsync
+        tempfile.flush
+        path = tempfile.path
+        tempfile.close
+        system(ENV['EDITOR'], path)
+        File.open(path) do |f|
+            s = f.readlines
+        end
+    end
+    s.inject([]) do |a,line|
+        a + ((line.scan(/\s(\d+)\s/)[0] unless(line =~ /^\#/)) || [])
+    end
+end
+
+alias_cmd 'help' => '--help'
+
 alias_cmd 'st' => 'status'
 default 'status'
 
@@ -147,21 +167,9 @@ command 'remove' do
             l = st.playlist.select do |s|
                 s.who.include? me
             end
-            s = []
-            Tempfile.open("ampt") do |tempfile|
-                songs_to_file(l, tempfile)
-                tempfile.fsync
-                tempfile.flush
-                path = tempfile.path
-                tempfile.close
-                system(ENV['EDITOR'], path)
-                File.open(path) do |f|
-                    s = f.readlines
-                end
-            end
-            arr = s.inject([]) do |a,line|
-                a + ((line.scan(/\s(\d+)\s/)[0] unless(line =~ /^\#/)) || [])
-            end
+
+            arr = select_interactively(l)
+
             unless arr.empty?
                 arr.each_slice(40) do |a|
                     unvote a
@@ -175,6 +183,7 @@ end
 
 alias_cmd 'up' => 'add'
 alias_cmd 'upvote' => 'add'
+alias_cmd 'vote' => 'add'
 command 'add' do
     desc "Vote for a song. Provide a song id, or one of the flags."
     arg 'song_id'
@@ -209,21 +218,8 @@ command 'add' do
                        end
                    end
             l = l.flatten
-            s = []
-            Tempfile.open("ampt") do |tempfile|
-                songs_to_file(l, tempfile)
-                tempfile.fsync
-                tempfile.flush
-                path = tempfile.path
-                tempfile.close
-                system(ENV['EDITOR'], path)
-                File.open(path) do |f|
-                    s = f.readlines
-                end
-            end
-            arr = s.inject([]) do |a,line|
-                a + ((line.scan(/\s(\d+)\s/)[0] unless(line =~ /^\#/)) || [])
-            end
+
+            arr = select_interactively(l)
 
             unless arr.empty?
                 if randomize
@@ -400,3 +396,32 @@ command 'history' do
         pp_songs_full history(args[0]), :show_all_voters => true
     end
 end
+
+command 'shuffle' do
+    desc 'Shuffle your votes.'
+    on_run do |opts,args|
+        shuffle_votes
+    end
+end
+
+alias_cmd 'top' => 'votetotop'
+command 'votetotop' do
+    desc 'Bring the song to the top of your list of voted songs'
+    opt :interactive, "Select interactively.", :short => '-i'
+    arg 'song_id'
+    on_run do |opts,args|
+        if opts[:interactive]
+            st = status
+            me = st.who
+            mine = st.playlist.select do |s|
+                s.who.include? me
+            end
+            arr = select_interactively mine
+            unless arr.empty?
+                vote_to_top arr
+            end
+        else
+            vote_to_top args
+        end
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ampt
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Rich