nehm 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 522fa489786504c1af992b0e72d4bace47c06243
-  data.tar.gz: 645a69728cbecb7cd384189e044df8753a6e8377
+  metadata.gz: b08eefd3115d43cbe5cd3668fc4dcab6b2393b52
+  data.tar.gz: c1f896f13a89eeac413c7f3dc7f4be5341bc8dcd
 SHA512:
-  metadata.gz: 2a68159c8bd5a1387fb21f1339d73af9c61a3586afa0cf5f7eeb12eac475a6f25f43b48dcbf22742af5aa793eae27755d919c5d54926954bca62c4e77ddde811
-  data.tar.gz: 9e849f3554f6c3e9b4ad3a4e7de3489cc7f8f5bfe6c65ad7f852398eb4bcc37dc16420a6379e4e0182b7c6da65381d796c46871e4a7d072504a4e9d506d10df4
+  metadata.gz: bb02cb4c2974269b3de4c6d2e661f1e9b4e00b5e25fd4c3936bc4ccd806bfed6aad887681542bae3602010738e426e4c894a8861e2da738bd3689a0bb1d96445
+  data.tar.gz: f88c3e0575446c42bee43d55b2394275c5f83525994eae2732f3b09d749fa63b4291efde25d073d04cac340a66d24581a175b0291baf784c107c353dca85f2b3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # nehm change log
 
+## 1.5.2
+* Binary now works if you use nehm from source
+* Minor improvements
+
 ## 1.5.1
 * Update `nehm help`
   * Fix some descriptions

data/bin/nehm

@@ -1,3 +1,6 @@
 #!/usr/bin/env ruby
+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)

data/lib/nehm.rb

@@ -61,6 +61,6 @@ module App
   end
 
   def initialized?
-    File.exist?(File.join(ENV['HOME'], '.nehmconfig'))
+    File.exist?(Cfg::FILE_PATH)
   end
 end

data/lib/nehm/cfg.rb

@@ -1,41 +1,27 @@
-require 'yaml'
+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_hash = load_config
-    config_hash[key.to_s]
+    CONFIG_FILE[key.to_s]
   end
 
   def self.[]=(key, value)
-    config_hash = load_config
-    config_hash[key.to_s] = value
-    save_config(config_hash)
+    CONFIG_FILE[key.to_s] = value
   end
 
   def self.create
-    File.open(file_path, 'w+') { |f| f.write("---\napp: nehm") }
+    File.open(FILE_PATH, 'w+') { |f| f.write("---\napp: nehm") }
   end
 
   def self.exist?
-    File.exist?(file_path)
+    File.exist?(FILE_PATH)
   end
 
   def self.key?(key)
-    load_config.key?(key.to_s)
-  end
-
-  module_function
-
-  def file_path
-    File.join(ENV['HOME'], '.nehmconfig')
-  end
-
-  def load_config
-    YAML.load_file(file_path)
-  end
-
-  def save_config(config_hash)
-    IO.write(file_path, config_hash.to_yaml)
+    CONFIG_FILE.to_h.key?(key.to_s)
   end
 end

data/lib/nehm/get.rb

@@ -1,5 +1,4 @@
 require 'taglib'
-require 'fileutils'
 
 # TrackUtils module responds to 'nehm get/dl ...' commands
 module Get

data/lib/nehm/help.rb

@@ -1,16 +1,18 @@
 # Help module responds to 'nehm help ...' command
 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 "See #{Paint['nehm help [command]', :yellow]} to read about a specific subcommand"
+    puts <<-HELP.gsub(/^ {6}/, '')
+      #{Paint['Avalaible nehm commands:', :yellow]}
+        #{Paint['get', :green]}        Downloading, setting tags and adding to your iTunes library last post or like from your profile
+        #{Paint['dl', :green]}         Downloading and setting tags last post or like from your profile
+        #{Paint['configure', :green]}  Configuring application
+      See #{Paint['nehm help [command]', :yellow]} to read about a specific subcommand
+    HELP
   end
 
   def self.show(command)
     case command
-    when 'get', 'dl', 'configure'
+    when 'get', 'dl', 'configure', 'permalink'
       Help.send(command)
     when nil
       Help.available_commands
@@ -24,54 +26,62 @@ module Help
   module_function
 
   def configure
-    puts Paint['Input: ', :yellow] + 'nehm configure'
-    puts "\n"
-    puts Paint['Summary:', :yellow]
-    puts '  Configuring nehm app'
+    puts <<-CONFIGURE.gsub(/^ {6}/, '')
+      #{Paint['Input:', :yellow]} nehm configure
+
+      #{Paint['Summary:', :yellow]}
+        Configuring nehm app
+      CONFIGURE
   end
 
   def dl
-    puts Paint['Input: ', :yellow] + 'nehm dl OPTIONS [from PERMALINK] [to PATH_TO_DIRECTORY] [playlist ITUNES_PLAYLIST]'
-    puts "\n"
-    puts Paint['Summary:', :yellow]
-    puts '  Downloading tracks from SoundCloud and setting tags'
-    puts "\n"
-    puts Paint['OPTIONS:', :yellow]
-    puts '  ' + Paint['post', :green] + '                       Do same with last post (track or repost) from your profile'
-    puts '  ' + Paint['<number> posts', :green] + '             Do same with last <number> posts from your profile'
-    puts '  ' + Paint['like', :green] + '                       Do same with your last like'
-    puts '  ' + Paint['<number> likes', :green] + '             Do same with your last <number> likes'
-    puts '  ' + Paint['url', :magenta] + '                        Do same with track from entered url'
-    puts "\n"
-    puts Paint['Extra options:', :yellow]
-    puts '  ' + Paint['from PERMALINK', :green] + '             Do aforecited operations from custom user profile'
-    puts '  ' + Paint['to PATH_TO_DIRECTORY', :green] + '       Do aforecited operations to custom directory'
-    puts '  ' + Paint['to current', :green] + '                 Do aforecited operations to current working directory'
-    puts '  ' + Paint['playlist ITUNES_PLAYLIST', :green] + '   Do aforecited operations to custom iTunes playlist'
+    puts <<-DL.gsub(/^ {6}/, '')
+      #{Paint['Input:', :yellow]} nehm dl OPTIONS [from PERMALINK] [to PATH_TO_DIRECTORY] [playlist ITUNES_PLAYLIST]
+
+      #{Paint['Summary:', :yellow]}
+        Downloading tracks from SoundCloud and setting tags
+
+      #{Paint['OPTIONS:', :yellow]}
+        #{Paint['post', :green]}                       Do same with last post (track or repost) from your profile
+        #{Paint['<number> posts', :green]}             Do same with last <number> posts from your profile
+        #{Paint['like', :green]}                       Do same with your last like
+        #{Paint['<number> likes', :green]}             Do same with your last <number> likes
+        #{Paint['url', :magenta]}                        Do same with track from entered url
+
+      #{Paint['Extra options:', :yellow]}
+        #{Paint['from PERMALINK', :green]}             Do aforecited operations from custom user profile
+        #{Paint['to PATH_TO_DIRECTORY', :green]}       Do aforecited operations to custom directory
+        #{Paint['to current', :green]}                 Do aforecited operations to current working directory
+        #{Paint['playlist ITUNES_PLAYLIST', :green]}   Do aforecited operations to custom iTunes playlist
+    DL
   end
 
   def get
-    puts Paint['Input: ', :yellow] + 'nehm get OPTIONS [from PERMALINK] [to PATH_TO_DIRECTORY] [playlist ITUNES_PLAYLIST]'
-    puts "\n"
-    puts Paint['Summary:', :yellow]
-    puts '  Downloading tracks, setting tags and adding to your iTunes library tracks from Soundcloud'
-    puts "\n"
-    puts Paint['OPTIONS:', :yellow]
-    puts '  ' + Paint['post', :green] + '                       Do same with last post (track or repost) from your profile'
-    puts '  ' + Paint['<number> posts', :green] + '             Do same with last <number> posts from your profile'
-    puts '  ' + Paint['like', :green] + '                       Do same with your last like'
-    puts '  ' + Paint['<number> likes', :green] + '             Do same with your last <number> likes'
-    puts '  ' + Paint['url', :magenta] + '                        Do same with track from entered url'
-    puts "\n"
-    puts Paint['Extra options:', :yellow]
-    puts '  ' + Paint['from PERMALINK', :green] + '             Do aforecited operations from profile with PERMALINK'
-    puts '  ' + Paint['to PATH_TO_DIRECTORY', :green] + '       Do aforecited operations to custom directory'
-    puts '  ' + Paint['to current', :green] + '                 Do aforecited operations to current working directory'
-    puts '  ' + Paint['playlist ITUNES_PLAYLIST', :green] + '   Do aforecited operations to custom iTunes playlist'
+    puts <<-GET.gsub(/^ {6}/, '')
+      #{Paint['Input:', :yellow]} nehm get OPTIONS [from PERMALINK] [to PATH_TO_DIRECTORY] [playlist ITUNES_PLAYLIST]
+
+      #{Paint['Summary:', :yellow]}
+        Downloading tracks, setting tags and adding to your iTunes library tracks from Soundcloud
+
+      #{Paint['OPTIONS:', :yellow]}
+        #{Paint['post', :green]}                       Do same with last post (track or repost) from your profile
+        #{Paint['<number> posts', :green]}             Do same with last <number> posts from your profile
+        #{Paint['like', :green]}                       Do same with your last like
+        #{Paint['<number> likes', :green]}             Do same with your last <number> likes
+        #{Paint['url', :magenta]}                        Do same with track from entered url
+
+      #{Paint['Extra options:', :yellow]}
+        #{Paint['from PERMALINK', :green]}             Do aforecited operations from profile with PERMALINK
+        #{Paint['to PATH_TO_DIRECTORY', :green]}       Do aforecited operations to custom directory
+        #{Paint['to current', :green]}                 Do aforecited operations to current working directory
+        #{Paint['playlist ITUNES_PLAYLIST', :green]}   Do aforecited operations to custom iTunes playlist
+    GET
   end
 
   def permalink
-    puts 'Permalink is the last word in your profile url'
-    puts 'Example: for profile url ' + Paint['soundcloud.com/qwerty', :magenta] + ' permalink is ' + Paint['qwerty', :magenta]
+    puts <<-PERM.gsub(/^ {6}/, '')
+      Permalink is the last word in your profile url
+      Example: for profile url #{Paint['soundcloud.com/qwerty', :magenta]} permalink is #{Paint['qwerty', :magenta]}
+    PERM
   end
 end

data/lib/nehm/user_control.rb

@@ -1,4 +1,7 @@
 module UserControl
+  def self.user
+    @temp_user || default_user
+  end
 
   def self.logged_in?
     Cfg.key?(:default_id)
@@ -7,9 +10,8 @@ module UserControl
   def self.log_in
     loop do
       permalink = HighLine.new.ask('Please enter your permalink (last word in your profile url): ')
-      url = "https://soundcloud.com/#{permalink}"
-      if user_exist?(permalink)
-        user = Client.get('/resolve', url: url)
+      user = get_user(permalink)
+      if user
         Cfg[:default_id] = user.id
         Cfg[:permalink] = permalink
         puts Paint['Successfully logged in!', :green]
@@ -21,8 +23,8 @@ module UserControl
   end
 
   def self.temp_user=(permalink)
-    if user_exist?(permalink)
-      user = Client.get('/resolve', url: "https://soundcloud.com/#{permalink}")
+    user = get_user(permalink)
+    if user
       @temp_user = User.new(user.id)
     else
       puts Paint['Invalid permalink. Please enter correct permalink', :red]
@@ -30,10 +32,6 @@ module UserControl
     end
   end
 
-  def self.user
-    @temp_user || default_user
-  end
-
   module_function
 
   def default_user
@@ -46,16 +44,16 @@ module UserControl
     end
   end
 
-  def user_exist?(permalink)
-    Client.get('/resolve', url: "https://soundcloud.com/#{permalink}")
-
+  def get_user(permalink)
+    begin
+      user = Client.get('/resolve', url: "https://soundcloud.com/#{permalink}")
     rescue SoundCloud::ResponseError => e
       if e.message =~ /404/
-        false
+        user = nil
       else
         raise e
       end
-    else
-      true
+    end
+    user
   end
 end

data/lib/nehm/version.rb

@@ -1,3 +1,3 @@
 module Nehm
-  VERSION = '1.5.1'.freeze
+  VERSION = '1.5.2'.freeze
 end

data/nehm.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'highline',    '>= 1.7.2'
   spec.add_dependency 'certifi'
   spec.add_dependency 'paint'
+  spec.add_dependency 'bogy'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nehm
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Albert Nigmatzianov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: soundcloud
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bogy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 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 "