nehm 1.2.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa02f86ca11d320cfcafe87503b8b5410b976d07
-  data.tar.gz: a6eade14a40a20d7d395190299b8ca3ceb9de858
+  metadata.gz: 3f0c4e15904c1a52655fc3847970d6ab417fcedb
+  data.tar.gz: 1e0969f09138e26b6788c695b323079951155a80
 SHA512:
-  metadata.gz: aa6aa113affb78d4d02189714e0b03825bed1f62a9ab25e32127641b1f938f9a67d91dd65662e92f93458562284e25538f27489c3c5f53c2d42aa7ea386b5f67
-  data.tar.gz: ceb5e211de5fd23567fdff33c541416ae0eab037227673c388895fd2fb99da4f07fecd752cab2b668e1efe779728924c42e631c84fca3a386d8bf8eb5138cc92
+  metadata.gz: 2dae199bc056dc4d431f61f12d5fdafc92442bff56ea60eb994c19ef14b81f1a355dbc36744f4dd3529f27127966330a63511c8bc3d031a8cf864d00f61dfc44
+  data.tar.gz: ed3a74038f90cf65ce9629396a661d9f2c97847f1b723e8b433440115e0931b08bdc8eb489b9a74eb58a2483d3964ae36714bfd9fd1bfa5d37dc133e7df6b2e4

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # nehm change log
 
+## 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

data/README.md

@@ -16,9 +16,9 @@ or
 
 **Linux:**
 
-Debian/Ubuntu: ` sudo apt-get install libtag1-dev`
+Debian/Ubuntu: `sudo apt-get install libtag1-dev`
 
-Fedora/RHEL: ` sudo yum install taglib-devel`
+Fedora/RHEL: `sudo yum install taglib-devel`
 
 **2. Then you can install `nehm` gem:**
 
@@ -36,7 +36,7 @@ nehm should answer like this:
 ```
 Hello!
 Before using the nehm, you should set it up:
-Enter a FULL path to desirable download directory (press enter to set it to ...
+Enter path to desirable download directory (press enter to set it to ...
 ```
 
 **Now you can use nehm!**

data/lib/nehm.rb

@@ -43,10 +43,7 @@ module App
     PathControl.set_dl_path
     puts "\n"
 
-    unless OS.linux?
-      PathControl.set_itunes_path
-      puts "\n"
-    end
+    PathControl.set_itunes_path_to_default
 
     UserControl.log_in
 

data/lib/nehm/configure.rb

@@ -6,13 +6,17 @@ module Configure
     puts 'Permalink: ' + Paint[Config[:permalink], :cyan] if Config[:permalink]
     puts "\n"
 
-    HighLine.new.choose do |menu|
-      menu.prompt = Paint['Choose setting', :yellow]
+    loop do
+      HighLine.new.choose do |menu|
+        menu.prompt = Paint['Choose setting', :yellow]
 
-      menu.choice('Edit download path') { PathControl.set_dl_path }
-      menu.choice('Edit itunes path') { PathControl.set_itunes_path } unless OS.linux?
-      menu.choice('Edit permalink') { UserControl.log_in }
-      menu.choice('Exit') { exit }
+        menu.choice('Edit download path') { PathControl.set_dl_path }
+        menu.choice('Edit itunes path') { PathControl.set_itunes_path } unless OS.linux?
+        menu.choice('Edit permalink') { UserControl.log_in }
+        menu.choice('Exit') { exit }
+      end
+      sleep(1)
+      puts "\n"
     end
   end
 end

data/lib/nehm/get.rb

@@ -22,7 +22,7 @@ module Get
       index = args.index('to')
       path = args[index + 1]
 
-      path = File.join(ENV['HOME'], path[1..-1]) if path[0] == '~'
+      path = PathControl.tilde_to_home(path) if PathControl.tilde_at_top?(path)
 
       PathControl.temp_dl_path = path
 

data/lib/nehm/path_control.rb

@@ -6,7 +6,7 @@ class PathControl
   def self.set_dl_path
     loop do
       default_path = File.join(ENV['HOME'], '/Music')
-      path_ask = 'Enter a FULL path to default download directory'
+      path_ask = 'Enter path to desirable download directory'
 
       if Dir.exist?(default_path)
         path_ask << " (press enter to set it to #{Paint[default_path, :magenta]})"
@@ -17,9 +17,11 @@ class PathControl
       path = HighLine.new.ask(path_ask + ':')
       path = default_path if path == '' && default_path
 
+      path = PathControl.tilde_to_home(path) if PathControl.tilde_at_top?(path)
+
       if Dir.exist?(path)
         Config[:dl_path] = path
-        puts Paint['Download directory set up!', :green]
+        puts Paint["Download directory set up to #{Paint[path, :magenta]}", :green]
         break
       else
         puts Paint["This directory doesn't exist. Please enter path again", :red]
@@ -48,7 +50,7 @@ class PathControl
   def self.set_itunes_path
     loop do
       default_path = File.join(ENV['HOME'], '/Music/iTunes')
-      path_ask = 'Enter a FULL path to iTunes directory'
+      path_ask = 'Enter path to iTunes directory'
 
       if Dir.exist?(default_path)
         path_ask << " (press enter to set it to #{Paint[default_path, :magenta]})"
@@ -59,15 +61,29 @@ class PathControl
       path = HighLine.new.ask(path_ask + ':')
       path = default_path if path == '' && default_path
 
+      path = PathControl.tilde_to_home(path) if PathControl.tilde_at_top?(path)
+
       path = File.join(path, "iTunes\ Media/Automatically\ Add\ to\ iTunes.localized")
 
       if Dir.exist?(path)
         Config[:itunes_path] = path
-        puts Paint['iTunes directory set up!', :green]
+        puts Paint["iTunes directory set up to #{Paint[path, :magenta]}", :green]
         break
       else
         puts Paint["This directory doesn't exist. Please enter path again", :red]
       end
     end
   end
+
+  def self.set_itunes_path_to_default
+    Config[:itunes_path] = File.join(ENV['HOME'], "/Music/iTunes/iTunes\ Media/Automatically\ Add\ to\ iTunes.localized")
+  end
+
+  def self.tilde_to_home(path)
+    File.join(ENV['HOME'], path[1..-1])
+  end
+
+  def self.tilde_at_top?(path)
+    path[0] == '~' ? true : false
+  end
 end

data/lib/nehm/version.rb

@@ -1,3 +1,3 @@
 module Nehm
-  VERSION = '1.2.2'
+  VERSION = '1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nehm
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: '1.3'
 platform: ruby
 authors:
 - Albert Nigmatzianov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-25 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler