aaf-gumboot 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 621e2323c9655c1e7b36f143102db089b01d2aace411cc099eada952ad0324c6
-  data.tar.gz: c1bccb4e8dc8b110d9116f91dd54552b2ec4f97d8e8f58948588e9df314ea1d5
+  metadata.gz: 7a713e915fc7a71196b7127e2a20f052e328fad64bc53c8c18ed4f9b77d1bbc0
+  data.tar.gz: 389bb5fb4cde9a1db6ab7027b8f3db37120adb29b41f0d5a3fc68a74dfe0b720
 SHA512:
-  metadata.gz: b69c418d9f7e73fa8f426b7ceb380b6b7e5ce7adaa9d53742614a5e1a0ecd2c9a2f6772895d07ab1c5f5576dbcdbe1017492ea02436410a47b1a25ab8fd554ed
-  data.tar.gz: d2363f1fdfc5eea05e4c8f003bdd17ffb09d27576eb6615a31c7e3c46f8cceb3e96f4640d9e227538794fdecff8f0802c8550255a3d9d7872db2d1513e4f2b2a
+  metadata.gz: 2bba367eadd046a177e1efae9c68b0dc875925e84500d9a2de0d52671e4ec27705a16e32134ee8e8bd2d540442eabafdb1356feddb01915ff675639febc7cfd3
+  data.tar.gz: e078a051b4e7f1cd7d4ac05b2f5fb380fc5cc353426fced3cf1ce72e60414fade87bfc6a5dec952a332a004fd91920422fb248722d8b8904014ca386274a831d

data/lib/gumboot/shared_examples/database_schema.rb

@@ -35,6 +35,7 @@ RSpec.shared_examples 'Database Schema' do
       query('SHOW TABLE STATUS').each do |table|
         table_name = table[:Name]
         next if table_name == 'schema_migrations'
+
         expect(table).to(
           have_collations(%w[utf8_bin utf8mb4_bin], "`#{table_name}`")
         )
@@ -47,6 +48,7 @@ RSpec.shared_examples 'Database Schema' do
                       except_column == column[:Field].to_sym
                     end
                   end
+
           expect(column)
             .to have_collations(%w[utf8_bin utf8mb4_bin],
                                 " `#{table_name}`.`#{column[:Field]}`")

data/lib/gumboot/strap.rb

@@ -42,9 +42,14 @@ module Gumboot
         "Ensuring access to `#{database}` for #{username} user is granted"
       )
 
+      create_and_grant_user(client, database, username, password)
+    end
+
+    def create_and_grant_user(client, database, username, password)
+      client.query("CREATE USER IF NOT EXISTS '#{client.escape(username)}'" \
+                   "@'localhost' IDENTIFIED BY '#{client.escape(password)}';")
       client.query("GRANT ALL PRIVILEGES ON `#{database}`.* " \
-                   "TO '#{client.escape(username)}'@'localhost' " \
-                   "IDENTIFIED BY '#{client.escape(password)}'")
+                   "TO '#{client.escape(username)}'@'localhost'")
     end
 
     def maintain_activerecord_schema
@@ -82,6 +87,7 @@ module Gumboot
 
         dest =  "config/#{file}"
         next if File.exist?(dest)
+
         FileUtils.ln_s(src, dest)
       end
     end
@@ -104,6 +110,7 @@ module Gumboot
         raise("Missing dist config file: #{src}") unless File.exist?(src)
 
         next if File.exist?(dest)
+
         FileUtils.copy(src, dest)
       end
     end

data/lib/gumboot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gumboot
-  VERSION = '2.1.3'.freeze
+  VERSION = '2.1.4'.freeze
 end

data/spec/dummy/.rubocop.yml

@@ -2,6 +2,5 @@ inherit_from:
   - ../../aaf-rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.5
   Exclude:
     - db/schema.rb

data/spec/dummy/app/controllers/api/api_controller.rb

@@ -58,6 +58,7 @@ module API
 
     def check_access!(action)
       raise(Forbidden) unless @subject.permits?(action)
+
       @access_checked = true
     end
 

data/spec/dummy/app/controllers/application_controller.rb

@@ -16,6 +16,7 @@ class ApplicationController < ActionController::Base
   def subject
     subject = session[:subject_id] && Subject.find_by(id: session[:subject_id])
     return nil unless subject.try(:functioning?)
+
     @subject = subject
   end
 
@@ -38,6 +39,7 @@ class ApplicationController < ActionController::Base
 
   def check_access!(action)
     raise(Forbidden) unless subject.permits?(action)
+
     @access_checked = true
   end
 

data/spec/lib/gumboot/strap_spec.rb

@@ -73,11 +73,17 @@ RSpec.describe Gumboot::Strap do
 
     it 'sets permissions for database users' do
       expect(client).to receive(:query)
-        .with("GRANT ALL PRIVILEGES ON `one_db`.* TO 'one_user'@'localhost' " \
-              "IDENTIFIED BY 'one_password'").once
+        .with("CREATE USER IF NOT EXISTS 'one_user'@'localhost' " \
+              "IDENTIFIED BY 'one_password';").once
       expect(client).to receive(:query)
-        .with("GRANT ALL PRIVILEGES ON `two_db`.* TO 'two_user'@'localhost' " \
-              "IDENTIFIED BY 'two_password'").once
+        .with("GRANT ALL PRIVILEGES ON `one_db`.* TO 'one_user'@'localhost'")
+        .once
+      expect(client).to receive(:query)
+        .with("CREATE USER IF NOT EXISTS 'two_user'@'localhost' " \
+              "IDENTIFIED BY 'two_password';").once
+      expect(client).to receive(:query)
+        .with("GRANT ALL PRIVILEGES ON `two_db`.* TO 'two_user'@'localhost'")
+        .once
 
       allow(client).to receive(:query).with(match(/^CREATE DATABASE.*/))
 
@@ -107,9 +113,12 @@ RSpec.describe Gumboot::Strap do
     end
 
     it 'sets permission for the database user' do
+      expect(client).to receive(:query)
+        .with("CREATE USER IF NOT EXISTS 'test_user'@'localhost' " \
+          "IDENTIFIED BY 'test_password';").once
       expect(client).to receive(:query)
         .with('GRANT ALL PRIVILEGES ON `test_db`.* TO ' \
-              "'test_user'@'localhost' IDENTIFIED BY 'test_password'").once
+              "'test_user'@'localhost'").once
 
       subject.ensure_database_user(opts)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aaf-gumboot
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Bradley Beddoes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: accession