billinfo 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a72ef1c301dc6c67c0f46d692d4c401e6f913bfa
-  data.tar.gz: d1b1428ba496911b404f621d6ec514d5651fdd8b
+  metadata.gz: bcbed057e6d6e100e5b7825607f227d86f612a00
+  data.tar.gz: ea9fb3b5acb5a3a12a3d1aed7dff7b7ef4562613
 SHA512:
-  metadata.gz: e136ba27cb545d54790c46f208d65e39b6859adc800be2c7f55140bbcd5608c69754dadb8484b6a5739e542c682e34392bebe3d71b1d715ee7e0223481ef5ddd
-  data.tar.gz: 470383576d51b1c74fa9d910494e736f2178687716d4c266d57ec20b80b5b8e19676903cece5210b036a7727773b4a993b06312014ffffd75a5db0d323c8dd5d
+  metadata.gz: ac0eeb7eb8fb5ec852514ae02b214360956aa96246d7aea4cd69ece8bfcc11b5f63911e98c1c305a7d7723c7675ca4d30bc2c6451fe07f7e00306251d7a5be03
+  data.tar.gz: 57cd3136512936202030cfdd6b0473dbfdc1fdbc0d8e860ca40f1058ca40af06a1ccc1761893e146c0034142520ce58cf55a36aacdacce0db584ad7663d51db4

data/Gemfile.lock

@@ -0,0 +1,26 @@
+PATH
+  remote: .
+  specs:
+    billinfo (0.0.1)
+      sqlite3 (~> 1.4.0, >= 1.4.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rake (10.5.0)
+    sqlite3 (1.4.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  billinfo!
+  bundler (~> 2.0)
+  rake (~> 10.5.0, >= 10.5.0)
+  sqlite3 (~> 1.4.0, >= 1.4.0)
+
+RUBY VERSION
+   ruby 2.3.7p456
+
+BUNDLED WITH
+   2.0.1

data/billinfo.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Billinfo::VERSION
   spec.authors       = ["mepyyeti"]
   spec.email         = ["rcabej@gmail.com"]
-
-  spec.summary       = %q{A bill repository. Organizes monthly bills by category. Calculates inclusive/exclusive means. Sums categories.}
+  spec.description   = %q{A bill repository. Organizes monthly bills by category. Calculates inclusive/exclusive means. Sums categories. Bug in Display option fixed. Added functionality that permanently adds custom categories}
+  spec.summary       = %q{A bill repository. Organizes monthly bills by category. Calculates inclusive/exclusive means. Sums categories. Bug in Display option fixed. Added functionality that permanently adds custom categories}
   spec.homepage      = "https://www.github.com/mepyyeti/billinfo"
   spec.files	     = 'git ls-files'.split($/)
   spec.require_paths = ["lib"]

data/lib/billinfo.rb

@@ -20,30 +20,39 @@ module Billinfo
 			print "choose 1 or 2: "
 			choice = gets.chomp.to_i
 		end
-		categories = ['electricity','water','cable','streaming','rent','food','clothes','out \'n about']
-	
+
 		if choice == 1
-			puts "enter a category such as: #{categories}: "
-			print "category: "
+			create_categories
+			categories = print_standard_categories
+			print "enter a category such as: " , categories
+			print "\ncategory: "
 			category = gets.chomp.to_s
-			new_cat = category
-			category = [category]
-			
+
+			if category.empty?
+				print "you must enter a category\n"
+				next
+			else
+				category = [category]
+			end
+
 			while (category & categories).empty?
 				puts "your category is not listed."
 				print "\nwould you like to add #{category} as a category? [y/n]: "
 				choice = gets.chomp.downcase
-				if choice == 'y' or choice 'yes'
-					categories << new_cat
+				if choice == 'y' or choice =='yes'
+					create_categories(category)
+					categories = print_standard_categories
+				else
+					next
 				end
 			end
-			
+
 			puts
 			print "enter Month: "
 			month = gets.chomp.to_s.capitalize
 			month = [month]
 			months = ['January','February','March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
-			
+
 			while (month & months).empty?
 				puts "You must enter a month."
 				print "\nAcceptable months are: " , months
@@ -68,6 +77,13 @@ module Billinfo
 			billavgx(info_hash)
 	
 		elsif choice == 2
+			if !File.file?('billinfo.db')
+				puts "You have not made any entries yet - there is nothing to show."
+				next
+			end
+
+			categories = print_standard_categories
+
 			print categories
 			puts "\nenter a category from choices above"
 			print "category: "
@@ -80,32 +96,21 @@ module Billinfo
 			end
 			
 			print "enter year to search (form: XXXX): "
-			year_foo = [gets.chomp]
+			year_foo = [gets.chomp.to_i]
 			yrs = uniq_yrs
 			
 			while year_foo.is_a?(String) || year_foo.empty? || (year_foo & yrs).empty?
 				puts "year must be one of the following:"
-				print yrs
-				puts
 				print "enter year to search (form: XXXX): "
-				year_foo = gets.chomp
+				year_foo = [gets.chomp.to_i]
 			end
-			
-			year = Integer(year_foo.pop)
-			
-			while year.is_a?(Integer)==false
-				puts "You must enter a numeric year (such as 2019)."
-				puts "Please retry."
-				year = [gets.chomp]
-			end
-			year = [year]
-				
+
+			year = [year_foo]
 			info_hash = {category: category, year: year}
 			printinfo(info_hash)
 
 		elsif choice == 3
 			go = false
-
 		else
 			next
 		end
@@ -121,5 +126,4 @@ module Billinfo
 		end
 	
 	end
-
 end

data/lib/billinfo/version.rb

@@ -1,3 +1,3 @@
 module Billinfo
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/billinfo_methods.rb

@@ -3,15 +3,64 @@
 
 require 'sqlite3'
 
+def create_categories(new_category = nil)
+	unless File.file?('billinfo.db')
+		categories = ['electricity','water','cable','streaming','rent','food','clothes','out \'n about']
+		begin
+			db = SQLite3::Database.open('billinfo.db')
+			db.transaction
+			db.execute2 "CREATE table if not exists categories(Type TEXT PRIMARY KEY)"
+			categories.each { |cat| db.execute2 "INSERT into categories(Type) values(:Type)", cat }
+			db.commit
+		rescue SQLite3::Exception => e
+			puts e
+			db.rollback
+		ensure
+			db.close if db
+		end
+	end
+	if new_category != nil
+		begin 
+			db = SQLite3::Database.open('billinfo.db')
+			db.transaction
+			db.execute2 "INSERT into categories(Type) values(:new_category)", new_category
+			db.commit
+			puts db.changes.to_s + " new category added"
+		rescue SQLite3::Exception => e
+			puts e
+			db.rollback
+		ensure
+			db.close if db
+		end
+	end
+end
+
+def print_standard_categories
+	begin
+		db = SQLite3::Database.open('billinfo.db')
+		db.results_as_hash = true
+		categories_to_print = []
+		categories = db.prepare "SELECT Type FROM categories"
+		categories.execute
+		categories.each { |cat| categories_to_print << cat[0] }
+		@categories_to_print = categories_to_print
+	rescue SQLite3::Exception => e
+		puts e
+	ensure
+		categories.close if categories
+		db.close if db
+	end
+	@categories_to_print
+end
+
 def billdb(info_hash)
 	begin
 		db = SQLite3::Database.open('billinfo.db')
-		puts db.get_first_value "select SQLite_version()"
 		db.transaction
 		db.execute2 "CREATE table if not exists bills(Id INTEGER PRIMARY KEY, Type TEXT, Month TEXT, Year INTEGER, Amount FLOAT, AvgInc FLOAT, AvgX FLOAT, Total FLOAT)"
 		db.execute2 "INSERT into bills(Type, Month, Year, Amount) values(:Type, :Month, :Year, :Amount)", info_hash[:category], info_hash[:month], info_hash[:year], info_hash[:amt]
 		db.commit
-		puts db.changes.to_s + " change made"
+		puts db.changes.to_s + " entry made"
 	rescue SQLite3::Exception => e
 		puts e
 		db.rollback
@@ -25,10 +74,14 @@ def billtotal(info_hash)
 		db = SQLite3::Database.open('billinfo.db')
 		db.transaction
 		get_amt =  db.execute2 "SELECT sum(Amount) from bills WHERE Type = :Type AND Year = :Year", info_hash[:category], info_hash[:year]
-		puts "foo"
 		db.execute2 "UPDATE bills SET Total = :Total WHERE Type = :Type AND Year = :Year", get_amt[1][0], info_hash[:category], info_hash[:year]
 		@total_amt=get_amt[1][0]
-		puts db.changes.to_s + " changes made"
+				if db.changes == 1
+			alter = "change"
+		else
+			alter = "changes"
+		end
+		puts db.changes.to_s + " #{alter} made to " + info_hash[:category].to_s + " for " + info_hash[:year].to_s
 		db.commit
 	rescue SQLite3::Exception => e
 		puts "error here " , e
@@ -59,7 +112,12 @@ def billavginc(info_hash)
 		update_avginc.each do |line|
 			db.execute2 "UPDATE bills SET AvgInc = :AvgInc WHERE Type = :Type AND Year = :Year", @avginc, info_hash[:category], info_hash[:year]
 			end
-		puts db.changes.to_s + " changes made " + "for #{info_hash[:year].to_s}"
+		if db.changes == 1
+			alter = "change"
+		else
+			alter = "changes"
+		end
+		puts db.changes.to_s + " #{alter} made " + "for #{info_hash[:year].to_s}"
 		db.commit
 	rescue SQLite3::Exception => e
 		puts "error here " , e
@@ -86,7 +144,6 @@ def billavgx(info_hash)
 			end	
 			db.execute2 "UPDATE bills SET AvgX = :AvgX WHERE Amount = :Amount AND Type = :Type AND Year = :Year", avgx, specific_row[0], info_hash[:category], info_hash[:year]
 		end
-		puts db.changes.to_s + " changes made " + "to #{info_hash[:year].to_s}"
 		db.commit
 	rescue SQLite3::Exception => e
 		puts "error here " , e
@@ -102,7 +159,7 @@ def uniq_yrs
 		yrs = []
 		db_print = db.execute2 "SELECT Year FROM bills"
 		db_print.each do |yr|
-			yrs << yr
+			yrs << yr[0]
 		end
 		yrs.shift
 		@yrs = yrs.uniq
@@ -111,6 +168,7 @@ def uniq_yrs
 	ensure
 		db.close if db
 	end
+	p @yrs.class
 	@yrs
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: billinfo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - mepyyeti
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-13 00:00:00.000000000 Z
+date: 2019-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,7 +64,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
-description: 
+description: A bill repository. Organizes monthly bills by category. Calculates inclusive/exclusive
+  means. Sums categories. Bug in Display option fixed. Added functionality that permanently
+  adds custom categories
 email:
 - rcabej@gmail.com
 executables: []
@@ -74,9 +76,11 @@ files:
 - ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- billinfo-0.0.1.gem
 - billinfo.gemspec
 - bin/console
 - bin/setup
@@ -110,5 +114,6 @@ rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: A bill repository. Organizes monthly bills by category. Calculates inclusive/exclusive
-  means. Sums categories.
+  means. Sums categories. Bug in Display option fixed. Added functionality that permanently
+  adds custom categories
 test_files: []