ampt 0.2.0.pre3 → 0.2.0

data/ampt.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ampt}
-  s.version = "0.2.0.pre3"
+  s.version = "0.2.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rich"]
-  s.date = %q{2010-01-10}
+  s.date = %q{2010-01-22}
   s.default_executable = %q{ampt}
   s.description = %q{This is a command line client for the Acoustics Media Player (amp).}
   s.email = %q{rich@interhacktive.com}

data/lib/ampt.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'trollop'
 
 module Ampt
-    VERSION = '0.2.0.pre3'
+    VERSION = '0.2.0'
     # This is the module that holds the API for the current music player. Defined in
     # ampt_api/acoustics.rb
     module API
@@ -301,73 +301,4 @@ module Ampt
             end
         end
     end
-    class Song
-        # Create from json
-        def self.json_create o
-            new o['data'] if o['data']
-        end
-        # Serialize to json
-        def to_json(*a)
-            {
-                'json_class' => self.class.name,
-                'data' => [self.instance_variables.reduce({}) do |d,v|
-                    d[v[1..-1]] = self.instance_variable_get v
-                    d
-                end]
-            }.to_json(*a)
-        end
-
-        # Takes a hash to set up the object
-        def initialize h
-            h.each do |k,v|
-                (class << self; self; end).instance_eval do
-                    attr_reader k
-                end
-                instance_variable_set '@'+k, v
-            end
-        end
-    end
-
-    class Status
-        attr_reader :playlist, :now_playing, :who
-        def self.json_create(o)
-            o = o['data']
-            playlist = if o['playlist']
-                playlist = o['playlist'].collect do |s|
-                    Song.json_create('data' => s)
-                end
-            else
-                []
-            end
-            now_playing= Song.json_create('data' => o['now_playing'])
-            new o['player'], o['can_skip'], o['who'], now_playing, playlist
-        end
-
-        def initialize player, can_skip, whoami, now_playing, playlist
-            if player
-                player.each do |k,v|
-                    meta_eval do
-                        attr_reader k
-                    end
-                    instance_variable_set '@'+k, v
-                end
-            end
-            @can_skip = can_skip
-            @who = whoami
-            @playlist = playlist
-            @now_playing = now_playing
-        end
-
-        def can_skip?
-            @can_skip
-        end
-
-        private
-        def metaclass
-            (class << self; self; end)
-        end
-        def meta_eval &b
-            metaclass.instance_eval &b
-        end
-    end
 end

data/lib/ampt_api/acoustics.rb

@@ -8,7 +8,7 @@ module Ampt
         # Request the player's status. gets the session first so we can tell
         # whether or not we can skip the current song, which songs are ours, etc.
         def status
-            auth
+            auth false
             player_status req
         end
 
@@ -31,7 +31,7 @@ module Ampt
 
         # Clears all of your votes.
         def reset
-            player_status unvote '0'
+            unvote '0'
         end
 
         # Gets the most recently added songs. Takes a string count.
@@ -125,7 +125,7 @@ module Ampt
         end
 
         # Perform an authenticated request
-        def auth
+        def auth fatal = true
             unless @sess
                 c = Curl::Easy.new
                 c.http_auth_types = Curl::CURLAUTH_GSSNEGOTIATE
@@ -135,10 +135,80 @@ module Ampt
                 sessid = c.header_str[/CGISESSID=(.+);/]
                 if sessid.nil?
                     puts "Could not authenticate -- maybe you should kinit?"
-                    abort
+                    abort if fatal
+                    return
                 end
                 @sess = sessid.chop
             end
         end
     end
+    class Song
+        # Create from json
+        def self.json_create o
+            new o['data'] if o['data']
+        end
+        # Serialize to json
+        def to_json(*a)
+            {
+                'json_class' => self.class.name,
+                'data' => [self.instance_variables.reduce({}) do |d,v|
+                    d[v[1..-1]] = self.instance_variable_get v
+                    d
+                end]
+            }.to_json(*a)
+        end
+
+        # Takes a hash to set up the object
+        def initialize h
+            h.each do |k,v|
+                (class << self; self; end).instance_eval do
+                    attr_reader k
+                end
+                instance_variable_set '@'+k, v
+            end
+        end
+    end
+
+    class Status
+        attr_reader :playlist, :now_playing, :who
+        def self.json_create(o)
+            o = o['data']
+            playlist = if o['playlist']
+                playlist = o['playlist'].collect do |s|
+                    Song.json_create('data' => s)
+                end
+            else
+                []
+            end
+            now_playing= Song.json_create('data' => o['now_playing'])
+            new o['player'], o['can_skip'], o['who'], now_playing, playlist
+        end
+
+        def initialize player, can_skip, whoami, now_playing, playlist
+            if player
+                player.each do |k,v|
+                    meta_eval do
+                        attr_reader k
+                    end
+                    instance_variable_set '@'+k, v
+                end
+            end
+            @can_skip = can_skip
+            @who = whoami
+            @playlist = playlist
+            @now_playing = now_playing
+        end
+
+        def can_skip?
+            @can_skip
+        end
+
+        private
+        def metaclass
+            (class << self; self; end)
+        end
+        def meta_eval &b
+            metaclass.instance_eval &b
+        end
+    end
 end

data/lib/ampt_cfg/default.rb

@@ -144,12 +144,12 @@ command 'remove' do
         elsif opts[:interactive]
             st = status
             me = st.who
-            list = st.playlist.select do |s|
+            l = st.playlist.select do |s|
                 s.who.include? me
             end
             s = []
             Tempfile.open("ampt") do |tempfile|
-                songs_to_file(list, tempfile)
+                songs_to_file(l, tempfile)
                 tempfile.fsync
                 tempfile.flush
                 path = tempfile.path
@@ -195,7 +195,7 @@ command 'add' do
             list_of[:album]  = opts[:album]
             list_of[:title]  = opts[:title]
             list_of[:search] = opts[:search]
-            list = if opts[:search_given]
+            l = if opts[:search_given]
                        list_of.collect do |k,v|
                            v.collect do |v|
                                search(v)
@@ -208,10 +208,10 @@ command 'add' do
                            end
                        end
                    end
-            list = list.flatten
+            l = l.flatten
             s = []
             Tempfile.open("ampt") do |tempfile|
-                songs_to_file(list, tempfile)
+                songs_to_file(l, tempfile)
                 tempfile.fsync
                 tempfile.flush
                 path = tempfile.path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ampt
 version: !ruby/object:Gem::Version 
-  version: 0.2.0.pre3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Rich
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-10 00:00:00 -06:00
+date: 2010-01-22 00:00:00 -06:00
 default_executable: ampt
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,9 +81,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
   version: 
 requirements: []