nehm 1.5.4 → 1.5.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9da0b37e8738ecc87f3169744ac7bad706e04814
-  data.tar.gz: ccc01546551cd7f5836a59cb16d1323347917470
+  metadata.gz: 8b56162720e521296eab895683dc2fa1c8829d9d
+  data.tar.gz: edfdc21208cc7ef4fcf079b10c76717a64ef6a6d
 SHA512:
-  metadata.gz: 3a2405ccecfd65c5012471cc694caae4735c92a75e923c77e95f0bf9551309a7a2d5b350d2e7caf50b4cb5015113fe7bc6b3f5924ae3fffe4fff6b3abad0c97c
-  data.tar.gz: 1933d9e9b7430102a13a6b01e423109190fc5559a37c88eb651fe5a321899ad1ea8307d1c7e2a7455d91905718824162fe4b8b0b1b3881f9d6dec35f82869906
+  metadata.gz: b136d0b1e1db0198a9ed64e8dca40208f08f8218d606f5ecbfac05652270745f171ed0b41895502c1be0717b2acd6f2d82961f4fd96a20768a1201009ddb1b3f
+  data.tar.gz: cc7b42a50791e55e5014b8da6f4d295d9ad7c66d1cfa8564942f916ae2ca0328efae6e8d2f70c8a217b858db2c4efead95b58990e020291c2f68039279bdf8a5

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # nehm change log
 
+## 1.5.5.1
+* Fix bug with `nil` in user class
+
+## 1.5.5
+* Add `version` command
+* Some bug fixes for Linux users
+* Edit some output messages
+* Minor optimizations
+
 ## 1.5.4
 * Add availability to get/dl 300+ likes and posts
 * More convenient CLI
@@ -21,7 +30,6 @@
   * Add `url` option to `dl` and `get`
 
 ## 1.5
-
 * Add support for Ruby 1.9.3
 * Edit application structure
   * Improve performance when adding tracks to iTunes library
@@ -29,16 +37,13 @@
 * Prettify `nehm help`
 
 ## 1.4.2
-
 * Fix: app fails if you didn't set up playlist (again)
 * Reduce gem size
 
 ## 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
@@ -49,91 +54,70 @@
 * Minor improvements and fixes
 
 ## 1.3.3
-
 * Add `to current` feature
 
 ## 1.3.2
-
 * Add check for no user's posts/likes
 
 ## 1.3.1.1
-
 * Minor changes
 
 ## 1.3.1
-
 * Edit looped configure menu
 
 ## 1.3
-
 * Now you can type short paths to download and iTunes paths while configuring nehm (e.g. ~/Music)
 * Configure menu doesn't automatically exit after choose
 * nehm doesn't ask for iTunes path by first run
 
 ## 1.2.2
-
 * Tracks has got now year tag
 
 ## 1.2.1
-
 * Minor technical update
 
 ## 1.2
-
 * Add `to PARHTODIRECTORY` feature. See the 'Usage' for instructions
 * Improve readability of help
 * Add some error checks
 
 ## 1.1
-
 * Add `from PERMALINK` feature. See the 'Usage' for instructions
 
 ## 1.0.7.1
-
 * Remove useless dependency :)
 
 ## 1.0.7
-
 * Add paint dependency
 
 ## 1.0.6.1
-
 * Edit gem description
 * Edit dependencies
 
 ## 1.0.6
-
 * Add check for invalid number of likes/posts
 * Add `CHANGELOG.md`
 * Use `OPTIONS` instead of `[options]` in help
 
 ## 1.0.5
-
 * Fix bundler development dependency
 
 ## 1.0.4
-
 * Edit summary in gemspec
 
 ## 1.0.3
-
 * Change description of nehm
 
 ## 1.0.2
-
 * Edit path to nehm version in Rakefile
 * Fix: nehm fails, then setting tags to track
 
 ## 1.0.1
-
 * Rakefile:
-
   * Add push (push to rubygems.org) task
   * Modify tasks
-
 * Edit required Ruby version
 * Fix: if you type invalid argument in `nehm get`, then app fails
 
 ## 1.0
-
 * First release!

data/bin/nehm

@@ -3,4 +3,4 @@ nehm_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(nehm_dir) unless $LOAD_PATH.include?(nehm_dir)
 require 'nehm'
 
-App.do(ARGV)
+Nehm::App.do(ARGV)

data/lib/nehm.rb

@@ -15,52 +15,57 @@ require 'nehm/playlist_manager'
 require 'nehm/track'
 require 'nehm/user'
 require 'nehm/user_manager'
+require 'nehm/version'
 
-module App
-  def self.do(args)
-    init unless initialized?
+module Nehm
+  module App
+    def self.do(args)
+      init unless initialized?
 
-    command = args.shift
-    case command
-    when 'get'
-      Get[:get, args]
-    when 'dl'
-      Get[:dl, args]
-    when 'configure'
-      Configure.menu
-    when 'help', nil
-      Help.show(args.first)
-    else
-      puts Paint["Invalid command '#{command}'", :red]
-      puts "Input #{Paint['nehm help', :yellow]} for all avalaible commands"
-    end
-
-    # SIGINT
-    rescue Interrupt
-      puts "\nGoodbye!"
-  end
+      command = args.shift
+      case command
+      when 'get'
+        Get[:get, args]
+      when 'dl'
+        Get[:dl, args]
+      when 'configure'
+        Configure.menu
+      when 'version'
+        puts Nehm::VERSION
+      when 'help', nil
+        Help.show(args.first)
+      else
+        puts Paint["Invalid command '#{command}'", :red]
+        puts "Input #{Paint['nehm help', :yellow]} for all avalaible commands"
+      end
 
-  module_function
+      # SIGINT
+      rescue Interrupt
+        puts "\nGoodbye!"
+    end
 
-  def init
-    puts Paint['Hello!', :green]
-    puts 'Before using the nehm, you should set it up:'
-    Cfg.create unless Cfg.exist?
+    module_function
 
-    PathManager.set_dl_path
-    puts "\n"
+    def init
+      puts Paint['Hello!', :green]
+      puts 'Before using the nehm, you should set it up:'
+      Cfg.create unless Cfg.exist?
 
-    unless OS.linux?
-      PlaylistManager.set_playlist
+      PathManager.set_dl_path
       puts "\n"
-    end
 
-    UserManager.log_in
+      unless OS.linux?
+        PlaylistManager.set_playlist
+        puts "\n"
+      end
 
-    puts Paint['Now you can use nehm :)', :green]
-  end
+      UserManager.log_in
+
+      puts Paint["Now you can use nehm!\n", :green]
+    end
 
-  def initialized?
-    File.exist?(Cfg::FILE_PATH)
+    def initialized?
+      File.exist?(Cfg::FILE_PATH)
+    end
   end
 end

data/lib/nehm/applescript.rb

@@ -1,21 +1,24 @@
-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
+module Nehm
+  # Module which works with AppleScript scripts
+  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
+    def self.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)}\"`
-  end
+    def self.music_master_library
+      `osascript \"#{script_path(:music_master_library)}\"`
+    end
 
-  module_function
+    module_function
 
-  def script_path(script_name)
-    applescripts_path = File.expand_path(File.join(File.dirname(__FILE__), 'applescripts'))
-    File.join(applescripts_path, "#{script_name.to_s}.applescript")
+    def script_path(script_name)
+      applescripts_path = File.expand_path(File.join(File.dirname(__FILE__), 'applescripts'))
+      File.join(applescripts_path, "#{script_name.to_s}.applescript")
+    end
   end
 end

data/lib/nehm/artwork.rb

@@ -1,30 +1,32 @@
-# Artwork objects contains all needed information of track's artwork
-class Artwork
-  def initialize(track)
-    @track = track
-  end
+module Nehm
+  # Artwork objects contains all needed information of track's artwork
+  class Artwork
+    def initialize(track)
+      @track = track
+    end
 
-  def file_path
-    File.join('/tmp', "#{@track.id}.jpg")
-  end
+    def file_path
+      File.join('/tmp', "#{@track.id}.jpg")
+    end
 
-  # Use in Get.dl
-  def name
-    'artwork'
-  end
+    # Use in Get.dl
+    def name
+      'artwork'
+    end
 
-  def suicide
-    File.delete(file_path)
-  end
+    def suicide
+      File.delete(file_path)
+    end
 
-  def url
-    hash = @track.hash
-    url =
-      if hash['artwork_url'].nil?
-        hash['user']['avatar_url']
-      else
-        hash['artwork_url']
-      end
-    url.sub('large', 't500x500')
+    def url
+      hash = @track.hash
+      url =
+        if hash['artwork_url'].nil?
+          hash['user']['avatar_url']
+        else
+          hash['artwork_url']
+        end
+      url.sub('large', 't500x500')
+    end
   end
 end

data/lib/nehm/cfg.rb

@@ -1,27 +1,30 @@
 require 'bogy'
 
-# Cfg module manipulate with nehm's config file (~/.nehmconfig)
-module Cfg
-  FILE_PATH = File.join(ENV['HOME'], '.nehmconfig')
-  CONFIG_FILE = Bogy.new(file: FILE_PATH)
 
-  def self.[](key)
-    CONFIG_FILE[key.to_s]
-  end
+module Nehm
+  # Cfg module manipulates with nehm's config file (~/.nehmconfig)
+  module Cfg
+    FILE_PATH = File.join(ENV['HOME'], '.nehmconfig')
+    CONFIG_FILE = Bogy.new(file: FILE_PATH)
 
-  def self.[]=(key, value)
-    CONFIG_FILE[key.to_s] = value
-  end
+    def self.[](key)
+      CONFIG_FILE[key.to_s]
+    end
 
-  def self.create
-    File.open(FILE_PATH, 'w+') { |f| f.write("---\napp: nehm") }
-  end
+    def self.[]=(key, value)
+      CONFIG_FILE[key.to_s] = value
+    end
 
-  def self.exist?
-    File.exist?(FILE_PATH)
-  end
+    def self.create
+      File.open(FILE_PATH, 'w+') { |f| f.write("---\napp: nehm") }
+    end
+
+    def self.exist?
+      File.exist?(FILE_PATH)
+    end
 
-  def self.key?(key)
-    CONFIG_FILE.to_h.key?(key.to_s)
+    def self.key?(key)
+      CONFIG_FILE.to_h.key?(key.to_s)
+    end
   end
 end

data/lib/nehm/client.rb

@@ -1,21 +1,23 @@
 require 'certifi'
 require 'soundcloud'
 
-# Just a Soundcloud API client.
-module Client
-  # Set a SSL certificate file path for SC API
-  ENV['SSL_CERT_FILE'] = Certifi.where
+module Nehm
+  # Soundcloud API client.
+  module Client
+    # Set a SSL certificate file path for SC API
+    ENV['SSL_CERT_FILE'] = Certifi.where
 
-  # SoundCloud API client ID
-  CLIENT_ID = '11a37feb6ccc034d5975f3f803928a32'
+    # SoundCloud API client ID
+    CLIENT_ID = '11a37feb6ccc034d5975f3f803928a32'
 
-  def self.get(*args)
-    sc_client.get(*args)
-  end
+    def self.get(*args)
+      sc_client.get(*args)
+    end
 
-  module_function
+    module_function
 
-  def sc_client
-    @client ||= Soundcloud.new(client_id: CLIENT_ID)
+    def sc_client
+      @client ||= Soundcloud.new(client_id: CLIENT_ID)
+    end
   end
 end

data/lib/nehm/configure.rb

@@ -1,22 +1,24 @@
-# Configure module responds to 'nehm configure' command
-module Configure
-  def self.menu
-    loop do
-      puts "Download path: #{Paint[Cfg[:dl_path], :magenta]}"
-      puts "Permalink: #{Paint[Cfg[:permalink], :cyan]}"
-      puts "iTunes playlist: #{Paint[PlaylistManager.playlist, :cyan]}" unless OS.linux?
-      puts "\n"
+module Nehm
+  # Configure module responds to 'nehm configure' command
+  module Configure
+    def self.menu
+      loop do
+        puts "Download path: #{Paint[Cfg[:dl_path], :magenta]}"
+        puts "Permalink: #{Paint[Cfg[:permalink], :cyan]}"
+        puts "iTunes playlist: #{Paint[PlaylistManager.playlist, :cyan]}" unless OS.linux?
+        puts "\n"
 
-      HighLine.new.choose do |menu|
-        menu.prompt = Paint['Choose setting', :yellow]
+        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 }
+          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
-      sleep(1)
-      puts "\n"
     end
   end
 end