candelabra 1.1.1 → 1.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    candelabra (1.0.2)
+    candelabra (1.1.1.beta)
 
 GEM
   remote: http://rubygems.org/

data/candelabra.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.name        = "candelabra"
   s.version     = Candelabra::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = []
-  s.email       = []
+  s.authors     = ['cajun']
+  s.email       = ['zac@kleinpeter.org']
   s.homepage    = "http://rubygems.org/gems/candelabra"
   s.summary     = "Wrapper for pianobar"
   s.description = "initial wrapper for pianobar"

data/lib/candelabra/event_cmd.rb

@@ -20,17 +20,8 @@ module Candelabra
         Remote.flush
       when 'userlogin'
         unless @pRet.to_i == 1
-          `notify-send Bad Username`
           `ps a | grep 'candelabra install' | cut -c1-5`.split("\n").each{|id| `kill #{id}` unless Process.pid == id.to_i }
         end
-
-      else
-        #`notify-send #{@pRet}`
-        #`notify-send #{command}`
-        #`notify-send #{command}`
-        #instance_variables.each do |i|
-        #  `notify-send #{i}`
-        #end
       end
     end
 

data/lib/candelabra/installer.rb

@@ -89,6 +89,9 @@ module Candelabra
     end
 
     def start_pianobar
+      Remote.flush
+      Remote.flush_input
+
       if Pianobar.running?
         print "Restarting Pianobar with Autostation".ljust(CONSOLE_WIDTH + 20, '.')
         Pianobar.restart
@@ -113,13 +116,13 @@ module Candelabra
 
       if Pianobar.running?
         `echo '0' > #{Installer.input_path}` # forcing auto selection of the first station
-        sleep( 2 )
+        sleep( 5 )
         puts ''
         puts "Select Auto station".center( CONSOLE_WIDTH + 20, ' ' )
-        stations = Remote.stations
-        stations.each { |s| puts s }
         
         begin
+          stations = Remote.stations
+          stations.each { |s| puts s }
           result = ask 'Select Station and press ENTER:'
           raise "You must enter the number of a valid station" unless result == result.to_i.to_s
           raise "That is not a valid station it must be a number between 0 and #{stations.size - 1}" unless (0..stations.size - 1).include? result.to_i

data/lib/candelabra/osx.rb

@@ -56,7 +56,7 @@ module Candelabra
 
       # Notify the user using growl
       def notify
-        %x[growlnotify --image #{art_work} -t "Pianobar - #{stationName}" -m "Now Playing: #{artist} - #{title}"]
+        %x[growlnotify --image #{art_work} -t "Pianobar - #{stationName}" -m "Now Playing: #{artist} - #{title}"] if notify?
       end
 
     end

data/lib/candelabra/pianobar.rb

@@ -92,13 +92,14 @@ module Candelabra
 
       def initialize
         @commands = {
-          :start => Start.new,
+          :start    => Start.new,
           :stop_all => StopAll.new,
-          :pid => PID.new
+          :pid      => PID.new
         }
       end
 
       def command(command)
+        Remote.flush_all
         @commands[command].go if @commands[command]
       end
     end
@@ -107,7 +108,8 @@ module Candelabra
     class Start
       def go
         pid = fork do
-          $stdin.reopen File.open( Installer.input_path, 'r+' )
+          [$stdin, $stdout].each {|st| st.close}
+          $stdin.reopen  File.open( Installer.input_path , 'r+' )
           $stdout.reopen File.open( Installer.output_path, 'w+' )
           exec 'pianobar'
         end

data/lib/candelabra/remote.rb

@@ -42,6 +42,7 @@ module Candelabra
     #
     # Returns command you passed in
     def execute_command cmd
+      return nil unless Candelabra::Pianobar.running?
       if commands.include? cmd
         %x[ echo #{commands[cmd]} > #{Candelabra::Installer.ctl_path} ]
       else
@@ -123,7 +124,7 @@ module Candelabra
     # Returns an array of stations
     def stations
       list = []
-      execute_command( :change_station )
+      execute_command( :stations )
       output do |io|
         io.lines.each do |line|
           /(\[\?\])/ =~ line
@@ -134,16 +135,19 @@ module Candelabra
       list
     end
 
+    def flush_all
+      flush
+      flush_input
+    end
+
     def flush
-      output do |io| 
-        loop do
-          begin
-            io.read_nonblock(1); 
-          rescue 
-            break
-          end 
-        end
-      end
+      output { |io| loop { io.read_nonblock(1) } }
+    rescue # TODO put the correct exception
+    end
+
+    def flush_input
+      input { |io| loop { io.read_nonblock(1) } }
+    rescue # TODO put the correct exception
     end
 
     # The out put file for the commands
@@ -152,6 +156,16 @@ module Candelabra
     # Yields and IO reader for pianobar's output
     def output
       File.open( Candelabra::Installer.output_path, 'r+' ) do |io|
+        yield(io)
+      end
+    end
+
+    # The out put file for the commands
+    # This contains all the output from pianobar
+    #
+    # Yields and IO reader for pianobar's output
+    def input
+      File.open( Candelabra::Installer.input_path, 'r+' ) do |io|
         yield( io )
       end
     end

data/lib/candelabra/runner.rb

@@ -69,9 +69,11 @@ module Candelabra
       when 'start'
         Candelabra::Pianobar.start
       when 'stop'
-        Candelabra::Pianobar.stop
+        Candelabra::Pianobar.stop_all
       when 'restart'
         Candelabra::Pianobar.restart
+      when 'flush' # Force flushing of the fifo files
+        Candelabra::Remote.flush_all
       when 'install'
         Candelabra::Installer.run
       when *cmds.keys

data/lib/candelabra/templates/banner.erb

@@ -1,16 +1,18 @@
     usage: candelabra [command] [data]
     
     Base Commands:
-      install
-      start
-      stop
-      restart
+    install # installs pianobar and sets up the configuration files
+    start
+    stop
+    restart
+    flush   # flushs out all of the fifo files
     
     Controlling Pianobar
       n(ext)
       p(ause)
       co(continue)
-      ch(change_station) # of station
+      ch(change_station) [ # of station ]
+      s(tations)
       t(ired)
       u(pcomming)
       q(ick_mix)

data/lib/candelabra/version.rb

@@ -1,3 +1,3 @@
 module Candelabra
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: candelabra
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: !!null 
 platform: ruby
-authors: []
+authors:
+- cajun
 autorequire: !!null 
 bindir: bin
 cert_chain: []
-date: 2011-02-17 00:00:00.000000000 -06:00
+date: 2011-02-20 00:00:00.000000000 -06:00
 default_executable: !!null 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153408540 !ruby/object:Gem::Requirement
+  requirement: &2153649260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153408540
+  version_requirements: *2153649260
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2153408080 !ruby/object:Gem::Requirement
+  requirement: &2153648800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,9 +33,10 @@ dependencies:
         version: 2.0.2
   type: :development
   prerelease: false
-  version_requirements: *2153408080
+  version_requirements: *2153648800
 description: initial wrapper for pianobar
-email: []
+email:
+- zac@kleinpeter.org
 executables:
 - candelabra
 extensions: []