audio_addict 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ce61de9768ce00fd9d96c2b8f2f66a87758987806cd34de7f576a75b9e2cd8d
-  data.tar.gz: 605d0e3e92bb272a46350a7a557c8601ede972269790acb7d786f242da776771
+  metadata.gz: d7d324a3657ae9b16cc367a39bbbdf23be19880471dc199fd1762dc163c63b36
+  data.tar.gz: eb20e965b292d3802fcc1d8c0b0c9416dc23bc1b24b91fc88c58a0835bb33029
 SHA512:
-  metadata.gz: 73b2810bf10f96ce2e7f09ffa4783e56c83d6200909b623f468f45fe5aa0cad1817168f7bafd443520dec7e5b2d2b94d00df2107817ce8da7055acf544684d7c
-  data.tar.gz: 8bef5e3b79cf40c7005fca90159f67b6d0310431b0dc61cf7a0f55b4061c3ebdfd00d1e5edcfb0f1901c95e321b57956c9d58c60c1df4113f5d4a8488b4fcb50
+  metadata.gz: 6b9d46c654ce1096e59f40261577dd6b86500a410e7e894aaf03d1f1358bc8aaf5bc8ddff327864897efb4226c5eab9195ec1a666a78dd52aa4b56cfb48128da
+  data.tar.gz: e85d2e9509c20a181163a6b8d444754d6836e1900504f9a862c9fde04fc6cedf4edf9dc8ccd6708039d30fb6f8945f2616b85139862fa56f8ca38da3bde124d8

data/bin/radio

@@ -11,20 +11,20 @@ rescue Interrupt, AudioAddict::Interrupt, TTY::Reader::InputInterrupt
   say "\nGoodbye"
   exit 1
 rescue AudioAddict::ConfigError => e
-  say '!undred!ERROR: Missing Configuration Values'
+  say 'ru`ERROR: Missing Configuration Values`'
   say "#{e.message}:"
   e.missing_keys.each do |key|
-    say "- !txtblu!#{key}"
+    say "- b`#{key}`"
   end
   say ''
-  say 'Run !txtpur!radio config guide!txtrst! for more information'
+  say 'Run m`radio config guide` for more information'
   exit 1
 rescue => e
   if ENV['DEBUG']
     puts e.backtrace.reverse
     say ''
   end
-  say "!undred!ERROR: #{e.class}"
+  say "ru`ERROR: #{e.class}`"
   say e.message
   exit 1
 end

data/lib/audio_addict/commands/channels.rb

@@ -20,7 +20,7 @@ module AudioAddict
       def run
         needs :network
 
-        say "!undgrn!#{radio.name}\n"
+        say "gu`#{radio.name}`\n"
 
         search = args['SEARCH']
 
@@ -39,7 +39,7 @@ module AudioAddict
       def show_verbose(channels)
         channels.each do |channel|
           say ''
-          say "!txtgrn!#{channel.name.ljust 22} !txtrst!# #{channel.key}"
+          say "g`#{channel.name.ljust 22} `# #{channel.key}"
           say ''
           say word_wrap channel.description.to_s
           say ''
@@ -50,7 +50,7 @@ module AudioAddict
 
           say 'Similar Channels:'
           similar.each do |key, similar_channel|
-            say "- !txtblu!#{similar_channel.name.ljust 20}!txtrst! # #{key}"
+            say "- b`#{similar_channel.name.ljust 20}` # #{key}"
           end
           say ''
         end
@@ -58,7 +58,7 @@ module AudioAddict
 
       def show_compact(channels)
         channels.each do |channel|
-          say "!txtblu!#{channel.key.rjust 25} !txtgrn!#{channel.name.strip}"
+          say "b`#{channel.key.rjust 25}` g`#{channel.name.strip}`"
         end
       end
     end

data/lib/audio_addict/commands/config.rb

@@ -36,7 +36,7 @@ module AudioAddict
       def get_command
         key = args['KEY'].to_sym
         value = Config.properties[key]
-        say value ? "!txtgrn!#{value}" : '!txtred!<Unset>'
+        say value ? "g`#{value}`" : 'r`<Unset>`'
       end
 
       def set_command
@@ -44,22 +44,22 @@ module AudioAddict
         value = args['VALUE']
         Config.properties[key] = value
         Config.save
-        say "!txtgrn!#{key}=#{value}"
+        say "g`#{key}=#{value}`"
       end
 
       def del_command
         key = args['KEY'].to_sym
         Config.delete key
         Config.save
-        say '!txtgrn!Deleted'
+        say 'g`Deleted`'
       end
 
       def show_command
-        say "!undpur!# #{Config.path}"
+        say "mu`# #{Config.path}`"
         if File.exist? Config.path
           puts File.read Config.path
         else
-          say '!txtred!File Not Found'
+          say 'r`File Not Found`'
         end
       end
 
@@ -70,7 +70,7 @@ module AudioAddict
 
       def guide_command
         key_guide.each do |key, value|
-          say "!txtgrn!#{key}"
+          say "g`#{key}`"
           say word_wrap "  #{value}"
           say ''
         end
@@ -88,12 +88,12 @@ module AudioAddict
 
       def verify_and_show_keys(keys, critical: false)
         problems = 0
-        prefix = critical ? '!txtred!Error  !txtrst!' : '!txtylw!Warning!txtrst!'
+        prefix = critical ? 'r`Error  `' : 'y`Warning`'
 
         keys.each do |key, command|
           unless Config.has_key? key
             problems += 1
-            say "#{prefix} : Key !txtgrn!#{key}!txtrst! is not set. Fix with !txtpur!radio #{command}!txtrst!."
+            say "#{prefix} : Key g`#{key}` is not set. Fix with m`radio #{command}`."
           end
         end
 
@@ -102,11 +102,11 @@ module AudioAddict
 
       def key_guide
         {
-          email:       "Last email used for logging in.\nUsually set with !txtpur!radio login!txtrst!.",
-          session_key: "Used for authentication.\nUsually set with !txtpur!radio login!txtrst!.",
-          listen_key:  "Used for generating playlists.\nUsually set with !txtpur!radio login!txtrst!.",
-          network:     "Specify the AudioAddict network you are currently listening to.\nUsually set with !txtpur!radio set!txtrst!.",
-          channel:     "Specify the AudioAddict channel you are currently listening to.\nUsually set with !txtpur!radio set!txtrst!.",
+          email:       "Last email used for logging in.\nUsually set with m`radio login`.",
+          session_key: "Used for authentication.\nUsually set with m`radio login`.",
+          listen_key:  "Used for generating playlists.\nUsually set with m`radio login`.",
+          network:     "Specify the AudioAddict network you are currently listening to.\nUsually set with m`radio set`.",
+          channel:     "Specify the AudioAddict channel you are currently listening to.\nUsually set with m`radio set`.",
           like_log:    "Specify the path to store all your positive votes.\nIf this is not set, votes will only be sent to AudioAddict and not logged locally.",
           cache_dir:   "Specify the path to store API response cache.\nDefault: ~/.audio_addict/cache",
           cache_life:  "Specify the cache life period.\nDefault: 6h.",

data/lib/audio_addict/commands/download.rb

@@ -30,12 +30,12 @@ module AudioAddict
       def current_command
         needs :network, :channel
 
-        say '!txtblu!Downloading !txtrst!: ... '
+        say 'b`Downloading` : ... '
 
         track = current_channel.current_track
         query = track.search_string
 
-        resay "!txtblu!Downloading !txtgrn!: #{query}"
+        say "b`Downloading` : g`#{query}`", replace: true
 
         Youtube.new(query).get count
       end
@@ -48,7 +48,7 @@ module AudioAddict
         data.each do |line|
           _network, _channel, artist, song = line.split(' :: ')
           query = "#{artist}, #{song}"
-          say "\n!txtblu!Downloading !txtgrn!: #{query}"
+          say "\nb`Downloading` : g`#{query}`"
           Youtube.new(query).get count
         end
       end
@@ -56,7 +56,7 @@ module AudioAddict
       def search_command
         query = args['QUERY']
 
-        say "\n!txtblu!Downloading !txtgrn!: #{query}"
+        say "\nb`Downloading` : g`#{query}`"
         Youtube.new(query).get count
       end
 

data/lib/audio_addict/commands/history.rb

@@ -10,10 +10,10 @@ module AudioAddict
 
       def run
         needs :network, :channel
-        say "!undgrn!#{radio.name} > #{current_channel.name}"
+        say "gu`#{radio.name} > #{current_channel.name}`"
         say ''
         tracks.each do |track|
-          say "!txtgrn! #{track.artist.rjust max_artist_len}!txtrst! : !txtblu!#{track.title}"
+          say "g` #{track.artist.rjust max_artist_len}` : b`#{track.title}`"
         end
       end
 

data/lib/audio_addict/commands/log.rb

@@ -45,7 +45,7 @@ module AudioAddict
       def sort_command
         needs :like_log
         log.sort
-        say '!txtgrn!Sorted'
+        say 'g`Sorted`'
       end
 
       def browse_command
@@ -59,7 +59,7 @@ module AudioAddict
           per_page: page_size
 
         say 'Songs:'
-        tree[network][channel][artist].each { |song| say "- !txtgrn!#{song}" }
+        tree[network][channel][artist].each { |song| say "- g`#{song}`" }
         say ''
 
         browse_command if prompt.yes?('Again?')
@@ -71,7 +71,7 @@ module AudioAddict
 
         if filename
           File.write filename, yaml
-          say "!txtgrn!Saved #{filename}"
+          say "g`Saved #{filename}`"
         else
           puts yaml
         end
@@ -84,7 +84,7 @@ module AudioAddict
       end
 
       def page_size
-        @page_size ||= detect_terminal_size[1] - 4
+        @page_size ||= terminal_height - 4
       end
     end
   end

data/lib/audio_addict/commands/login.rb

@@ -12,7 +12,7 @@ module AudioAddict
         proceed = true
 
         if radio.api.logged_in?
-          say "!txtylw!You are already logged in as !undylw!#{Config.email}"
+          say "y`You are already logged in as` yu`#{Config.email}`"
           proceed = prompt.yes? 'Login again?'
         end
 
@@ -28,9 +28,9 @@ module AudioAddict
         if user && pass
           say 'Logging in... '
           radio.api.login user, pass
-          resay '!txtgrn!Saved'
+          say 'g`Saved`', replace: true
         else
-          say '!txtred!Cancelled'
+          say 'r`Cancelled`'
         end
       end
     end

data/lib/audio_addict/commands/now.rb

@@ -11,13 +11,13 @@ module AudioAddict
       def run
         needs :network, :channel
 
-        say "!txtblu!  Network !txtrst!: !txtgrn!#{radio.name}!txtrst! # #{radio.network}"
-        say "!txtblu!  Channel !txtrst!: !txtgrn!#{current_channel.name}!txtrst! # #{current_channel.key}"
-        say '!txtblu!    Track !txtrst!: ... '
+        say "b`  Network `: g`#{radio.name}` # #{radio.network}"
+        say "b`  Channel `: g`#{current_channel.name}` # #{current_channel.key}"
+        say 'b`    Track `: ... '
 
         track = current_channel.current_track
-        resay "!txtblu!    Track !txtrst!: !txtgrn!#{track.title.strip}"
-        say "!txtblu!       By !txtrst!: !txtgrn!#{track.artist.strip}"
+        say "b`    Track `: g`#{track.title.strip}`", replace: true
+        say "b`       By `: g`#{track.artist.strip}`"
       end
     end
   end

data/lib/audio_addict/commands/playlist.rb

@@ -26,7 +26,7 @@ module AudioAddict
         name = args['NAME']
         outfile = "#{name}.yml"
 
-        say "!txtred!Warning!txtrst!: !txtgrn!#{outfile}!txtrst! already exists!" if File.exist? outfile
+        say "r`Warningr`: g`#{outfile}` already exists!" if File.exist? outfile
         proceed = prompt.yes? "Create #{outfile}?"
         return unless proceed
 
@@ -46,11 +46,11 @@ module AudioAddict
         outfile = "#{name}.pls"
 
         if File.exist? infile
-          say "!txtred!Warning!txtrst!: !txtgrn!#{outfile}!txtrst! already exists!" if File.exist? outfile
+          say "r`Warning`: g`#{outfile}` already exists!" if File.exist? outfile
           proceed = prompt.yes? "Create #{outfile}?"
           generate_playlist infile, outfile if proceed
         else
-          say "!txtred!Cannot find #{infile}"
+          say "r`Cannot find #{infile}`"
         end
       end
 
@@ -68,7 +68,7 @@ module AudioAddict
         data[:channels] = channels
 
         File.write outfile, data.to_yaml
-        say "Saved !txtgrn!#{outfile}"
+        say "Saved g`#{outfile}`"
       end
 
       def generate_playlist(infile, outfile)
@@ -92,7 +92,7 @@ module AudioAddict
         output = "#{output.join("\n")}\n"
 
         File.write outfile, output
-        say "Saved !txtgrn!#{outfile}"
+        say "Saved g`#{outfile}`"
       end
 
       def template_params(channel_key)

data/lib/audio_addict/commands/set.rb

@@ -59,7 +59,7 @@ module AudioAddict
         elsif radio.search(channel).any?
           channel_menu channel
         else
-          say "!txtred!Invalid channel: #{radio.name} > #{channel}"
+          say "r`Invalid channel: #{radio.name} > #{channel}`"
         end
       end
 
@@ -100,13 +100,13 @@ module AudioAddict
       def save_channel(channel, echo: true)
         Config.channel = channel
         Config.save
-        say "Channel : !txtgrn!#{radio.name} > #{current_channel.name}!txtrst! # #{channel}" if echo
+        say "Channel : g`#{radio.name} > #{current_channel.name}` # #{channel}" if echo
       end
 
       def save_network(network, echo: true)
         Config.network = network
         Config.save
-        say "Network : !txtgrn!#{radio.name}!txtrst! # #{network}" if echo
+        say "Network : g`#{radio.name}` # #{network}" if echo
       end
     end
   end

data/lib/audio_addict/commands/vote.rb

@@ -42,7 +42,7 @@ module AudioAddict
       def send_vote(vote, track = nil)
         say 'Voting... '
         current_channel.vote vote, track: track
-        resay '!txtgrn!Voted'
+        say 'g`Voted`', replace: true
       end
 
       def tracks

data/lib/audio_addict/version.rb

@@ -1,3 +1,3 @@
 module AudioAddict
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: audio_addict
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2023-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.3
+rubygems_version: 3.4.5
 signing_key: 
 specification_version: 4
 summary: AudioAddict Command Line