grape-starter 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c784e58c2cc7e636d53f3f780155ad9b63c67ea4
-  data.tar.gz: 9d73dd73328a762aaccb3d8a7a5189d4050137e7
+  metadata.gz: ac4a3b4fcc54cc1ab74b2f305b238f008241564c
+  data.tar.gz: 325b939a9e383dfcca234a7218aba8d4bd3a62ab
 SHA512:
-  metadata.gz: 9cf56c31de8fb7a4d5d0c17d20481ebbcb3b72de3589b33b800ebd7ac5cb08a1473f7fe85ea3b620a0c5ff5f3743315af1cf964c52a48989b5be8ba4765a311f
-  data.tar.gz: 9f3f9f378ba76af98a8313b2a84ec668655e496089eaacc5427f0602e109c84e243f71e5f4b94aa1214bdbe0698c7672252ebc298ca13acdb3b6dae3a1556937
+  metadata.gz: 898bbcd8fdb4101bc3b33a7f1bd011d1c3629bd11d8d00e4a44cdfee99f97c217021d849c6456a63914abc23a98c3732cfec5651175806b1c7d0dc97a6e6c2ac
+  data.tar.gz: e0e2c5e4c1370764d9998d224cdf65a82301c17235d76ce93821d4e8678defc4b046df82fd82038ddf61fe8407e35d73d1cbf3f116217bd9708e3a6b9aaf7152

data/.travis.yml

@@ -7,9 +7,8 @@ before_install:
   - gem install bundler
 
 rvm:
-  - 2.4.1
-  - 2.3.4
-  - 2.2.7
+  - 2.4.2
+  - 2.3.5
   - ruby-head
 
 matrix:

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 - contributions
 
+### 0.8.5
+
+- [cbea8](https://github.com/LeFnord/grape-starter/commit/fa5edb5dc7e0883ff099e297e9cbd5bd5ebcbea8) - DRYs up template code; passes rubocop 0.51.0
+
+- [6bbe7](https://github.com/LeFnord/grape-starter/commit/a224b5d8dfa001cb1e8dec3b1a1e28fc9826bbe7) - avoids overriding of dev db by running specs; fixes syntox error
+
 ### 0.8.4
 
 - [d8e13](https://github.com/LeFnord/grape-starter/commit/1f5faef958799704163b7db25db07c569cad8e13) -

data/lib/starter/builder.rb

@@ -83,7 +83,7 @@ module Starter
         file_list.map { |x| send("#{x}_name") }.each do |file_to_remove|
           begin
             FileUtils.rm file_to_remove
-          rescue => error
+          rescue StandardError => error
             $stdout.puts error.to_s
           end
         end

data/lib/starter/builder/orms.rb

@@ -26,6 +26,35 @@ module Starter
         Starter::Config.save(dest: dest, content: { orm: orm.downcase })
       end
 
+      def config
+        <<-FILE.strip_heredoc
+        # ActiveRecord Database Configuration
+        development:
+          adapter: 'sqlite3'
+          host: localhost
+          port: 27017
+          database: "db/development.sqlite3"
+          username:
+          password:
+
+        test:
+          adapter: 'sqlite3'
+          host: localhost
+          port: 27017
+          database: "db/test.sqlite3"
+          username:
+          password:
+
+        production:
+          adapter: 'sqlite3'
+          host: localhost
+          port: 27017
+          database: "db/production.sqlite3"
+          username:
+          password:
+        FILE
+      end
+
       private
 
       def build_initializer(dest)

data/lib/starter/builder/templates/activerecord.rb

@@ -21,7 +21,7 @@ module Starter
         ActiveRecord::Base.establish_connection db_conf[env]
         logger = if %w[development test].include? env
                    log_dir = File.join(Dir.getwd, 'log')
-                   log_file = File.join(log_dir, 'db.log'))
+                   log_file = File.join(log_dir, 'db.log')
                    FileUtils.mkdir(log_dir) unless Dir.exist?(log_dir)
                    Logger.new(File.open(log_file, 'a'))
                  else
@@ -46,7 +46,7 @@ module Starter
                 end
 
                 return response
-              rescue Exception
+              rescue StandardError
                 ActiveRecord::Base.clear_active_connections!
                 raise
               end
@@ -56,35 +56,6 @@ module Starter
         FILE
       end
 
-      def config # TODO: Dry (Same config for Sequel)
-        <<-FILE.strip_heredoc
-        # ActiveRecord Database Configuration
-        development:
-          adapter: 'sqlite3'
-          host: localhost
-          port: 27017
-          database: "db/development.sqlite3"
-          username:
-          password:
-
-        test:
-          adapter: 'sqlite3'
-          host: localhost
-          port: 27017
-          database: "db/test.sqlite3"
-          username:
-          password:
-
-        production:
-          adapter: 'sqlite3'
-          host: localhost
-          port: 27017
-          database: "db/production.sqlite3"
-          username:
-          password:
-        FILE
-      end
-
       def rakefile
         <<-FILE.strip_heredoc
         # ActiveRecord DB tasks

data/lib/starter/builder/templates/sequel.rb

@@ -37,35 +37,6 @@ module Starter
         FILE
       end
 
-      def config
-        <<-FILE.strip_heredoc
-        # Sequel Database Configuration
-        development:
-          adapter: 'sqlite'
-          host: localhost
-          port: 27017
-          database: "db/development.sqlite3"
-          username:
-          password:
-
-        test:
-          adapter: 'sqlite'
-          host: localhost
-          port: 27017
-          database: "db/test.sqlite3"
-          username:
-          password:
-
-        production:
-          adapter: 'sqlite'
-          host: localhost
-          port: 27017
-          database: "db/production.sqlite3"
-          username:
-          password:
-        FILE
-      end
-
       def rakefile
         <<-FILE.strip_heredoc
         # Sequel migration tasks

data/lib/starter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Starter
-  VERSION = '0.8.4'
+  VERSION = '0.8.5'
 end

data/template/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-ENV['RACK_ENV'] ||= 'test'
+ENV['RACK_ENV'] = 'test'
 
 require 'rack/test'
 require File.expand_path('../../config/environment', __FILE__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-starter
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - LeFnord
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2017-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Create a Grape Rack skeleton