candelabra 1.1.1.beta1 → 1.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    candelabra (1.1.1.beta)
+    candelabra (1.0.2)
 
 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     = ['cajun']
-  s.email       = ['zac@kleinpeter.org']
+  s.authors     = []
+  s.email       = []
   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,8 +20,17 @@ 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,9 +89,6 @@ 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
@@ -116,13 +113,13 @@ module Candelabra
 
       if Pianobar.running?
         `echo '0' > #{Installer.input_path}` # forcing auto selection of the first station
-        sleep( 5 )
+        sleep( 2 )
         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}"] if notify?
+        %x[growlnotify --image #{art_work} -t "Pianobar - #{stationName}" -m "Now Playing: #{artist} - #{title}"]
       end
 
     end

data/lib/candelabra/remote.rb

@@ -42,7 +42,6 @@ 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
@@ -124,7 +123,7 @@ module Candelabra
     # Returns an array of stations
     def stations
       list = []
-      execute_command( :stations )
+      execute_command( :change_station )
       output do |io|
         io.lines.each do |line|
           /(\[\?\])/ =~ line
@@ -136,13 +135,15 @@ module Candelabra
     end
 
     def flush
-      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
+      output do |io| 
+        loop do
+          begin
+            io.read_nonblock(1); 
+          rescue 
+            break
+          end 
+        end
+      end
     end
 
     # The out put file for the commands
@@ -151,16 +152,6 @@ 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/version.rb

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

metadata

@@ -1,11 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: candelabra
 version: !ruby/object:Gem::Version
-  version: 1.1.1.beta1
-  prerelease: 6
+  version: 1.1.1
+  prerelease: !!null 
 platform: ruby
-authors:
-- cajun
+authors: []
 autorequire: !!null 
 bindir: bin
 cert_chain: []
@@ -14,7 +13,7 @@ default_executable: !!null
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153435960 !ruby/object:Gem::Requirement
+  requirement: &2153408540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153435960
+  version_requirements: *2153408540
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2153435500 !ruby/object:Gem::Requirement
+  requirement: &2153408080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,9 @@ dependencies:
         version: 2.0.2
   type: :development
   prerelease: false
-  version_requirements: *2153435500
+  version_requirements: *2153408080
 description: initial wrapper for pianobar
-email:
-- zac@kleinpeter.org
+email: []
 executables:
 - candelabra
 extensions: []