am 0.1.6 → 0.1.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 607457b961dba43878566b3a4bb32f656a4d3993
4
- data.tar.gz: 04e5f824a7374a4f9569255ae44b853a8c2032b8
3
+ metadata.gz: fac50d2eabdc351426d3a51b51375a06b0b6f368
4
+ data.tar.gz: b0fe8ed7efdfb2e2064ebc15e8e3817636f9e271
5
5
  SHA512:
6
- metadata.gz: 4c78383e7b482182f52c12e265d083c16d6255305f22d587a4b33fcb68d0205e7f870f1529afcb1f8a3530fbfe91e38da6343c162ae998b0e00a17c42c7d9de5
7
- data.tar.gz: e58d5542d42370b85ece05fc01b8d54ecc9fdb6f1e49bc8e5751c8ee72d33b4510dbb168edeffb3ff29fd6682a3f417cb2c51ec602bba74a36b7acb78eb7b154
6
+ metadata.gz: 3fea47f2ecc2fd658ea740aaa13986df28deacfd37ce3332adaa530081feaa3b018ca3a2863ce390f4818fb2420b0c72c5310e729ff18ea7c48ff36b1343680b
7
+ data.tar.gz: 22272ca7c0bf079f1bfcdd8782e59a98ca992f8501775da5f015ac9313d7f8888cfac561d20f685ddb81a0c6b19b158ab32316470c1013c1a02198086eaf3304
@@ -1,3 +1,3 @@
1
1
  module Am
2
- VERSION = "0.1.6"
2
+ VERSION = "0.1.7"
3
3
  end
@@ -11,7 +11,7 @@ module AM
11
11
  WARNING_MESSAGE = {
12
12
  add_command: "%s / %s couldn't add command",
13
13
  empty_config_number: "selected number missing in current config",
14
- validate_number: "please input using number",
14
+ validate_number: "please input valid number",
15
15
  validate_number_range: "please input number 1-%s",
16
16
  validate_alias: 'input using a-z or 0-9 or _ or -',
17
17
  }
data/lib/ui.rb CHANGED
@@ -32,9 +32,7 @@ module AM
32
32
  def add_command_with_number(commands)
33
33
  number = get_number
34
34
 
35
- if valid?(number, "^[^0-9]+$")
36
- warning(:validate_number)
37
- elsif number.to_i > TAIL_LINE || number.to_i <= 0
35
+ if number.to_i > TAIL_LINE
38
36
  warning(:validate_number_range, TAIL_LINE)
39
37
  else
40
38
  alias_name = get_alias
@@ -44,20 +42,22 @@ module AM
44
42
 
45
43
  def delete_command_with_number(config)
46
44
  number = get_number
47
- if valid?(number, "^[1-9]+$")
48
- if config.al.length >= number.to_i && config.al.key?(config.al.to_a[number.to_i-1][0])
49
- config.al.to_a[number.to_i-1][0]
50
- else
51
- warning(:empty_config_number)
52
- end
45
+ if config.al.length >= number.to_i && config.al.key?(config.al.to_a[number.to_i-1][0])
46
+ config.al.to_a[number.to_i-1][0]
53
47
  else
54
- warning(:validate_number)
48
+ warning(:empty_config_number)
55
49
  end
56
50
  end
57
51
 
58
52
  def get_number
59
53
  print 'please select number: '
60
- get_stdin
54
+ number = get_stdin
55
+ if valid?(number, "^[^0-9]+$") || number.to_i <= 0
56
+ warning(:validate_number)
57
+ get_number
58
+ else
59
+ number
60
+ end
61
61
  end
62
62
 
63
63
  def get_alias
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: am
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.6
4
+ version: 0.1.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - ka-yamashita