gtk2mp3 0.3.2 → 0.4.0

data/bin/gtk2mp3

@@ -1,28 +1,25 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-gem 'gtk2applib', '~> 10'
+gem 'gtk2applib', '~> 14.0'
 $help = <<EOT
 
 You can also give it the default mp3 directory via command line...
 \t#{$0} /path-to/mp3s
 
 EOT
-require 'gtk2applib'
-include Gtk2AppLib
-include Configuration
+require 'gtk2applib' # Gtk2AppLib defined
 
-Lock.lock_mode
-program = Program.new( {
+program = Gtk2AppLib::Program.new( {
         'name'		=> 'Ruby-Gnome MP3',
         'authors'	=> ['carlosjhr64@gmail.com'],
-        'website'	=> 'http://ruby-gnome-apps.blogspot.com/search/label/MP3',
+        'website'	=> 'https://sites.google.com/site/gtk2applib/home/gtk2applib-applications/gtk2mp3',
         'website-label'	=> 'Ruby-Gnome MP3',
         'license'	=> 'GPL',
-        'copyright'	=> '2010-12-07 13:04:23',
+        'copyright'	=> '2011-03-10 11:19:13',
         } )
 
 begin
-  require 'gtk2mp3'
+  require 'gtk2mp3' # Gtk2MP3 defined
   Gtk2MP3::Couple.load
   program.window do |window|
     Gtk2MP3::GUI.new(window,program)

data/lib/gtk2mp3/appconfig.rb

@@ -1,5 +1,15 @@
-module Gtk2AppLib
+module Gtk2AppLib # Gtk2AppLib defined
 module Configuration
+  WINDOW_DEFAULT_SIZE[0],WINDOW_DEFAULT_SIZE[1] = 0,0 # WINDOW_DEFAULT_SIZE defined in gtk2applib/configuration
+  MENU[:dock] = '_Dock' # MENU defined in gtk2applib/configuration
+end
+end
+
+module Gtk2MP3
+module Configuration
+  # File defined
+  # ARGV defined as command line arguments
+  # Gtk defined in gtk2
   # Where is your MP3 directory?
   dialog = Gtk::FileChooserDialog.new("Choose Mp3 Directory", nil, Gtk::FileChooser::ACTION_SELECT_FOLDER, nil,
 	[Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL], [Gtk::Stock::OPEN, Gtk::Dialog::RESPONSE_ACCEPT])
@@ -15,25 +25,22 @@ module Configuration
   dialog.destroy
   DIRECTORY = directory
 
-  WINDOW_DEFAULT_SIZE[0],WINDOW_DEFAULT_SIZE[1] = 0,0
-  OPTIONS = {:modify_font => FONT[:Large]}.freeze
-
-  SPACER1 = [' ',	OPTIONS].freeze
-  SPACER2 = [' ',	OPTIONS].freeze
-  SPACER3 = [' ',	OPTIONS].freeze
-  SPACER4 = ['   ',	OPTIONS].freeze
-  INFO = {:modify_font => FONT[:Small]}.freeze
-
+  options = {:modify_font => Gtk2AppLib::Configuration::FONT[:Large]}.freeze
+  SPACER1 = [' ',	options].freeze
+  SPACER2 = [' ',	options].freeze
+  SPACER3 = [' ',	options].freeze
+  SPACER4 = ['   ',	options].freeze
+  INFO = ['Gtk2 MP3 Next!!!!',{:modify_font => Gtk2AppLib::Configuration::FONT[:Small]}].freeze
 
   RELOAD = '_Reload'
 
-  CLICKED = 'clicked' # Signal (should be no need to edit)
-  NEXT		= ['Next!',	OPTIONS,	CLICKED].freeze
-  PAUSE		= ['Pause',	OPTIONS,	CLICKED].freeze # this one can be set to nil
-  STOP		= ['Stop',	OPTIONS,	CLICKED].freeze # this one can be set to nil
-  DELETE	= ['Delete',	OPTIONS,	CLICKED].freeze # this one can be set to nil
+  clicked = 'clicked'
+  NEXT		= ['Next!',	options,	clicked].freeze
+  PAUSE		= ['Pause',	options,	clicked].freeze # this one can be set to nil
+  STOP		= ['Stop',	options,	clicked].freeze # this one can be set to nil
+  DELETE	= ['Delete',	options,	clicked].freeze # this one can be set to nil
 
-  SELECT_A_FILE = [['Select a file', Gtk::FileChooser::ACTION_OPEN],HNIL].freeze
+  SELECT_A_FILE = [['Select a file', Gtk::FileChooser::ACTION_OPEN],Gtk2AppLib::HNIL].freeze
 
   PLAYER	= 'mpg123 -q -a hw:0,0 -R' # 'mpg123 -q -R'
   # mpg123 commands
@@ -43,11 +50,5 @@ module Configuration
   C_LOAD	= 'L'
   C_QUIT	= 'Q'
 
-### Unused ####
-# C_LOADPAUSED	= 'LP'
-# C_VOLUME	= 'V'
-# C_TAG		= 'T'
-
-  MENU[:dock] = '_Dock'
 end
 end

data/lib/gtk2mp3/couple.rb

@@ -1,17 +1,25 @@
-module Gtk2MP3
-class Couple
+# Gtk2AppLib defined
+module Gtk2MP3 # Gtk2MP3 defined
+class Couple # Couple defined
   BASE = Hash.new(1.0)
-  BASE_DUMP = USERDIR + '/base.dump'
+  BASE_DUMP = Gtk2AppLib::USERDIR + '/base.dump'
 
   COUPLE = Hash.new(1.0)
-  COUPLE_DUMP = USERDIR + '/couple.dump'
+  COUPLE_DUMP = Gtk2AppLib::USERDIR + '/couple.dump'
 
-  LEARNING = Math.sqrt(2.0)
+  LEARNING = Math.sqrt(2.0) # Math defined, built in
   SEP = '/'
-  SEPX = Regexp.new(SEP)
+  SEPX = Regexp.new(SEP) # Regexp defined, built in
+
+  def initialize(candidate,previous)
+    @candidate = candidate
+    @previous = previous
+    self.keys!
+    self.threshold!
+  end
 
   def self._load(dump,hash)
-    File.open(dump,'r'){|fh|
+    File.open(dump,'r'){|fh| # File defined, built in
       fh.each{|line|
         if line=~/^(.*)\s([\d\.]+)\s*$/ then
           hash[$1.strip] = $2.to_f
@@ -25,7 +33,7 @@ class Couple
   end
 
   def self.delete(current)
-    key = File.basename(current,MP3)
+    key = File.basename(current,Gtk2MP3::MP3)
     BASE.delete(key)
     COUPLE.delete_if{|k| k.split(SEPX).include?(key)}
   end
@@ -40,8 +48,8 @@ class Couple
   end
 
   def keys!
-    @base = File.basename(@candidate,MP3)
-    @couple = @base + SEP + File.basename(@previous,MP3)
+    @base = File.basename(@candidate,Gtk2MP3::MP3)
+    @couple = @base + SEP + File.basename(@previous,Gtk2MP3::MP3)
   end
 
   def keys
@@ -56,13 +64,6 @@ class Couple
     @threshold
   end
 
-  def initialize(candidate,previous)
-    @candidate = candidate
-    @previous = previous
-    self.keys!
-    self.threshold!
-  end
-
   def promote
     BASE[@base]		*= LEARNING
     COUPLE[@couple]	*= LEARNING

data/lib/gtk2mp3/playlist.rb

@@ -1,12 +1,8 @@
-module Gtk2MP3
-class Playlist < Array
-  IS_MP3 = Regexp.new(/\.mp3$/)
+require 'find' # Find defined
 
-  def reload
-    self.clear
-    Find.find(@directory){|fn| self.push(fn)	if fn=~IS_MP3 }
-    raise 'no mp3s found' if self.length < 1
-  end
+module Gtk2MP3
+class Playlist < Array # [] defined in Array
+  IS_MP3 = Regexp.new(/\.mp3$/) # Regexp defined, built in
 
   def initialize(directory)
     super()
@@ -15,6 +11,12 @@ class Playlist < Array
     $stderr.puts "Playlist length #{self.length}" if $trace
   end
 
+  def reload
+    self.clear
+    Find.find(@directory){|fn| self.push(fn)	if fn=~IS_MP3 }
+    raise 'no mp3s found' if self.length < 1
+  end
+
   def random
     self[ rand(self.length) ]
   end

data/lib/gtk2mp3.rb

@@ -1,12 +1,19 @@
 require 'gtk2mp3/playlist'
-require 'gtk2mp3/couple'
+require 'gtk2mp3/couple' # Couple defined
+    # Configuration defined in gtk2mp3/appconfig
+    # Gtk2AppLib defined
 
-module Gtk2MP3
+module Gtk2MP3 # Gtk2MP3 defined
   MP3 = '.mp3'
 
-  class Pipe
+  class Pipe # Pipe defined
+    def initialize(gui)
+      @gui = gui
+      @pipe = nil
+      self.open
+    end
     def _read
-      @thread = Thread.new do
+      @thread = Thread.new do # Thread defined
         @pipe.each do |line|
           line.strip!
           $stderr.puts line if $trace
@@ -24,8 +31,8 @@ module Gtk2MP3
     end
     def open
       if !@pipe then
-        @pipe = IO.popen(Configuration::PLAYER,'w+')
-        self.puts C_SILENCE
+        @pipe = IO.popen(Configuration::PLAYER,'w+') # IO defined
+        self.puts Configuration::C_SILENCE
         self._read
       end
     end
@@ -42,16 +49,54 @@ module Gtk2MP3
         @pipe = nil
       end
     end
-    def initialize(gui)
-      @gui = gui
-      self.open
-    end
   end
 
   class GUI
-    include Configuration
     attr_reader :continue, :couple, :current
     attr_writer :previous
+    def initialize(window,program)
+      @playlist = Gtk2MP3::Playlist.new(Configuration::DIRECTORY)
+      @current = ''
+      @previous = ''
+      @continue = true
+      @pipe = Pipe.new(self)
+      window.signal_connect('destroy'){ @pipe.close }
+
+      vbox = Gtk2AppLib::Widgets::VBox.new(window)
+
+      hbox = Gtk2AppLib::Widgets::HBox.new(vbox)
+      @info = Gtk2AppLib::Widgets::Label.new(*Configuration::INFO+[hbox])
+
+      hbox = Gtk2AppLib::Widgets::HBox.new(vbox)
+      Gtk2AppLib::Widgets::Label.new(*Configuration::SPACER1+[hbox]) # Spacer
+      Gtk2AppLib::Widgets::Button.new(*Configuration::NEXT+[hbox]){ self.skip_song }
+      if Configuration::PAUSE then
+        Gtk2AppLib::Widgets::Label.new(*Configuration::SPACER2+[hbox]) # Spacer
+        Gtk2AppLib::Widgets::Button.new(*Configuration::PAUSE+[hbox]){ self.pause_song }
+      end
+      if Configuration::STOP then
+        Gtk2AppLib::Widgets::Label.new(*Configuration::SPACER2+[hbox]) # Spacer
+        Gtk2AppLib::Widgets::Button.new(*Configuration::STOP+[hbox]){ self.stop_song }
+      end
+      if Configuration::DELETE then
+        Gtk2AppLib::Widgets::Label.new(*Configuration::SPACER3+[hbox]) # Spacer
+        Gtk2AppLib::Widgets.define_composite(:CheckButton,:Button)
+        Gtk2AppLib::Widgets::CheckButtonButton.new(*Configuration::DELETE+[hbox]){|is,*dummies|
+          if is.checkbutton.active? then
+            self.delete_song
+            is.checkbutton.active = false
+          end
+        }
+      end
+      Gtk2AppLib::Widgets::Label.new(*Configuration::SPACER4+[hbox]) # Spacer
+
+      self.load_song
+
+      program.append_app_menu(Configuration::RELOAD){ @playlist.reload }
+      program.append_dock_menu(Configuration::PAUSE.first){ self.pause_song }	if Configuration::PAUSE
+      program.append_dock_menu(Configuration::STOP.first){ self.stop_song }	if Configuration::STOP
+      program.append_dock_menu(Configuration::NEXT.first){ self.skip_song }
+    end
 
     def random_song
       plays = false
@@ -66,8 +111,8 @@ module Gtk2MP3
 
     def load_song
       self.random_song
-      @info.text = File.basename(@current,MP3)
-      @pipe.puts "#{C_LOAD} #{@current}"
+      @info.text = File.basename(@current,MP3) # File defined
+      @pipe.puts "#{Configuration::C_LOAD} #{@current}"
     end
 
     def skip_song
@@ -77,7 +122,7 @@ module Gtk2MP3
 
     def stop_song
       if @continue then
-        @pipe.puts C_STOP
+        @pipe.puts Configuration::C_STOP
         @previous = ''
         @continue = false
         @pipe.close
@@ -88,7 +133,7 @@ module Gtk2MP3
     end
 
     def pause_song
-      @pipe.puts C_PAUSE
+      @pipe.puts Configuration::C_PAUSE
     end
 
     def delete_song
@@ -97,50 +142,5 @@ module Gtk2MP3
       Couple.delete(@current)
       self.load_song
     end
-
-
-    def initialize(window,program)
-      @playlist = Gtk2MP3::Playlist.new(DIRECTORY)
-      @current = ''
-      @previous = ''
-      @continue = true
-      @pipe = Pipe.new(self)
-      window.signal_connect('destroy'){ @pipe.close }
-
-      vbox = Widgets::VBox.new(window)
-
-      hbox = Widgets::HBox.new(vbox)
-      @info = Widgets::Label.new('Gtk2 MP3 Next!!!!', INFO, hbox)
-
-      hbox = Widgets::HBox.new(vbox)
-      Widgets::Label.new(*SPACER1, hbox) # Spacer
-      Widgets::Button.new(*NEXT, hbox){ self.skip_song }
-      if PAUSE then
-        Widgets::Label.new(*SPACER2, hbox) # Spacer
-        Widgets::Button.new(*PAUSE, hbox){ self.pause_song }
-      end
-      if STOP then
-        Widgets::Label.new(*SPACER2, hbox) # Spacer
-        Widgets::Button.new(*STOP, hbox){ self.stop_song }
-      end
-      if DELETE then
-        Widgets::Label.new(*SPACER3, hbox) # Spacer
-        Widgets.define_composite(:CheckButton,:Button)
-        Widgets::CheckButtonButton.new(*DELETE, hbox){|is,*dummies|
-          if is.checkbutton.active? then
-            self.delete_song
-            is.checkbutton.active = false
-          end
-        }
-      end
-      Widgets::Label.new(*SPACER4, hbox) # Spacer
-
-      self.load_song
-
-      program.append_app_menu(RELOAD){ @playlist.reload }
-      program.append_dock_menu(PAUSE.first){ self.pause_song }	if PAUSE
-      program.append_dock_menu(STOP.first){ self.stop_song }	if STOP
-      program.append_dock_menu(NEXT.first){ self.skip_song }
-    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gtk2mp3
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - carlosjhr64@gmail.com
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 -08:00
+date: 2011-03-10 00:00:00 -08:00
 default_executable: gtk2mp3
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,10 +26,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 51
         segments: 
-        - 10
-        version: "10"
+        - 14
+        - 0
+        version: "14.0"
   type: :runtime
   version_requirements: *id001
 description: a "Next!" button gui for mpg123
@@ -51,7 +52,7 @@ files:
 - README.txt
 - bin/gtk2mp3
 has_rdoc: true
-homepage: http://ruby-gnome-apps.blogspot.com/search/label/MP3
+homepage: https://sites.google.com/site/gtk2applib/home/gtk2applib-applications/gtk2mp3
 licenses: []
 
 post_install_message: 
@@ -80,8 +81,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: 
 - mpg123
-rubyforge_project: gtk2mp3
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Gtk2MP3