cli_miami 1.0.5.pre → 1.0.9.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42418b61ff38c853438626c7bc70ad533ce728d7
-  data.tar.gz: 8cc0c02b300bd52c9d15969edd95f88468717645
+  metadata.gz: e74cf731743ec201c0c4bac48b2b60644cd74b33
+  data.tar.gz: 5967a1bbf6ebcd77701f4cb05f2a1e4f13954b40
 SHA512:
-  metadata.gz: 3df0997f3ba2a4e57859962b3024c3f488a04ffd59fccf3e8eca8d0a29cd5392aa70caac8240abcb7f6b503842e530449e9976a4ea38848b69c28c8902707ebc
-  data.tar.gz: 2aba81627198c963ab0c46d44d2135cb0e7b492fec548927643d5d25251326ce500b87e4368e48e3018c38af5d9c26a2dffc16b559f4601408df380c9b088222
+  metadata.gz: 51b5d2c06581417dd46bf6dfdc14b40bf0090d601df88e40f43e6f5675fb5ec5fb546db8cbb1345f37ee06bc7e8e9cfbe53748b85b57a8df6eb1a44110aa9064
+  data.tar.gz: bfe0b344630ccb19f973aa73b8eeb53bd1deb1c2fd0ff2d7e660cadaea40e612a0ea3c11fac50ec6a9d12caaf69b4573c794a4af4a4b6ff122c0a0ba12a59607

data/i18n/en.yml

@@ -1,4 +1,4 @@
-en:
+en: &en
   cli_miami:
     # CliMiami core library strings
     core:
@@ -40,3 +40,9 @@ en:
       range:
       string:
       symbol:
+
+# regional variations
+en_gb:
+  <<: *en
+en_us:
+  <<: *en

data/lib/cli_miami/ask.rb

@@ -45,7 +45,7 @@ private
   def request_type options
     send("request_#{options[:type]}", options)
   rescue
-    CliMiami::S.ay I18n.t('cli_miami.errors.type', options.merge(preset: :cli_miami_fail))
+    CliMiami::S.ay I18n.t('cli_miami.errors.type', type: options[:type]), options.merge(preset: :cli_miami_fail)
   end
 
   # for most types, a simple validation check is all that is needed
@@ -130,7 +130,9 @@ private
       # display options
       CliMiami::S.ay
       CliMiami::S.ay I18n.t('cli_miami.core.multiple_choice.prompt'), :cli_miami_instruction
-      options[:choices].each_with_index do |li, i|
+      options[:choices].to_a.each_with_index do |li, i|
+        li = li[1] if li.is_a? Array
+
         # show already selected choices with a different color
         choice_text = "#{(i + 1).to_s.rjust(3)}: #{li}"
         choice_text_color = selected_choice_indexes.include?(i) ? :black : :cyan
@@ -159,11 +161,22 @@ private
         end
       end
 
+      # get selected choice values
+      selected_choices = selected_choice_indexes.map do |i|
+        options[:choices].to_a[i]
+      end
+
+      # convert associate array back to hash
+      if options[:choices].is_a? Hash
+        selected_choices = Hash[*selected_choices.flatten]
+      end
+
+      # show user their selected choices
       # update user
       CliMiami::S.ay
       CliMiami::S.ay I18n.t('cli_miami.core.multiple_choice.selected_choices'), :cli_miami_instruction_sub
-      selected_choices = selected_choice_indexes.map{ |i| options[:choices][i] }
       selected_choices.each do |sc|
+        sc = sc[1] if sc.is_a? Array
         CliMiami::S.ay "• #{sc}", preset: :cli_miami_update, indent: 3
       end
     end

data/lib/cli_miami/error.rb

@@ -107,13 +107,13 @@ private
     i18n_string = keys.flatten.compact.each(&:to_s).join('.')
 
     # check if value exists, and translate it
-    if I18n.exists? i18n_string
-      # format description for i18n messages
-      if options[:description]
-        options[:description] = ' (' << options[:description] << ')'
-      end
+    return unless I18n.exists? i18n_string
 
-      I18n.t i18n_string, options
+    # format description for i18n messages
+    if options[:description]
+      options[:description] = ' (' << options[:description] << ')'
     end
+
+    I18n.t i18n_string, options
   end
 end

data/lib/cli_miami/say.rb

@@ -67,13 +67,13 @@ private
 
   # Set foreground color
   def modify_text_color!
-    if @options[:color]
-      # if bright style is passed, use the bright color variation
-      @text = if @options[:style].delete :bright
-        @text.send "bright_#{@options[:color]}"
-      else
-        @text.send @options[:color]
-      end
+    return unless @options[:color]
+
+    # if bright style is passed, use the bright color variation
+    @text = if @options[:style].delete :bright
+      @text.send "bright_#{@options[:color]}"
+    else
+      @text.send @options[:color]
     end
   end
 

data/lib/cli_miami/validation.rb

@@ -111,14 +111,14 @@ private
   # validate the value is within the min and max values
   #
   def validate_length value, length, options
-    unless (options[:min]..options[:max]).cover? length
-      options[:value_length] = length
+    return if (options[:min]..options[:max]).cover? length
 
-      # replace empty values with i18n `empty` string
-      value = I18n.t('cli_miami.core.empty') if value.respond_to?(:empty?) && value.empty?
+    options[:value_length] = length
 
-      raise CliMiami::Error.new(value, options, :length).message
-    end
+    # replace empty values with i18n `empty` string
+    value = I18n.t('cli_miami.core.empty') if value.respond_to?(:empty?) && value.empty?
+
+    raise CliMiami::Error.new(value, options, :length).message
   end
 
   # validate that the value passes a regular expression
@@ -153,7 +153,7 @@ private
     validate_length float, float, options
   end
 
-  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/AbcSize
   def validate_hash hash, options
     hash.deep_symbolize_keys!
 
@@ -162,18 +162,17 @@ private
     # return if no value options are set
     value_options = options[:value_options]
     return unless value_options
+    return unless value_options[:keys]
 
     # validate required keys are set
-    if value_options[:keys]
-      missing_keys = Set.new(value_options[:keys].map(&:to_sym)) - Set.new(hash.keys)
-      value_options[:missing_values] = missing_keys.to_a.to_sentence
+    missing_keys = Set.new(value_options[:keys].map(&:to_sym)) - Set.new(hash.keys)
+    value_options[:missing_values] = missing_keys.to_a.to_sentence
 
-      unless missing_keys.empty?
-        raise CliMiami::Error.new(hash, options, :keys).message
-      end
+    unless missing_keys.empty?
+      raise CliMiami::Error.new(hash, options, :keys).message
     end
   end
-  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:enable Metrics/AbcSize
 
   def validate_multiple_choice selections, options
     validate_length selections, selections.length, options

data/lib/cli_miami/version.rb

@@ -0,0 +1,3 @@
+module CliMiami
+  VERSION = '1.0.9.pre'.freeze
+end

data/lib/cli_miami.rb

@@ -24,26 +24,25 @@ class String
     method_string = method.to_s.dup
 
     if method_string.slice! 'cli_miami_'
-      preset = CliMiami.presets[method_string.to_sym]
+      method_symbol = method_string.to_sym
+      preset = CliMiami.presets[method_symbol] || {}
       options = preset.merge args[0] || {}
+
       CliMiami::S.ay self, options
     else
       super
     end
   end
+
+  def respond_to_missing? method, _args
+    method =~ /^cli_miami_/ || super
+  end
 end
 
 # i18n
 #
-# load yml locales included in the cli miami gem
-#   [PATH TO GEMS]/cli_miami/i18n/en.yml
 I18n.load_path += Dir["#{File.dirname(__FILE__)}/../i18n/*.yml"]
-# load locale in current directory named `i18n.yml`
-#   ./i18n.yml
-I18n.load_path += Dir['./i18n.yml']
-# load locales in the folder `i18n` in the current directory
-#   ./i18n/en.yml
-I18n.load_path += Dir['./i18n/*.yml']
+I18n.reload!
 
 # readline
 #
@@ -61,11 +60,6 @@ class FalseClass; include Boolean; end
 # create Cli Miami namespace and load library
 #
 module CliMiami
-  require 'cli_miami/ask'
-  require 'cli_miami/error'
-  require 'cli_miami/say'
-  require 'cli_miami/validation'
-
   BOOLEAN_TRUE_VALUES = %w(true t yes y).freeze
   BOOLEAN_FALSE_VALUES = %w(false f no n).freeze
 
@@ -202,4 +196,14 @@ module CliMiami
     options
   end
   # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+
+  def self.version
+    CliMiami::VERSION
+  end
 end
+
+require 'cli_miami/ask'
+require 'cli_miami/error'
+require 'cli_miami/say'
+require 'cli_miami/validation'
+require 'cli_miami/version'

data/spec/lib/cli_miami/ask_spec.rb

@@ -55,6 +55,12 @@ describe CliMiami::A do
   end
 
   describe 'MULTIPLE_CHOICE' do
+    it 'should allow a hash of choices' do
+      allow($stdin).to receive(:gets).and_return '2', '1', ''
+      ask = CliMiami::A.sk @q, type: :multiple_choice, choices: { one: 'option 1', two: 'option 2', three: 'option 3' }
+      expect(ask.value).to eq(two: 'option 2', one: 'option 1')
+    end
+
     it 'should allow a user to remove selections' do
       allow($stdin).to receive(:gets).and_return '1', '2', '1', ''
       ask = CliMiami::A.sk @q, type: :multiple_choice, choices: ['option 1', 'option 2', 'option 3']

metadata

@@ -1,175 +1,211 @@
 --- !ruby/object:Gem::Specification
 name: cli_miami
 version: !ruby/object:Gem::Version
-  version: 1.0.5.pre
+  version: 1.0.9.pre
 platform: ruby
 authors:
 - Ryan Brewster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-14 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.2.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.2.7.1
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.0.8
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.7
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: ruby_dep
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 1.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 description: 
 email: brewster1134@gmail.com
 executables: []
@@ -184,6 +220,7 @@ files:
 - lib/cli_miami/global.rb
 - lib/cli_miami/say.rb
 - lib/cli_miami/validation.rb
+- lib/cli_miami/version.rb
 - spec/fixtures/i18n.yml
 - spec/lib/cli_miami/ask_spec.rb
 - spec/lib/cli_miami/error_spec.rb