nehm 1.3.3 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bf19dcd813d15eaaa99341e35776f10b4659c34
-  data.tar.gz: a569b37fb0261e6b873b4080cc94934e4d95a4aa
+  metadata.gz: 720165cf1bb886b479357651ef70597a724ae003
+  data.tar.gz: 2189aad4a535796a4099e127c50bb3aef11410e6
 SHA512:
-  metadata.gz: 4a10ba0e6aa0dfe912de49f81bbcb57d9844768946ad65edab9e50ac73c35c53f9c34517c5557ebdb7533e3a4d1fef348cf487e50695d86167c612e13e8d0925
-  data.tar.gz: 6870f0928cea34964ae4cae6123e47cc410cc96e156869e531898edcfa62585884eb243ce79af9c8f5a7f8e65f628eed537df87bc74e5ff8d8d010ff47ab17b9
+  metadata.gz: 2b735c675fc41539522eab2707028d34d65f823a9c7cb6c634a61aff9c49237e0d706208595b355f5aa71b28543c587edd3492061e82aaa0b4f14d3f91ae5007
+  data.tar.gz: 3b329df0e0171250dfa45f5906f2f2a00ae31efea6063c3e43986e32d173d5e704e4c464f64623ba3323e9674fd840443477121b93b6f36d29879f6461d96228

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # nehm change log
 
+## 1.4.2
+
+* Fix: app fails if you didn't set up playlist (again)
+
+## 1.4.1
+
+* Fix: app fails if you didn't set up playlist
+
+## 1.4
+
+* Now nehm can automatically add track to iTunes playlist. Enter `nehm configure` to set it up
+* Also you can download tracks with custom iTunes playlist with `playlist PLAYLIST` feature. See the 'Usage' for instructions
+* Handle more errors
+* Update `nehm help` command:
+  * Add 'Summary' article
+  * Convenient read improvements
+* Edit warning messages
+* Minor improvements and fixes
+
 ## 1.3.3
 
 * Add `to current` feature

data/README.md

@@ -66,11 +66,15 @@ Go to usage for further instructions
 
   `nehm get post from nasa` or `nehm dl like from bogem`
 
-* To get tracks to custom directory
+* To get tracks to another directory
 
   `nehm get post from nasa to ~/Downloads` or `nehm dl like from bogem to current`
 
-  (if you type *..to current*, nehm will get track to current working directory)
+  *(if you type `to current`, nehm will get track to current working directory)*
+
+* To get tracks to another playlist
+
+  `nehm get post playlist MyPlaylist`
 
 * And of course you can get or download track from url
 
@@ -92,12 +96,16 @@ Go to usage for further instructions
 
 **Q: What is permalink?**
 
-A: Permalink is the last word in your profile url. Example: for profile url 'soundcloud.com/qwerty' permalink is 'qwerty'
+A: Permalink is the last word in your profile url. **Example:** for profile url ***soundcloud.com/qwerty*** permalink is ***qwerty***
 
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/bogem/nehm.
 
+## License
+
+MIT License
+
 ## Links
 
 My SoundCloud profile: https://soundcloud.com/bogem

data/lib/nehm/applescript.rb

@@ -0,0 +1,17 @@
+module AppleScript
+  def self.add_track_to_playlist(track_path, playlist_name)
+    `osascript #{script_path(:add_track_to_playlist)} #{track_path} #{playlist_name} > /dev/null`
+  end
+
+  def self.list_of_playlists
+    output = `osascript #{script_path(:list_of_playlists)}`
+    output.chomp.split(', ')
+  end
+
+  module_function
+
+  def script_path(script_name)
+    applescripts_path = File.expand_path('applescripts', __dir__)
+    File.join(applescripts_path, "#{script_name.to_s}.applescript")
+  end
+end

data/lib/nehm/applescripts/add_track_to_playlist.applescript

@@ -0,0 +1,10 @@
+on run argv
+	set posixFile to first item of argv
+	set playlistName to second item of argv
+
+	tell application "iTunes"
+		set p to posixFile
+		set a to (p as POSIX file)
+		add a to playlist playlistName
+	end tell
+end run

data/lib/nehm/applescripts/list_of_playlists.applescript

@@ -0,0 +1,3 @@
+tell application "iTunes"
+  get name of playlists
+end tell

data/lib/nehm/client.rb

@@ -1,9 +1,10 @@
+require 'certifi'
 require 'soundcloud'
 
 # Just a Soundcloud API client.
 module Client
   # Set a SSL certificate file path for SC API
-  ENV['SSL_CERT_FILE'] = File.join(__dir__, 'cacert.pem')
+  ENV['SSL_CERT_FILE'] = Certifi.where
 
   # SoundCloud API client ID
   CLIENT_ID = '11a37feb6ccc034d5975f3f803928a32'

data/lib/nehm/configure.rb

@@ -2,20 +2,38 @@
 module Configure
   def self.menu
     loop do
-      puts 'Download path: ' + Paint[PathControl.dl_path, :magenta] if PathControl.dl_path
-      puts 'iTunes path: ' + Paint[PathControl.itunes_path_name, :magenta] if PathControl.itunes_path
-      puts 'Permalink: ' + Paint[Config[:permalink], :cyan] if Config[:permalink]
+      output = ''
+      options = [['Download path', Config[:dl_path], :magenta],
+                 ['Permalink', Config[:permalink], :cyan],
+                 ['iTunes path', PathControl.itunes_root_path, :magenta],
+                 ['iTunes playlist', PlaylistControl.playlist, :cyan]]
+
+      options.each do |option|
+        # option[0] - name
+        # option[1] - value
+        # option[2] - color
+        output << option[0] + ': '
+        output <<
+          unless option[1].nil? && option[1].to_s.empty?
+            Paint[option[1], option[2]]
+          else
+            Paint["doesn't set up", 'gold']
+          end
+        output << "\n"
+      end
+
+      puts output
       puts "\n"
 
       HighLine.new.choose do |menu|
         menu.prompt = Paint['Choose setting', :yellow]
 
         menu.choice('Edit download path'.freeze) { PathControl.set_dl_path }
-        menu.choice('Edit itunes path'.freeze) { PathControl.set_itunes_path } unless OS.linux?
         menu.choice('Edit permalink'.freeze) { UserControl.log_in }
-        menu.choice('Exit'.freeze) { exit }
+        menu.choice('Edit iTunes path'.freeze) { PathControl.set_itunes_path } unless OS.linux?
+        menu.choice('Edit iTunes playlist'.freeze) { PlaylistControl.set_playlist } unless OS.linux?
+        menu.choice('Exit'.freeze) { puts 'Goodbye!'; exit }
       end
-      sleep(1)
       puts "\n"
     end
   end

data/lib/nehm/get.rb

@@ -4,35 +4,27 @@ require 'fileutils'
 # TrackUtils module responds to 'nehm get/dl ...' commands
 module Get
   def self.[](get_or_dl, args)
-    user =
-      # If option 'from ...' typed
-      if args.include? 'from'
-        index = args.index('from')
-        permalink = args[index + 1]
+    # Processing arguments
+    # Using arrays instead of hashes to improve performance
+    options = [['to', PathControl, :temp_dl_path=],
+               ['from', UserControl, :temp_user=],
+               ['playlist', PlaylistControl, :temp_playlist=]]
+
+    options.each do |option|
+      # option[0] - option name
+      # option[1] - module
+      # option[2] - setter method
+      if args.include? option[0]
+        index = args.index(option[0])
+        value = args[index + 1]
         args.delete_at(index + 1)
         args.delete_at(index)
 
-        UserControl.user(permalink)
-      else
-        UserControl.default_user
+        option[1].send(option[2], value)
       end
-
-    # If option 'to ...' typed
-    if args.include? 'to'
-      index = args.index('to')
-      path = args[index + 1]
-      args.delete_at(index + 1)
-      args.delete_at(index)
-
-      # If 'to ~/../..' typed
-      path = PathControl.tilde_to_home(path) if PathControl.tilde_at_top?(path)
-
-      # If 'to current' typed
-      path = Dir.pwd if path == 'current'
-
-      PathControl.temp_dl_path = path
     end
 
+    user = UserControl.user
     tracks = []
     tracks +=
       case args.last
@@ -54,11 +46,31 @@ module Get
         exit
       end
 
+    # Check if iTunes path set up
+    if !PathControl.itunes_path && get_or_dl == :get && !OS.linux?
+      puts Paint["You don't set up iTunes path!", :yellow]
+      puts "Your track won't add to iTunes library"
+      itunes_set_up = false
+    else
+      itunes_set_up = true
+    end
+
+    # Check if iTunes playlist set up
+    playlist = PlaylistControl.playlist
+    if !playlist && !playlist.to_s.empty? && get_or_dl == :get && !OS.linux?
+      puts Paint["You don't set up iTunes playlist!", :yellow]
+      puts "Your track won't add to iTunes playlist"
+    end
+
     tracks.each do |track|
       dl(track)
       dl(track.artwork)
       tag(track)
-      cp(track) unless (get_or_dl == :dl) || (OS.linux?)
+      if itunes_set_up && !OS.linux? && get_or_dl == :get
+        cp(track)
+        wait_while_itunes_add_track_to_lib(track) unless playlist.to_s.empty?
+        playlist.add_track(track.file_path) unless playlist.to_s.empty?
+      end
       track.artwork.suicide
     end
     puts Paint['Done!', :green]
@@ -76,7 +88,7 @@ module Get
     path = arg.file_path
     url = arg.url
     command = "curl -# -o '" + path + "' -L " + url
-    system(command)
+    `#{command}`
   end
 
   def tag(track)
@@ -104,4 +116,11 @@ module Get
     puts 'Adding to iTunes library'
     FileUtils.cp(track.file_path, PathControl.itunes_path)
   end
+
+  # Check when iTunes will add track to its library from 'Auto' directory
+  def wait_while_itunes_add_track_to_lib(track)
+    loop do
+      break unless File.exist?(File.join(PathControl.itunes_path, track.file_name))
+    end
+  end
 end

data/lib/nehm/help.rb

@@ -26,38 +26,46 @@ module Help
   def configure
     puts Paint['Input: ', :yellow] + 'nehm configure'
     puts "\n"
-    puts Paint['Available options:', :yellow]
-    puts '  No options'
+    puts Paint['Summary:', :yellow]
+    puts '  Configuring nehm app'
   end
 
   def dl
-    puts Paint['Input: ', :yellow] + 'nehm dl OPTIONS [from PERMALINK] [to PATHTODIRECTORY]'
+    puts Paint['Input: ', :yellow] + 'nehm dl OPTIONS [from PERMALINK] [to PATH_TO_DIRECTORY] [playlist ITUNES_PLAYLIST]'
+    puts "\n"
+    puts Paint['Summary:', :yellow]
+    puts '  Downloading tracks from SoundCloud and setting tags'
     puts "\n"
     puts Paint['OPTIONS:', :yellow]
-    puts '  ' + Paint['post', :green]            + ' - Downloading and setting tags last post(track or repost) from your profile'
-    puts '  ' + Paint['<number> posts', :green]  + ' - Downloading and setting tags last <number> posts from your profile'
-    puts '  ' + Paint['like', :green]            + ' - Downloading and setting tags your last like'
-    puts '  ' + Paint['<number> likes', :green]  + ' - Downloading and setting tags your last <number> likes'
+    puts '  ' + Paint['post', :green] + '                       Do same with last post (track or repost) from your profile'
+    puts '  ' + Paint['<number> posts', :green] + '             Do same with last <number> posts from your profile'
+    puts '  ' + Paint['like', :green] + '                       Do same with tags your last like'
+    puts '  ' + Paint['<number> likes', :green] + '             Do same with tags your last <number> likes'
     puts "\n"
     puts Paint['Extra options:', :yellow]
-    puts '  ' + Paint['from PERMALINK', :green]     + ' - Do the aforecited operations from custom user profile'
-    puts '  ' + Paint['to PATHTODIRECTORY', :green] + ' - Do the aforecited operations to custom directory'
-    puts '  ' + Paint['to current', :green]         + ' - Do the aforecited operations to current working directory'
+    puts '  ' + Paint['from PERMALINK', :green] + '             Do aforecited operations from custom user profile'
+    puts '  ' + Paint['to PATH_TO_DIRECTORY', :green] + '       Do aforecited operations to custom directory'
+    puts '  ' + Paint['to current', :green] + '                 Do aforecited operations to current working directory'
+    puts '  ' + Paint['playlist ITUNES_PLAYLIST', :green] + '   Do aforecited operations to custom iTunes playlist'
   end
 
   def get
-    puts Paint['Input: ', :yellow] + 'nehm get OPTIONS [from PERMALINK] [to PATHTODIRECTORY]'
+    puts Paint['Input: ', :yellow] + 'nehm get OPTIONS [from PERMALINK] [to PATH_TO_DIRECTORY] [playlist ITUNES_PLAYLIST]'
+    puts "\n"
+    puts Paint['Summary:', :yellow]
+    puts '  Downloading tracks, setting tags and adding to your iTunes library tracks from Soundcloud'
     puts "\n"
     puts Paint['OPTIONS:', :yellow]
-    puts '  ' + Paint['post', :green]            + ' - Downloading, setting tags and adding to your iTunes library last post(track or repost) from your profile'
-    puts '  ' + Paint['<number> posts', :green]  + ' - Downloading, setting tags and adding to your iTunes library last <number> posts from your profile'
-    puts '  ' + Paint['like', :green]            + ' - Downloading, setting tags and adding to your iTunes library your last like'
-    puts '  ' + Paint['<number> likes', :green]  + ' - Downloading, setting tags and adding to your iTunes library your last <number> likes'
+    puts '  ' + Paint['post', :green] + '                       Do same with last post (track or repost) from your profile'
+    puts '  ' + Paint['<number> posts', :green] + '             Do same with last <number> posts from your profile'
+    puts '  ' + Paint['like', :green] + '                       Do same with your last like'
+    puts '  ' + Paint['<number> likes', :green] + '             Do same with your last <number> likes'
     puts "\n"
     puts Paint['Extra options:', :yellow]
-    puts '  ' + Paint['from PERMALINK', :green]     + ' - Do the aforecited operations from profile with PERMALINK'
-    puts '  ' + Paint['to PATHTODIRECTORY', :green] + ' - Do the aforecited operations to custom directory'
-    puts '  ' + Paint['to current', :green]         + ' - Do the aforecited operations to current working directory'
+    puts '  ' + Paint['from PERMALINK', :green] + '             Do aforecited operations from profile with PERMALINK'
+    puts '  ' + Paint['to PATH_TO_DIRECTORY', :green] + '       Do aforecited operations to custom directory'
+    puts '  ' + Paint['to current', :green] + '                 Do aforecited operations to current working directory'
+    puts '  ' + Paint['playlist ITUNES_PLAYLIST', :green] + '   Do aforecited operations to custom iTunes playlist'
   end
 
   def permalink

data/lib/nehm/path_control.rb

@@ -1,6 +1,8 @@
-class PathControl
+module PathControl
+  attr_reader :temp_dl_path
+
   def self.dl_path
-    @temp_dl_path || Config[:dl_path]
+    @temp_dl_path || default_dl_path
   end
 
   def self.set_dl_path
@@ -24,16 +26,22 @@ class PathControl
         puts Paint["Download directory set up to #{Paint[path, :magenta]}", :green]
         break
       else
-        puts Paint["This directory doesn't exist. Please enter path again", :red]
+        puts Paint["This directory doesn't exist. Please enter correct path", :red]
       end
     end
   end
 
   def self.temp_dl_path=(path)
+    # If 'to ~/../..' entered
+    path = PathControl.tilde_to_home(path) if PathControl.tilde_at_top?(path)
+
+    # If 'to current' entered
+    path = Dir.pwd if path == 'current'
+
     if Dir.exist?(path)
       @temp_dl_path = path
     else
-      puts Paint['Invalid path!', :red]
+      puts Paint['Invalid download path! Please enter correct path', :red]
       exit
     end
   end
@@ -43,7 +51,7 @@ class PathControl
   end
 
   # Use in Configure.menu
-  def self.itunes_path_name
+  def self.itunes_root_path
     PathControl.itunes_path.sub("/iTunes\ Media/Automatically\ Add\ to\ iTunes.localized", '')
   end
 
@@ -67,16 +75,21 @@ class PathControl
 
       if Dir.exist?(path)
         Config[:itunes_path] = path
-        puts Paint["iTunes directory set up to #{Paint[path, :magenta]}", :green]
+        puts Paint["iTunes directory set up to #{Paint[PathControl.itunes_root_path, :magenta]}", :green]
         break
       else
-        puts Paint["This directory doesn't exist. Please enter path again", :red]
+        puts Paint["This directory doesn't exist. Please enter correct path", :red]
       end
     end
   end
 
   def self.set_itunes_path_to_default
-    Config[:itunes_path] = File.join(ENV['HOME'], "/Music/iTunes/iTunes\ Media/Automatically\ Add\ to\ iTunes.localized")
+    itunes_path = File.join(ENV['HOME'], "/Music/iTunes/iTunes\ Media/Automatically\ Add\ to\ iTunes.localized")
+    if Dir.exist?(itunes_path)
+      Config[:itunes_path] = itunes_path
+    else
+      puts Paint["Don't know where your iTunes path. Set it up manually from ", 'gold'] + Paint['nehm configure', :yellow]
+    end
   end
 
   def self.tilde_to_home(path)
@@ -84,6 +97,18 @@ class PathControl
   end
 
   def self.tilde_at_top?(path)
-    path[0] == '~' ? true : false
+    path[0] == '~'
+  end
+
+  module_function
+
+  def default_dl_path
+    if Config[:dl_path]
+      Config[: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

data/lib/nehm/playlist.rb

@@ -0,0 +1,16 @@
+class Playlist
+  attr_reader :name
+
+  def initialize(name)
+    @name = name
+  end
+
+  def add_track(track_path)
+    puts 'Adding to playlist'
+    AppleScript.add_track_to_playlist(track_path, @name)
+  end
+
+  def to_s
+    @name
+  end
+end

data/lib/nehm/playlist_control.rb

@@ -0,0 +1,37 @@
+module PlaylistControl
+  def self.playlist
+    if @temp_playlist
+      @temp_playlist
+    elsif !Config[:playlist].nil?
+      Playlist.new(Config[:playlist])
+    end
+  end
+
+  def self.set_playlist
+    loop do
+      playlist = HighLine.new.ask('Enter name of default iTunes playlist to which you want add tracks (press Enter to unset default playlist)')
+      if playlist == ''
+        Config[:playlist] = ''
+        puts Paint['Default iTunes playlist unset', :green]
+        break
+      end
+
+      if AppleScript.list_of_playlists.include? playlist
+        Config[:playlist] = playlist
+        puts Paint["Default iTunes playlist set up to #{playlist}", :green]
+        break
+      else
+        puts Paint['Invalid playlist name. Please enter correct name', :red]
+      end
+    end
+  end
+
+  def self.temp_playlist=(playlist)
+    if AppleScript.list_of_playlists.include? playlist
+      @temp_playlist = Playlist.new(playlist)
+    else
+      puts Paint['Invalid playlist name. Please enter correct name', :red]
+      exit
+    end
+  end
+end

data/lib/nehm/track.rb

@@ -19,7 +19,7 @@ class Track
   end
 
   def file_name
-    "#{name}.mp3".tr('/', '')
+    "#{name}.mp3".tr('/ ', '')
   end
 
   def file_path

data/lib/nehm/user_control.rb

@@ -1,13 +1,4 @@
 module UserControl
-  def self.default_user
-    if UserControl.logged_in?
-      User.new(Config[:default_id])
-    else
-      puts Paint["You didn't logged in", :red]
-      puts "Input #{Paint['nehm configure', :yellow]} to login"
-      exit
-    end
-  end
 
   def self.logged_in?
     Config.key?(:default_id)
@@ -29,18 +20,32 @@ module UserControl
     end
   end
 
-  def self.user(permalink)
+  def self.temp_user=(permalink)
     if user_exist?(permalink)
       user = Client.get('/resolve', url: "https://soundcloud.com/#{permalink}")
-      User.new(user.id)
+      @temp_user = User.new(user.id)
     else
       puts Paint['Invalid permalink. Please enter correct permalink', :red]
       exit
     end
   end
 
+  def self.user
+    @temp_user || default_user
+  end
+
   module_function
 
+  def default_user
+    if UserControl.logged_in?
+      User.new(Config[:default_id])
+    else
+      puts Paint["You didn't logged in", :red]
+      puts "Login from #{Paint['nehm configure', :yellow]} or use #{Paint['[from PERMALINK]', :yellow]} option"
+      exit
+    end
+  end
+
   def user_exist?(permalink)
     Client.get('/resolve', url: "https://soundcloud.com/#{permalink}")
 

data/lib/nehm/version.rb

@@ -1,3 +1,3 @@
 module Nehm
-  VERSION = '1.3.3'.freeze
+  VERSION = '1.4.2'.freeze
 end

data/lib/nehm.rb

@@ -1,6 +1,7 @@
 require 'highline'
 require 'paint'
 
+require 'nehm/applescript'
 require 'nehm/artwork'
 require 'nehm/config'
 require 'nehm/configure'
@@ -9,6 +10,8 @@ require 'nehm/get'
 require 'nehm/help'
 require 'nehm/os'
 require 'nehm/path_control'
+require 'nehm/playlist'
+require 'nehm/playlist_control'
 require 'nehm/track'
 require 'nehm/user'
 require 'nehm/user_control'
@@ -31,6 +34,10 @@ module App
       puts Paint['Invalid command', :red]
       puts "Input #{Paint['nehm help', :yellow]} for all avalaible commands"
     end
+
+    # SIGINT
+    rescue Interrupt
+      puts "\nGoodbye!"
   end
 
   module_function
@@ -43,7 +50,13 @@ module App
     PathControl.set_dl_path
     puts "\n"
 
-    PathControl.set_itunes_path_to_default
+    unless OS.linux?
+      PathControl.set_itunes_path_to_default
+      puts "\n"
+
+      PlaylistControl.set_playlist
+      puts "\n"
+    end
 
     UserControl.log_in
 

data/nehm.gemspec

@@ -18,12 +18,12 @@ Gem::Specification.new do |spec|
   spec.bindir                = 'bin'
   spec.executables           = 'nehm'
   spec.require_paths         = ['lib']
-  spec.required_ruby_version = '>= 1.9'
+  spec.required_ruby_version = '>= 2.0'
 
-  spec.add_development_dependency 'bundler',     '>= 1.10.5'
-  spec.add_dependency             'soundcloud',  '>= 0.3.2'
-  spec.add_dependency             'taglib-ruby', '>= 0.7.0'
-  spec.add_dependency             'faraday',     '>= 0.9.1'
-  spec.add_dependency             'highline',    '>= 1.7.2'
-  spec.add_dependency             'paint'
+  spec.add_dependency 'soundcloud',  '>= 0.3.2'
+  spec.add_dependency 'taglib-ruby', '>= 0.7.0'
+  spec.add_dependency 'faraday',     '>= 0.9.1'
+  spec.add_dependency 'highline',    '>= 1.7.2'
+  spec.add_dependency 'certifi'
+  spec.add_dependency 'paint'
 end