mikeplayer 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44e5e59f36ed8b6c41f8d2c36e65bb1b997b920a2dd3ad59eba2fff0c2dc5141
-  data.tar.gz: 59efb825846abc56475a6b5a562a3a897ea68f4b985ae4bb880c968492160bec
+  metadata.gz: 129df9ce63171d9efbe8bd1e581fdbfdf33fdadf127936089db72149ebd76a54
+  data.tar.gz: 25f8be729ae785873137a34e291c63983fcb9a5ff71ccb035e6160bbb3448007
 SHA512:
-  metadata.gz: ddf8ec65bf9ba7486cf48cc4e27c4507d55fbc233aa2c3c9bb4afc74a6d0778a77a6817bc66070ab7adaa90248bed5ced766b4bf203e9afd905789800fc546a8
-  data.tar.gz: e3655f5176eb292128264151db69987dcd3b3fd3fcc6379c6c80028198e1b0da9833591ddd798cfb53d9395ee30a04bd77d9c6911eabd19608a13784c3614687
+  metadata.gz: b1ec4ae4f8a765ffeed9fb96d7097f97392a27db66211a4bfc4bb14f7a1636b876ec40ecd84458a8ce8a53050cc160d36769a18088fa99533ce927e8ac5185c8
+  data.tar.gz: eebd1b3afce640dd29ba8e639122f56b64c7b7e0878a1b50e0f7e72cc78a4b258708e50ef8cde1e5fc1f43916b39b42444339b339ad488cdada53a387692ac6e

data/lib/mikeplayer/playlist.rb

@@ -55,7 +55,9 @@ module MikePlayer
     end
 
     def previous
-      @song_i -= 1 unless @song_i <= 0
+      @song_i -= 1
+
+      @song_i = 0 if @song_i < 0
 
       return self.current
     end
@@ -87,7 +89,7 @@ module MikePlayer
     end
 
     def finished?
-      return @song_i == @songs.size
+      return @song_i >= @songs.size
     end
 
     private

data/lib/mikeplayer/version.rb

@@ -1,3 +1,3 @@
 module MikePlayer
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.0.3'.freeze
 end

data/lib/mikeplayer.rb

@@ -75,7 +75,7 @@ module MikePlayer
             pause_if_over_time_limit
 
             if (true == playing?)
-              indicator = "#{'>' * (playing_time % 4)}"
+              indicator = "#{'>' * (playing_time % 4)}".ljust(4)
               info_changed = true
             elsif (true == paused?) && (PAUSE_INDICATOR != indicator)
               indicator = PAUSE_INDICATOR
@@ -89,12 +89,14 @@ module MikePlayer
                 mindicator = "(#{minutes_remaining}↓) "
               end
 
-              info  = "#{info_prefix} #{song.length_str(playing_time)} #{mindicator}#{indicator}".ljust(display_width)
+              print("\r" << ' '.ljust(display_width))
 
-              display_width = info.size
+              info  = "#{info_prefix} #{song.length_str(playing_time)} #{mindicator}#{indicator}"
 
               print(info)
 
+              display_width = info.size
+
               info_changed = false
               $stdout.flush
             end
@@ -108,17 +110,18 @@ module MikePlayer
           @pid = nil
 
           if (true == playing?)
-            next_song
+            next_song unless @pid.nil?
           end
         end
 
         @pid   = nil
+        print("\r\n")
         exit
       end
 
       wait_on_user
 
-      puts ""
+      print("\r\n")
     end
 
     def cmd_exist?(cmd)
@@ -208,6 +211,7 @@ module MikePlayer
       end
 
       @state = STOPPED
+      @pid   = nil
     end
 
     def pid_alive?(pid = @pid)
@@ -227,7 +231,9 @@ module MikePlayer
     def previous_song
       stop_song
 
-      @playlist.previous
+      if (playing_time < 10)
+        @playlist.previous
+      end
     end
 
     def kill(signal)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mikeplayer
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Mike Crockett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-28 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json