nehm 2.2 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bf7e68091443c74df5a8e00dcc08a999727ce5a
-  data.tar.gz: a0e51c37733f016e288897e6810c2ad9b189b814
+  metadata.gz: 8ef72ee45232c3392418a466fdbb1dc7dc190c65
+  data.tar.gz: b5158776e4e34d80ef33d00ee778beb51e478d05
 SHA512:
-  metadata.gz: f0234c789ef84484ff2cc78432a971035fb2bd7ae985b3760cc0231e3b5cd8cf247497ed7d5f1f80f1b14861722a751f0032feb2d759c5ea4926f5d09889a6b7
-  data.tar.gz: 1983f674098e5a068b1fa944e773afaad4e5530f6cefc5cc13415f374f2b756e6e221e3ab594bfb6c99581f3e4c38ce0b42d31757675150bf3150f2574ecc301
+  metadata.gz: fb586861dc9ed9e2065adfeb3eac510a7793db7590150c0a030ceaade3e1c053737c43fe37d013bfb617d3b0c3213189b1d060a7b88606947fe1cf5e400d80f4
+  data.tar.gz: 32e2611f1e840d59d7a2c91d80318b05c8c84d8fa335fbf7d81ff57e8e5b9219eab2ff911712eb0cdd5c845855272b568e76822f55a051d820abedfbab3ab2d9

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # nehm change log
 
+## 2.2.1
+* Small improvements
+
 ## 2.2
 * Rename `select` command to `list`
 * Some prettifying things in `help`

data/README.md

@@ -7,13 +7,14 @@
 <a href="http://badge.fury.io/rb/nehm"><img src="https://badge.fury.io/rb/nehm.svg" alt="Gem Version"></img></a>
 <a href="https://gemnasium.com/bogem/nehm"><img src="https://gemnasium.com/bogem/nehm.svg" alt="Dependency staus"></img></a>
 <a href="https://codeclimate.com/github/bogem/nehm"><img src="https://codeclimate.com/github/bogem/nehm/badges/gpa.svg" alt="Code climate"></img></a>
+<a href="https://github.com/bogem/nehm/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-MIT-green.svg" alt="License"></img></a>
 </div>
 
 ---
 <div align="center">
 <a href="https://www.dropbox.com/s/m4heiyq7vbpc4qs/1help.png" target="_blank"><img src="https://raw.github.com/bogem/nehm/master/Pictures/1help.png" alt="Help"></img></a>
 <a href="https://www.dropbox.com/s/b68flm7hv5myhk4/2get.png" target="_blank"><img src="https://raw.github.com/bogem/nehm/master/Pictures/2get.png" alt="Get"></img></a>
-<a href="https://www.dropbox.com/s/5gy6c5nzrsvhlv0/3select.png" target="_blank"><img src="https://raw.github.com/bogem/nehm/master/Pictures/3select.png" alt="List"></img></a>
+<a href="https://www.dropbox.com/s/0cmcn59ho7kcjke/3list.png" target="_blank"><img src="https://raw.github.com/bogem/nehm/master/Pictures/3list.png" alt="List"></img></a>
 <a href="https://www.dropbox.com/s/ynn9kb0ykcdishp/4search.png" target="_blank"><img src="https://raw.github.com/bogem/nehm/master/Pictures/4search.png" alt="Search"></img></a>
 
 <p><b>(click to zoom)</b></p>
@@ -33,7 +34,9 @@ Nehm developer doesn't responsible for any illegal usage of this program</i></b>
 
 ## Installation
 
-**1. Install `taglib` library**
+**1. [Install Ruby](https://www.ruby-lang.org/en/documentation/installation/)**
+
+**2. Install `taglib` library**
 
 **Mac OS X:**
 
@@ -49,23 +52,25 @@ Debian/Ubuntu: `sudo apt-get install libtag1-dev`
 
 Fedora/RHEL: `sudo yum install taglib-devel`
 
-**2. Install `nehm` gem:**
+**3. Install `nehm` gem:**
 
 `gem install nehm`
 
 ## First usage
 
-If you just installed nehm, write any command for its setup
+If you just installed `nehm`, write any command for its setup
 
 For example, `nehm help`
 
-nehm should answer like this:
+`nehm` should answer like this:
 ```
 Hello!
 Before using the nehm, you should set it up:
 Enter path to desirable download directory (press enter to set it to ...
 ```
 
+And then follow instruction, which `nehm` gives
+
 ## Usage Examples
 
 Type `nehm help` to list of all available commands or `nehm help COMMAND` for specific command

data/lib/nehm/command.rb

@@ -53,6 +53,7 @@ module Nehm
     # be left in #options[:args]
 
     def execute
+      raise StandardError, 'generic command has no actions'
     end
 
     ##

data/lib/nehm/commands/help_command.rb

@@ -1,7 +1,7 @@
 module Nehm
   class HelpCommand < Command
 
-    SPACES_BTWN_NAME_AND_DESC = 3
+    SPACES_BTWN_NAME_AND_DESC = 15
 
     def execute
       command_name = options[:args].pop
@@ -65,19 +65,17 @@ module Nehm
     end
 
     def show_info(hash)
-      @longest ||= nil
-
-      unless @longest
-        names = []
-        names += @cmd.arguments.keys unless @cmd.arguments.empty?
-        names += @cmd.options_descs.keys unless @cmd.options_descs.empty?
-        @longest ||= find_longest_name(names).length
-      end
+      @longest ||=
+        Proc.new do
+          names = []
+          names += @cmd.arguments.keys unless @cmd.arguments.empty?
+          names += @cmd.options_descs.keys unless @cmd.options_descs.empty?
+          find_longest_name(names).length
+        end.call
 
       hash.each do |name, desc|
-        need_spaces = @longest - name.length
-
-        UI.say "  #{name.green}#{' ' * (need_spaces + SPACES_BTWN_NAME_AND_DESC)}#{desc}"
+        space_count = @longest + SPACES_BTWN_NAME_AND_DESC
+        UI.say "  #{name.green.ljust(space_count)}#{desc}"
       end
     end
 

data/lib/nehm/commands/list_command.rb

@@ -45,7 +45,8 @@ module Nehm
     end
 
     def summary
-      'Get list of likes or posts from your account and download selected'
+      'Get list of likes or posts from your account and download, set tags ' \
+                                                  'and add to iTunes selected'
     end
 
     def usage

data/lib/nehm/commands/search_command.rb

@@ -47,7 +47,8 @@ module Nehm
     end
 
     def summary
-      'Search tracks, print them nicely and download selected tracks'
+      'Search tracks, print them nicely and download, set tags and add ' \
+                                                          'to iTunes selected'
     end
 
     def usage

data/lib/nehm/track.rb

@@ -30,7 +30,7 @@ module Nehm
     end
 
     def file_name
-      "#{full_name.tr(',./\\\'$%"', '')}.mp3"
+      "#{full_name.tr(",./'\\\"$%", '')}.mp3"
     end
 
     def file_path

data/lib/nehm/track_manager.rb

@@ -12,7 +12,6 @@ module Nehm
 
     def process_tracks(tracks)
       tracks.reverse_each do |track|
-        UI.newline
         dl(track)
         tag(track)
         track.artwork.suicide
@@ -40,7 +39,6 @@ module Nehm
       posts = Client.tracks(limit, offset, :posts, @uid)
       return nil if posts.empty?
 
-      posts.reject! { |hash| hash['type'] == 'playlist' }
       posts.map! { |hash| hash['track'] }
       filter(posts)
       convert(posts)
@@ -107,7 +105,7 @@ module Nehm
       unless @uid
         UI.error "You didn't logged in"
         UI.say "Login from #{'nehm configure'.yellow} " \
-               "or use #{'[from PERMALINK]'.yellow} option"
+               "or use #{'from PERMALINK'.yellow} option"
         UI.term
       end
 
@@ -117,7 +115,7 @@ module Nehm
       if dl_path
         ENV['dl_path'] = dl_path
       else
-        UI.error "You don't set up download path!"
+        UI.error "You didn't set up download path!"
         UI.say "Set it up from #{'nehm configure'.yellow} " \
                "or use #{'to PATH'.yellow} option"
         UI.term
@@ -132,9 +130,13 @@ module Nehm
     end
 
     def filter(tracks)
-      # Removing unstreamable tracks
       first_length = tracks.length
-      tracks.select! { |hash| hash['streamable'] }
+
+      # Filters
+      tracks.select! do |hash|
+        hash['type'] != 'playlist' || hash['streamable'] unless hash.nil?
+      end
+
       diff = first_length - tracks.length
 
       UI.warning "Was skipped #{diff} undownloadable track(s)" if diff > 0

data/lib/nehm/tracks_view_command.rb

@@ -1,4 +1,14 @@
 module Nehm
+
+  ##
+  # TracksViewCommand is a super class for all commands, that show tracks
+  # in list and let download selected tracks. When creating a new
+  # TracksViewCommand, define #get_tracks (protected), #initialize, #arguments, #program_name,
+  # #summary and #usage. You can also define #execute if you need, but
+  # you must place also 'super' in this inherited method
+  #
+  # See 'list_command.rb' or 'search_command.rb' as example
+
   class TracksViewCommand < Command
 
     DEFAULT_LIMIT = 10
@@ -38,7 +48,10 @@ module Nehm
 
     protected
 
-    def get_tracks; end
+    def get_tracks
+      raise StandardError, "You must define 'get_tracks' method"
+    end
+
 
     def show_menu(tracks)
       UI.menu do |menu|
@@ -73,6 +86,7 @@ module Nehm
     end
 
     def download_tracks_from_queue
+      UI.newline
       @track_manager.process_tracks(@queue)
     end
 

data/lib/nehm/version.rb

@@ -1,3 +1,3 @@
 module Nehm
-  VERSION = '2.2'.freeze
+  VERSION = '2.2.1'.freeze
 end

data/nehm.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
   spec.executables           = 'nehm'
   spec.require_paths         = ['lib']
   spec.required_ruby_version = '>= 1.9.3'
-  spec.post_install_message  = "Don't forget to install Taglib from OS' package manager!"
 
   spec.add_dependency 'certifi'
   spec.add_dependency 'colored'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nehm
 version: !ruby/object:Gem::Version
-  version: '2.2'
+  version: 2.2.1
 platform: ruby
 authors:
 - Albert Nigmatzianov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: certifi
@@ -132,7 +132,7 @@ homepage: http://www.github.com/bogem/nehm
 licenses:
 - MIT
 metadata: {}
-post_install_message: Don't forget to install Taglib from OS' package manager!
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib