Merge 7371eaa into 309db92

Author: Jonathan Claudius

.gitignore

@@ -20,7 +20,6 @@ postgres-data/*
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-Gemfile.lock
 .ruby-version
 .ruby-gemset
 

.travis.yml

@@ -18,9 +18,11 @@ matrix:
       - SSHSCAN_DATABASE_USERNAME=sshobs
     services:
       - postgres
-    before_script:
-      - chmod u+x database/init-user-db-travis.sh
-      - database/init-user-db-travis.sh
+    script:
+      - createuser sshobs --no-password --superuser
+      - bundle install
+      - RAILS_ENV=test bundle exec rake db:drop && rake db:create && rake db:migrate
+      - bundle exec rake spec
     after_success:
       - coveralls
   - rvm: 2.5.0
@@ -35,9 +37,11 @@ matrix:
       - SSHSCAN_DATABASE_USERNAME=sshobs
     services:
       - postgres
-    before_script:
-      - chmod u+x database/init-user-db-travis.sh
-      - database/init-user-db-travis.sh
+    script:
+      - createuser sshobs --no-password --superuser
+      - bundle install
+      - RAILS_ENV=test bundle exec rake db:drop && rake db:create && rake db:migrate
+      - bundle exec rake spec
   - rvm: 2.3.6
     env:
       - LABEL=unit_tests
@@ -50,9 +54,11 @@ matrix:
       - SSHSCAN_DATABASE_USERNAME=sshobs
     services:
       - postgres
-    before_script:
-      - chmod u+x database/init-user-db-travis.sh
-      - database/init-user-db-travis.sh
+    script:
+      - createuser sshobs --no-password --superuser
+      - bundle install
+      - RAILS_ENV=test bundle exec rake db:drop && rake db:create && rake db:migrate
+      - bundle exec rake spec
   - rvm: 2.2.9
     env:
       - SSHSCAN_API_HOST=127.0.0.1
@@ -65,9 +71,11 @@ matrix:
       - LABEL=unit_tests
     services:
       - postgres
-    before_script:
-      - chmod u+x database/init-user-db-travis.sh
-      - database/init-user-db-travis.sh
+    script:
+      - createuser sshobs --no-password --superuser
+      - bundle install
+      - RAILS_ENV=test bundle exec rake db:drop && rake db:create && rake db:migrate
+      - bundle exec rake spec
   - rvm: 2.5.0
     env:
       - LABEL=docker_build_and_push

Gemfile

@@ -1,3 +1,20 @@
-source "https://rubygems.org"
+# Generated from /Users/jclaudius/code/ssh_scan_api/ssh_scan_api.gemspec
+source 'https://rubygems.org'
+gem "ssh_scan", "= 0.0.35"
+gem "sinatra", ">= 0"
+gem "sinatra-contrib", ">= 0"
+gem "sinatra-activerecord", ">= 0"
+gem "pg", "~> 0.21"
+gem "thin", ">= 0"
+gem "haml", ">= 0"
+gem "rspec", "~> 3.7"
+gem "rspec-its", "~> 1.2"
+gem "rake", ">= 0"
+gem "rack-test", ">= 0"
+gem "secure_headers", "= 3.6.4"
 
-gemspec
+group :development do
+  gem "coveralls", ">= 0"
+  gem "pry", ">= 0"
+  gem "rubocop", ">= 0"
+end

Gemfile.lock

@@ -0,0 +1,150 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (9.0.0)
+    ast (2.4.0)
+    backports (3.11.3)
+    bindata (2.4.3)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
+    coveralls (0.8.21)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.14.1)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
+    daemons (1.2.6)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    eventmachine (1.2.7)
+    haml (5.0.4)
+      temple (>= 0.8.0)
+      tilt
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.1)
+    json (2.1.0)
+    method_source (0.9.0)
+    minitest (5.11.3)
+    multi_json (1.13.1)
+    mustermann (1.0.2)
+    net-ssh (4.2.0)
+    netaddr (1.5.1)
+    parallel (1.12.1)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
+    pg (0.21.0)
+    powerpack (0.1.2)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rack (2.0.5)
+    rack-protection (2.0.3)
+      rack
+    rack-test (1.0.0)
+      rack (>= 1.0, < 3)
+    rainbow (3.0.0)
+    rake (12.3.1)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    rubocop (0.57.2)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.9.0)
+    secure_headers (3.6.4)
+      useragent
+    simplecov (0.14.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sinatra (2.0.3)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.3)
+      tilt (~> 2.0)
+    sinatra-activerecord (2.0.13)
+      activerecord (>= 3.2)
+      sinatra (>= 1.0)
+    sinatra-contrib (2.0.3)
+      activesupport (>= 4.0.0)
+      backports (>= 2.8.2)
+      multi_json
+      mustermann (~> 1.0)
+      rack-protection (= 2.0.3)
+      sinatra (= 2.0.3)
+      tilt (>= 1.3, < 3)
+    ssh_scan (0.0.35)
+      bindata (~> 2.0)
+      net-ssh (~> 4.2)
+      netaddr (= 1.5.1)
+      sshkey
+    sshkey (1.9.0)
+    temple (0.8.0)
+    term-ansicolor (1.6.0)
+      tins (~> 1.0)
+    thin (1.7.2)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (>= 1, < 3)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tilt (2.0.8)
+    tins (1.16.3)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.4.0)
+    useragent (0.16.10)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  coveralls
+  haml
+  pg (~> 0.21)
+  pry
+  rack-test
+  rake
+  rspec (~> 3.7)
+  rspec-its (~> 1.2)
+  rubocop
+  secure_headers (= 3.6.4)
+  sinatra
+  sinatra-activerecord
+  sinatra-contrib
+  ssh_scan (= 0.0.35)
+  thin
+
+BUNDLED WITH
+   1.16.2

Rakefile

@@ -1,11 +1,8 @@
-require 'rubygems'
 require 'rake'
-require 'rubygems/package_task'
 require 'rspec'
-require 'rspec/core'
 require 'rspec/core/rake_task'
 require 'bundler/setup'
-require "sinatra/activerecord/rake"
+require 'sinatra/activerecord/rake'
 
 namespace :db do
   task :load_config do
@@ -14,7 +11,6 @@ namespace :db do
 end
 
 $:.unshift File.join(File.dirname(__FILE__), "lib")
-
 require 'ssh_scan'
 
 task :default => :spec

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180120054652) do
+ActiveRecord::Schema.define(version: 2018_01_20_054652) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

lib/ssh_scan_api.rb

@@ -5,6 +5,7 @@
 
 # #Internal Deps
 require 'ssh_scan_api/version'
+require 'ssh_scan_api/models/scan'
 require 'ssh_scan_api/api'
 require 'ssh_scan_api/authenticator'
 require 'ssh_scan_api/target_validator'

ssh_scan_api.gemspec

@@ -32,12 +32,12 @@ Gem::Specification.new do |s|
   s.add_dependency('pg', '~> 0.21')
   s.add_dependency('thin')
   s.add_dependency('haml')
+  s.add_dependency('rspec', '~> 3.7')
+  s.add_dependency('rspec-its', '~> 1.2')
+  s.add_dependency('rake')
+  s.add_dependency('rack-test')
   s.add_dependency('secure_headers', '3.6.4')
-  s.add_development_dependency('rack-test')
   s.add_development_dependency('coveralls')
   s.add_development_dependency('pry')
-  s.add_development_dependency('rspec', '~> 3.0')
-  s.add_development_dependency('rspec-its', '~> 1.2')
-  s.add_development_dependency('rake')
   s.add_development_dependency('rubocop')
 end