grape-starter 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b45c7d30a7066e73e414c2bcb86c55c781706ebb
-  data.tar.gz: e627e85fecf7a6112048732c46673eb556cc4dc4
+  metadata.gz: c784e58c2cc7e636d53f3f780155ad9b63c67ea4
+  data.tar.gz: 9d73dd73328a762aaccb3d8a7a5189d4050137e7
 SHA512:
-  metadata.gz: 412db3a0f60310e1460d739dc7153c97220606faf4f8f61af81a92e08f76435518d8a1e6162b5af129f3a7adad5a06826e553eedeae3fddca6a0aeb26c87b339
-  data.tar.gz: 73c23fcda010e7d74eabe9fcd232d749afe9d6ff051e93d6c5ca89c2b36230fc1b722855fc10f8f4cbebaad91301832b02fec82e5a996bdd745c5f00d4519318
+  metadata.gz: 9cf56c31de8fb7a4d5d0c17d20481ebbcb3b72de3589b33b800ebd7ac5cb08a1473f7fe85ea3b620a0c5ff5f3743315af1cf964c52a48989b5be8ba4765a311f
+  data.tar.gz: 9f3f9f378ba76af98a8313b2a84ec668655e496089eaacc5427f0602e109c84e243f71e5f4b94aa1214bdbe0698c7672252ebc298ca13acdb3b6dae3a1556937

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 - contributions
 
+### 0.8.4
+
+- [d8e13](https://github.com/LeFnord/grape-starter/commit/1f5faef958799704163b7db25db07c569cad8e13) -
+  fixes error on configuration
+
+- [6baba](https://github.com/LeFnord/grape-starter/commit/e00433dee97509e71c1685a0da9134ce2a66baba) -  
+  minor re-working of Rakefile and initializer templates
+
 ### 0.8.3
 
 - [3fe13](https://github.com/LeFnord/grape-starter/commit/3fe134c6ce0666dfd86165b5d2c1a219a4629862) - improves sequel rake tasks

data/README.md

@@ -165,8 +165,8 @@ To add an new ORM, it needs following steps:
   see as example [sequel.rb](lib/starter/builder/templates/sequel.rb), there the return value of each method would be written into the
   corresponding file (see: [orms.rb](lib/starter/builder/orms.rb)).
 
-2. An additional switch in the [`Starter::Orms.build`](https://github.com/LeFnord/grape-starter/blob/67738438ba9278b280a6eac402096fcb74526ab3/lib/starter/builder/orms.rb#L7-L13) method to choose the template.
-3. An entry in the description of the [`add` command](https://github.com/LeFnord/grape-starter/blob/master/bin/grape-starter#L30), when it would be called with `-h`
+2. An additional switch in the [`Starter::Orms.build`](https://github.com/LeFnord/grape-starter/blob/ef45133e6d2254efee06ae4f17ede2fc5c06bebb/lib/starter/builder/orms.rb#L7-L18) and [`Starter::Names.lib_klass_name`](https://github.com/LeFnord/grape-starter/blob/ef45133e6d2254efee06ae4f17ede2fc5c06bebb/lib/starter/builder/names.rb#L13-L24) methods to choose the right template.
+3. An entry in the description of the [`new` command](https://github.com/LeFnord/grape-starter/blob/fa62c8a2ff72f984144b2336859d3e0b397398bd/bin/grape-starter#L28), when it would be called with `-h`
 
 ## License
 

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

@@ -20,13 +20,13 @@ 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')
-          FileUtils.mkdir(log_dir) unless Dir.exist?(log_dir)
-          Logger.new(File.open(log_file, 'a'))
-        else
-          Logger.new(STDOUT)
-        end
+                   log_dir = File.join(Dir.getwd, '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
+                   Logger.new(STDOUT)
+                 end
 
         ActiveRecord::Base.logger = logger
 

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

@@ -17,9 +17,23 @@ module Starter
         settings = YAML.load_file('config/database.yml')
         DB = Sequel.connect(settings[ENV['RACK_ENV']])
 
+        env = ENV['RACK_ENV'] || 'development'
+
+        logger = if %w[development test].include? env
+                   log_dir = File.join(Dir.getwd, '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
+                   Logger.new($stdout)
+                 end
+
+        DB.loggers << logger
+
         # FIXME: maybe remove it later …
         #   see: https://groups.google.com/forum/#!topic/sequel-talk/QIIv5qoltjs
         Sequel::Model.require_valid_table = false
+        Sequel::Model.plugin :force_encoding, 'UTF-8'
         FILE
       end
 
@@ -60,13 +74,10 @@ module Starter
 
           desc "Prints current schema version"
           task version: :connect do
-            version = if DB.tables.include?(:schema_info)
-              DB[:schema_info].first[:version]
-            end || 0
+            version = DB.tables.include?(:schema_info) ? DB[:schema_info].first[:version] : 0
 
             $stdout.print 'Schema Version: '
-            $stdout.print version
-            $stdout.print "\n"
+            $stdout.puts version
           end
 
           desc 'Run all migrations in db/migrations'

data/lib/starter/config.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'yaml'
+
 module Starter
   class Config
     class << self

data/lib/starter/version.rb

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

data/template/.gitignore

@@ -0,0 +1,8 @@
+.DS_Store
+.rvmrc
+.redcar
+.irbrc
+.bundle
+Gemfile.lock
+tmp/
+log/

data/template/.rubocop.yml

@@ -10,8 +10,7 @@ AllCops:
   TargetRubyVersion: 2.4
 
 Metrics/BlockLength:
-  Exclude:
-    - 'api/endpoints/**/*'
+  Enabled: false
 
 Metrics/LineLength:
   Max: 120

data/template/Rakefile

@@ -2,23 +2,25 @@
 
 require 'rake'
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
+require File.expand_path('../config/environment', __FILE__)
 
 task :environment do
   ENV['RACK_ENV'] ||= 'development'
-  require File.expand_path('../config/environment', __FILE__)
 end
 
+# rspec tasks
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+# rubocop tasks
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new(:rubocop)
 
 task default: [:spec, :rubocop]
 
-require File.expand_path('../config/environment', __FILE__)
 
+# grape-swagger tasks
 require 'grape-swagger/rake/oapi_tasks'
 GrapeSwagger::Rake::OapiTasks.new(::Api::Base)
 

data/template/config.ru

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 require 'rack/cors'
-require_relative 'config/application'
+require_relative 'config/environment'
 
 use Rack::CommonLogger
 

data/template/config/environment.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-ENV['RACK_ENV'] ||= 'test'
+ENV['RACK_ENV'] ||= 'development'
 
-require File.expand_path('../application', __FILE__)
+require_relative 'application'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-starter
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - LeFnord
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -101,6 +101,7 @@ files:
 - lib/starter/rake/grape_tasks.rb
 - lib/starter/rspec/request_specs.rb
 - lib/starter/version.rb
+- template/.gitignore
 - template/.rubocop.yml
 - template/.rubocop_todo.yml
 - template/Gemfile