rirera 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc634ff48092a4b274b8109a507496d6ceb901e2
-  data.tar.gz: 07120b6a6c0508961557d6869f24a51e7479ce2b
+  metadata.gz: d91562e734a4fe07401d9108022647b8d07beca7
+  data.tar.gz: 1c7e9cbe92fa0a6265159b930e9183dae67b92bb
 SHA512:
-  metadata.gz: 8109aa7e63f1a402d552a5ec0f1e4de718d1faf92fb2c4b9e5ff43a7b21622a1c3171e5aeaea056169911650de7aa4e0b542e6a374caf96d65cc02486fa9aed3
-  data.tar.gz: e66eb730e439c1ad799df47ea03266699cdc4618537436661b78d431891a72bba02972ba01f805af86676654ce7bf783d551332bfc83c459ae4bceaa07a37986
+  metadata.gz: a44403f07e6c0d168e3ac2ffe8529b05c709e5fb56a584316b74a3cff47155acb7a854e1d7e529898d5d17cf49907f18f8b942debb46d798a9e5f01ff49c1818
+  data.tar.gz: 024ebe3a80b5d0af4dcf181b55ce0e081413ad99b5969a413daf74db93f19147f04f9f386fbb28f8fdc21acf88d6e072be7024de5ee70417a7770f697bf1537a

data/CHANGELOG

@@ -4,3 +4,4 @@ Version 0.1.2: added screenshot to README.rdoc
 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

data/bin/rirera

@@ -7,20 +7,21 @@ def input
   begin
     while true do
       system "clear"
-      rrr = Rirera.new
-      rrr.broker = rrr.get_broker(@opts[:broker])
+      broker = Rirera.get_broker(@opts[:broker])
       print "volume: "
-      rrr.volume = rrr.sanity_check($stdin.gets)
+      volume = Rirera.sanity_check($stdin.gets)
       print "target price: "
-      rrr.target = rrr.sanity_check($stdin.gets)
+      target = Rirera.sanity_check($stdin.gets)
       print "actual price: "
-      rrr.actual = rrr.sanity_check($stdin.gets)
+      actual = Rirera.sanity_check($stdin.gets)
+      stop = nil
       loop do
         print "stop loss: "
-        rrr.stop = rrr.stop_loss(rrr.actual, rrr.sanity_check($stdin.gets))
-        puts "stop loss has to be lower than actual price" if rrr.stop.nil?
-        break unless rrr.stop.nil?
+        stop = Rirera.stop_loss(actual, Rirera.sanity_check($stdin.gets))
+        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.print_result
       puts ""
       puts "Again? (y/n)"
@@ -46,13 +47,13 @@ def main
   if @opts[:loop_given]
     input
   else
-    rrr = Rirera.new
-    rrr.broker = rrr.get_broker(@opts[:broker])
-    rrr.volume = @opts[:volume_given] ? @opts[:volume] : abort("missing volume")
-    rrr.target = @opts[:target_given] ? @opts[:target] : abort("missing target")
-    rrr.actual = @opts[:actual_given] ? @opts[:actual] : abort("missing actual")
-    rrr.stop = @opts[:stop_given] ? rrr.stop_loss(rrr.actual,@opts[:stop]) : abort("missing stop")
-    abort("stop loss has to be lower than actual price") if rrr.stop.nil?
+    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.print_result
   end
 end

data/lib/rirera.rb

@@ -1,65 +1,90 @@
 require 'colorize'
 require 'yaml'
 
-class Rirera
-  attr_accessor :broker, :volume, :target, :actual, :stop
+module Rirera
+  CONFIG = YAML.load_file(File.join(File.expand_path("..", File.dirname(__FILE__)),"conf/rirera.yml"))
+
+  class Record
+    attr_accessor :broker, :volume, :target, :actual, :stop
+
+    def initialize(broker, volume, target, actual, stop)
+      @broker = Rirera.get_broker(broker)
+      @volume = volume
+      @target = target
+      @actual = actual
+      @stop = stop
+    end
 
-  def initialize
-    @conf = load_config
-  end
+    def get_rrr
+      chance = @target - @actual
+      risk = @actual - @stop
+      (chance/risk).round(1)
+    end
 
-  def get_broker(broker)
-    unless @conf['broker'][broker].nil?
-      broker
-    else
-      abort "Not a valid broker"
+    def get_total_commission
+      # calculate order pricing
+      basic_price = Rirera::CONFIG['broker'][@broker]['basic_price']
+      commission_rate = Rirera::CONFIG['broker'][@broker]['commission_rate']
+      volume_rate_buy = (get_amount * @actual * commission_rate).round(2)
+      volume_rate_sell = (get_amount * @target * commission_rate).round(2)
+      total_commission = 0.0
+
+      [volume_rate_buy, volume_rate_sell].each do |vr|
+        if (vr + basic_price) > Rirera::CONFIG['broker'][@broker]['min_rate']
+          if (vr + basic_price) > Rirera::CONFIG['broker'][@broker]['max_rate']
+            total_commission += Rirera::CONFIG['broker'][@broker]['max_rate']
+          else
+            total_commission += (basic_price + vr)
+          end
+        else
+          total_commission += Rirera::CONFIG['broker'][@broker]['min_rate']
+        end
+      end
+      total_commission.round(2)
     end
-  end
 
-  def decorate
-    12.times do
-      print "#"
+    def get_amount
+      (@volume/@actual).round
     end
-  end
 
-  def print_title
-    puts "€$€$€$€$€$€$€$€$€$€$€"
-    puts "€ Risk Reward Ratio €"
-    puts "€$€$€$€$€$€$€$€$€$€$€"
-    puts "|               /    "
-    puts "|      _  /\\_  /    "
-    puts "|     / \\/   \\/    "
-    puts "|  /\\/              "
-    puts "|_/                  "
-    puts "L___________________ "
-    puts ""
-  end
+    def get_max_gain
+      ((get_amount * @target) - @volume - get_total_commission).round(2)
+    end
 
-  def print_rrr
-    decorate
-    print "\n# RRR: "
-    print "#{get_rrr}".yellow
-    puts " #"
-    decorate
-  end
+    def get_loss
+      ((@volume-(get_amount*@stop)) + get_total_commission).round(2)
+    end
 
-  def print_result
-    print_rrr
-    puts ""
-    puts ""
-    puts "Volume: #{@volume}"
-    puts "Amount: #{get_amount}"
-    puts "Gain: #{get_max_gain}".green
-    puts "Loss: #{get_loss}".red
-    puts "Commission: #{get_total_commission}".magenta
-    puts "Break Even: #{get_break_even}".blue
+    def get_break_even
+      ((@volume + get_total_commission) / get_amount).round(2)
+    end
+
+    def print_result
+      12.times { print "#" }
+      print "\n# RRR: "
+      print "#{get_rrr}".yellow
+      puts " #"
+      12.times { print "#" }
+      2.times { puts "" }
+      puts "Volume: #{@volume}"
+      puts "Amount: #{get_amount}"
+      puts "Gain: #{get_max_gain}".green
+      puts "Loss: #{get_loss}".red
+      puts "Commission: #{get_total_commission}".magenta
+      puts "Break Even: #{get_break_even}".blue
+    end
   end
 
-  def load_config
-    YAML.load_file(File.join(File.expand_path("..", File.dirname(__FILE__)),"conf/rirera.yml"))
+  def Rirera.get_broker(broker)
+    unless Rirera::CONFIG['broker'][broker].nil?
+      broker
+    else
+      abort "Not a valid broker"
+    end
   end
 
-  def stop_loss(actual_price, stop_loss)
+
+  def Rirera.stop_loss(actual_price, stop_loss)
     if stop_loss >= actual_price
       nil
     else
@@ -67,63 +92,17 @@ class Rirera
     end
   end
 
-  def sanity_check(num)
+  def Rirera.sanity_check(num)
     num.chomp!.gsub!(",",".")
     # only allow int and float
-    unless is_numeric?(num)
-      puts "Wrong input"
-      abort
+    unless Rirera.is_numeric?(num)
+      abort "Wrong input"
     else
       num.to_f
     end
   end
 
-  def is_numeric?(s)
+  def Rirera.is_numeric?(s)
     !!Float(s) rescue false
   end
-
-  def get_rrr
-    chance = @target - @actual
-    risk = @actual - @stop
-    (chance/risk).round(1)
-  end
-
-  def get_total_commission
-    # calculate order pricing
-    basic_price = @conf['broker'][@broker]['basic_price']
-    commission_rate = @conf['broker'][@broker]['commission_rate']
-    volume_rate_buy = (get_amount * @actual * commission_rate).round(2)
-    volume_rate_sell = (get_amount * @target * commission_rate).round(2)
-    total_commission = 0.0
-
-    [volume_rate_buy, volume_rate_sell].each do |vr|
-      if (vr + basic_price) > @conf['broker'][@broker]['min_rate']
-        if (vr + basic_price) > @conf['broker'][@broker]['max_rate']
-          total_commission += @conf['broker'][@broker]['max_rate']
-        else
-          total_commission += (basic_price + vr)
-        end
-      else
-        total_commission += @conf['broker'][@broker]['min_rate']
-      end
-    end
-    total_commission.round(2)
-  end
-
-  def get_amount
-    (@volume/@actual).round
-  end
-
-  def get_max_gain
-    ((get_amount * @target) - @volume - get_total_commission).round(2)
-  end
-
-  def get_loss
-    ((@volume-(get_amount*@stop)) + get_total_commission).round(2)
-  end
-
-  def get_break_even
-    ((@volume + get_total_commission) / get_amount).round(2)
-  end
-
 end

data/rirera.gemspec

@@ -1,19 +1,19 @@
 Gem::Specification.new do |s|
-  s.name                    = 'rirera'
-  s.version                 = '0.1.5'
-  s.date                    = Time.now.strftime('%Y-%m-%d')
+  s.name                    = "rirera"
+  s.version                 = "0.2.0"
+  s.date                    = Time.now.strftime("%Y-%m-%d")
   s.summary                 = "Risk Reward Ratio"
   s.description             = "A simple Risk Reward Ratio calculator"
   s.authors                 = ["Maximilian Meister"]
-  s.email                   = 'mmeister@suse.de'
-  s.rubyforge_project       = 'rirera'
+  s.email                   = "mmeister@suse.de"
+  s.rubyforge_project       = "rirera"
   s.files                   = `git ls-files`.split("\n")
   s.executables             = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.bindir                  = 'bin'
+  s.bindir                  = "bin"
   s.require_paths           = ["lib"]
-  s.homepage                = 'http://github.com/MaximilianMeister/rirera'
-  s.license                 = 'MIT'
-  s.add_dependency("colorize", ["~> 0.7.3"])
+  s.homepage                = "http://github.com/MaximilianMeister/rirera"
+  s.license                 = "MIT"
+  s.add_dependency("colorize", ["~> 0.7", ">= 0.7.3"])
   s.add_dependency("trollop", ["2.0"])
-  s.post_install_message    = 'Happy trading!'
+  s.post_install_message    = "Happy trading!"
 end

metadata

@@ -1,20 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: rirera
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Maximilian Meister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.3
   type: :runtime
@@ -22,6 +25,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.3
 - !ruby/object:Gem::Dependency