emotion-picker 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6dc1f0f67e1065f9b19ab588414b8dc0fe2a68aa
-  data.tar.gz: dd2ba5a43592fc8f02873c36f3febaa521e3d76d
+SHA256:
+  metadata.gz: 4923405e10668de1aaf6294877ff11eed21b101f1fb02f01ade6ac062231c450
+  data.tar.gz: 13358d81e9e3dfbb7b6abf5db3b8dcaa9f211d971c2cc285449f9d8174277946
 SHA512:
-  metadata.gz: c0b0baafc48608f60e5c9154b8febd3ff4d93e335120eadcb982acbd47b55456ae7805b3c560d7b2e203131b4544035a0847b98c611cace7a8bb9adcb7bc1338
-  data.tar.gz: 456ec47422a2069b1e5e273b4569a2d774a1932886fc9a3a591ef295487f00e3abebbf082cdcdffc603a1853b7ee1c91752fcdcb4e0fd0a4ebf332600a95c0e4
+  metadata.gz: 7a763e6c73b70d27930ebd066adf4c2304aee6cc51de90f06f9059a51ad9f14f9ee687ae809b1d4ee7a3033a3911f3b44fe823aff5d48bab35acdc4012efde93
+  data.tar.gz: 18689ca949dfaff5ec532469942bb5533cbd3a6c3081ad128a845de9559dc3ce313fbc24c200b2cda2eb0c8342bcc24feb1a8d5ae379e46a57a2f633e59a51e9

data/bin/emotion-picker

@@ -3,27 +3,9 @@
 
 require 'emotion/picker'
 require 'nice-sigint'
-require 'optparse'
 
-parser = OptionParser.new do |opts|
-  opts.banner = 'Usage: emotion-picker [-hv]'
+options_parser = Emotion::Picker::Cli.new
+emotions_picker = Emotion::Picker::EmotionPicker.new
 
-  opts.on('-h', '--help', 'Prints this help') do
-    puts opts
-    exit
-  end
-
-  opts.on('-v', '--version', 'Prints program version') do
-    puts Emotion::Picker::VERSION
-    exit
-  end
-end
-
-begin
-  parser.parse!
-rescue OptionParser::ParseError => e
-  warn e.message
-  abort parser.to_s
-end
-
-puts "You are feeling #{Emotion::Picker.pick}"
+options_parser.parse!(ARGV)
+puts "You are feeling #{emotions_picker.pick}"

data/lib/emotion/emotions.yml

@@ -1,5 +1,5 @@
 - name: Abandoned
-  description: An emotional state in which people feel discarted, undesired, left behind
+  description: A state in which people feel discarted, undesired, left behind
 
 - name: Fear of Abandonment
   description:  An irrational belief that one is in imminent danger of being personally rejected, discarded or replaced

data/lib/emotion/picker.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'emotion/picker/version'
-require 'emotion/picker/emotion'
 require 'yaml'
 
 module Emotion
@@ -9,6 +7,10 @@ module Emotion
     EMOTIONS_FILE = "#{__dir__}/emotions.yml"
     private_constant :EMOTIONS_FILE
 
+    autoload :Emotion, 'emotion/picker/emotion'
+    autoload :Cli, 'emotion/picker/cli'
+    autoload :VERSION, 'emotion/picker/version'
+
     # Class for choosing an emotion
     class EmotionPicker
       def initialize
@@ -19,7 +21,7 @@ module Emotion
       # @return [Emotion]
       def pick
         rand = Random.new
-        index = rand.rand(0..@emotions.length)
+        index = rand.rand(0...@emotions.length)
         @emotions[index]
       end
 
@@ -39,12 +41,5 @@ module Emotion
         emotions
       end
     end
-
-    # Shortcut method for getting a random emotion
-    # @return [Emotion]
-    def self.pick
-      picker = EmotionPicker.new
-      picker.pick
-    end
   end
 end

data/lib/emotion/picker/cli.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'optparse'
+
+module Emotion
+  module Picker
+    class Cli
+      # @param args[Array]
+      def parse!(args)
+        parser = OptionParser.new do |opts|
+          opts.banner = 'Usage: emotion-picker [-hv]'
+
+          opts.on('-h', '--help', 'Prints this help') do
+            puts opts
+            exit
+          end
+
+          opts.on('-v', '--version', 'Prints program version') do
+            puts VERSION
+            exit
+          end
+        end
+
+        begin
+          parser.parse!(args)
+        rescue OptionParser::ParseError => e
+          warn e.message
+          abort parser.to_s
+        end
+      end
+    end
+  end
+end

data/lib/emotion/picker/version.rb

@@ -2,6 +2,6 @@
 
 module Emotion
   module Picker
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emotion-picker
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Christopher Birmingham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-21 00:00:00.000000000 Z
+date: 2019-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nice-sigint
@@ -38,34 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.17'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
 description: Program for picking a random emotion
 email:
 - chris.birmingham@hotmail.co.uk
@@ -78,6 +50,7 @@ files:
 - bin/emotion-picker
 - lib/emotion/emotions.yml
 - lib/emotion/picker.rb
+- lib/emotion/picker/cli.rb
 - lib/emotion/picker/emotion.rb
 - lib/emotion/picker/version.rb
 homepage: https://github.com/chrisBirmingham/emotion-picker
@@ -99,8 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Emotion Picker