Skip to content

Commit a88493f

Browse files
authored
Merge pull request #88 from Namasteh/dev-6
Minor Patch Update 6.5.8 from 6.5.7
2 parents 44d1ef8 + 4b64dac commit a88493f

File tree

11 files changed

+665
-151
lines changed

11 files changed

+665
-151
lines changed

.gitignore

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,3 +213,32 @@ pip-log.txt
213213

214214
#Mr Developer
215215
.mr.developer.cfg
216+
217+
#Ruby Ignores
218+
219+
# Ignore bundler config
220+
/.bundle
221+
222+
# Ignore the default SQLite database.
223+
/db/*.sqlite3
224+
225+
# Ignore all logfiles and tempfiles.
226+
/log/*.log
227+
/tmp
228+
229+
*.gem
230+
*.rbc
231+
.bundle
232+
.config
233+
coverage
234+
InstalledFiles
235+
lib/bundler/man
236+
pkg
237+
rdoc
238+
spec/reports
239+
test/tmp
240+
test/version_tmp
241+
tmp
242+
.directory
243+
.vscode/launch.json
244+
Gemfile.lock

Eve.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
c.channels = ["#Eve"]
2727
c.nick = "Eve"
2828
c.user = "Eve"
29-
c.realname = "Eve 6.5.7"
29+
c.realname = "Eve 6.5.8"
3030

3131
## Below is the plugin block for Eve-Bot. Please be sure that all the plugins
3232
## that you want the bot to use are included in this block. If you want to
@@ -56,7 +56,7 @@
5656
# Cinch::Plugins::TwitterStatus,
5757
Cinch::Plugins::Wikipedia,
5858
Cinch::Plugins::Weather,
59-
Cinch::Plugins::Google,
59+
# Cinch::Plugins::Google,
6060
Cinch::Plugins::YouTube,
6161
Cinch::Plugins::Math,
6262
Cinch::Plugins::UserInfo,
@@ -69,7 +69,7 @@
6969
Cinch::Plugins::News,
7070
Cinch::Plugins::Wolfram,
7171
Cinch::Plugins::CoinQuery,
72-
Cinch::Plugins::WordGame,
72+
# Cinch::Plugins::WordGame,
7373
Cinch::Plugins::Reddit,
7474
Cinch::Plugins::Tag,
7575
Cinch::Plugins::LastFm];
@@ -104,9 +104,9 @@
104104

105105
c.plugins.options[Cinch::Plugins::LastFm] = { key: 'foo' }
106106

107-
c.plugins.options[Cinch::Plugins::Google] = { key: 'foo',
108-
engineid: 'bar'
109-
}
107+
# c.plugins.options[Cinch::Plugins::Google] = { key: 'foo',
108+
# engineid: 'bar'
109+
# }
110110

111111
c.password = "nspass"
112112

Gemfile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
ruby '2.4.1'
2+
3+
source 'https://rubygems.org'
4+
5+
gem "cinch"
6+
gem "highline"
7+
gem "activesupport"
8+
gem "redis"
9+
gem 'nokogiri', '~> 1.6', '>= 1.6.8'
10+
gem 'cinch-toolbox'
11+
gem 'time-lord'
12+
gem 'mechanize'
13+
gem 'oj'
14+
gem 'twitter'
15+
gem 'calc'
16+
gem 'wolfram-alpha'
17+
gem 'actionview'

bin/plugins.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
require_relative "../lib/plugins/plugin_management"
2525
require_relative "../lib/plugins/wikipedia"
2626
require_relative "../lib/plugins/weather"
27-
require_relative "../lib/plugins/google"
27+
#require_relative "../lib/plugins/google"
2828
require_relative "../lib/plugins/you_tube"
2929
require_relative "../lib/plugins/math"
3030
require_relative "../lib/plugins/user_info"
@@ -37,7 +37,7 @@
3737
require_relative "../lib/plugins/news"
3838
require_relative "../lib/plugins/wolfram"
3939
require_relative "../lib/plugins/reddit"
40-
require_relative "../lib/plugins/word_game"
40+
#require_relative "../lib/plugins/word_game"
4141
require_relative "../lib/plugins/tag"
4242
require_relative "../lib/plugins/coin_query"
4343
require_relative "../lib/plugins/last_fm"

install.rb

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
2+
# The script is for easy install of the gems Eve requires
3+
4+
5+
6+
7+
# This function checks if a gem is installed and installs it if it isn't
8+
def install_check(gem)
9+
say "Checking if '#{gem}' is installed."
10+
if system('gem list -i "^#{gem}$"') # This ensures we don't get a false positive
11+
say "Found '#{gem}'."
12+
else
13+
say "Gem '#{gem}' is not installed, installing..."
14+
system("gem install #{gem}")
15+
say "Installation of '#{gem}' successful!"
16+
end
17+
end
18+
19+
# This function is for installing highline to make output pretty
20+
def install_highline
21+
puts "In order to continue with automatic installation 'highline' is required!"
22+
puts "Should I install the 'highline' gem now? [y/n]:"
23+
answer = gets.chomp
24+
if answer.downcase != 'y'
25+
puts "Highline is needed to proceed! Exiting in 3 seconds..."
26+
puts "Please see documentation for manual install."
27+
sleep 3
28+
system("kill #{Process.pid}")
29+
else
30+
system("gem install highline")
31+
end
32+
end
33+
34+
# Here we check to see if highline is installed
35+
puts "Checking to see if 'highline' is installed..."
36+
if system('gem list -i "^highline$"')
37+
puts "Looks like 'highline' is already installed, good!"
38+
sleep 2
39+
else
40+
puts "Looks like 'highline' is NOT installed"
41+
install_highline # Install highline if it's not
42+
end
43+
44+
# Prepare script to use highline
45+
require 'highline/import'
46+
cli = HighLine.new
47+
system("clear")
48+
49+
# Start main script, ask if they wanna update their gems
50+
say "Welcome to eve6!"
51+
if agree("Would you like to run an update on your Ruby Gems? [y/n]: ", true)
52+
system("gem update")
53+
say("Your gems have been updated!")
54+
else
55+
say("Ok! Continuing without updating...")
56+
end
57+
58+
# Confirm that they want us installing gems
59+
say "This script is for use if you plan on using a full-featured Eve."
60+
say "We will install things to your system using gems."
61+
if agree("Would you like to proceed? [y/n]: ", true)
62+
say "Alright! Proceeding with framework install!"
63+
else
64+
say "Please see documentation to continue."
65+
system("kill #{Process.pid}")
66+
end
67+
68+
# Start checking for bundler, and then install based on Gemfile
69+
say "Checking basic dependencies..."
70+
71+
install_check("bundler")
72+
say "Using Bundler to install needed gems..."
73+
system *%W[bundler install --system]
74+
75+
say "Required dependencies for eve6 now installed."
76+
say "Once you've configured Eve you can start it using: ruby Eve.rb"
77+
78+
system("kill #{Process.pid}") # End program
79+

0 commit comments

Comments
 (0)