sinatra-cmd 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee23e6d0369a54c958d548bf8c69497884303002
-  data.tar.gz: 0e03622da8c384f10d581b119f614915acc62cee
+  metadata.gz: 95d75b257f0a1af3176b310e93b31b8e62c688f6
+  data.tar.gz: 16b5f043a1c0d26d7c84db82aeecd7ffa381545d
 SHA512:
-  metadata.gz: 956439ae61b1e9cc6ee8b087fdb68c8b91fab7e7f92c599d775f2251001e8da5f584c9648f94cccd9f66abf65b4900e2a7cca97a3897b8a602c5906c628d35d4
-  data.tar.gz: 5d71b93001342962f597f10c814ac9070906466dcdc955b7c82acfac437a005989456b359ffe9136efcac9cab6fba8102728a4b475ca77eed4a549c107559061
+  metadata.gz: 3c4d7bcb36e9af360ac5761d520963a4039353f76c89de8310e8f9791af488b2f9ab7c2a5d9b119e34b5177d67b94067156539ec7cc6bb683fe4e9778ace5007
+  data.tar.gz: c39c119c60985df380801a6dbfdb09b1e39804672739c1f960e8f5363ccfe1f375c7d4ada5a24f79037b1c38c4f6b4bc2584ba7cb185da4d400da327275ebf10

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/lib/sinatra_cmd/generator.rb

@@ -30,6 +30,7 @@ module SinatraCmd
     end
 
     def setup_config
+      template "config/mongo_mapper.yml.erb", "#{app_name}/config/mongo_mapper.yml"
       template "config/application.rb.erb", "#{app_name}/config/application.rb"
       template "config/boot.rb.erb", "#{app_name}/config/boot.rb"
       copy_file "config/environment.rb", "#{app_name}/config/environment.rb"

data/lib/sinatra_cmd/version.rb

@@ -1,3 +1,3 @@
 module SinatraCmd
-  VERSION = '0.0.13'
+  VERSION = '0.0.14'
 end

data/sinatra-cmd.gemspec

@@ -6,8 +6,8 @@ require 'sinatra_cmd/version'
 Gem::Specification.new do |spec|
   spec.name          = "sinatra-cmd"
   spec.version       = SinatraCmd::VERSION
-  spec.authors       = ["CBluowei"]
-  spec.email         = ["wei.luo@careerbuilder.com"]
+  spec.authors       = ["wluo"]
+  spec.email         = ["luowei---010101@163.com"]
 
   spec.summary       = %q{Command for generating sinatra project}
   spec.description   = %q{Generate a sinatra project.}
@@ -24,4 +24,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "thor", "~> 0.19"
+
+  spec.add_development_dependency "rspec", "~> 3.2"
+  spec.add_development_dependency "pry", "~> 0.10"
+  spec.add_development_dependency "pry-stack_explorer", "~> 0.4"
+  spec.add_development_dependency "pry-byebug", "~> 3.0"
 end

data/spec/generate_spec.rb

@@ -0,0 +1,6 @@
+describe SinatraCmd do
+  it "Generator sinatra" do
+    bin_path = File.join(File.expand_path('../../bin', __FILE__))
+    system("#{bin_path}/sinatra test-project")
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,72 @@
+require 'bundler/setup'
+Bundler.setup
+
+require 'sinatra_cmd' # and any other gems you need
+
+require 'pry' # for debuge
+
+RSpec.configure do |config|
+  # config.include Capybara::DSL,:type=>:request
+  # The settings below are suggested to provide a good initial experience
+  # with RSpec, but feel free to customize to your heart's content.
+  #=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  # config.filter_run :focus
+  # config.run_all_when_everything_filtered = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  # if config.files_to_run.one?
+  # Use the documentation formatter for detailed output,
+  # unless a formatter has already been configured
+  # (e.g. via a command-line flag).
+  # config.default_formatter = 'doc'
+  # end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # Enable only the newer, non-monkey-patching expect syntax.
+    # For more details, see:
+    #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+    expectations.syntax = :expect
+
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Enable only the newer, non-monkey-patching expect syntax.
+    # For more details, see:
+    #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+    mocks.syntax = :expect
+
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended.
+    mocks.verify_partial_doubles = true
+  end
+  #=end
+end

data/templates/Gemfile

@@ -6,6 +6,9 @@ gem 'sinatra'
 gem 'sinatra-contrib', require: false
 gem 'sinatra-r18n'
 
+# gem 'mongo_mapper'
+# gem 'bson_ext'
+
 group :test, :development do
   gem 'pry'
   gem 'pry-stack_explorer'

data/templates/README.md.erb

@@ -1,2 +1,10 @@
 <%= app_name.split(/\-|\_/).map(&:capitalize).join('') %>
 ====================
+
+1. start server
+
+```ruby
+rackup
+# or
+thin start
+```

data/templates/config/boot.rb.erb

@@ -4,28 +4,54 @@ require 'bundler/setup'
 Bundler.require
 require 'pry' if development? or test?
 
-require 'sinatra/reloader' if development?
+require 'sinatra/reloader'
 require 'sinatra/namespace'
 require 'sinatra/json'
+require 'sinatra/custom_logger'
+
+require 'fileutils'
 
 module <%= app_name.split(/\-|\_/).map(&:capitalize).join('') %>
   API_VERSION = '1'
 
   class App < Sinatra::Base
-    register Sinatra::Namespace
     helpers Sinatra::JSON
+    helpers Sinatra::CustomLogger
+
+    register Sinatra::Namespace
+
     # language automatic changed by params['locale']
     register Sinatra::R18n
 
-    set :logging, true
+    configure :development do
+      register Sinatra::Reloader
+    end
 
     configure do
-      # Mongoid config file load
-      # Mongoid.load!(File.expand_path('../database.yml', __FILE__))
+      # db_file = File.join(File.expand_path('../mongo_mapper.yml', __FILE__))
+
+      # Mongoid load config file
+      # Mongoid.load!(File.expand_path('../mongoid.yml', __FILE__))
+
+      # MongoMapper setup condig file
+      # mongo_config = YAML::load(ERB.new(File.read(db_file)).result)
+      # MongoMapper.setup(mongo_config, ENV['RACK_ENV'])
+
+      # R18n::I18n.default = 'en-us'
 
       # Error blocks don't trigger in development mode.
       # https://github.com/sinatra/sinatra/issues/578
       set :show_exceptions, :after_handler
     end
+
+    configure :development, :production do
+      file_path = File.join(File.expand_path('../../log', __FILE__))
+      FileUtils.mkdir_p(file_path)
+
+      # RACK_ENV default to development
+      logger = Logger.new(File.join(file_path, "#{ENV['RACK_ENV']}.log"), 'daily')
+      logger.level = Logger::DEBUG if development?
+      set :logger, logger
+    end
   end
 end

data/templates/config/mongo_mapper.yml.erb

@@ -0,0 +1,13 @@
+development:
+  host: localhost
+  port: 27017
+  database: demo-dev
+  username:
+  password:
+
+test:
+  host: localhost
+  port: 27017
+  database: demo-test
+  username:
+  password:

data/templates/helpers/application.rb.erb

@@ -2,19 +2,5 @@ require 'fileutils'
 
 module <%= app_name.split(/\-|\_/).map(&:capitalize).join('') %>
   module ApplicationHelper
-    def logger
-      return @logger unless @logger.nil?
-
-      file_path = File.join(File.expand_path('../../log', __FILE__))
-      FileUtils.mkdir_p(file_path)
-
-      @logger = Logger.new(File.join(file_path, "#{ENV['RACK_ENV']}.log"), 'daily')
-      @logger.level = Logger::INFO
-      @logger.datetime_format = "%Y-%m-%d %H:%M:%S"
-      @logger.formatter = proc {|severity, datetime, default_field , msg|
-        "#{severity[0..0]}, #{datetime}, #{severity} -- #{msg}\n"
-      }
-      @logger
-    end
   end
 end

data/templates/helpers/error_handling.rb.erb

@@ -48,9 +48,9 @@ module <%= app_name.split(/\-|\_/).map(&:capitalize).join('') %>
       end
 
       def halt_with_500
-        message = "#{t.error_handling.internal_server_error}: #{env['sinatra.error'].message}"
-        logger.error("500, #{message}")
-        halt 500, json({code: 500, error: message})
+        err = env['sinatra.error']
+        logger.error("500, #{err.message} \n #{err.backtrace.join("\n")}")
+        halt 500, json({code: 500, error: "#{t.error_handling.internal_server_error}: #{err.message}"})
       end
     end
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cmd
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
-- CBluowei
+- wluo
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -52,15 +52,72 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: pry-stack_explorer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Generate a sinatra project.
 email:
-- wei.luo@careerbuilder.com
+- luowei---010101@163.com
 executables:
 - sinatra
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -71,6 +128,8 @@ files:
 - lib/sinatra_cmd/generator.rb
 - lib/sinatra_cmd/version.rb
 - sinatra-cmd.gemspec
+- spec/generate_spec.rb
+- spec/spec_helper.rb
 - templates/.gitignore
 - templates/.rspec
 - templates/Gemfile
@@ -82,6 +141,7 @@ files:
 - templates/config/environment.rb
 - templates/config/i18n/en-us.yml
 - templates/config/i18n/zh-cn.yml
+- templates/config/mongo_mapper.yml.erb
 - templates/helpers/application.rb.erb
 - templates/helpers/error_handling.rb.erb
 - templates/routes/demo.rb.erb
@@ -106,8 +166,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Command for generating sinatra project
-test_files: []
+test_files:
+- spec/generate_spec.rb
+- spec/spec_helper.rb