sinatra-cmd 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea81795ea492ba2d56ddff90e6ec4b129a9c3ab4
-  data.tar.gz: 58a14ebbf864548ace2759c1fc842901e6dbdfeb
+  metadata.gz: d647af50011bda3073f6674c6e30888cd0349ef4
+  data.tar.gz: c54a1c1b97993062e5dd9079abffd40629bcbdde
 SHA512:
-  metadata.gz: 35ad2c65af27fbd9b33f27a9c5d7a1144a00358e53051b0063ff812231f8a5b8238b4be892c349ff7c086aa79d9af38d812f23b284828444846d44735719f53a
-  data.tar.gz: 6026113055d9d28d655616fa414305dbcb8e7b5acacf2b20fef77731ad72713948798b886002a923cd7a2ba98083ff79fe3e3d2dd39d91133e51a5397cb8ba3b
+  metadata.gz: b522839aea1de75e2cfc2b41e700a27df5de0169e30573f2660394c593c6adbdfe56688b390c11ee4995719c4f713f866bcca48e709a0263e934ddb2e0d6de46
+  data.tar.gz: 4e8caeda62b75c82b58b0f5e5f59440386116db6056b9f60d76b05e0d5b72b72bb36b7a3a6c908604622b911d7624d822ac8f9364993b470d64c8cb79a73512c

data/.gitignore

@@ -10,3 +10,4 @@
 
 /.DS_Store
 /*.gem
+/test-project

data/README.md

@@ -2,11 +2,7 @@
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'sinatra-cmd'
-```
+Add `gem 'sinatra-cmd'` to your application's Gemfile:
 
 And then execute:
 
@@ -26,6 +22,11 @@ Or install it yourself as:
 
 sinatra {app_name}
 ```
+> Supported options:
+
+  1. --skip_bundle_install
+  2. continue...
+
 
 ##How to use pry (option, latest version is unnecessary)
 

data/lib/sinatra_cmd/generator.rb

@@ -5,6 +5,7 @@ module SinatraCmd
     include Thor::Actions
 
     argument :app_name
+    class_option :skip_bundle_install, :type => :boolean
 
     def self.source_root
       File.join(File.dirname(__FILE__), "../../", "templates")
@@ -15,7 +16,7 @@ module SinatraCmd
     end
 
     def setup_helpers
-      keep_file "#{app_name}/helpers"
+      empty_directory "#{app_name}/helpers"
       template "helpers/application.rb.erb", "#{app_name}/helpers/application.rb"
       template "helpers/error_handling.rb.erb", "#{app_name}/helpers/error_handling.rb"
     end
@@ -25,7 +26,7 @@ module SinatraCmd
     end
 
     def setup_routes
-      keep_file "#{app_name}/routes"
+      empty_directory "#{app_name}/routes"
       template "routes/demo.rb.erb", "#{app_name}/routes/demo.rb"
     end
 
@@ -40,6 +41,12 @@ module SinatraCmd
       copy_file "config/i18n/zh-cn.yml", "#{app_name}/config/i18n/zh-cn.yml"
     end
 
+    def setup_rspec
+      empty_directory "#{app_name}/spec"
+      copy_file ".rspec", "#{app_name}/.rspec"
+      copy_file "spec/spec_helper.rb", "#{app_name}/spec/spec_helper.rb"
+    end
+
     def setup_appfile
       copy_file ".gitignore", "#{app_name}/.gitignore"
       copy_file "Gemfile", "#{app_name}/Gemfile"
@@ -48,20 +55,16 @@ module SinatraCmd
       template "README.md.erb", "#{app_name}/README.md"
     end
 
-    def setup_rspec
-      keep_file "#{app_name}/spec"
-      copy_file ".rspec", "#{app_name}/.rspec"
-      copy_file "spec/spec_helper.rb", "#{app_name}/spec/spec_helper.rb"
-    end
-
     def bundle_install
-      system "cd #{app_name} && bundle install && cd ../"
+      unless options[:skip_bundle_install]
+        system "cd #{app_name} && bundle install && cd ../"
+      end
     end
 
     protected
 
       def keep_file(destination)
-        create_file "#{destination}/.keep"
+        create_file "#{destination}/.gtkeep"
       end
   end
 end

data/lib/sinatra_cmd/version.rb

@@ -1,3 +1,3 @@
 module SinatraCmd
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/sinatra-cmd.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Command for generating sinatra project}
   spec.description   = %q{Generate a sinatra project.}
-  spec.homepage      = "https://github.com/hilotus/sinatra-cli"
+  spec.homepage      = "https://github.com/hilotus/sinatra-cmd"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/spec/generate_spec.rb

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

data/templates/config/boot.rb.erb

@@ -10,6 +10,7 @@ require 'sinatra/json'
 require 'sinatra/custom_logger'
 
 require 'fileutils'
+require 'logger'
 
 module <%= app_name.split(/\-|\_/).map(&:capitalize).join('') %>
   API_VERSION = '1'
@@ -68,11 +69,14 @@ module <%= app_name.split(/\-|\_/).map(&:capitalize).join('') %>
       R18n::I18n.default = 'en-us'
     end
 
-    # Important
+    ##### Important
     before do
       # We have to set default locale into session,
       # because of the sinatra-r18n source code doesn't check R18n::I18n.default
       session[:locale] = R18n::I18n.default
+
+      # TODO: In sinatra-r18n-2.0.4, if params[:locale] will return true....
+      params[:locale] = nil if params[:locale] == ""
     end
 
     configure :development, :production do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cmd
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - wluo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -146,7 +146,7 @@ files:
 - templates/helpers/error_handling.rb.erb
 - templates/routes/demo.rb.erb
 - templates/spec/spec_helper.rb
-homepage: https://github.com/hilotus/sinatra-cli
+homepage: https://github.com/hilotus/sinatra-cmd
 licenses:
 - MIT
 metadata: {}