nehm 2.0.1 → 2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 642f53e571f554b780f52a641af8fdfe81f0a05c
-  data.tar.gz: d7eef194b669c2915a4ee53ddf7e8049b3e46058
+  metadata.gz: c10edc21faa4a5d48238b4016cccd64ed556294e
+  data.tar.gz: 0e73986835c88704ba2c838c78a8a5b1e95ecd85
 SHA512:
-  metadata.gz: d5926b9ad5deabd35d73a8caff482596e37a2083ad048dc203fc6171c8758e0b3cb769f6a838e919938598cd25f650d97606df580de9764f590600ef232f870e
-  data.tar.gz: 8097e9ef27791c75a04fa6841c1fea3d537426fda0551808702aba9fcc0376e4d2791e67aa0cd095462c38c554aef350188147038c99165ca6ddaf46063edfd7
+  metadata.gz: 125b005c86619752e5046656af178595b759e5a73f67be7905b887d56166a2afeff1a74ff16cb6b59113e51d3fb064a1655ed08963b0d399d978575f6da25233
+  data.tar.gz: 1c2dfc04d057d4b93a96098454e2e9e9f656dd3b397a38875ae0f319cc5d93f98f196cd74405be34162b4757ffa102ace446023ba6fda5734526783924b3ac30

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # nehm change log
 
+## 2.1
+* `search` command
+  * Use dash-options *(see help)*
+  * Remove `offset` option
+* Show duration of track in `search` and `select` commands
+* Remove message bar in `search` and `select` commands
+
 ## 2.0.1
 * Make gem size smaller
 

data/README.md

@@ -2,7 +2,7 @@
 <img src="https://raw.github.com/bogem/nehm/master/Pictures/logo.png" alt="Logo"></img>
 
 
-<p><b><i>nehm</i></b> is a console tool, which downloads, sets IDv3 tags and adds to your iTunes library your SoundCloud posts or likes in convenient way</p>
+<p><b><i>nehm</i></b> is a console tool, which downloads, sets IDv3 tags and adds to your iTunes library your <b>SoundCloud</b> posts or likes in convenient way</p>
 
 <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>
@@ -16,7 +16,7 @@
 <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="Select"></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>(clickable screenshots)</b></p>
+<p><b>(click to zoom)</b></p>
 
 </div>
 
@@ -82,9 +82,9 @@ Also commands and arguments (but **NOT** options) may be abbreviated, so long as
 
 #### Get multiple last posts or likes
 
-  `$ nehm get 3 posts` = `$ nehm get 3 ps`
+  `$ nehm get 3 posts` = `$ nehm g 3 ps`
 
-  `$ nehm get 5 likes` = `$ nehm get 5 ls`
+  `$ nehm get 5 likes` = `$ nehm g 5 ls`
 
 #### Just download and set tags any track
 

data/lib/nehm.rb

@@ -62,7 +62,7 @@ EOF
     UI.success "Now you can use nehm!"
     UI.newline
 
-    sleep(UI::SLEEP_PERIOD)
+    UI.sleep
   end
 
   def initialized?

data/lib/nehm/commands/configure_command.rb

@@ -6,7 +6,7 @@ module Nehm
         show_info
         UI.newline
         show_menu
-        sleep(UI::SLEEP_PERIOD)
+        UI.sleep
       end
     end
 
@@ -31,8 +31,10 @@ module Nehm
       permalink = UserManager.default_permalink
       UI.say "Permalink: #{permalink.cyan}" if permalink
 
-      playlist = PlaylistManager.default_playlist
-      UI.say "iTunes playlist: #{playlist.to_s.cyan}" if playlist
+      if OS.mac?
+        playlist = PlaylistManager.default_playlist
+        UI.say "iTunes playlist: #{playlist.to_s.cyan}" if playlist
+      end
     end
 
     def show_menu

data/lib/nehm/commands/get_command.rb

@@ -1,6 +1,8 @@
 module Nehm
   class GetCommand < Command
 
+    FIRST_TRACK = [1, 0]
+
     def initialize
       super
 
@@ -28,9 +30,9 @@ module Nehm
           count = @options[:args].pop.to_i
           track_manager.posts(count, 0)
         when /^l/
-          track_manager.likes(1, 0)
+          track_manager.likes(*FIRST_TRACK)
         when /^p/
-          track_manager.posts(1, 0)
+          track_manager.posts(*FIRST_TRACK)
         when /https:\/\/soundcloud.com\//
           track_manager.track_from_url(arg)
         when nil

data/lib/nehm/commands/help_command.rb

@@ -19,7 +19,7 @@ module Nehm
     end
 
     def arguments
-      { 'COMMAND' => 'name of command to show help' }
+      { 'COMMAND' => 'name of command (can be abbreviated) to show help' }
     end
 
     def program_name

data/lib/nehm/commands/search_command.rb

@@ -6,9 +6,30 @@ module Nehm
 
     def initialize
       super
+
+      add_option(:"-t", '-t PATH',
+                 'Download track(s) to PATH')
+
+      add_option(:"-pl", '-pl PLAYLIST',
+                 'Add track(s) to iTunes playlist with PLAYLIST name')
+
+      add_option(:"-lim", '-lim NUMBER',
+                 'Show NUMBER tracks on each page')
+
     end
 
     def execute
+      # Convert dash-options to normal options
+      options_to_convert = { :"-t"   => :to,
+                            :"-pl"  => :pl,
+                            :"-lim" => :limit }
+
+      options_to_convert.each do |k,v|
+        value = @options[k]
+        @options.delete(k)
+        @options[v] = value unless value.nil?
+      end
+
       @query = @options[:args].join(' ')
       super
     end

data/lib/nehm/commands/select_command.rb

@@ -13,6 +13,18 @@ module Nehm
 
       add_option(:from, 'from PERMALINK',
                  'Select track(s) from user with PERMALINK')
+
+      add_option(:to, 'to PATH',
+                 'Download track(s) to PATH')
+
+      add_option(:pl, 'pl PLAYLIST',
+                 'Add track(s) to iTunes playlist with PLAYLIST name')
+
+      add_option(:limit, 'limit NUMBER',
+                 'Show NUMBER tracks on each page')
+
+      add_option(:offset, 'offset NUMBER',
+                 'Show from NUMBER+1 track')
     end
 
     def arguments

data/lib/nehm/menu.rb

@@ -2,8 +2,6 @@ module Nehm
   module UI
     class Menu
 
-      attr_writer :msg_bar, :header
-
       def initialize
         @choices = {}
         @inc_index = 1
@@ -37,21 +35,13 @@ module Nehm
         @items << "#{visual_index} #{desc}"
       end
 
-      def show_header
-        UI.say @header
-        UI.newline
+      def header=(value)
+        @items.unshift(value)
       end
 
-      ##
-      # Message bar used to show messages of
-      # last successful or not operations
-      # Shown before menu
-
-      def show_msg_bar
-        UI.say 'Message:'
-        UI.say "  #{@msg_bar}"
+      def show_header
+        UI.say @header
         UI.newline
-        @msg_bar.clear
       end
 
       def newline
@@ -59,9 +49,6 @@ module Nehm
       end
 
       def select
-        show_header unless @header.to_s.empty?
-        show_msg_bar unless @msg_bar.to_s.empty?
-
         # Add exit option
         newline
         choice('e', 'Exit'.red) { UI.term }
@@ -83,7 +70,7 @@ module Nehm
         loop do
           if @choices.keys.include? selected
             block = @choices[selected]
-            block.call
+            block.call unless block.nil?
             break
           else
             selected = UI.ask "You must choose one of [#{@choices.keys.join(', ')}]"

data/lib/nehm/track.rb

@@ -20,6 +20,15 @@ module Nehm
       Artwork.new(self)
     end
 
+    def duration
+      seconds = @hash['duration'] / 1000
+
+      time = Time.at(seconds)
+      time -= time.utc_offset
+
+      time.hour > 0 ? time.strftime("%H:%M:%S") : time.strftime("%M:%S")
+    end
+
     def file_name
       "#{full_name.tr(',./\\\'$%"', '')}.mp3"
     end

data/lib/nehm/tracks_view_command.rb

@@ -7,40 +7,25 @@ module Nehm
 
     def initialize
       super
-
-      add_option(:to, 'to PATH',
-                 'Download track(s) to PATH')
-
-      add_option(:pl, 'pl PLAYLIST',
-                 'Add track(s) to iTunes playlist with PLAYLIST name')
-
-      add_option(:limit, 'limit NUMBER',
-                 'Show NUMBER tracks on each page')
-
-      add_option(:offset, 'offset NUMBER',
-                 'Show from NUMBER track')
-
     end
 
     def execute
+      setup_environment
+
       tracks = []
       old_offset = -1
 
       @queue = []
       @track_manager = TrackManager.new(@options)
 
-      setup_environment
-
       loop do
-        # If offset changed
+        # If offset changed, update list of tracks
         unless old_offset == @offset
           tracks = get_tracks
           old_offset = @offset
         end
 
-        # If tracks == nil, then there is a last page or there aren't tracks
         if tracks.nil?
-          @msg = 'There are no more tracks'.red
           prev_page
           next
         end
@@ -57,14 +42,14 @@ module Nehm
       UI.menu do |menu|
         menu.header = 'Enter the number of track to add it to download queue'.green
 
-        menu.msg_bar = @msg
-
+        ids = @queue.map(&:id) # Get ids of tracks in queue
         tracks.each do |track|
-          ids = @queue.map(&:id) # Get ids of tracks in queue
+          track_info = "#{track.full_name} | #{track.duration}"
+
           if ids.include? track.id
-            menu.choice(:added, track.full_name) { already_added(track) }
+            menu.choice(:added, track_info)
           else
-            menu.choice(:inc, track.full_name) { add_track_to_queue(track) }
+            menu.choice(:inc, track_info) { add_track_to_queue(track) }
           end
         end
 
@@ -100,11 +85,6 @@ module Nehm
 
     def add_track_to_queue(track)
       @queue << track
-      @msg = "'#{track.full_name}' added".green
-    end
-
-    def already_added(track)
-      @msg = "'#{track.full_name}' was already added".yellow
     end
 
     def download_tracks_from_queue

data/lib/nehm/ui.rb

@@ -19,6 +19,10 @@ module Nehm
       puts "#{msg}\n".red
     end
 
+    def self.menu(&block)
+      Menu.new(&block)
+    end
+
     def self.newline
       puts
     end
@@ -27,12 +31,12 @@ module Nehm
       puts msg
     end
 
-    def self.success(msg)
-      puts msg.green
+    def self.sleep
+      sleep(SLEEP_PERIOD)
     end
 
-    def self.menu(&block)
-      Menu.new(&block)
+    def self.success(msg)
+      puts msg.green
     end
 
     def self.term(msg = nil)

data/lib/nehm/version.rb

@@ -1,3 +1,3 @@
 module Nehm
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.1'.freeze
 end

data/nehm.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors = ['Albert Nigmatzianov']
   spec.email   = ['albertnigma@gmail.com']
 
-  spec.summary     = 'Convenient way to download tracks from SoundCloud via terminal'
+  spec.summary     = 'Convenient way to download tracks (also to iTunes) from SoundCloud via terminal'
   spec.description = 'nehm is a console tool, which downloads, sets IDv3 tags and adds to your iTunes library your SoundCloud posts or likes in convenient way. See homepage for instructions'
   spec.homepage    = 'http://www.github.com/bogem/nehm'
   spec.license     = 'MIT'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nehm
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: '2.1'
 platform: ruby
 authors:
 - Albert Nigmatzianov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: certifi
@@ -123,5 +123,5 @@ rubyforge_project:
 rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
-summary: Convenient way to download tracks from SoundCloud via terminal
+summary: Convenient way to download tracks (also to iTunes) from SoundCloud via terminal
 test_files: []