audio_addict 0.4.1 → 0.4.3

data/lib/audio_addict/commands/log.rb

@@ -1,71 +1,73 @@
 module AudioAddict
   module Commands
     class LogCmd < Base
-      summary "Manage local like-log"
+      summary 'Manage local like-log'
 
-      help "This command provides access and utilities for the local log of liked tracks. Before you can use this command, make sure you have configured the path to your log."
+      help 'This command provides access and utilities for the local log of liked tracks. Before you can use this command, make sure you have configured the path to your log.'
 
-      usage "radio log show [SEARCH]"
-      usage "radio log tail [--lines N]"
-      usage "radio log sort"
-      usage "radio log browse"
-      usage "radio log tree [--save FILE]"
-      usage "radio log --help"
+      usage 'radio log show [SEARCH]'
+      usage 'radio log tail [--lines N]'
+      usage 'radio log sort'
+      usage 'radio log browse'
+      usage 'radio log tree [--save FILE]'
+      usage 'radio log --help'
 
-      option "-l --lines N", "Number of lines to show [default: 5]"
-      option "-s --save FILE", "Save the tree output to a YAML file"
+      option '-l --lines N', 'Number of lines to show [default: 5]'
+      option '-s --save FILE', 'Save the tree output to a YAML file'
 
-      param "SEARCH", "Show only log lines matching this string"
+      param 'SEARCH', 'Show only log lines matching this string'
 
-      command "show", "Show the entire like log"
-      command "tail", "Show the last few rows of the like log"
-      command "sort", "Sort the log alphabetically and save it"
-      command "browse", "Browse the log file interactively"
-      command "tree", "Show or save the log as YAML"
+      command 'show', 'Show the entire like log'
+      command 'tail', 'Show the last few rows of the like log'
+      command 'sort', 'Sort the log alphabetically and save it'
+      command 'browse', 'Browse the log file interactively'
+      command 'tree', 'Show or save the log as YAML'
 
-      example "radio log show"
-      example "radio log show paramore"
-      example "radio log tail"
-      example "radio log tail --lines 10"
-      example "radio log sort"
-      example "radio log tree --save out.yml"
+      example 'radio log show'
+      example 'radio log show paramore'
+      example 'radio log tail'
+      example 'radio log tail --lines 10'
+      example 'radio log sort'
+      example 'radio log tree --save out.yml'
 
       def show_command
         needs :like_log
-        query = args["SEARCH"]
+        query = args['SEARCH']
         puts query ? log.search(query) : log.data
       end
 
       def tail_command
         needs :like_log
-        lines = args["--lines"].to_i
-        puts log.data[-lines..-1]
+        lines = args['--lines'].to_i
+        puts log.data[-lines..]
       end
 
       def sort_command
         needs :like_log
         log.sort
-        say "!txtgrn!Sorted"
+        say '!txtgrn!Sorted'
       end
 
       def browse_command
         tree = log.tree
 
-        say ""
-        network = prompt.select "Network:", tree.keys, symbols: { marker: ">" }, filter: true, per_page: 10
-        channel = prompt.select "Channel:", tree[network].keys, symbols: { marker: ">" }, filter: true, per_page: page_size
-        artist = prompt.select "Artist:", tree[network][channel].keys, symbols: { marker: ">" }, filter: true, per_page: page_size
+        say ''
+        network = prompt.select 'Network:', tree.keys, symbols: { marker: '>' }, filter: true, per_page: 10
+        channel = prompt.select 'Channel:', tree[network].keys, symbols: { marker: '>' }, filter: true,
+          per_page: page_size
+        artist = prompt.select 'Artist:', tree[network][channel].keys, symbols: { marker: '>' }, filter: true,
+          per_page: page_size
 
-        say "Songs:"
+        say 'Songs:'
         tree[network][channel][artist].each { |song| say "- !txtgrn!#{song}" }
-        say ""
+        say ''
 
-        browse_command if prompt.yes?("Again?")
+        browse_command if prompt.yes?('Again?')
       end
 
       def tree_command
         yaml = log.tree.to_yaml
-        filename = args["--save"]
+        filename = args['--save']
 
         if filename
           File.write filename, yaml
@@ -75,7 +77,7 @@ module AudioAddict
         end
       end
 
-      private
+    private
 
       def log
         @log ||= Log.new

data/lib/audio_addict/commands/login.rb

@@ -1,36 +1,36 @@
 module AudioAddict
   module Commands
     class LoginCmd < Base
-      summary "Save login credentials"
+      summary 'Save login credentials'
 
       help "Some commands in this AudioAddict CLI require access to the AudioAddict API. The 'login' command requests your AudioAddict user and password, and stores an API session key. This operation needs to be executed only once.\n\nThe user and password are not stored anywhere, only the session key is stored in your local configuration file."
 
-      usage "radio login"
-      usage "radio login --help"
+      usage 'radio login'
+      usage 'radio login --help'
 
       def run
         proceed = true
 
         if radio.api.logged_in?
           say "!txtylw!You are already logged in as !undylw!#{Config.email}"
-          proceed = prompt.yes? "Login again?"
+          proceed = prompt.yes? 'Login again?'
         end
 
         login_prompt if proceed
       end
 
-      private
+    private
 
       def login_prompt
-        user = prompt.ask "Username :", default: Config.email
-        pass = prompt.mask "Password :"
+        user = prompt.ask 'Username :', default: Config.email
+        pass = prompt.mask 'Password :'
 
-        if user and pass
-          say "Logging in... "
+        if user && pass
+          say 'Logging in... '
           radio.api.login user, pass
-          resay "!txtgrn!Saved"
+          resay '!txtgrn!Saved'
         else
-          say "!txtred!Cancelled"
+          say '!txtred!Cancelled'
         end
       end
     end

data/lib/audio_addict/commands/now.rb

@@ -1,19 +1,19 @@
 module AudioAddict
   module Commands
     class NowCmd < Base
-      summary "Show network, channel and playing track"
+      summary 'Show network, channel and playing track'
 
-      help "This command displays the active network and channel, as well as the currently playing track."
+      help 'This command displays the active network and channel, as well as the currently playing track.'
 
-      usage "radio now"
-      usage "radio now --help"
+      usage 'radio now'
+      usage 'radio now --help'
 
       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 '!txtblu!    Track !txtrst!: ... '
 
         track = current_channel.current_track
         resay "!txtblu!    Track !txtrst!: !txtgrn!#{track.title.strip}"

data/lib/audio_addict/commands/playlist.rb

@@ -1,37 +1,38 @@
 module AudioAddict
   module Commands
     class PlaylistCmd < Base
-      summary "Generate playlists"
+      summary 'Generate playlists'
 
       help "This command lets you generate playlists for the active network. In order to allow configuration, the process is done in two stages: 'init' and 'generate'."
 
-      usage "radio playlist init NAME"
-      usage "radio playlist generate NAME"
-      usage "radio playlist --help"
+      usage 'radio playlist init NAME'
+      usage 'radio playlist generate NAME'
+      usage 'radio playlist --help'
 
-      command "init", "Create a playlist configuration file. This step is required prior to using the generate command. After you generate this file, feel free to edit it to your preferences (sort order, remove channels etc)."
-      command "generate", "Generate a playlist file based on the configuration file."
+      command 'init',
+        'Create a playlist configuration file. This step is required prior to using the generate command. After you generate this file, feel free to edit it to your preferences (sort order, remove channels etc).'
+      command 'generate', 'Generate a playlist file based on the configuration file.'
 
-      param "NAME", "The name of the playlist without any extension"
+      param 'NAME', 'The name of the playlist without any extension'
 
-      example "radio playlist init MyRockMusic"
-      example "radio playlist generate MyRockMusic"
+      example 'radio playlist init MyRockMusic'
+      example 'radio playlist generate MyRockMusic'
 
       def init_command
         needs :network, :channel, :listen_key
 
         require_premium_account
 
-        name = args["NAME"]
+        name = args['NAME']
         outfile = "#{name}.yml"
 
         say "!txtred!Warning!txtrst!: !txtgrn!#{outfile}!txtrst! already exists!" if File.exist? outfile
         proceed = prompt.yes? "Create #{outfile}?"
-        if proceed
-          generate_config outfile
-          say ""
-          generate_command name
-        end
+        return unless proceed
+
+        generate_config outfile
+        say ''
+        generate_command name
       end
 
       def generate_command(name = nil)
@@ -39,21 +40,21 @@ module AudioAddict
 
         require_premium_account
 
-        name ||= args["NAME"]
+        name ||= args['NAME']
 
         infile = "#{name}.yml"
         outfile = "#{name}.pls"
 
-        if !File.exist? infile
-          say "!txtred!Cannot find #{infile}"
-        else
+        if File.exist? infile
           say "!txtred!Warning!txtrst!: !txtgrn!#{outfile}!txtrst! already exists!" if File.exist? outfile
           proceed = prompt.yes? "Create #{outfile}?"
           generate_playlist infile, outfile if proceed
+        else
+          say "!txtred!Cannot find #{infile}"
         end
       end
 
-      private
+    private
 
       def generate_config(outfile)
         data = { template: radio.url_template }
@@ -76,19 +77,19 @@ module AudioAddict
         channels = data[:channels]
 
         output = []
-        output << "[playlist]"
+        output << '[playlist]'
         output << "NumberOfEntries=#{channels.count}"
 
         index = 0
 
         channels.each do |key, name|
           index += 1
-          output << "File#{index}=#{template}" % template_params(key)
+          output << ("File#{index}=#{template}" % template_params(key))
           output << "Title#{index}=#{name}"
           output << "Length#{index}=0"
         end
 
-        output = output.join("\n") + "\n"
+        output = "#{output.join("\n")}\n"
 
         File.write outfile, output
         say "Saved !txtgrn!#{outfile}"
@@ -104,7 +105,7 @@ module AudioAddict
 
       # This is a patch to circumvent some anomalies in the AudioAddict API
       def fix_key(key)
-        key = :electrohouse if current_network == "di" and key == :electro
+        key = :electrohouse if (current_network == 'di') && (key == :electro)
         key
       end
     end

data/lib/audio_addict/commands/set.rb

@@ -1,26 +1,28 @@
 module AudioAddict
   module Commands
     class SetCmd < Base
-      summary "Set the radio network and channel"
+      summary 'Set the radio network and channel'
 
-      help "This command provides both interactive and non-interactive means of storing the currenlty active channel and network in the configuration file."
+      help 'This command provides both interactive and non-interactive means of storing the currenlty active channel and network in the configuration file.'
 
-      usage "radio set [CHANNEL NETWORK]"
-      usage "radio set --help"
+      usage 'radio set [CHANNEL NETWORK]'
+      usage 'radio set --help'
 
-      param "CHANNEL", "AudioAddict channel key. You can use a partial key here or leave empty for an interactive prompt.\nUse '-' to set the first channel in the network."
-      param "NETWORK", "AudioAddict network key. You can use a partial key here or leave empty for an interactive prompt."
+      param 'CHANNEL',
+        "AudioAddict channel key. You can use a partial key here or leave empty for an interactive prompt.\nUse '-' to set the first channel in the network."
+      param 'NETWORK',
+        'AudioAddict network key. You can use a partial key here or leave empty for an interactive prompt.'
 
-      example "radio set"
-      example "radio set punk"
-      example "radio set dance digitally"
-      example "radio set dance di"
-      example "radio set metal rockradio"
-      example "radio set - rockradio"
+      example 'radio set'
+      example 'radio set punk'
+      example 'radio set dance digitally'
+      example 'radio set dance di'
+      example 'radio set metal rockradio'
+      example 'radio set - rockradio'
 
       def run
-        channel = args["CHANNEL"]
-        network = args["NETWORK"]
+        channel = args['CHANNEL']
+        network = args['NETWORK']
 
         full_set = (channel and network) || !(channel or network)
 
@@ -31,12 +33,12 @@ module AudioAddict
         end
       end
 
-      private
+    private
 
       def set_both(channel, network)
         needs :session_key
 
-        if !network or !Radio.valid_network? network
+        if !network || !Radio.valid_network?(network)
           network_menu network
         elsif Radio.valid_network? network
           save_network network
@@ -50,7 +52,7 @@ module AudioAddict
 
         if !channel
           channel_menu
-        elsif channel == "-"
+        elsif channel == '-'
           save_channel radio.channels.keys.first
         elsif radio.valid_channel? channel
           save_channel channel
@@ -84,15 +86,15 @@ module AudioAddict
       end
 
       def channel_prompt(channels)
-        options = channels.map { |channel| ["#{channel.name.ljust 20} # #{channel.key}", channel.key] }.to_h
-        options = { "Cancel" => :cancel }.merge options
-        prompt.select "Channel :", options, symbols: { marker: ">" }, filter: true
+        options = channels.to_h { |channel| ["#{channel.name.ljust 20} # #{channel.key}", channel.key] }
+        options = { 'Cancel' => :cancel }.merge options
+        prompt.select 'Channel :', options, symbols: { marker: '>' }, filter: true
       end
 
       def network_prompt(networks)
         options = networks.invert
-        options["Skip"] = :cancel
-        prompt.select "Network :", options, symbols: { marker: ">" }, filter: true, per_page: 10
+        options['Skip'] = :cancel
+        prompt.select 'Network :', options, symbols: { marker: '>' }, filter: true, per_page: 10
       end
 
       def save_channel(channel, echo: true)

data/lib/audio_addict/commands/vote.rb

@@ -1,48 +1,48 @@
 module AudioAddict
   module Commands
     class VoteCmd < Base
-      summary "Vote on a recently played track"
+      summary 'Vote on a recently played track'
 
-      help "This command starts an interactive voting prompt for the currently playing track or for previously played tracks."
+      help 'This command starts an interactive voting prompt for the currently playing track or for previously played tracks.'
 
-      usage "radio vote [--all --past]"
-      usage "radio vote --help"
+      usage 'radio vote [--all --past]'
+      usage 'radio vote --help'
 
-      option "-a --all", "Show all voting options"
-      option "-p --past", "Vote on previously played tracks"
+      option '-a --all', 'Show all voting options'
+      option '-p --past', 'Vote on previously played tracks'
 
-      example "radio vote"
-      example "radio vote --all"
-      example "radio vote --past"
-      example "radio vote --all --past"
-      example "radio vote -ap"
+      example 'radio vote'
+      example 'radio vote --all'
+      example 'radio vote --past'
+      example 'radio vote --all --past'
+      example 'radio vote -ap'
 
       def run
         needs :network, :channel, :session_key
         vote_mode == :now ? vote_now : vote_past
       end
 
-      private
+    private
 
       def vote_past
-        track = get_user_track
-        unless track == :cancel
-          vote = get_user_vote
-          send_vote vote, track unless vote == :cancel
-        end
+        track = user_track
+        return if track == :cancel
+
+        vote = user_vote
+        send_vote vote, track unless vote == :cancel
       end
 
       def vote_now
         NowCmd.new(args).run
-        puts ""
-        vote = get_user_vote
+        puts ''
+        vote = user_vote
         send_vote vote unless vote == :cancel
       end
 
       def send_vote(vote, track = nil)
-        say "Voting... "
+        say 'Voting... '
         current_channel.vote vote, track: track
-        resay "!txtgrn!Voted"
+        resay '!txtgrn!Voted'
       end
 
       def tracks
@@ -53,33 +53,33 @@ module AudioAddict
         tracks.map { |t| t.artist.size }.max
       end
 
-      def get_user_track
-        options = tracks.map { |t| ["#{t.artist.ljust max_artist_len} > #{t.title}", t] }.to_h
-        options = { "Cancel" => :cancel }.merge options
-        prompt.select "Track:", options, symbols: { marker: ">" }
+      def user_track
+        options = tracks.to_h { |t| ["#{t.artist.ljust max_artist_len} > #{t.title}", t] }
+        options = { 'Cancel' => :cancel }.merge options
+        prompt.select 'Track:', options, symbols: { marker: '>' }
       end
 
-      def get_user_vote
+      def user_vote
         vote_style == :menu ? menu_prompt : simple_prompt
       end
 
       def menu_prompt
-        options = { "Like" => :up, "Dislike" => :down,
-                    "Unvote" => :delete, "Cancel" => :cancel }
-        prompt.select "Vote:", options, symbols: { marker: ">" }
+        options = { 'Like' => :up, 'Dislike' => :down,
+                    'Unvote' => :delete, 'Cancel' => :cancel }
+        prompt.select 'Vote:', options, symbols: { marker: '>' }
       end
 
       def simple_prompt
-        like = prompt.yes? "Vote?"
+        like = prompt.yes? 'Vote?'
         like ? :up : :cancel
       end
 
       def vote_style
-        args["--all"] ? :menu : :simple
+        args['--all'] ? :menu : :simple
       end
 
       def vote_mode
-        args["--past"] ? :past : :now
+        args['--past'] ? :past : :now
       end
     end
   end

data/lib/audio_addict/config.rb

@@ -1,4 +1,4 @@
-require "yaml"
+require 'yaml'
 
 module AudioAddict
   class Config
@@ -6,7 +6,7 @@ module AudioAddict
       attr_writer :path
 
       def method_missing(name, *args, &_blk)
-        if name.to_s.end_with? "="
+        if name.to_s.end_with? '='
           name = name[0..-2].to_sym
           properties[name] = args.first
         else
@@ -14,6 +14,10 @@ module AudioAddict
         end
       end
 
+      def respond_to_missing?(*_args)
+        true
+      end
+
       def delete(*keys)
         keys.each { |key| properties.delete key.to_sym }
       end
@@ -39,7 +43,7 @@ module AudioAddict
       end
 
       def path
-        @path ||= ENV.fetch("AUDIO_ADDICT_CONFIG_PATH", default_path)
+        @path ||= ENV.fetch('AUDIO_ADDICT_CONFIG_PATH', default_path)
       end
 
       def default_path

data/lib/audio_addict/exceptions.rb

@@ -9,12 +9,12 @@ module AudioAddict
 
     def initialize(missing_keys)
       @missing_keys = missing_keys
-      super "Some parameters required by this operation are missing"
+      super 'Some parameters required by this operation are missing'
     end
   end
 
   class PremiumAccount < Error
-    def initialize(message = "This operation requires a premium account")
+    def initialize(message = 'This operation requires a premium account')
       super
     end
   end

data/lib/audio_addict/extensions/file.rb

@@ -1,21 +1,25 @@
-require "fileutils"
+require 'fileutils'
 
 class File
-  def self.contains?(file, content)
-    return false unless File.exist? file
-    foreach file do |line|
-      return true if line.chomp == content
+  class << self
+    def contains?(file, content)
+      return false unless File.exist? file
+
+      foreach file do |line|
+        return true if line.chomp == content
+      end
+
+      false
     end
-    return false
-  end
 
-  def self.append(file, content)
-    open(file, "a") { |f| f.puts content }
-  end
+    def append(file, content)
+      File.open(file, 'a') { |f| f << "#{content}\n" }
+    end
 
-  def self.deep_write(file, content)
-    dir = File.dirname file
-    FileUtils.mkdir_p dir unless Dir.exist? dir
-    File.write file, content
+    def deep_write(file, content)
+      dir = File.dirname file
+      FileUtils.mkdir_p dir unless Dir.exist? dir
+      File.write file, content
+    end
   end
 end

data/lib/audio_addict/inspectable.rb

@@ -1,8 +1,8 @@
 module AudioAddict
   module Inspectable
     def inspect
-      keys = inspectable.map { |k| %Q[@#{k}="#{send k}"] }
-      "#<#{self.class} #{keys.join ", "}>"
+      keys = inspectable.map { |k| %[@#{k}="#{send k}"] }
+      "#<#{self.class} #{keys.join ', '}>"
     end
   end
 end

data/lib/audio_addict/log.rb

@@ -21,7 +21,7 @@ module AudioAddict
     end
 
     def sort
-      output = data.sort.join("\n") + "\n"
+      output = "#{data.sort.join("\n")}\n"
       File.write path, output
     end
 
@@ -33,7 +33,7 @@ module AudioAddict
       result = {}
 
       data.each do |line|
-        network, channel, artist, song = line.split(" :: ")
+        network, channel, artist, song = line.split(' :: ')
         result[network] ||= {}
         result[network][channel] ||= {}
         result[network][channel][artist] ||= []