audio_addict 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20084805bf5d4e9fa5409b4354364be364e005e8c5db251d4bc84dfa68f04436
-  data.tar.gz: 8011bab35c939ffd10c183b56e62d169259add2f6c7c042a4e60b29b9e1fa1ca
+  metadata.gz: 78b583c758b2761c1722e3d70822ae254fc1fb45f3443d4b569d35bcbd2d69a5
+  data.tar.gz: '03608ec25c58034590834c322185adba375026292f0249d96cd8b1c29a8758a8'
 SHA512:
-  metadata.gz: d28c3632e64e82c2154c70366c6664c90f1cb9a9e84b3ef6082efcf0629cde1ab3003ee6985a048d2d21c5d699bf7a87ba15119e5ff4d8ec18a581d7e9dad7bc
-  data.tar.gz: f53f5dfeaabed9bb8d099809bae886f2b7b5cca0eb838e401f235257407cc9e8f7d386eab99d30577699b91f8110a7eda34126f059e3ea9b3a9d434fe0e8d775
+  metadata.gz: 182cca3495b2a000347eb9299c9981ecbbe8bbe464459dc1848293095a473f3153fbf611678bb2696a0811b052f6c6920b00b70e06a8176030381ad3ada6f048
+  data.tar.gz: 798d39dd7ada375219e5b45af40b82c2b45aa27ad1913b6eaa9ea239965ed8faf90d27bfe4532f3eca0975129a99e9700e896e2b26f0b96f726a80cabf356b8a

data/README.md

@@ -67,6 +67,7 @@ Commands:
   vote      Vote on the currently playing track
   playlist  Generate playlists
   config    Manage local configuration
+  log       Manage local like log
 
 
 ```

data/bin/radio

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

data/lib/audio_addict/cli.rb

@@ -12,6 +12,7 @@ module AudioAddict
       router.route 'vote',     to: Commands::VoteCmd
       router.route 'playlist', to: Commands::PlaylistCmd
       router.route 'config',   to: Commands::ConfigCmd
+      router.route 'log',      to: Commands::LogCmd
 
       router
     end

data/lib/audio_addict/commands/base.rb

@@ -12,14 +12,11 @@ module AudioAddict
           missing.push key unless Config.has_key? key
         end
 
-        if missing.any?
-          missing_keys = missing.map { |k| "- !txtblu!#{k}" }.join "\n"
-          raise ConfigError, "This operation requires some config parameters that are missing:\n#{missing_keys}" 
-        end
+        raise ConfigError, missing if missing.any?
       end
 
       def require_premium_account
-        raise PremiumAccount, "This operation requires a premium account" unless Config.premium
+        raise PremiumAccount unless Config.premium
       end
 
       def radio

data/lib/audio_addict/commands/channels.rb

@@ -8,7 +8,7 @@ module AudioAddict
       usage "radio channels [SEARCH]"
       usage "radio channels --help"
 
-      param "SEARCH", "Channel name or a partial name to search for."
+      param "SEARCH", "Channel name or a partial name to search for"
 
       example "radio channels"
       example "radio channels metal"

data/lib/audio_addict/commands/config.rb

@@ -8,7 +8,7 @@ module AudioAddict
       usage "radio config del KEY"
       usage "radio config show"
       usage "radio config edit"
-      usage "radio config keys"
+      usage "radio config guide"
       usage "radio config --help"
 
       param "KEY", "Config key"
@@ -17,12 +17,12 @@ module AudioAddict
       option "-s --show", "Show the contents of the config file"
       option "-e --edit", "Open the config file for editing"
 
-      command "get", "Show the value of this config key."
-      command "set", "Set the value of this config key."
-      command "del", "Delete the value of this config key."
-      command "show", "Show the entire config file contents."
-      command "edit", "Open the config file for editing."
-      command "keys", "Show a list of supported config keys and their purpose."
+      command "get", "Show the value of this config key"
+      command "set", "Set the value of this config key"
+      command "del", "Delete the value of this config key"
+      command "show", "Show the entire config file contents"
+      command "edit", "Open the config file for editing"
+      command "guide", "Show a list of supported config keys and their purpose"
 
       example "radio config edit"
       example "radio config set like_log ~/like.log"
@@ -64,7 +64,7 @@ module AudioAddict
         system "#{editor} #{Config.path}"
       end
 
-      def keys_command(args)
+      def guide_command(args)
         key_guide.each do |key, value|
           say "!txtgrn!#{key}"
           say word_wrap "  #{value}"

data/lib/audio_addict/commands/log.rb

@@ -0,0 +1,53 @@
+module AudioAddict
+  module Commands
+    class LogCmd < Base
+      summary "Manage local like log"
+
+      usage "radio log show"
+      usage "radio log tail [--lines N]"
+      usage "radio log sort"
+      usage "radio log --help"
+
+      option "-l --lines N", "Number of lines to show [default: 5]"
+
+      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"
+
+      example "radio log show"
+      example "radio log tail"
+      example "radio log tail --lines 10"
+      example "radio log sort"
+
+      def show_command(args)
+        setup
+        puts File.read(logfile)
+      end
+
+      def tail_command(args)
+        setup
+        lines = args['--lines'].to_i
+        puts File.readlines(logfile)[-lines..-1]
+      end
+
+      def sort_command(args)
+        setup
+        lines = File.readlines logfile
+        File.write logfile, lines.sort.join
+        say "!txtgrn!Sorted"
+      end
+
+    private
+
+      def setup
+        needs :like_log
+        raise Error, "File not found: #{logfile}" unless File.exist? logfile
+      end
+
+      def logfile
+        @logfile ||= Config.like_log
+      end
+
+    end
+  end
+end

data/lib/audio_addict/commands/login.rb

@@ -30,7 +30,7 @@ module AudioAddict
           radio.api.login user, pass
           resay "!txtgrn!Saved"
         else
-          say "!txtred!Aborted"
+          say "!txtred!Cancelled"
         end
       end
       

data/lib/audio_addict/commands/set.rb

@@ -69,7 +69,7 @@ module AudioAddict
           save_channel list.first.key
         else
           answer = channel_prompt list
-          save_channel(answer, echo: false) unless answer == :abort
+          save_channel(answer, echo: false) unless answer == :cancel
         end
       end
 
@@ -80,19 +80,19 @@ module AudioAddict
           save_network list.keys.first
         else
           answer = network_prompt list
-          save_network(answer, echo: false) unless answer == :abort
+          save_network(answer, echo: false) unless answer == :cancel
         end
       end
 
       def channel_prompt(channels)
         options = channels.map { |channel| ["#{channel.name.ljust 20} # #{channel.key}", channel.key] }.to_h
-        options = { "Abort" => :abort }.merge options
+        options = { "Cancel" => :cancel }.merge options
         prompt.select "Channel :", options, marker: '>', filter: true
       end
 
       def network_prompt(networks)
         options = networks.invert
-        options["Abort"] = :abort
+        options["Skip"] = :cancel
         prompt.select "Network :", options, marker: '>', filter: true
       end
 

data/lib/audio_addict/commands/vote.rb

@@ -5,16 +5,20 @@ module AudioAddict
 
       help "Start an interactive voting prompt for the currently playing track."
 
-      usage "radio vote"
+      usage "radio vote [--all]"
       usage "radio vote --help"
 
+      option "-a --all", "Show all voting options"
+
       def run(args)
         needs :network, :channel, :session_key
 
+        prompt_style = args['--all'] ? :menu : :simple
+
         NowCmd.new.run args
         puts ""
-        answer = get_user_vote
-        unless answer == :abort
+        answer = get_user_vote style: prompt_style
+        unless answer == :cancel
           say "Voting... "
           current_channel.vote answer
           resay "!txtgrn!Voted"
@@ -23,12 +27,25 @@ module AudioAddict
 
     private
 
-      def get_user_vote
+      def get_user_vote(style: :menu)
+        if style == :menu
+          menu_prompt
+        else
+          simple_prompt
+        end
+      end
+
+      def menu_prompt
         options = { "Like" => :up, "Dislike" => :down, 
-          "Unvote" => :delete, "Abort" => :abort }
+          "Unvote" => :delete, "Cancel" => :cancel }
         prompt.select "Your Vote :", options, marker: '>'
       end
 
+      def simple_prompt
+        like = prompt.yes? "Like?"
+        like ? :up : :cancel
+      end
+
     end
   end
 end

data/lib/audio_addict/exceptions.rb

@@ -2,9 +2,23 @@ module AudioAddict
   class Error < StandardError; end
   
   class Interrupt < Error; end
+
   class ArgumentError < Error; end
-  class ConfigError < Error; end
-  class PremiumAccount < Error; end
+
+  class ConfigError < Error
+    attr_reader :missing_keys
+
+    def initialize(missing_keys)
+      @missing_keys = missing_keys
+      super "Some parameters required by this operation are missing" 
+    end
+  end
+  
+  class PremiumAccount < Error
+    def initialize(message="This operation requires a premium account")
+      super
+    end
+  end
   
   class APIError < Error
     attr_reader :response

data/lib/audio_addict/version.rb

@@ -1,3 +1,3 @@
 module AudioAddict
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: audio_addict
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-01 00:00:00.000000000 Z
+date: 2018-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole
@@ -113,6 +113,7 @@ files:
 - lib/audio_addict/commands/base.rb
 - lib/audio_addict/commands/channels.rb
 - lib/audio_addict/commands/config.rb
+- lib/audio_addict/commands/log.rb
 - lib/audio_addict/commands/login.rb
 - lib/audio_addict/commands/now.rb
 - lib/audio_addict/commands/playlist.rb