nehm 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77c9b630040b56e2cbedaa2be10a657e44ef156b
-  data.tar.gz: 1d4bd72a0fbf335bccd513b490008046de41e99c
+  metadata.gz: 75ed072f758889011410959f8570e881a4f6fbb0
+  data.tar.gz: c7c9bc0647822e95e7d88768de2e3707030bda21
 SHA512:
-  metadata.gz: 0153f57f582668008347ba610de269473682090cd4943f5e892f6b7653c5c6f31ffb67f8a6cb0178855515f3dfc673f287d2be1528c64c565776fd58b8ed03bc
-  data.tar.gz: 854e80521be2013ea28a321ade2bc3b54c36f301e0edea602e1af464713682a2ca48638bfd2b28c88b73fc340d963239b666cc602fbe8fe19f0350d7f04bac51
+  metadata.gz: d2442ce4395f8198400dc5283e1b5898995945b1a755d5ef63b3ac58457e441203e2e98b0ea17c10cc103c5e03857ecbe94fce4375c02110aef68dc33552ffaa
+  data.tar.gz: 1a51ce91f3b24f49152210f2a838797953fd402658c6d15143fbab2a33f51c5c81febaab4a0408c8754b8186c058b173a3e566bbe935b8e050071ba33ef3ffc4

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # nehm change log
 
+## 2.1.5
+* Remove `Getting information about tracks(s)` message in `get` and `dl` commands
+* Handle more errors
+
 ## 2.1.4
 * Fix bug `wrong number of arguments (1 for 0)` in `configure` command or in first initialization
 

data/bin/nehm

@@ -5,10 +5,4 @@ require 'nehm'
 
 $stderr = STDOUT
 
-begin
-  Nehm.start(ARGV)
-rescue Interrupt # SIGINT
-  Nehm::UI.term
-rescue StandardError, Timeout::Error => ex
-  Nehm::UI.term "While executing nehm ... (#{ex.class})\n    #{ex}"
-end
+Nehm.start(ARGV)

data/lib/nehm.rb

@@ -12,15 +12,23 @@ require 'nehm/user_manager'
 
 module Nehm
 
+  class NehmExit < SystemExit; end
+
   def self.start(args)
     init unless initialized?
 
-    if args.empty?
-      UI.say HELP
-      UI.term
+    begin
+      if args.empty?
+        UI.say HELP
+        UI.term
+      end
+
+      CommandManager.run(args)
+    rescue StandardError, Timeout::Error => ex
+      Nehm::UI.term "While executing nehm ... (#{ex.class})\n    #{ex}"
+    rescue Interrupt
+    rescue NehmExit
     end
-
-    CommandManager.run(args)
   end
 
   HELP = <<-EOF
@@ -59,7 +67,7 @@ EOF
       UI.newline
     end
 
-    UI.success "Now you can use nehm!"
+    UI.success 'Now you can use nehm!'
     UI.newline
 
     UI.sleep

data/lib/nehm/client.rb

@@ -28,8 +28,6 @@ module Nehm
     # Returns raw array of likes or posts (depends on argument 'type')
 
     def self.tracks(count, offset, type, uid)
-      UI.term "Invalid number of #{type}" if count == 0
-
       iterations = count.to_f / TRACKS_LIMIT
       iterations = iterations.ceil
 
@@ -55,9 +53,9 @@ module Nehm
     end
 
     ##
-    # Returns track hash from SoundCloud by specified uri
+    # Returns hash from SoundCloud by specified uri
 
-    def self.track(uri)
+    def self.resolve(uri)
       HTTP_CLIENT.resolve(uri)
     end
 

data/lib/nehm/commands/get_command.rb

@@ -19,7 +19,6 @@ module Nehm
     def execute
       track_manager = TrackManager.new(@options)
 
-      UI.say 'Getting information about track(s)'
       arg = @options[:args].pop
       tracks =
         case arg

data/lib/nehm/commands/search_command.rb

@@ -28,7 +28,7 @@ module Nehm
                              :"-lim" => :limit,
                              :"-dl"  => :dl }
 
-      options_to_convert.each do |k,v|
+      options_to_convert.each do |k, v|
         value = @options[k]
         @options.delete(k)
         @options[v] = value unless value.nil?

data/lib/nehm/http_client.rb

@@ -33,9 +33,7 @@ module Nehm
         end
       end
 
-      if response['status'] =~ /302/
-        get_hash(response['location'])
-      end
+      get_hash(response['location']) if response['status'] =~ /302/
     end
 
     private

data/lib/nehm/track.rb

@@ -26,7 +26,7 @@ module Nehm
       time = Time.at(seconds)
       time -= time.utc_offset
 
-      time.hour > 0 ? time.strftime("%H:%M:%S") : time.strftime("%M:%S")
+      time.hour > 0 ? time.strftime('%H:%M:%S') : time.strftime('%M:%S')
     end
 
     def file_name

data/lib/nehm/track_manager.rb

@@ -23,6 +23,9 @@ module Nehm
     end
 
     def likes(limit, offset)
+      UI.term "Invalid limit value\nIt should be more than 0" if limit <= 0
+      UI.term "Invalid offset value\nIt should be more or equal 0" if offset < 0
+
       likes = Client.tracks(limit, offset, :likes, @uid)
       return nil if likes.empty?
 
@@ -31,6 +34,9 @@ module Nehm
     end
 
     def posts(limit, offset)
+      UI.term "Invalid limit value\nIt should be more than 0" if limit <= 0
+      UI.term "Invalid offset value\nIt should be more or equal 0" if offset < 0
+
       posts = Client.tracks(limit, offset, :posts, @uid)
       return nil if posts.empty?
 
@@ -41,7 +47,9 @@ module Nehm
     end
 
     def track_from_url(url)
-      track = [Client.track(url)]
+      track = [Client.resolve(url)]
+
+      UI.term 'Invalid URL! Please type link to track' if track.first['kind'] != 'track'
       return nil if track.empty?
 
       filter(track)
@@ -49,6 +57,9 @@ module Nehm
     end
 
     def search(query, limit, offset)
+      UI.term "Invalid limit value\nIt should be more than 0" if limit <= 0
+      UI.term "Invalid offset value\nIt should be more or equal 0" if offset < 0
+
       found = Client.search(query, limit, offset)
       return nil if found.empty?
 

data/lib/nehm/tracks_view_command.rb

@@ -64,25 +64,8 @@ module Nehm
     end
 
     def setup_environment
-      limit = @options[:limit]
-      @limit =
-        if limit
-          limit = limit.to_i
-          UI.term "Invalid limit value\nIt should be more than 0" if limit <= 0
-          limit
-        else
-          DEFAULT_LIMIT
-        end
-
-      offset = @options[:offset]
-      @offset =
-        if offset
-          offset = offset.to_i
-          UI.term "Invalid offset value\nIt should be more or equal 0" if offset < 0
-          offset
-        else
-          DEFAULT_OFFSET
-        end
+      @limit = @options[:limit] ? @options[:limit].to_i : DEFAULT_LIMIT
+      @offset = @options[:offset] ? @options[:offset].to_i : DEFAULT_OFFSET
     end
 
     def add_track_to_queue(track)

data/lib/nehm/ui.rb

@@ -40,11 +40,8 @@ module Nehm
     end
 
     def self.term(msg = nil)
-      if msg
-        abort msg.red
-      else
-        exit
-      end
+      puts msg.red if msg
+      raise NehmExit
     end
 
     def self.warning(msg)

data/lib/nehm/version.rb

@@ -1,3 +1,3 @@
 module Nehm
-  VERSION = '2.1.4'.freeze
+  VERSION = '2.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nehm
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Albert Nigmatzianov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2015-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: certifi