nehm 1.5.4 → 1.5.5.1

data/lib/nehm/get.rb

@@ -1,101 +1,100 @@
 require 'taglib'
 
-# TrackUtils module responds to 'nehm get/dl ...' commands
-module Get
-  def self.[](get_or_dl, args)
-    # Processing arguments
-    options = [{ name: 'to', method: PathManager.method(:temp_dl_path=) },
-               { name: 'from', method: UserManager.method(:temp_user=) },
-               { name: 'playlist', method: PlaylistManager.method(:temp_playlist=) }]
+module Nehm
+  # Get module responds to 'nehm get/dl ...' commands
+  module Get
+    def self.[](get_or_dl, args)
+      # Processing arguments
+      options = [{ name: 'to', method: PathManager.method(:temp_dl_path=) },
+                 { name: 'from', method: UserManager.method(:temp_user=) },
+                 { name: 'playlist', method: PlaylistManager.method(:temp_playlist=) }]
 
-    options.each do |option|
-      if args.include? option[:name]
-        index = args.index(option[:name])
-        value = args[index + 1]
-        args.delete_at(index + 1)
-        args.delete_at(index)
+      options.each do |option|
+        if args.include? option[:name]
+          index = args.index(option[:name])
+          value = args[index + 1]
+          args.delete_at(index + 1)
+          args.delete_at(index)
 
-        option[:method].call(value)
+          option[:method].call(value)
+        end
       end
-    end
 
-    puts 'Getting information about track(s)'
-    user = UserManager.user
-    tracks = []
-    tracks +=
-      case args.last
-      when 'like'
-        user.likes(1)
-      when 'post'
-        user.posts(1)
-      when 'likes'
-        count = args[-2].to_i
-        user.likes(count)
-      when 'posts'
-        count = args[-2].to_i
-        user.posts(count)
-      when %r{https:\/\/soundcloud.com\/}
-        track_from_url(args.last)
-      when nil
-        puts Paint['You must provide option', :red]
-        puts "Input #{Paint['nehm help', :yellow]} for help"
-        exit
-      else
-        puts Paint["Invalid argument(s) '#{args.last}'", :red]
-        puts "Input #{Paint['nehm help', :yellow]} for help"
-        exit
-      end
+      puts 'Getting information about track(s)'
+      user = UserManager.user
+      tracks = []
+      tracks +=
+        case args.last
+        when 'like'
+          user.likes(1)
+        when 'post'
+          user.posts(1)
+        when 'likes'
+          count = args[-2].to_i
+          user.likes(count)
+        when 'posts'
+          count = args[-2].to_i
+          user.posts(count)
+        when %r{https:\/\/soundcloud.com\/}
+          track_from_url(args.last)
+        when nil
+          puts Paint['You must provide option', :red]
+          puts "Input #{Paint['nehm help', :yellow]} for help"
+          exit
+        else
+          puts Paint["Invalid argument(s) '#{args.last}'", :red]
+          puts "Input #{Paint['nehm help', :yellow]} for help"
+          exit
+        end
 
-    playlist = PlaylistManager.playlist
-    tracks.each do |track|
-      if track.streamable?
-        dl(track)
-        dl(track.artwork)
-        tag(track)
-        track.artwork.suicide
-        playlist.add_track(track.file_path) if playlist && get_or_dl == :get && !OS.linux?
-      else
-        puts "#{Paint['Track', :yellow]} #{Paint[track.name, :cyan]} #{Paint['undownloadable', :yellow]}"
-        puts 'Skip it'
+      tracks.each do |track|
+        if track.streamable?
+          dl(track)
+          dl(track.artwork)
+          tag(track)
+          track.artwork.suicide
+          PlaylistManager.playlist.add_track(track.file_path) if PlaylistManager.playlist && get_or_dl == :get && !OS.linux?
+        else
+          puts "#{Paint['Track', :yellow]} #{Paint[track.name, :cyan]} #{Paint['undownloadable', :yellow]}"
+        end
       end
-      puts "\n"
+      puts Paint['Done!', :green]
     end
-    puts Paint['Done!', :green]
-  end
 
-  module_function
+    module_function
 
-  def track_from_url(url)
-    hash = Client.get('/resolve', url: url)
-    [*Track.new(hash)]
-  end
+    def track_from_url(url)
+      hash = Client.get('/resolve', url: url)
+      [*Track.new(hash)]
+    end
 
-  def dl(arg)
-    puts 'Downloading ' + arg.name
-    path = arg.file_path
-    url = arg.url
-    command = "curl -# -o \"#{path}\" -L #{url}"
-    `#{command}`
-  end
+    def dl(arg)
+      puts 'Downloading ' + arg.name
+      path = arg.file_path
+      url = arg.url
+      command = "curl -# -o \"#{path}\" -L #{url}"
+      `#{command}`
+    end
 
-  def tag(track)
-    path = track.file_path
-    TagLib::MPEG::File.open(path) do |file|
-      puts 'Setting tags'
-      tag = file.id3v2_tag
-      tag.artist = track.artist
-      tag.title = track.title
-      tag.year = track.year
+    def tag(track)
+      path = track.file_path
+      TagLib::MPEG::File.open(path) do |file|
+        puts 'Setting tags'
+        tag = file.id3v2_tag
+        tag.artist = track.artist
+        tag.title = track.title
+        tag.year = track.year
 
-      # Adding artwork
-      apic = TagLib::ID3v2::AttachedPictureFrame.new
-      apic.mime_type = 'image/jpeg'
-      apic.description = 'Cover'
-      apic.type = TagLib::ID3v2::AttachedPictureFrame::FrontCover
-      apic.picture = File.open(track.artwork.file_path, 'rb') { |f| f.read }
-      tag.add_frame(apic)
+        # Adding artwork
+        apic = TagLib::ID3v2::AttachedPictureFrame.new
+        apic.mime_type = 'image/jpeg'
+        apic.description = 'Cover'
+        apic.type = TagLib::ID3v2::AttachedPictureFrame::FrontCover
+        apic.picture = File.open(track.artwork.file_path, 'rb') { |f| f.read }
+        tag.add_frame(apic)
 
-      file.save
+        file.save
+      end
     end
   end
 end

data/lib/nehm/help.rb

@@ -1,90 +1,93 @@
-# Help module responds to 'nehm help ...' command
-module Help
-  def self.available_commands
-    puts <<-HELP.gsub(/^ {6}/, '')
-      #{Paint['nehm', :green]} is a console tool, which downloads, sets IDv3 tags and adds to your iTunes library your SoundCloud posts or likes in convenient way
+module Nehm
+  # Help module responds to 'nehm help ...' command
+  module Help
+    def self.available_commands
+      puts <<-HELP.gsub(/^ {8}/, '')
+        #{Paint['nehm', :green]} is a console tool, which downloads, sets IDv3 tags and adds to your iTunes library your SoundCloud posts or likes in convenient way
 
-      #{Paint['Avalaible nehm commands:', :yellow]}
-        #{Paint['get', :green]}        Downloading, setting tags and adding to your iTunes library last post or like from your profile
-        #{Paint['dl', :green]}         Downloading and setting tags last post or like from your profile
-        #{Paint['configure', :green]}  Configuring application
+        #{Paint['Avalaible nehm commands:', :yellow]}
+          #{Paint['get', :green]}        Download, set tags and add to your iTunes library last post or like from your profile
+          #{Paint['dl', :green]}         Download and set tags last post or like from your profile
+          #{Paint['configure', :green]}  Configure application
+          #{Paint['version', :green]}    Show version of installed nehm
 
-      See #{Paint['nehm help [command]', :yellow]} to read about a specific subcommand
-    HELP
-  end
+        See #{Paint['nehm help [command]', :yellow]} to read about a specific subcommand
+      HELP
+    end
 
-  def self.show(command)
-    case command
-    when 'get', 'dl', 'configure', 'permalink'
-      Help.send(command)
-    when nil
-      Help.available_commands
-    else
-      puts Paint["Command '#{command}' doesn't exist", :red]
-      puts "\n"
-      Help.available_commands
+    def self.show(command)
+      case command
+      when 'get', 'dl', 'configure', 'permalink'
+        Help.send(command)
+      when nil
+        Help.available_commands
+      else
+        puts Paint["Command '#{command}' doesn't exist", :red]
+        puts "\n"
+        Help.available_commands
+      end
     end
-  end
 
-  module_function
+    module_function
 
-  def configure
-    puts <<-CONFIGURE.gsub(/^ {6}/, '')
-      #{Paint['Input:', :yellow]} nehm configure
+    def configure
+      puts <<-CONFIGURE.gsub(/^ {8}/, '')
+        #{Paint['Input:', :yellow]} nehm configure
 
-      #{Paint['Summary:', :yellow]}
-        Configuring nehm app
-      CONFIGURE
-  end
+        #{Paint['Summary:', :yellow]}
+          Configuring nehm app
+        CONFIGURE
+    end
 
-  def dl
-    puts <<-DL.gsub(/^ {6}/, '')
-      #{Paint['Input:', :yellow]} nehm dl OPTIONS [from PERMALINK] [to PATH_TO_DIRECTORY] [playlist ITUNES_PLAYLIST]
+    def dl
+      puts <<-DL.gsub(/^ {8}/, '')
+        #{Paint['Input:', :yellow]} nehm dl OPTIONS [from PERMALINK] [to PATH_TO_DIRECTORY] [playlist ITUNES_PLAYLIST]
 
-      #{Paint['Summary:', :yellow]}
-        Downloading tracks from SoundCloud and setting tags
+        #{Paint['Summary:', :yellow]}
+          Download tracks from SoundCloud and setting tags
 
-      #{Paint['OPTIONS:', :yellow]}
-        #{Paint['post', :green]}                       Do same with last post (track or repost) from your profile
-        #{Paint['<number> posts', :green]}             Do same with last <number> posts from your profile
-        #{Paint['like', :green]}                       Do same with your last like
-        #{Paint['<number> likes', :green]}             Do same with your last <number> likes
-        #{Paint['url', :magenta]}                        Do same with track from entered url
+        #{Paint['OPTIONS:', :yellow]}
+          #{Paint['post', :green]}                       Do same with last post (track or repost) from your profile
+          #{Paint['<number> posts', :green]}             Do same with last <number> posts from your profile
+          #{Paint['like', :green]}                       Do same with your last like
+          #{Paint['<number> likes', :green]}             Do same with your last <number> likes
+          #{Paint['url', :magenta]}                        Do same with track from entered url
 
-      #{Paint['Extra options:', :yellow]}
-        #{Paint['from PERMALINK', :green]}             Do aforecited operations from custom user profile
-        #{Paint['to PATH_TO_DIRECTORY', :green]}       Do aforecited operations to custom directory
-        #{Paint['to current', :green]}                 Do aforecited operations to current working directory
-        #{Paint['playlist ITUNES_PLAYLIST', :green]}   Do aforecited operations to custom iTunes playlist
-    DL
-  end
+        #{Paint['Extra options:', :yellow]}
+          #{Paint['from PERMALINK', :green]}             Do aforecited operations from custom user profile
+          #{Paint['to PATH_TO_DIRECTORY', :green]}       Do aforecited operations to custom directory
+          #{Paint['to current', :green]}                 Do aforecited operations to current working directory
+          #{Paint['playlist ITUNES_PLAYLIST', :green]}   Do aforecited operations to custom iTunes playlist
+      DL
+    end
 
-  def get
-    puts <<-GET.gsub(/^ {6}/, '')
-      #{Paint['Input:', :yellow]} nehm get OPTIONS [from PERMALINK] [to PATH_TO_DIRECTORY] [playlist ITUNES_PLAYLIST]
+    def get
+      puts <<-GET.gsub(/^ {8}/, '')
+        #{Paint['Input:', :yellow]} nehm get OPTIONS [from PERMALINK] [to PATH_TO_DIRECTORY] [playlist ITUNES_PLAYLIST]
 
-      #{Paint['Summary:', :yellow]}
-        Downloading tracks, setting tags and adding to your iTunes library tracks from Soundcloud
+        #{Paint['Summary:', :yellow]}
+          Download tracks, set tags and add to your iTunes library tracks from Soundcloud
 
-      #{Paint['OPTIONS:', :yellow]}
-        #{Paint['post', :green]}                       Do same with last post (track or repost) from your profile
-        #{Paint['<number> posts', :green]}             Do same with last <number> posts from your profile
-        #{Paint['like', :green]}                       Do same with your last like
-        #{Paint['<number> likes', :green]}             Do same with your last <number> likes
-        #{Paint['url', :magenta]}                        Do same with track from entered url
+        #{Paint['OPTIONS:', :yellow]}
+          #{Paint['post', :green]}                       Do same with last post (track or repost) from your profile
+          #{Paint['<number> posts', :green]}             Do same with last <number> posts from your profile
+          #{Paint['like', :green]}                       Do same with your last like
+          #{Paint['<number> likes', :green]}             Do same with your last <number> likes
+          #{Paint['url', :magenta]}                        Do same with track from entered url
 
-      #{Paint['Extra options:', :yellow]}
-        #{Paint['from PERMALINK', :green]}             Do aforecited operations from profile with PERMALINK
-        #{Paint['to PATH_TO_DIRECTORY', :green]}       Do aforecited operations to custom directory
-        #{Paint['to current', :green]}                 Do aforecited operations to current working directory
-        #{Paint['playlist ITUNES_PLAYLIST', :green]}   Do aforecited operations to custom iTunes playlist
-    GET
-  end
+        #{Paint['Extra options:', :yellow]}
+          #{Paint['from PERMALINK', :green]}             Do aforecited operations from profile with PERMALINK
+          #{Paint['to PATH_TO_DIRECTORY', :green]}       Do aforecited operations to custom directory
+          #{Paint['to current', :green]}                 Do aforecited operations to current working directory
+          #{Paint['playlist ITUNES_PLAYLIST', :green]}   Do aforecited operations to custom iTunes playlist
+      GET
+    end
 
-  def permalink
-    puts <<-PERM.gsub(/^ {6}/, '')
-      Permalink is the last word in your profile url
-      Example: for profile url #{Paint['soundcloud.com/qwerty', :magenta]} permalink is #{Paint['qwerty', :magenta]}
-    PERM
+    def permalink
+      puts <<-PERM.gsub(/^ {8}/, '')
+        Permalink is the last word in your profile url
+        Example: for profile url #{Paint['soundcloud.com/qwerty', :magenta]} permalink is #{Paint['qwerty', :magenta]}
+      PERM
+    end
   end
 end

data/lib/nehm/os.rb

@@ -1,6 +1,8 @@
 require 'rbconfig'
-module OS
-  def self.linux?
-    RbConfig::CONFIG['host_os'] =~ /linux/ ? true : false
+module Nehm
+  module OS
+    def self.linux?
+      RbConfig::CONFIG['host_os'] =~ /linux/ ? true : false
+    end
   end
 end

data/lib/nehm/path_manager.rb

@@ -1,69 +1,71 @@
-module PathManager
-  def self.dl_path
-    @temp_dl_path || default_dl_path
-  end
+module Nehm
+  module PathManager
+    def self.dl_path
+      @temp_dl_path || default_dl_path
+    end
 
-  def self.set_dl_path
-    loop do
-      default_path = File.join(ENV['HOME'], '/Music')
-      path_ask = 'Enter path to desirable download directory'
+    def self.set_dl_path
+      loop do
+        default_path = File.join(ENV['HOME'], '/Music')
+        ask_sentence = 'Enter path to desirable download directory'
 
-      if Dir.exist?(default_path)
-        path_ask << " (press enter to set it to #{Paint[default_path, :magenta]})"
-      else
-        default_path = nil
-      end
+        if Dir.exist?(default_path)
+          ask_sentence << " (press enter to set it to #{Paint[default_path, :magenta]})"
+        else
+          default_path = nil
+        end
 
-      path = HighLine.new.ask(path_ask + ':')
+        path = HighLine.new.ask(ask_sentence + ':')
 
-      # If user press enter (set path to default)
-      path = default_path if path == '' && default_path
+        # If user press enter, set path to default
+        path = default_path if path == '' && default_path
 
-      # If tilde at top of the line of path
-      path = PathManager.tilde_to_home(path) if PathManager.tilde_at_top?(path)
+        # If tilde at top of the line of path
+        path = PathManager.tilde_to_home(path) if PathManager.tilde_at_top?(path)
 
-      if Dir.exist?(path)
-        Cfg[:dl_path] = path
-        puts Paint["Download directory set up to #{Paint[path, :magenta]}", :green]
-        break
-      else
-        puts Paint["This directory doesn't exist. Please enter correct path", :red]
+        if Dir.exist?(path)
+          Cfg[:dl_path] = path
+          puts Paint["Download directory set up to #{Paint[path, :magenta]}", :green]
+          break
+        else
+          puts Paint["This directory doesn't exist. Please enter correct path", :red]
+        end
       end
     end
-  end
 
-  def self.temp_dl_path=(path)
-    # If 'to ~/../..' entered
-    path = tilde_to_home(path) if tilde_at_top?(path)
+    def self.temp_dl_path=(path)
+      # If 'to ~/../..' entered
+      path = tilde_to_home(path) if tilde_at_top?(path)
 
-    # If 'to current' entered
-    path = Dir.pwd if path == 'current'
+      # If 'to current' entered
+      path = Dir.pwd if path == 'current'
 
-    if Dir.exist?(path)
-      @temp_dl_path = path
-    else
-      puts Paint['Invalid download path! Please enter correct path', :red]
-      exit
+      if Dir.exist?(path)
+        @temp_dl_path = path
+      else
+        puts Paint['Invalid download path! Please enter correct path', :red]
+        exit
+      end
     end
-  end
 
-  module_function
+    module_function
 
-  def default_dl_path
-    if Cfg[:dl_path]
-      Cfg[:dl_path]
-    else
-      puts Paint["You don't set up download path!", :red]
-      puts "Set it up from #{Paint['nehm configure', :yellow]} or use #{Paint['[to PATH_TO_DIRECTORY]', :yellow]} option"
-      exit
+    def default_dl_path
+      if Cfg[:dl_path]
+        Cfg[:dl_path]
+      else
+        puts Paint["You don't set up download path!", :red]
+        puts "Set it up from #{Paint['nehm configure', :yellow]} or use #{Paint['[to PATH_TO_DIRECTORY]', :yellow]} option"
+        exit
+      end
     end
-  end
 
-  def tilde_at_top?(path)
-    path[0] == '~'
-  end
+    def tilde_at_top?(path)
+      path[0] == '~'
+    end
 
-  def tilde_to_home(path)
-    File.join(ENV['HOME'], path[1..-1])
+    def tilde_to_home(path)
+      File.join(ENV['HOME'], path[1..-1])
+    end
   end
 end