nehm 1.5.6.2 → 1.6.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nehm
 version: !ruby/object:Gem::Version
-  version: 1.5.6.2
+  version: 1.6.1
 platform: ruby
 authors:
 - Albert Nigmatzianov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogy
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: certifi
   requirement: !ruby/object:Gem::Requirement
@@ -39,47 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
-  name: paint
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: soundcloud
   requirement: !ruby/object:Gem::Requirement
@@ -133,15 +133,21 @@ files:
 - lib/nehm/artwork.rb
 - lib/nehm/cfg.rb
 - lib/nehm/client.rb
-- lib/nehm/configure.rb
-- lib/nehm/get.rb
-- lib/nehm/help.rb
+- lib/nehm/command.rb
+- lib/nehm/command_manager.rb
+- lib/nehm/commands/configure_command.rb
+- lib/nehm/commands/dl_command.rb
+- lib/nehm/commands/get_command.rb
+- lib/nehm/commands/help_command.rb
+- lib/nehm/commands/version_command.rb
+- lib/nehm/option_parser.rb
 - lib/nehm/os.rb
 - lib/nehm/path_manager.rb
 - lib/nehm/playlist.rb
 - lib/nehm/playlist_manager.rb
 - lib/nehm/track.rb
-- lib/nehm/user.rb
+- lib/nehm/tracks.rb
+- lib/nehm/ui.rb
 - lib/nehm/user_manager.rb
 - lib/nehm/version.rb
 - nehm.gemspec
@@ -165,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Convenient way to download tracks from SoundCloud via terminal

data/lib/nehm/configure.rb

@@ -1,24 +0,0 @@
-module Nehm
-  # Configure module responds to 'nehm configure' command
-  module Configure
-    def self.menu
-      loop do
-        puts "Download path: #{Paint[Cfg[:dl_path], :magenta]}" if Cfg[:dl_path]
-        puts "Permalink: #{Paint[Cfg[:permalink], :cyan]}" if Cfg[:permalink]
-        puts "iTunes playlist: #{Paint[PlaylistManager.playlist, :cyan]}" if !OS.linux? && PlaylistManager.playlist
-        puts "\n"
-
-        HighLine.new.choose do |menu|
-          menu.prompt = Paint['Choose setting', :yellow]
-
-          menu.choice('Edit download path'.freeze) { PathManager.set_dl_path }
-          menu.choice('Edit permalink'.freeze) { UserManager.log_in }
-          menu.choice('Edit iTunes playlist'.freeze) { PlaylistManager.set_playlist } unless OS.linux?
-          menu.choice('Exit'.freeze) { puts 'Goodbye!'; exit }
-        end
-        sleep(1)
-        puts "\n"
-      end
-    end
-  end
-end

data/lib/nehm/get.rb

@@ -1,100 +0,0 @@
-require 'taglib'
-
-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)
-
-          option[:method].call(value)
-        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
-
-      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 Paint['Done!', :green]
-    end
-
-    module_function
-
-    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 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)
-
-        file.save
-      end
-    end
-  end
-end

data/lib/nehm/help.rb

@@ -1,93 +0,0 @@
-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]}        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
-
-    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
-
-    module_function
-
-    def configure
-      puts <<-CONFIGURE.gsub(/^ {8}/, '')
-        #{Paint['Input:', :yellow]} nehm configure
-
-        #{Paint['Summary:', :yellow]}
-          Configuring nehm app
-        CONFIGURE
-    end
-
-    def dl
-      puts <<-DL.gsub(/^ {8}/, '')
-        #{Paint['Input:', :yellow]} nehm dl OPTIONS [from PERMALINK] [to PATH_TO_DIRECTORY] [playlist ITUNES_PLAYLIST]
-
-        #{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['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(/^ {8}/, '')
-        #{Paint['Input:', :yellow]} nehm get OPTIONS [from PERMALINK] [to PATH_TO_DIRECTORY] [playlist ITUNES_PLAYLIST]
-
-        #{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['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(/^ {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/user.rb

@@ -1,81 +0,0 @@
-require 'json'
-require 'faraday'
-
-module Nehm
-  class User
-    # Max limit of tracks for correct SoundCloud requests
-    SOUNDCLOUD_MAX_LIMIT = 180
-
-    def initialize(id)
-      @id = id
-    end
-
-    def likes(count)
-      # Method to_i return 0, if there aren't any numbers in string
-      if count == 0
-        puts Paint['Invalid number of likes!', :red]
-        exit
-      end
-
-      d = count / SOUNDCLOUD_MAX_LIMIT
-      m = count % SOUNDCLOUD_MAX_LIMIT
-      d = m == 0 ? d : d + 1
-
-      likes = []
-      d.times do |i|
-        limit = count > SOUNDCLOUD_MAX_LIMIT ? SOUNDCLOUD_MAX_LIMIT : count
-        count -= SOUNDCLOUD_MAX_LIMIT
-
-        likes += Client.get("/users/#{@id}/favorites?limit=#{limit}&offset=#{(i)*SOUNDCLOUD_MAX_LIMIT}")
-      end
-
-      if likes.empty?
-        puts Paint['There are no likes yet :(', :red]
-        exit
-      end
-
-      likes.map! { |hash| Track.new(hash) }
-    end
-
-    # Post is last track/repost in profile
-    def posts(count)
-      # Method to_i return 0, if there aren't any numbers in string
-      if count == 0
-        puts Paint['Invalid number of posts!', :red]
-        exit
-      end
-
-      d = count / SOUNDCLOUD_MAX_LIMIT
-      m = count % SOUNDCLOUD_MAX_LIMIT
-      d = m == 0 ? d : d + 1
-
-      # Official SC API wrapper doesn't support posts
-      # So I should get posts by HTTP requests
-      conn = Faraday.new(url: 'https://api-v2.soundcloud.com/')
-
-      posts = []
-      d.times do |i|
-        limit = count > SOUNDCLOUD_MAX_LIMIT ? SOUNDCLOUD_MAX_LIMIT : count
-        count -= SOUNDCLOUD_MAX_LIMIT
-
-        response = conn.get("/profile/soundcloud:users:#{@id}?limit=#{limit}&offset=#{i*SOUNDCLOUD_MAX_LIMIT}")
-        parsed = JSON.parse(response.body)
-        collection = parsed['collection']
-
-        break if collection.nil?
-
-        posts += collection
-      end
-
-      if posts.empty?
-        puts Paint['There are no posts yet :(', :red]
-        exit
-      end
-
-      rejected = posts.reject! { |hash| hash['type'] == 'playlist' }
-      puts Paint["Was skipped #{rejected.length} playlist(s) (nehm doesn't download playlists)", :yellow] if rejected
-
-      posts.map! { |hash| Track.new(hash['track']) }
-    end
-  end
-end