where_to_cli 0.1.5 → 0.1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2MzMmY4Nzg1ZjdkMWFjMmRjNTA4OTFmMmY0NDE2ZTViMDRjNjdhMw==
+    Y2IyMjhhMDllODRmMWRjYjY4NDBhODVkMmIyZjg5NGI0ZDNiMmMxNw==
   data.tar.gz: !binary |-
-    YmUzNTFkNjYzNzg3ZjI5ZWI0YTVkYjcwYTJiNGMzZWQxZTkxMzJkZQ==
+    YzM5ZDUxYmY0MTk5ZDFmN2RkNGQ2ODUyYzBhN2YzMjhmOTdmZGZjZQ==
 SHA512:
   metadata.gz: !binary |-
-    OTQ1YTUwMThmNjY3M2JiNTVmNDUxNmJkMWRhNDc2ZjU0YTNlZTMwOTNhNDVl
-    NjIxMmM5OTQyYTk0N2VkNWViYjY0ODg2NWQxNjg3MjUxNWY2ZjM4MjRlMTJl
-    NGQ3NmE4NmViMjJiZjQ1YjRmYzIxMTg4MDI5NzI3YjA1MzM4NzM=
+    MjZkZmNjNjY3ODFlZGVlYzgyYTRlNjU5ZTAxMGFhOWQwOTJiMjE1YjU1OWFj
+    ZTFlMjY5YWM1MjA3ZWZlYjVhZGU2ZjMxNGEyOTEzNDQ3MDJlNjljYzQxZWU3
+    ZjcyNDZhMDhjMGJlNGMzNzFkNjA3MjJjMDNhY2JkMDUyMTZmODU=
   data.tar.gz: !binary |-
-    ZjMxMGYzYzQ1NmNhNTUwNGMzYTEzMjE3ZjJiZGU1N2JlNjEzYzQ0MTZjODBj
-    ZjM0OTExNzMyY2JmN2VkZTg2NTdlN2Q4NGFiNjY0OTdlMThmYmQzMjcwOGY3
-    MjRhODBjNGJkZDQyN2VjOTJmYjY2OGY5ZjQ0MzMxZDJjMDZhMTM=
+    ZTQwY2NkNDhjNjRlMjVjNzJkZmUzMDhhYTc5ODE1MGE1OGQ5Yjg4NzIxYjA5
+    YjIwY2FiYWYyYTQ0YmNiYjI1MjU4ZjY2MGJkNWMwN2VjMTdhNjgzZTY4MTNk
+    OWY3NDFmZGYzZTdhZmYyZTgwZGU2OTU1ODEzMzMzNTBlY2RlY2Q=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    where_to_cli (0.1.5)
+    where_to_cli (0.1.6)
       gli (= 2.13.1)
       where_to (~> 0.9.0, >= 0.9)
 

data/bin/whereto

@@ -4,6 +4,15 @@ require 'where_to_cli'
 
 include GLI::App
 
+PROMPT_DESCRIPTORS = Hash.new do |hash, key|
+  hash[key] = "a #{key}"
+end
+
+PROMPT_DESCRIPTORS[:episode_number] = 'an episode number'
+PROMPT_DESCRIPTORS[:episode_title]  = 'an episode title'
+
+# PROMPT_DESCRIPTORS.freeze
+
 program_desc 'Helps you organize your media library by enforcing a consistent directory structure.'
 
 version WhereToCli::VERSION
@@ -17,17 +26,18 @@ command :organize do |cmd|
 
   cmd.desc 'Set the name of the series (will otherwise be prompted to enter)'
   cmd.arg_name 'series_title'
+  cmd.default_value nil
   cmd.flag [:s, :series]
 
   cmd.desc 'Set the season number'
   cmd.arg_name 'season_number'
-  cmd.default_value 1
+  cmd.default_value nil
   cmd.flag [:n, :season]
 
-  cmd.desc 'Set the series airdate'
-  cmd.arg_name 'season_airdate'
-  cmd.default_value Date.today.year
-  cmd.flag [:a, :airdate]
+  # cmd.desc 'Set the series airdate'
+  # cmd.arg_name 'season_airdate'
+  # cmd.default_value nil
+  # cmd.flag [:a, :airdate]
 
   cmd.desc 'Only look for files with the given extension'
   cmd.arg_name 'extname'
@@ -69,12 +79,14 @@ def process(files)
   files.each do |file|
     puts ''
     puts "For file #{file}:"
-    locator.season = prompt_for_season default: locator.season
-    locator.episode_number = prompt_for_episode_number default: locator.episode_number.to_i + 1
-    locator.group          = prompt_for_group default: locator.group
+
+    %i{season episode_number group}.each do |field|
+      puts field
+      locator.send("#{field}=", prompt_for(field, default: locator.send(field)))
+    end
 
     locator.lookup! 
-    locator.episode_title  = prompt_for_episode_title default: locator.episode_title
+    locator.episode_title  = prompt_for :episode_title, default: locator.episode_title
 
     new_file = locator.locate.filename
 
@@ -95,50 +107,13 @@ def rename(from, to:)
   puts 'success!'
 end
 
-def prompt_for_series_title(default: nil)
-  return @options[:series] if @options[:series]
-  prompt = "Enter a series title"
-  prompt += " (or press enter for #{default})" unless default.nil?
-  prompt += ': '
-  print prompt
-  input = STDIN.gets.chomp
-  input.empty? ? default : input
-end
-
-def prompt_for_season(default: nil)
-  prompt = "Enter a season number"
-  prompt += " (or press enter for #{default})" unless default.nil?
-  prompt += ': '
-  print prompt
-  input = STDIN.gets.chomp
-  input.empty? ? default : input
-end
-
-def prompt_for_episode_number(default: nil)
-  prompt = "Enter an episode number"
-  prompt += " (or press enter for #{default})" unless default.nil?
-  prompt += ': '
-  print prompt
-  input = STDIN.gets.chomp
-  input.empty? ? default : input
-end
-
-def prompt_for_episode_title(default: nil)
-  prompt = "Enter an episode title"
-  prompt += " (or press enter for #{default})" unless default.nil?
-  prompt += ': '
-  print prompt
-  input = STDIN.gets.chomp
-  input.empty? ? default : input
-end
-
-def prompt_for_group(default: nil)
-  prompt = "Enter a group"
+def prompt_for(option, default: nil)
+  prompt = "Enter #{PROMPT_DESCRIPTORS[option]}"
   prompt += " (or press enter for #{default})" unless default.nil?
   prompt += ': '
   print prompt
   input = STDIN.gets.chomp
-  input.empty? ? default : input
+  input.empty? ? default : input  
 end
 
 pre do |global,command,options,args|

data/lib/where_to_cli/version.rb

@@ -1,3 +1,3 @@
 module WhereToCli
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: where_to_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Justin Toniazzo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake