nehm 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b08eefd3115d43cbe5cd3668fc4dcab6b2393b52
-  data.tar.gz: c1f896f13a89eeac413c7f3dc7f4be5341bc8dcd
+  metadata.gz: 5bd2f9e928ec72d11c65ff7e1a8d4ab251e401c8
+  data.tar.gz: 0422b2fceff29c45f852fe547670e6cd17753505
 SHA512:
-  metadata.gz: bb02cb4c2974269b3de4c6d2e661f1e9b4e00b5e25fd4c3936bc4ccd806bfed6aad887681542bae3602010738e426e4c894a8861e2da738bd3689a0bb1d96445
-  data.tar.gz: f88c3e0575446c42bee43d55b2394275c5f83525994eae2732f3b09d749fa63b4291efde25d073d04cac340a66d24581a175b0291baf784c107c353dca85f2b3
+  metadata.gz: fa9bfb36d31c334f211885c42e0c85bc2eae664b4fc7e7ef8000a38f6933124de3bf5be6b0e56762aa83a6974e2770764780483944301c332575833319e7bd50
+  data.tar.gz: 36b2cfedab998142757a7a871868fa1d885b718a25560c468d80a09f4975a79714936405ebe296b92384d42684dd081f5f406c6e435457663f7255940a40c444

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # nehm change log
 
+## 1.5.3
+* Fix bugs, associated with special characters in track's name
+* Minor improvements
+
 ## 1.5.2
 * Binary now works if you use nehm from source
 * Minor improvements

data/README.md

@@ -1,10 +1,12 @@
 # nehm
 
+![ScreenShot](https://raw.github.com/bogem/nehm/master/Screenshots/screenshot.png)
+
 *nehm* is a console tool, which downloads, sets IDv3 tags and adds to your iTunes library your SoundCloud posts or likes in convenient way
 
 ## Installation
 
-**1. First, you should install `taglib` library**
+**1. Install `taglib` library**
 
 **Mac OS X:**
 
@@ -20,12 +22,10 @@ Debian/Ubuntu: `sudo apt-get install libtag1-dev`
 
 Fedora/RHEL: `sudo yum install taglib-devel`
 
-**2. Then you can install `nehm` gem:**
+**2. Install `nehm` gem:**
 
 `gem install nehm`
 
-**That's all!**
-
 ## First usage
 
 If you just installed nehm, write any command for its setup
@@ -39,44 +39,41 @@ Before using the nehm, you should set it up:
 Enter path to desirable download directory (press enter to set it to ...
 ```
 
-**Now you can use nehm!**
-Go to usage for further instructions
-
 ## Usage
 
 **!!nehm doesn't add tracks to iTunes library, if you use Linux!!**
 
-* To get (download to download directory, set tags and add to iTunes library) your last like
+* Get (download to download directory, set tags and add to iTunes library) your last like
 
   `nehm get like`
 
-* To get your last post (last track or repost from your profile)
+* Get your last post (last track or repost from your profile)
 
   `nehm get post`
 
-* To get multiple last posts or likes
+* Get multiple last posts or likes
 
   `nehm get 3 posts` or `nehm get 3 likes`
 
-* To just download and set tags any track, you can input
+* Just download and set tags any track, you can input
 
   `nehm dl post` or `nehm dl like` or `nehm dl 3 likes`
 
-* To get tracks from another user
+* Get tracks from another user
 
   `nehm get post from nasa` or `nehm dl like from bogem`
 
-* To get tracks to another directory
+* 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 iTunes playlist
+* Get tracks to another iTunes playlist
 
   `nehm get post playlist MyPlaylist`
 
-* And of course you can get or download track from url
+* Get or download track from url
 
   `nehm get https://soundcloud.com/nasa/delta-iv-launch`
 
@@ -84,11 +81,11 @@ Go to usage for further instructions
 
   `nehm dl https://soundcloud.com/nasa/delta-iv-launch`
 
-* Also, you can configure nehm (change download directory, permalink)
+* Configure (change download directory, permalink, playlist)
 
   `nehm configure`
 
-* For help, just input
+* Help
 
   `nehm help`
 
@@ -100,7 +97,7 @@ A: Permalink is the last word in your profile url. **Example:** for profile url
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/bogem/nehm.
+Bug reports and pull requests are welcome.
 
 ## License
 

data/lib/nehm.rb

@@ -9,12 +9,12 @@ require 'nehm/client'
 require 'nehm/get'
 require 'nehm/help'
 require 'nehm/os'
-require 'nehm/path_control'
+require 'nehm/path_manager'
 require 'nehm/playlist'
-require 'nehm/playlist_control'
+require 'nehm/playlist_manager'
 require 'nehm/track'
 require 'nehm/user'
-require 'nehm/user_control'
+require 'nehm/user_manager'
 
 module App
   def self.do(args)
@@ -47,15 +47,15 @@ module App
     puts 'Before using the nehm, you should set it up:'
     Cfg.create unless Cfg.exist?
 
-    PathControl.set_dl_path
+    PathManager.set_dl_path
     puts "\n"
 
     unless OS.linux?
-      PlaylistControl.set_playlist
+      PlaylistManager.set_playlist
       puts "\n"
     end
 
-    UserControl.log_in
+    UserManager.log_in
 
     puts Paint['Now you can use nehm :)', :green]
   end

data/lib/nehm/applescript.rb

@@ -1,15 +1,15 @@
 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`
+    `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 = `osascript \"#{script_path(:list_of_playlists)}\"`
     output.chomp.split(', ')
   end
 
   def self.music_master_library
-    `osascript #{script_path(:music_master_library)}`
+    `osascript \"#{script_path(:music_master_library)}\"`
   end
 
   module_function

data/lib/nehm/configure.rb

@@ -4,17 +4,18 @@ module Configure
     loop do
       puts 'Download path: ' + Paint[Cfg[:dl_path], :magenta]
       puts 'Permalink: ' + Paint[Cfg[:permalink], :cyan]
-      puts 'iTunes playlist: ' + Paint[PlaylistControl.playlist, :cyan] unless OS.linux?
+      puts 'iTunes playlist: ' + Paint[PlaylistManager.playlist, :cyan] unless OS.linux?
       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 permalink'.freeze) { UserControl.log_in }
-        menu.choice('Edit iTunes playlist'.freeze) { PlaylistControl.set_playlist } unless OS.linux?
+        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

data/lib/nehm/get.rb

@@ -4,26 +4,22 @@ require 'taglib'
 module Get
   def self.[](get_or_dl, args)
     # 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 = [{ name: 'to', module: PathManager, setter: :temp_dl_path= },
+               { name: 'from', module: UserManager, setter: :temp_user= },
+               { name: 'playlist', module: PlaylistManager, setter: :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])
+      if args.include? option[:name]
+        index = args.index(option[:name])
         value = args[index + 1]
         args.delete_at(index + 1)
         args.delete_at(index)
 
-        option[1].send(option[2], value)
+        option[:module].send(option[:setter], value)
       end
     end
 
-    user = UserControl.user
+    user = UserManager.user
     tracks = []
     tracks +=
       case args.last
@@ -45,7 +41,7 @@ module Get
         exit
       end
 
-    playlist = PlaylistControl.playlist
+    playlist = PlaylistManager.playlist
     tracks.each do |track|
       dl(track)
       dl(track.artwork)
@@ -67,7 +63,7 @@ module Get
     puts 'Downloading ' + arg.name
     path = arg.file_path
     url = arg.url
-    command = "curl -# -o '" + path + "' -L " + url
+    command = "curl -# -o \"" + path + "\" -L " + url
     `#{command}`
   end
 

data/lib/nehm/{path_control.rb → path_manager.rb}

@@ -1,6 +1,4 @@
-module PathControl
-  attr_reader :temp_dl_path
-
+module PathManager
   def self.dl_path
     @temp_dl_path || default_dl_path
   end
@@ -22,7 +20,7 @@ module PathControl
       path = default_path if path == '' && default_path
 
       # If tilde at top of the line of path
-      path = PathControl.tilde_to_home(path) if PathControl.tilde_at_top?(path)
+      path = PathManager.tilde_to_home(path) if PathManager.tilde_at_top?(path)
 
       if Dir.exist?(path)
         Cfg[:dl_path] = path
@@ -36,7 +34,7 @@ module PathControl
 
   def self.temp_dl_path=(path)
     # If 'to ~/../..' entered
-    path = PathControl.tilde_to_home(path) if PathControl.tilde_at_top?(path)
+    path = tilde_to_home(path) if tilde_at_top?(path)
 
     # If 'to current' entered
     path = Dir.pwd if path == 'current'
@@ -49,14 +47,6 @@ module PathControl
     end
   end
 
-  def self.tilde_to_home(path)
-    File.join(ENV['HOME'], path[1..-1])
-  end
-
-  def self.tilde_at_top?(path)
-    path[0] == '~'
-  end
-
   module_function
 
   def default_dl_path
@@ -68,4 +58,12 @@ module PathControl
       exit
     end
   end
+
+  def tilde_at_top?(path)
+    path[0] == '~'
+  end
+
+  def tilde_to_home(path)
+    File.join(ENV['HOME'], path[1..-1])
+  end
 end

data/lib/nehm/{playlist_control.rb → playlist_manager.rb}

@@ -1,11 +1,11 @@
-module PlaylistControl
+module PlaylistManager
   def self.playlist
     @temp_playlist || default_user_playlist || music_master_library
   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)')
+      playlist = HighLine.new.ask('Enter name of default iTunes playlist to which you want add tracks (press Enter to set it to default iTunes Music library)')
       if playlist == ''
         Cfg[:playlist] = nil
         puts Paint['Default iTunes playlist unset', :green]

data/lib/nehm/track.rb

@@ -19,11 +19,11 @@ class Track
   end
 
   def file_name
-    "#{name}.mp3".tr('/ ', '')
+    "#{name}.mp3".tr('/', '')
   end
 
   def file_path
-    File.join(PathControl.dl_path, file_name)
+    File.join(PathManager.dl_path, file_name)
   end
 
   def id

data/lib/nehm/user.rb

@@ -33,6 +33,7 @@ class User
 
     # Official SC API wrapper doesn't support for posts
     # So I should get posts by HTTP requests
+    #TODO: Get more than 300 posts (max limit = 300)
     conn = Faraday.new(url: 'https://api-v2.soundcloud.com/')
     response = conn.get("/profile/soundcloud:users:#{@id}?limit=#{count}&offset=0")
 

data/lib/nehm/{user_control.rb → user_manager.rb}

@@ -1,4 +1,4 @@
-module UserControl
+module UserManager
   def self.user
     @temp_user || default_user
   end
@@ -35,7 +35,7 @@ module UserControl
   module_function
 
   def default_user
-    if UserControl.logged_in?
+    if UserManager.logged_in?
       User.new(Cfg[:default_id])
     else
       puts Paint["You didn't logged in", :red]

data/lib/nehm/version.rb

@@ -1,3 +1,3 @@
 module Nehm
-  VERSION = '1.5.2'.freeze
+  VERSION = '1.5.3'.freeze
 end

data/nehm.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage    = 'http://www.github.com/bogem/nehm'
   spec.license     = 'MIT'
 
-  spec.files                 = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files                 = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(Screenshots)/}) }
   spec.bindir                = 'bin'
   spec.executables           = 'nehm'
   spec.require_paths         = ['lib']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nehm
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Albert Nigmatzianov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-23 00:00:00.000000000 Z
+date: 2015-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: soundcloud
@@ -137,12 +137,12 @@ files:
 - lib/nehm/get.rb
 - lib/nehm/help.rb
 - lib/nehm/os.rb
-- lib/nehm/path_control.rb
+- lib/nehm/path_manager.rb
 - lib/nehm/playlist.rb
-- lib/nehm/playlist_control.rb
+- lib/nehm/playlist_manager.rb
 - lib/nehm/track.rb
 - lib/nehm/user.rb
-- lib/nehm/user_control.rb
+- lib/nehm/user_manager.rb
 - lib/nehm/version.rb
 - nehm.gemspec
 homepage: http://www.github.com/bogem/nehm