rirera 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d91562e734a4fe07401d9108022647b8d07beca7
-  data.tar.gz: 1c7e9cbe92fa0a6265159b930e9183dae67b92bb
+  metadata.gz: e9766f03ed311c395d25084b745f0c13dae4efec
+  data.tar.gz: 0844d6627a654d32c946b58e4176fe38b3ef4cf8
 SHA512:
-  metadata.gz: a44403f07e6c0d168e3ac2ffe8529b05c709e5fb56a584316b74a3cff47155acb7a854e1d7e529898d5d17cf49907f18f8b942debb46d798a9e5f01ff49c1818
-  data.tar.gz: 024ebe3a80b5d0af4dcf181b55ce0e081413ad99b5969a413daf74db93f19147f04f9f386fbb28f8fdc21acf88d6e072be7024de5ee70417a7770f697bf1537a
+  metadata.gz: dcaa5076d33a8c3bf50bd2531d119bc240b7f4199d5fde17d80aad268dcbef87c7df20388ed1819218570a705e30e15db2312b51bbe963f618f1d351bca1d822
+  data.tar.gz: eaa4489a44a6025ef798deb3b9176f3c1eae0a10830ccfc2ed77be4d17e53bcb39d84ccc858c91de5a3ae9a0beb06f85e6b26e1ca69e2aa218e722985c04a6f3

data/CHANGELOG

@@ -5,3 +5,4 @@ Version 0.1.3: class refactoring/encapsulation
 Version 0.1.4: adding proper cli
 Version 0.1.5: adding dependencies
 Version 0.2.0: modularize rirera
+Version 0.2.1: only abort from bin

data/bin/rirera

@@ -3,25 +3,35 @@
 require 'rirera'
 require 'trollop'
 
+def input_single(msg)
+  begin
+    print "#{msg}: "
+    val = Rirera.sanity_check($stdin.gets)
+    if val.nil?
+      puts "wrong value"
+      raise ArgumentException
+    end
+  rescue
+    retry
+  end
+  val
+end
+
 def input
   begin
     while true do
       system "clear"
       broker = Rirera.get_broker(@opts[:broker])
-      print "volume: "
-      volume = Rirera.sanity_check($stdin.gets)
-      print "target price: "
-      target = Rirera.sanity_check($stdin.gets)
-      print "actual price: "
-      actual = Rirera.sanity_check($stdin.gets)
+      volume = input_single("volume")
+      target = input_single("target price")
+      actual = input_single("actual price")
       stop = nil
       loop do
-        print "stop loss: "
-        stop = Rirera.stop_loss(actual, Rirera.sanity_check($stdin.gets))
+        stop = Rirera.stop_loss(actual, input_single("stop loss"))
         puts "stop loss has to be lower than actual price" if stop.nil?
         break unless stop.nil?
       end
-      rrr = Rirera::Record.new(broker, volume, target, actual, stop)
+      rrr = Rirera::Order.new(broker, volume, target, actual, stop)
       rrr.print_result
       puts ""
       puts "Again? (y/n)"
@@ -44,16 +54,18 @@ def main
     opt :loop, "start rirera in loop input mode (other options will be discarded)", :short => 'l'
   end
 
+  broker = Rirera.get_broker(@opts[:broker])
+  abort("not a valid broker") if broker.nil?
+
   if @opts[:loop_given]
     input
   else
-    broker = Rirera.get_broker(@opts[:broker])
     volume = @opts[:volume_given] ? @opts[:volume] : abort("missing volume")
     target = @opts[:target_given] ? @opts[:target] : abort("missing target")
     actual = @opts[:actual_given] ? @opts[:actual] : abort("missing actual")
     stop = @opts[:stop_given] ? Rirera.stop_loss(actual,@opts[:stop]) : abort("missing stop")
     abort("stop loss has to be lower than actual price") if stop.nil?
-    rrr = Rirera::Record.new(broker, volume, target, actual, stop)
+    rrr = Rirera::Order.new(broker, volume, target, actual, stop)
     rrr.print_result
   end
 end

data/lib/rirera.rb

@@ -4,7 +4,7 @@ require 'yaml'
 module Rirera
   CONFIG = YAML.load_file(File.join(File.expand_path("..", File.dirname(__FILE__)),"conf/rirera.yml"))
 
-  class Record
+  class Order
     attr_accessor :broker, :volume, :target, :actual, :stop
 
     def initialize(broker, volume, target, actual, stop)
@@ -79,7 +79,7 @@ module Rirera
     unless Rirera::CONFIG['broker'][broker].nil?
       broker
     else
-      abort "Not a valid broker"
+      nil
     end
   end
 
@@ -96,7 +96,7 @@ module Rirera
     num.chomp!.gsub!(",",".")
     # only allow int and float
     unless Rirera.is_numeric?(num)
-      abort "Wrong input"
+      nil
     else
       num.to_f
     end

data/rirera.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                    = "rirera"
-  s.version                 = "0.2.0"
+  s.version                 = "0.2.1"
   s.date                    = Time.now.strftime("%Y-%m-%d")
   s.summary                 = "Risk Reward Ratio"
   s.description             = "A simple Risk Reward Ratio calculator"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rirera
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Maximilian Meister