candelabra 1.0.1 → 1.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    candelabra (0.0.1)
+    candelabra (1.0.1)
 
 GEM
   remote: http://rubygems.org/

data/lib/candelabra/remote.rb

@@ -21,6 +21,7 @@ module Candelabra
         :next           => 'n',
         :quit           => 'q',
         :change_station => 's',
+        :stations       => 's',
         :tired          => 't',
         :upcomming      => 'u',
         :quick_mix      => 'x',
@@ -47,7 +48,7 @@ module Candelabra
       else
         %x[ echo #{cmd} > #{Candelabra::Installer.ctl_path} ]
       end
-      cmd
+      nil
     end
 
     # Wrapper for all the commands.  This will give you the ability to call the following methods
@@ -135,7 +136,12 @@ module Candelabra
     end
 
     def flush
-      output {|io| io.flush }
+      output do |io| 
+        begin
+          io.read(1); 
+        rescue 
+        end 
+      end
     end
 
     # The out put file for the commands

data/lib/candelabra/runner.rb

@@ -23,7 +23,13 @@ module Candelabra
     #
     # Returns...it's the initializer
     def initialize(args)
+      parse(args)
       @command = args.shift
+      @data = args
+    end
+
+    def banner
+      Installer.get_template 'banner'
     end
 
     # Take in the arguments from the command line and parse out any
@@ -34,17 +40,7 @@ module Candelabra
       @options ={}
       Candelabra::Configuration.go do |config|
         OptionParser.new( args ) do |opts|
-          opts.banner = 'Usage: candelabra [command] [opts]'
-
-          opts.on( '-e','--event [EVENT=DATA]',
-                  'Send the EVENT to Candelabra.',
-                  'if the extra DATA is supplied',
-                  'set the EVENT to the DATA.' ) do |event_command|
-
-            event, cmd = event_command.split('=')
-            config.send( event + '=', cmd ) if cmd
-            @options[event] = true
-                  end
+          opts.banner = banner 
 
           opts.on_tail( '-h', '--help', 'Show this message' ) do
             puts opts
@@ -78,13 +74,12 @@ module Candelabra
         Candelabra::Pianobar.restart
       when 'install'
         Candelabra::Installer.run
-      when 'event'
-        # NOTE: this is mainly for debugging
-        puts "On Song Start: #{ config.on_song_start }" if options['on_song_start']
-        puts "On Song Finish: #{ config.on_song_finish }" if options['on_song_finish']
-        puts "On Error: #{ config.on_error }" if options['on_error']
       when *cmds.keys
-        Remote.send cmds[command].to_sym
+        if data.nil? || data.empty?
+          puts Remote.send cmds[command].to_sym
+        else
+          puts Remote.send cmds[command].to_sym, data
+        end
       else
         puts "No command given"
       end

data/lib/candelabra/templates/banner.erb

@@ -0,0 +1,17 @@
+    usage: candelabra [command] [data]
+    
+    Base Commands:
+      install
+      start
+      stop
+      restart
+    
+    Controlling Pianobar
+      n(ext)
+      p(ause)
+      co(continue)
+      ch(change_station) # of station
+      t(ired)
+      u(pcomming)
+      q(ick_mix)
+    

data/lib/candelabra/version.rb

@@ -1,3 +1,3 @@
 module Candelabra
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,65 +1,45 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: candelabra
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
+version: !ruby/object:Gem::Version
+  version: 1.0.2
+  prerelease: !!null 
 platform: ruby
 authors: []
-
-autorequire: 
+autorequire: !!null 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-16 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-02-16 00:00:00.000000000 -06:00
+default_executable: !!null 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153300860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153300860
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &2153300400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 0
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.2
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *2153300400
 description: initial wrapper for pianobar
 email: []
-
-executables: 
+executables:
 - candelabra
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -77,6 +57,7 @@ files:
 - lib/candelabra/pianobar.rb
 - lib/candelabra/remote.rb
 - lib/candelabra/runner.rb
+- lib/candelabra/templates/banner.erb
 - lib/candelabra/templates/config.erb
 - lib/candelabra/templates/header.erb
 - lib/candelabra/templates/setup_config_file.erb
@@ -94,38 +75,26 @@ files:
 has_rdoc: true
 homepage: http://rubygems.org/gems/candelabra
 licenses: []
-
-post_install_message: 
+post_install_message: !!null 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: candelabra
-rubygems_version: 1.4.2
-signing_key: 
+rubygems_version: 1.5.0
+signing_key: !!null 
 specification_version: 3
 summary: Wrapper for pianobar
 test_files: []
-