ogem 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 405237dd45ec8718e1e912144722455c18b3c5a3
-  data.tar.gz: 3da04ba666b20b45afb8946fac4a26bfcdf700f7
+  metadata.gz: 688314260efcab0747741a86f7c1a2b8a66aede0
+  data.tar.gz: 26f1b265bca5b98dca65b2fddb10a8eef12b978d
 SHA512:
-  metadata.gz: 78210c730ca95f1ac5dd9a10800d29b7a848d4a2089027f21570e2a23a5c9f6a493772693b7c6837e7551215e6866cab0241acedf4b3c08001bc4acde78bae4b
-  data.tar.gz: ce550989fab597d7a73501c958346d9129a2b893149b44bdffb302f14fc9bfa1bec7e0918e9f980407b7d319e0f926a1d00541b125feec71af0a0f145c69ddef
+  metadata.gz: 04d58a67cb49ca15614e6a429d3bca5ac8c8f6d42785da6169c5a031bc8cfd2647efd637bbd223fb43eba867ae10fcb3263bb67712b66dc02340eb9f03c2a998
+  data.tar.gz: b1eb81a0f591010ef0a8b7805506ef6a3bb663895c7603c239dd0f50065baaab4e36f61f4107f67104afcdb8a0030de56c8f7e4b7e1f344e5a9f7d239231007c

data/lib/ogem/ogamecalc.rb

@@ -3,7 +3,7 @@
 require_relative 'ship.class'
 require_relative 'player.class'
 
-module OgameCalc
+module Ogem
 
   SHIP_LIST = {
     light_fighter:  Ship.new("Chasseur léger",  "cl",   3000,     1000,    0),

data/lib/ogem/player.class.rb

@@ -2,13 +2,13 @@
 
 gem 'myerror'
 
-module OgameCalc
+module Ogem
   class Player
     attr_accessor :name, :r
 
     def initialize name="Player", m=1000, c=1000, d=0
       if !name.is_a?String
-        Error.call "OgameCalc::Player::new : invalid name", Error::ERR_MEDIUM
+        Error.call "Ogem::Player::new : invalid name", Error::ERR_MEDIUM
         name = "Player"
       end
 

data/lib/ogem/ship.class.rb

@@ -2,20 +2,20 @@
 
 gem 'myerror'
 
-module OgameCalc
+module Ogem
   class Ship
     attr_reader :name, :r, :abv
 
     def initialize name="Ship", abv="", m=3000, c=1000, d=0
       if !name.is_a?String
-        Error.call "OgameCalc::Ship::new : invalid name", Error::ERR_MEDIUM
+        Error.call "Ogem::Ship::new : invalid name", Error::ERR_MEDIUM
         name = "UnknowShip"
-      elsif !abv.is_a?String
-        Error.call "OgameCalc::Ship::new : invalid abv", Error::ERR_MEDIUM
+      elsif !abv.is_a?String and !abv.is_a?Symbol
+        Error.call "Ogem::Ship::new : invalid abv", Error::ERR_MEDIUM
         name = "unknow"
       end
       @name = name
-      @abv = abv
+      @abv = abv.to_sym
       @r = {m: m.to_i, c: c.to_i, d: d.to_i}
     end
 
@@ -29,14 +29,14 @@ module OgameCalc
 
     def cost
       line = ""
-      OgameCalc::RESOURCES.each do |k, v|
+      Ogem::RESOURCES.each do |k, v|
         line += "\t<#{v}:#{@r[k]}>"
       end
       return line
     end
 
     def self.get_abv abv
-      OgameCalc::SHIP_LIST.each do |k, ship|
+      Ogem::SHIP_LIST.each do |k, ship|
         Error.call "Ship::self.get_abv : Invalid element #{ship}" if !ship.is_a?Ship
         return ship if ship.abv == abv
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ogem
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - poulet_a