CoC-Calc 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b6f91f5cccf742958d38cbec043d0e2ef18250c
-  data.tar.gz: 7c50f2414670efa703bc5a59fc37b179dcc6de79
+  metadata.gz: 102dd1f37707efd35885c487ad872bffd353377d
+  data.tar.gz: 9d564ea37daf6679ac3e97174a35c6c76be13669
 SHA512:
-  metadata.gz: ffdd285b90a027da91d85f1daecb502e203f9ea25c87dcdc3de6b2cc9e798a45da48b3457c717e85c129168af71d1ae57d56402976aef6456deed2c8d686a102
-  data.tar.gz: 5456c275740778cdbfe96ec576891a023199e41843c434e98cd65e8b542cf8ea061c547d3f177916541d1f45500de551e8aa6a5b37e86f9ebf1729fa42be793c
+  metadata.gz: 7d21e14163c689d1ee83f52643e569cf9afdb25b5451e986ad6ded3690af2a8dafc08f67eea6b3b80722a6a030f7d182345b937cd9757fe1f0ab0166048813d5
+  data.tar.gz: aa6398cfd2cecf44429750c521d36f3faf543069683ba7e9e56adcf50a01111a49d811e9d2e222b5afdd1142e99637634a2dbee3962595768adad762b4c16878

data/bin/CoC-Calc

@@ -0,0 +1,2 @@
+#!/usr/bin/env ruby
+require 'CoC-Calc'

data/lib/CoC-Calc.rb

@@ -32,7 +32,9 @@ def initPuts
 
 	if $lvlSaveContent == ""
 		puts "You need to enter the levels of your troops by running 'ruby CoC-Calc.rb set_troop_lvl' if you need futher help run 'ruby CoC-Calc.rb set_troop_lvl help'!"
-	end
+	else
+        puts "Tests were successful!"
+    end
 
 	$lvls = $lvlSaveContent.split('||')
 	$lvls.each do |i|
@@ -225,44 +227,48 @@ def set_troop_lvl
 end
 
 def calc
-	if ARGV[1].downcase == 'help'
-		puts 'Calc the training time and cost of your troops run "ruby CoC-Calc.rb calc [amount of barbarians] [amount of archers] [amount of goblins] [amount of giants] [amount of wallbreakers] [amount of ballons] [amount of wizards] [amount of healers] [amount of dragons] [amount of pekkas]"'
-	elsif File.file? "/CoC-Calc-Saves/lvl.txt"
-		totalCost = 0
-		totalTime = 0
+	if ARGV[1].is_a? String
+		if ARGV[1].downcase == 'help'
+			puts 'Calc the training time and cost of your troops run "ruby CoC-Calc.rb calc [amount of barbarians] [amount of archers] [amount of goblins] [amount of giants] [amount of wallbreakers] [amount of ballons] [amount of wizards] [amount of healers] [amount of dragons] [amount of pekkas]"'
+		elsif File.file? "/CoC-Calc-Saves/lvl.txt"
+			totalCost = 0
+			totalTime = 0
 
-		get_troop_cost
+			get_troop_cost
 
-		if $troopLvlErr
+			if $troopLvlErr
 
-		else
-			totalCost += ARGV[1].to_i * $cost_barbarians
-			totalCost += ARGV[2].to_i * $cost_archers
-			totalCost += ARGV[3].to_i * $cost_goblins
-			totalCost += ARGV[4].to_i * $cost_giants
-			totalCost += ARGV[5].to_i * $cost_wallbreakers
-			totalCost += ARGV[6].to_i * $cost_ballons
-			totalCost += ARGV[7].to_i * $cost_wizards
-			totalCost += ARGV[8].to_i * $cost_healers
-			totalCost += ARGV[9].to_i * $cost_dragons
-			totalCost += ARGV[10].to_i * $cost_pekkas
+			else
+				totalCost += ARGV[1].to_i * $cost_barbarians
+				totalCost += ARGV[2].to_i * $cost_archers
+				totalCost += ARGV[3].to_i * $cost_goblins
+				totalCost += ARGV[4].to_i * $cost_giants
+				totalCost += ARGV[5].to_i * $cost_wallbreakers
+				totalCost += ARGV[6].to_i * $cost_ballons
+				totalCost += ARGV[7].to_i * $cost_wizards
+				totalCost += ARGV[8].to_i * $cost_healers
+				totalCost += ARGV[9].to_i * $cost_dragons
+				totalCost += ARGV[10].to_i * $cost_pekkas
 
-			totalTime += ARGV[1].to_i * 20
-			totalTime += ARGV[2].to_i * 25
-			totalTime += ARGV[3].to_i * 30
-			totalTime += ARGV[4].to_i * 120
-			totalTime += ARGV[5].to_i * 120
-			totalTime += ARGV[6].to_i * 380
-			totalTime += ARGV[7].to_i * 380
-			totalTime += ARGV[8].to_i * 900
-			totalTime += ARGV[9].to_i * 1800
-			totalTime += ARGV[10].to_i * 2700
+				totalTime += ARGV[1].to_i * 20
+				totalTime += ARGV[2].to_i * 25
+				totalTime += ARGV[3].to_i * 30
+				totalTime += ARGV[4].to_i * 120
+				totalTime += ARGV[5].to_i * 120
+				totalTime += ARGV[6].to_i * 380
+				totalTime += ARGV[7].to_i * 380
+				totalTime += ARGV[8].to_i * 900
+				totalTime += ARGV[9].to_i * 1800
+				totalTime += ARGV[10].to_i * 2700
 
-			puts "Your Troops will cost #{totalCost} elixir."
-			puts "Your total training time is #{totalTime}s."
+				puts "Your Troops will cost #{totalCost} elixir."
+				puts "Your total training time is #{totalTime}s."
+			end
+		else
+			puts "You need to enter the levels of your troops by running 'ruby CoC-Calc.rb set_troop_lvl' if you need futher help run 'ruby CoC-Calc.rb set_troop_lvl help'!"
 		end
 	else
-		puts "You need to enter the levels of your troops by running 'ruby CoC-Calc.rb set_troop_lvl' if you need futher help run 'ruby CoC-Calc.rb set_troop_lvl help'!"
+		puts "You need to supply an argument (run 'CoC-Calc cost help' for help)"
 	end
 end
 
@@ -274,4 +280,6 @@ elsif ARGV[0] == 'set_troop_lvl'
 	set_troop_lvl
 elsif ARGV[0]== 'calc'
 	calc
+else
+	puts "CoC-Calc up and running, Sir!"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: CoC-Calc
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ben Bals
@@ -13,10 +13,12 @@ dependencies: []
 description: Calculate your troop training cost and time for Clash of Clans! Written
   in Ruby (runns on Mac, Windows and Linux)
 email: benjustusbals@gmail.com
-executables: []
+executables:
+- CoC-Calc
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/CoC-Calc
 - lib/CoC-Calc.rb
 homepage: https://github.com/BenBals/CoC-Calc
 licenses: