nehm 1.4.2 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 720165cf1bb886b479357651ef70597a724ae003
-  data.tar.gz: 2189aad4a535796a4099e127c50bb3aef11410e6
+  metadata.gz: 6f45c781d72f8543d6b8f6172bd94682d89d3589
+  data.tar.gz: 517a5d04219f8ff0eb36a968f9b4c0c6adb1dfb4
 SHA512:
-  metadata.gz: 2b735c675fc41539522eab2707028d34d65f823a9c7cb6c634a61aff9c49237e0d706208595b355f5aa71b28543c587edd3492061e82aaa0b4f14d3f91ae5007
-  data.tar.gz: 3b329df0e0171250dfa45f5906f2f2a00ae31efea6063c3e43986e32d173d5e704e4c464f64623ba3323e9674fd840443477121b93b6f36d29879f6461d96228
+  metadata.gz: 4a4f13bfbadced60aa02119e1e69ede64c46deb7e7a5a067afb410014590287d50d09c9f2292c30f73027f2b08100f4e0ec6466ecdc9d5ad537310a31a89e98f
+  data.tar.gz: 99346b65d73ee41511e922b8cce7c3124ba342be5a4b5f64d8c4838efb3ba4c8831f233ac0c4deaeec953e726aa96538af3c544bb4b9dd91e25cdfc3c1aa7768

data/CHANGELOG.md

@@ -1,8 +1,17 @@
 # nehm change log
 
+## 1.5
+
+* Add support for Ruby 1.9.3
+* Edit application structure
+  * Improve performance when adding tracks to iTunes library
+  * Remove useless iTunes path logic
+* Prettify `nehm help`
+
 ## 1.4.2
 
 * Fix: app fails if you didn't set up playlist (again)
+* Reduce gem size
 
 ## 1.4.1
 

data/README.md

@@ -46,7 +46,7 @@ Go to usage for further instructions
 
 **!!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
+* To get (download to download directory, set tags and add to iTunes library) your last like
 
   `nehm get like`
 
@@ -72,7 +72,7 @@ Go to usage for further instructions
 
   *(if you type `to current`, nehm will get track to current working directory)*
 
-* To get tracks to another playlist
+* To get tracks to another iTunes playlist
 
   `nehm get post playlist MyPlaylist`
 
@@ -84,7 +84,7 @@ Go to usage for further instructions
 
   `nehm dl https://soundcloud.com/nasa/delta-iv-launch`
 
-* Also, you can configure nehm (change download directory, iTunes directory, permalink)
+* Also, you can configure nehm (change download directory, permalink)
 
   `nehm configure`
 

data/lib/nehm.rb

@@ -3,7 +3,7 @@ require 'paint'
 
 require 'nehm/applescript'
 require 'nehm/artwork'
-require 'nehm/config'
+require 'nehm/cfg'
 require 'nehm/configure'
 require 'nehm/client'
 require 'nehm/get'
@@ -45,15 +45,12 @@ module App
   def init
     puts Paint['Hello!', :green]
     puts 'Before using the nehm, you should set it up:'
-    Config.create unless Config.exist?
+    Cfg.create unless Cfg.exist?
 
     PathControl.set_dl_path
     puts "\n"
 
     unless OS.linux?
-      PathControl.set_itunes_path_to_default
-      puts "\n"
-
       PlaylistControl.set_playlist
       puts "\n"
     end

data/lib/nehm/applescript.rb

@@ -8,10 +8,14 @@ module AppleScript
     output.chomp.split(', ')
   end
 
+  def self.music_master_library
+    `osascript #{script_path(:music_master_library)}`
+  end
+
   module_function
 
   def script_path(script_name)
-    applescripts_path = File.expand_path('applescripts', __dir__)
+    applescripts_path = File.expand_path(File.join(File.dirname(__FILE__), "applescripts"))
     File.join(applescripts_path, "#{script_name.to_s}.applescript")
   end
 end

data/lib/nehm/applescripts/music_master_library.applescript

@@ -0,0 +1,3 @@
+tell application "iTunes"
+	get name of first playlist whose special kind is Music
+end tell

data/lib/nehm/{config.rb → cfg.rb}

@@ -1,7 +1,7 @@
 require 'yaml'
 
-# Config module manipulate with nehm's config file (~/.nehmconfig)
-module Config
+# Cfg module manipulate with nehm's config file (~/.nehmconfig)
+module Cfg
   def self.[](key)
     config_hash = load_config
     config_hash[key.to_s]

data/lib/nehm/configure.rb

@@ -2,27 +2,9 @@
 module Configure
   def self.menu
     loop do
-      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 'Download path: ' + Paint[Cfg[:dl_path], :magenta]
+      puts 'Permalink: ' + Paint[Cfg[:permalink], :cyan]
+      puts 'iTunes playlist: ' + Paint[PlaylistControl.playlist, :cyan] unless OS.linux?
       puts "\n"
 
       HighLine.new.choose do |menu|
@@ -30,7 +12,6 @@ module Configure
 
         menu.choice('Edit download path'.freeze) { PathControl.set_dl_path }
         menu.choice('Edit permalink'.freeze) { UserControl.log_in }
-        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

data/lib/nehm/get.rb

@@ -46,32 +46,13 @@ 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)
-      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
+      playlist.add_track(track.file_path) if playlist && get_or_dl == :get && !OS.linux?
     end
     puts Paint['Done!', :green]
   end
@@ -111,16 +92,4 @@ module Get
       file.save
     end
   end
-
-  def cp(track)
-    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

@@ -2,9 +2,9 @@
 module Help
   def self.available_commands
     puts Paint['Avalaible nehm commands:', :yellow]
-    puts '  ' + Paint['get', :green]       + ' - Downloading, setting tags and adding to your iTunes library last post or like from your profile'
-    puts '  ' + Paint['dl', :green]        + ' - Downloading and setting tags last post or like from your profile'
-    puts '  ' + Paint['configure', :green] + ' - Configuring application'
+    puts '  ' + Paint['get', :green] + '        Downloading, setting tags and adding to your iTunes library last post or like from your profile'
+    puts '  ' + Paint['dl', :green] + '         Downloading and setting tags last post or like from your profile'
+    puts '  ' + Paint['configure', :green] + '  Configuring application'
     puts "See #{Paint['nehm help [command]', :yellow]} to read about a specific subcommand"
   end
 

data/lib/nehm/path_control.rb

@@ -17,12 +17,15 @@ module PathControl
       end
 
       path = HighLine.new.ask(path_ask + ':')
+
+      # 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 = PathControl.tilde_to_home(path) if PathControl.tilde_at_top?(path)
 
       if Dir.exist?(path)
-        Config[:dl_path] = path
+        Cfg[:dl_path] = path
         puts Paint["Download directory set up to #{Paint[path, :magenta]}", :green]
         break
       else
@@ -46,52 +49,6 @@ module PathControl
     end
   end
 
-  def self.itunes_path
-    Config[:itunes_path]
-  end
-
-  # Use in Configure.menu
-  def self.itunes_root_path
-    PathControl.itunes_path.sub("/iTunes\ Media/Automatically\ Add\ to\ iTunes.localized", '')
-  end
-
-  def self.set_itunes_path
-    loop do
-      default_path = File.join(ENV['HOME'], '/Music/iTunes')
-      path_ask = 'Enter path to iTunes directory'
-
-      if Dir.exist?(default_path)
-        path_ask << " (press enter to set it to #{Paint[default_path, :magenta]})"
-      else
-        default_path = nil
-      end
-
-      path = HighLine.new.ask(path_ask + ':')
-      path = default_path if path == '' && default_path
-
-      path = PathControl.tilde_to_home(path) if PathControl.tilde_at_top?(path)
-
-      path = File.join(path, "iTunes\ Media/Automatically\ Add\ to\ iTunes.localized")
-
-      if Dir.exist?(path)
-        Config[:itunes_path] = path
-        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 correct path", :red]
-      end
-    end
-  end
-
-  def self.set_itunes_path_to_default
-    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)
     File.join(ENV['HOME'], path[1..-1])
   end
@@ -103,8 +60,8 @@ module PathControl
   module_function
 
   def default_dl_path
-    if Config[:dl_path]
-      Config[: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"

data/lib/nehm/playlist.rb

@@ -6,7 +6,7 @@ class Playlist
   end
 
   def add_track(track_path)
-    puts 'Adding to playlist'
+    puts 'Adding to iTunes'
     AppleScript.add_track_to_playlist(track_path, @name)
   end
 

data/lib/nehm/playlist_control.rb

@@ -1,23 +1,19 @@
 module PlaylistControl
   def self.playlist
-    if @temp_playlist
-      @temp_playlist
-    elsif !Config[:playlist].nil?
-      Playlist.new(Config[:playlist])
-    end
+    @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)')
       if playlist == ''
-        Config[:playlist] = ''
+        Cfg[:playlist] = nil
         puts Paint['Default iTunes playlist unset', :green]
         break
       end
 
       if AppleScript.list_of_playlists.include? playlist
-        Config[:playlist] = playlist
+        Cfg[:playlist] = playlist
         puts Paint["Default iTunes playlist set up to #{playlist}", :green]
         break
       else
@@ -34,4 +30,14 @@ module PlaylistControl
       exit
     end
   end
+
+  module_function
+
+  def default_user_playlist
+    Playlist.new(Cfg[:playlist]) unless Cfg[:playlist].nil?
+  end
+
+  def music_master_library
+    Playlist.new(AppleScript.music_master_library)
+  end
 end

data/lib/nehm/user_control.rb

@@ -1,7 +1,7 @@
 module UserControl
 
   def self.logged_in?
-    Config.key?(:default_id)
+    Cfg.key?(:default_id)
   end
 
   def self.log_in
@@ -10,8 +10,8 @@ module UserControl
       url = "https://soundcloud.com/#{permalink}"
       if user_exist?(permalink)
         user = Client.get('/resolve', url: url)
-        Config[:default_id] = user.id
-        Config[:permalink] = permalink
+        Cfg[:default_id] = user.id
+        Cfg[:permalink] = permalink
         puts Paint['Successfully logged in!', :green]
         break
       else
@@ -38,7 +38,7 @@ module UserControl
 
   def default_user
     if UserControl.logged_in?
-      User.new(Config[:default_id])
+      User.new(Cfg[: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"

data/lib/nehm/version.rb

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

data/nehm.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.bindir                = 'bin'
   spec.executables           = 'nehm'
   spec.require_paths         = ['lib']
-  spec.required_ruby_version = '>= 2.0'
+  spec.required_ruby_version = '>= 1.9.3'
 
   spec.add_dependency 'soundcloud',  '>= 0.3.2'
   spec.add_dependency 'taglib-ruby', '>= 0.7.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nehm
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: '1.5'
 platform: ruby
 authors:
 - Albert Nigmatzianov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: soundcloud
@@ -115,9 +115,10 @@ files:
 - lib/nehm/applescript.rb
 - lib/nehm/applescripts/add_track_to_playlist.applescript
 - lib/nehm/applescripts/list_of_playlists.applescript
+- lib/nehm/applescripts/music_master_library.applescript
 - lib/nehm/artwork.rb
+- lib/nehm/cfg.rb
 - lib/nehm/client.rb
-- lib/nehm/config.rb
 - lib/nehm/configure.rb
 - lib/nehm/get.rb
 - lib/nehm/help.rb
@@ -142,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="