From 137aa5a162484ff5c0fdccbfd87b5592f3f04b4b Mon Sep 17 00:00:00 2001 From: Coraline Ada Ehmke Date: Thu, 3 Nov 2016 20:18:55 -0500 Subject: [PATCH] More db fun --- Gemfile | 3 +- Gemfile.lock | 127 ++++++++++++++++++------------------ Gemfile.lock.bak | 158 +++++++++++++++++++++++++++++++++++++++++++++ config/mongoid.yml | 31 +++++---- 4 files changed, 243 insertions(+), 76 deletions(-) create mode 100644 Gemfile.lock.bak diff --git a/Gemfile b/Gemfile index e1758ea3..ae067541 100644 --- a/Gemfile +++ b/Gemfile @@ -7,9 +7,8 @@ gem 'capistrano' gem 'database_cleaner', '~> 1.3.0', group: :test #s :github => 'bmabey/database_cleaner', group: :test gem 'dotenv' gem 'google-search', '~> 1.0' -gem 'inflections' gem 'marky_markov' -gem 'mongoid', '~> 3.1.6' +gem 'mongoid', '~> 6.0.0' gem 'octokit', '~> 3.0' gem 'poro_plus' gem 'pry' diff --git a/Gemfile.lock b/Gemfile.lock index f3caa25b..2637f2ef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,34 +1,38 @@ GEM remote: https://rubygems.org/ specs: - aasm (4.0.5) - activemodel (3.2.21) - activesupport (= 3.2.21) - builder (~> 3.0.0) - activesupport (3.2.21) - i18n (~> 0.6, >= 0.6.4) - multi_json (~> 1.0) - addressable (2.3.6) + aasm (4.11.1) + activemodel (5.0.0.1) + activesupport (= 5.0.0.1) + activesupport (5.0.0.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.3.8) + airbrussh (1.1.1) + sshkit (>= 1.6.1, != 1.7.0) brewery_db (0.2.4) faraday (~> 0.8.0) faraday_middleware (~> 0.8) hashie (>= 1.1, < 3) - builder (3.0.4) - capistrano (3.3.3) - capistrano-stats (~> 1.0.3) + bson (4.1.1) + capistrano (3.6.1) + airbrussh (>= 1.0.0) + capistrano-harrow i18n rake (>= 10.0.0) - sshkit (~> 1.3) - capistrano-stats (1.0.3) - coderay (1.1.0) - colorize (0.7.3) - crass (0.2.1) + sshkit (>= 1.9.0) + capistrano-harrow (0.5.3) + coderay (1.1.1) + concurrent-ruby (1.0.2) + crass (1.0.2) database_cleaner (1.3.0) diff-lcs (1.2.5) - dotenv (1.0.2) - faraday (0.8.9) + dotenv (2.1.1) + faraday (0.8.11) multipart-post (~> 1.2.0) - faraday_middleware (0.9.1) + faraday_middleware (0.10.0) faraday (>= 0.7.4, < 0.10) google-search (1.0.3) json @@ -39,65 +43,62 @@ GEM multipart-post httparty (0.14.0) multi_xml (>= 0.5.2) - i18n (0.6.11) - inflections (3.2.12.20130314) - activesupport (~> 3.2.0) + i18n (0.7.0) json (1.8.3) marky_markov (0.3.5) msgpack method_source (0.8.2) mimemagic (0.3.2) - mini_portile (0.6.1) - mongoid (3.1.6) - activemodel (~> 3.2) - moped (~> 1.4) - origin (~> 1.0) - tzinfo (~> 0.3.29) - moped (1.5.2) - msgpack (0.5.9) - multi_json (1.10.1) + mini_portile2 (2.1.0) + minitest (5.9.1) + mongo (2.3.1) + bson (~> 4.1) + mongoid (6.0.2) + activemodel (~> 5.0) + mongo (~> 2.3) + msgpack (1.0.2) multi_xml (0.5.5) multipart-post (1.2.0) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (2.9.1) - nokogiri (1.6.5) - mini_portile (~> 0.6.0) - nokogumbo (1.1.12) + net-ssh (3.2.0) + nokogiri (1.6.8.1) + mini_portile2 (~> 2.1.0) + nokogumbo (1.4.10) nokogiri - octokit (3.7.0) + octokit (3.8.0) sawyer (~> 0.6.0, >= 0.5.3) - origin (1.1.0) - poro_plus (1.0.2) - pry (0.10.1) + poro_plus (1.1.5) + pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - rack (1.5.2) + rack (1.6.4) rack-protection (1.5.3) rack - rake (10.4.2) - require_all (1.3.2) - rspec (3.1.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) - rspec-core (3.1.7) - rspec-support (~> 3.1.0) - rspec-expectations (3.1.2) + rake (11.3.0) + require_all (1.3.3) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.1.0) - rspec-mocks (3.1.3) - rspec-support (~> 3.1.0) - rspec-support (3.1.2) - ruby-stemmer (0.9.3) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) + ruby-stemmer (0.9.6) ruby-web-search (0.0.2) json rubyfish (0.0.6) - sanitize (3.0.3) - crass (~> 0.2.0) + sanitize (4.4.0) + crass (~> 1.0.2) nokogiri (>= 1.4.4) - nokogumbo (= 1.1.12) + nokogumbo (~> 1.4.1) sawyer (0.6.0) addressable (~> 2.3.5) faraday (~> 0.8, < 0.10) @@ -110,13 +111,14 @@ GEM json sinatra slop (3.6.0) - sshkit (1.5.1) - colorize + sshkit (1.11.4) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) + thread_safe (0.3.5) tilt (2.0.5) - tzinfo (0.3.42) - wikipedia-client (1.4.0) + tzinfo (1.2.2) + thread_safe (~> 0.1) + wikipedia-client (1.6.3) wolfram-alpha (0.3.1) nokogiri yummly (0.0.13) @@ -135,9 +137,8 @@ DEPENDENCIES database_cleaner (~> 1.3.0) dotenv google-search (~> 1.0) - inflections marky_markov - mongoid (~> 3.1.6) + mongoid (~> 6.0.0) octokit (~> 3.0) poro_plus pry diff --git a/Gemfile.lock.bak b/Gemfile.lock.bak new file mode 100644 index 00000000..35b3ea18 --- /dev/null +++ b/Gemfile.lock.bak @@ -0,0 +1,158 @@ +GEM + remote: https://rubygems.org/ + specs: + aasm (4.0.5) + activemodel (3.2.13) + activesupport (= 3.2.13) + builder (~> 3.0.0) + activesupport (3.2.13) + i18n (= 0.6.1) + multi_json (~> 1.0) + addressable (2.3.6) + brewery_db (0.2.4) + faraday (~> 0.8.0) + faraday_middleware (~> 0.8) + hashie (>= 1.1, < 3) + builder (3.0.4) + capistrano (3.3.3) + capistrano-stats (~> 1.0.3) + i18n + rake (>= 10.0.0) + sshkit (~> 1.3) + capistrano-stats (1.0.3) + coderay (1.1.0) + colorize (0.7.3) + crass (0.2.1) + database_cleaner (1.3.0) + diff-lcs (1.2.5) + dotenv (1.0.2) + faraday (0.8.9) + multipart-post (~> 1.2.0) + faraday_middleware (0.9.1) + faraday (>= 0.7.4, < 0.10) + google-search (1.0.3) + json + hashie (2.1.2) + httmultiparty (0.3.16) + httparty (>= 0.7.3) + mimemagic + multipart-post + httparty (0.14.0) + multi_xml (>= 0.5.2) + i18n (0.6.1) + inflections (3.2.12.20130314) + activesupport (~> 3.2.0) + json (1.8.3) + marky_markov (0.3.5) + msgpack + method_source (0.8.2) + mimemagic (0.3.2) + mini_portile (0.6.1) + mongoid (3.1.7) + activemodel (~> 3.2) + moped (~> 1.4) + origin (~> 1.0) + tzinfo (~> 0.3.29) + moped (1.5.3) + msgpack (0.5.9) + multi_json (1.12.1) + multi_xml (0.5.5) + multipart-post (1.2.0) + net-scp (1.2.1) + net-ssh (>= 2.6.5) + net-ssh (2.9.1) + nokogiri (1.6.5) + mini_portile (~> 0.6.0) + nokogumbo (1.1.12) + nokogiri + octokit (3.7.0) + sawyer (~> 0.6.0, >= 0.5.3) + origin (1.1.0) + poro_plus (1.0.2) + pry (0.10.1) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + rack (1.5.2) + rack-protection (1.5.3) + rack + rake (10.4.2) + require_all (1.3.2) + rspec (3.1.0) + rspec-core (~> 3.1.0) + rspec-expectations (~> 3.1.0) + rspec-mocks (~> 3.1.0) + rspec-core (3.1.7) + rspec-support (~> 3.1.0) + rspec-expectations (3.1.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.1.0) + rspec-mocks (3.1.3) + rspec-support (~> 3.1.0) + rspec-support (3.1.2) + ruby-stemmer (0.9.3) + ruby-web-search (0.0.2) + json + rubyfish (0.0.6) + sanitize (3.0.3) + crass (~> 0.2.0) + nokogiri (>= 1.4.4) + nokogumbo (= 1.1.12) + sawyer (0.6.0) + addressable (~> 2.3.5) + faraday (~> 0.8, < 0.10) + sinatra (1.4.7) + rack (~> 1.5) + rack-protection (~> 1.4) + tilt (>= 1.3, < 3) + slackbotsy (0.4.2) + httmultiparty + json + sinatra + slop (3.6.0) + sshkit (1.5.1) + colorize + net-scp (>= 1.1.2) + net-ssh (>= 2.8.0) + tilt (2.0.5) + tzinfo (0.3.52) + wikipedia-client (1.4.0) + wolfram-alpha (0.3.1) + nokogiri + yummly (0.0.13) + faraday (>= 0.8.7) + json (~> 1.8.0) + rack (>= 1.4.5) + +PLATFORMS + ruby + +DEPENDENCIES + aasm + activesupport + brewery_db + capistrano + database_cleaner (~> 1.3.0) + dotenv + google-search (~> 1.0) + inflections + marky_markov + mongoid + octokit (~> 3.0) + poro_plus + pry + rake + require_all + rspec + ruby-stemmer (>= 0.8.3) + ruby-web-search + rubyfish + sanitize (>= 3.0.2) + sinatra + slackbotsy + wikipedia-client (>= 1.4.0) + wolfram-alpha + yummly + +BUNDLED WITH + 1.13.6 diff --git a/config/mongoid.yml b/config/mongoid.yml index 7ed3f9ab..e3bfa302 100644 --- a/config/mongoid.yml +++ b/config/mongoid.yml @@ -1,32 +1,41 @@ development: - sessions: + clients: default: - database: alice_dev hosts: - - localhost:27017 + - <%= ENV['DB_HOST'] %> + # Define the default database name. + database: alicebot + # Since this database points at a session connected to MongoHQ, we must + # provide the authentication details. + options: + user: <%= ENV['DB_USER'] %> + password: <%= ENV['DB_PASS'] %> + #database: alice_dev + # hosts: + # - localhost:27017 test: - sessions: + clients: default: database: alice_test hosts: - localhost:27017 production: - sessions: - # Define the default session. + clients: default: - # A session can have any number of hosts. Usually 1 for a single - # server setup, and at least 3 for a replica set. Hosts must be - # an array of host:port pairs. This session is single server. hosts: - <%= ENV['DB_HOST'] %> # Define the default database name. database: alicebot # Since this database points at a session connected to MongoHQ, we must # provide the authentication details. - username: <%= ENV['DB_USER'] %> - password: <%= ENV['DB_PASS'] %> + options: + user: <%= ENV['DB_USER'] %> + password: <%= ENV['DB_PASS'] %> + #database: alice_dev + # hosts: + # - localhost:27017 options: allow_dynamic_fields: false identity_map_enabled: true