slodd 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5895e32f16f7de60acc7fa7fff792e45d714ee2f
-  data.tar.gz: 9c11ed125b4d5adc56bc7f3359e12ccb101bcbee
+  metadata.gz: 58ad0ed388dc2f17445eb085c9e95903c2714bc0
+  data.tar.gz: e175c62ef7ee59e0f6caef00c4826e3d01660bdb
 SHA512:
-  metadata.gz: b848d14e7dca6b211ccf98b1214fa475414b6a59385b9b4c4cf4c6d8d43f5327512f3decd405083470a62f601e4632a11c646e35226c7494dccc349a0628ce7f
-  data.tar.gz: 4f25cce1177b1de06a96ceab6997dc342fa67b04ff91407938dcb87486c8e6dcce8dddaffd2f94a59994d3821bf82a8d425d957baa00baff1a0acbb38142b9f6
+  metadata.gz: 68d653d3f5153d9b923ada555e1008db3d51ffbfe3f8ef871bfa00687171cf1761870d0bcc91d6d5de46bbb2b627ec864012072d888c9f68dbbac473f053f984
+  data.tar.gz: ef32c965d69e51fa93ffcd078f34049c1e8663965ea2b10fde0c9e418e27e0783fceb5c489b936dcff493b7ac786e68800cacf6aa9bb68b6d6531e972027bbfd

data/.ruby-version

@@ -1 +1 @@
-2.1.8
+2.3.5

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 2.4.1
-  - 2.3.4
-  - 2.2.7
+  - 2.3.5
+  - 2.2.8
 sudo: false

data/Dockerfile

@@ -0,0 +1,20 @@
+FROM quay.io/assemblyline/alpine:3.6
+
+WORKDIR /app
+
+COPY . .
+
+RUN apk add --no-cache --virtual .builddeps \
+      build-base \
+      ca-certificates \
+      curl \
+      git \
+      mariadb-dev \
+      mariadb-client \
+      ruby$(cat .ruby-version) \
+      ruby$(cat .ruby-version)-dev \
+      ruby$(cat .ruby-version)-irb
+
+RUN bundle install -j4 -r3
+
+ENTRYPOINT ["bundle", "exec"]

data/docker-compose.yml

@@ -0,0 +1,26 @@
+version: '3.4'
+services:
+  mysql:
+    image: mysql:8
+    restart: always
+    ports:
+      - "3306:3306"
+    environment:
+      MYSQL_ALLOW_EMPTY_PASSWORD: "true"
+    volumes:
+      - mysql-socket:/run/mysqld/
+
+  slodd:
+    build:
+      context: .
+    depends_on:
+      - mysql
+    volumes:
+      - type: bind
+        source: .
+        target: /app
+      - mysql-socket:/run/mysqld/
+    command: rake
+
+volumes:
+  mysql-socket:

data/lib/slodd.rb

@@ -6,6 +6,7 @@ require "slodd/local"
 require "slodd/http"
 require "slodd/config"
 require "slodd/runner"
+require "slodd/exceptions"
 
 module Slodd
 end

data/lib/slodd/exceptions.rb

@@ -0,0 +1,4 @@
+module Slodd
+  class GithubError < StandardError
+  end
+end

data/lib/slodd/github.rb

@@ -15,6 +15,8 @@ module Slodd
 
     def schema
       @schema ||= open(url, headers).read
+    rescue OpenURI::HTTPError
+      raise Slodd::GithubError, "Check your credentials and the schema file location!"
     end
 
     private
@@ -24,7 +26,7 @@ module Slodd
     end
 
     def branch
-      "?ref=#{ref}" if ref.present?
+      "?ref=#{ref}" unless ref.nil?
     end
 
     def headers

data/lib/slodd/runner.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require "active_record"
+require "active_record/connection_adapters/abstract_mysql_adapter"
 require "mysql2"
 
 module Slodd
@@ -10,12 +11,14 @@ module Slodd
 
     def initialize
       self.schema = Config.fetcher.schema
+      # patch AR to work with mysql 5.7
+      ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter::NATIVE_DATABASE_TYPES[:primary_key] = "int(11) auto_increment PRIMARY KEY" # rubocop:disable Metrics/LineLength
     end
 
     def run!
       Config.databases.each do |database|
         create_database(database)
-        eval(schema) # rubocop:disable Lint/Eval
+        eval(schema) # rubocop:disable Security/Eval
       end
     end
 

data/lib/slodd/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Slodd
-  VERSION = "0.1.8".freeze
+  VERSION = "0.1.9".freeze
 end

data/slodd.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(/^bin\//).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(/^(test|spec|features)\//)
   gem.require_paths = ["lib"]
-  gem.add_dependency("activerecord", "~> 3.2.22")
+  gem.add_dependency("activerecord", "~> 3.2.22.5")
   gem.add_dependency("mysql2", "~> 0.3.10")
   gem.add_development_dependency("rspec")
   gem.add_development_dependency("rake")

data/spec/lib/{gitub_spec.rb → github_spec.rb}

@@ -70,5 +70,17 @@ describe Slodd::Github do
       allow(schema).to receive(:read).and_return("the schema")
       expect(subject.schema).to eq "the schema"
     end
+
+    context "with an invalid or unauthorized token" do
+      let(:token) { "invalid-or-unauthorized-token" }
+
+      it "raises exception on Github 404" do
+        allow(subject).to receive(:open).and_raise(OpenURI::HTTPError.new("404 not found", nil))
+        expect { subject.schema }.to raise_exception(
+          Slodd::GithubError,
+          "Check your credentials and the schema file location!",
+        )
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slodd
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Ed Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.22
+        version: 3.2.22.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.22
+        version: 3.2.22.5
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -107,14 +107,17 @@ files:
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
+- Dockerfile
 - Gemfile
 - LICENCE
 - README.md
 - Rakefile
 - bin/gurl
 - bin/slodd
+- docker-compose.yml
 - lib/slodd.rb
 - lib/slodd/config.rb
+- lib/slodd/exceptions.rb
 - lib/slodd/github.rb
 - lib/slodd/http.rb
 - lib/slodd/local.rb
@@ -122,7 +125,7 @@ files:
 - lib/slodd/version.rb
 - slodd.gemspec
 - spec/lib/config_spec.rb
-- spec/lib/gitub_spec.rb
+- spec/lib/github_spec.rb
 - spec/lib/http_spec.rb
 - spec/lib/local_spec.rb
 - spec/lib/runner_spec.rb
@@ -148,13 +151,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Schema Loading On Dependent Databases
 test_files:
 - spec/lib/config_spec.rb
-- spec/lib/gitub_spec.rb
+- spec/lib/github_spec.rb
 - spec/lib/http_spec.rb
 - spec/lib/local_spec.rb
 - spec/lib/runner_spec.rb