simba 0.0.5 → 0.8.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cb2bd16368abd55458bba86541741021ef3928a2
+  data.tar.gz: 522d9fe673b0aac572284216cad8ceabb105bf28
+SHA512:
+  metadata.gz: f789b0e3c3a4682972ba7887cd49c2df8bafb5bf7ac76873da57ee473be4bf98b88a728ac6f7b98a63cde6485ec668ed72f6ebeb44e16066afe47054502f3f8a
+  data.tar.gz: 6fe21a4558b682ba7382be5a1fe6f5c31d5958b25164a5663bea04673e56a766927fb70837cb48fd8268f63f0fc3975bf7640c651ce9b0229058f8ba42577c87

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in simba.gemspec
+# Specify your gem"s dependencies in simba.gemspec
 gemspec

data/README.md

@@ -1,10 +1,10 @@
 # Simba
 
-simba is a generator for sinatra applications.
+Simba is a generator for Sinatra applications.
 
-simba choose slim + sinatra + sequel to build your awesome app.
+Simba chooses slim + sinatra + activerecord to build your awesome apps.
 
-simba aim to set up ruby off rails's best practice.
+Simba's aim is to help you to use best practices when not using ruby on rails.
 
 ## Installation
 
@@ -12,12 +12,24 @@ simba aim to set up ruby off rails's best practice.
 
 ## Usage
 
-    $ simba appname [--skip-bundle]
+    $ simba new appname
+
+    $ # development
+    $ bundle exec rackup
+
+    $ # production
+    $ rake asset:precompile
+    $ bundle exec rackup -E production
+
+## More
+
+Simba uses [Linner](https://github.com/SaitoWu/linner) as its asset packaging system,
+You can star it on the github page.
 
 ## Contributing
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
+3. Commit your changes (`git commit -am "Added some feature"`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request

data/bin/simba

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + "/../lib/simba"
-arguments = ARGV.any? ? ARGV : ['-h']
-Simba::SkeletonGenerator.start(arguments)
+Simba::Command.start

data/lib/simba.rb

@@ -1,42 +1,5 @@
-require "thor"
-require "thor/group"
-require "securerandom"
-require_relative "simba/version"
+require "simba/command"
+require "simba/version"
 
 module Simba
-  class SkeletonGenerator < Thor::Group
-    include Thor::Actions
-
-    def self.source_root
-      File.dirname(__FILE__)
-    end
-
-    def self.banner
-      "simba [app_name]"
-    end
-
-    desc "Description:\n\n\tsimba is a generator for sinatra applications."
-
-    argument :name, :desc => "The name of your sinatra app"
-    class_option :skip_bundle,
-                 :default => false,
-                 :type => :boolean,
-                 :desc => "Skip bundle install when creating app skeleton"
-
-    def setup_skeleton
-      self.destination_root = name
-      @class_name = name
-      @session_secret = SecureRandom.hex 16
-      directory("simba/base_app/", self.destination_root)
-    end
-
-    def bundle_dependencies
-      unless options[:skip_bundle]
-        say "Bundling application dependencies using bundler."
-        in_root do
-          run 'bundle install'
-        end
-      end
-    end
-  end
 end

data/lib/simba/command.rb

@@ -0,0 +1,24 @@
+require "thor"
+require "securerandom"
+
+module Simba
+  class Command < Thor
+    include Thor::Actions
+    map "-v" => :version
+
+    def self.source_root
+      File.dirname(__FILE__)
+    end
+
+    desc "version", "show version"
+    def version
+      puts Simba::VERSION
+    end
+
+    desc "new", "create the skeleton of project"
+    def new(name)
+      @secret = SecureRandom.hex 32
+      directory("templates", name)
+    end
+  end
+end

data/lib/simba/templates/Gemfile

@@ -0,0 +1,28 @@
+source "https://rubygems.org"
+
+gem "rake"
+gem "sqlite3"
+gem "slim", "~> 2.0.1"
+gem "sinatra", "~> 1.4.3"
+gem "sinatra-contrib", "~> 1.4.1"
+gem "sinatra-activerecord", "~> 1.2.3"
+
+# If you want to use mail
+# gem "pony"
+
+group :development do
+  gem "http", "~> 0.5.0"
+  gem "therubyracer", "~> 0.12.0"
+  gem "linner", "~> 0.6", require: false
+end
+
+group :production do
+  gem "puma"
+end
+
+group :test do
+  gem "pry"
+  gem "rack-test"
+  gem "factory_girl"
+  gem "database_cleaner"
+end

data/lib/simba/templates/Linnerfile

@@ -0,0 +1,37 @@
+paths:
+  app: "app/assets"
+  public: "public"
+groups:
+  scripts:
+    paths:
+      - app/assets/scripts
+    concat:
+      "/assets/app.js": "{app/assets/scripts,vendor}/**/*.{js,coffee}"
+    order:
+      - "vendor/jquery.js"
+      - "..."
+      - "app/scripts/app.coffee"
+  styles:
+    paths:
+      - app/assets/styles
+    concat:
+      "/assets/app.css": "{app/assets/styles,vendor}/**/[a-z]*.{css,scss,sass}"
+  images:
+    paths:
+      - app/assets/images
+    sprite:
+      "../app/assets/styles/icons.scss": "app/assets/images/**/*.png"
+modules:
+  wrapper: "cmd"
+  ignored: "vendor/**/*"
+  definition: "/assets/app.js"
+sprites:
+  selector: ".icon-"
+  path: "/assets/images/"
+  url: "/assets/images/"
+revision: true
+notification: true
+bundles:
+  jquery.js:
+    version: 1.11.0
+    url: http://code.jquery.com/jquery-1.11.0.js

data/lib/simba/templates/Rakefile

@@ -0,0 +1,6 @@
+# load rake tasks
+require "sinatra/activerecord/rake"
+
+Dir["./lib/tasks/**/*.rake"].sort.each { |ext| load ext }
+
+require "./config/boot.rb"

data/lib/simba/templates/app/assets/scripts/app.coffee

@@ -0,0 +1,4 @@
+welcome = require "welcome"
+
+$ ->
+  welcome()

data/lib/simba/templates/app/assets/scripts/welcome.coffee

@@ -0,0 +1,2 @@
+module.exports = ->
+  console.info "Aha! Simba!"

data/lib/simba/templates/app/assets/styles/app.scss

@@ -0,0 +1,9 @@
+@import "compass/reset";
+
+.hero-unit {
+  text-align: center;
+
+  .icon-logo {
+    margin: 0 auto;
+  }
+}

data/lib/simba/templates/app/helpers/helper.rb

@@ -0,0 +1,9 @@
+helpers do
+  def asset_path file
+    if settings.development?
+      file
+    else
+      settings.manifest[file]
+    end
+  end
+end

data/lib/simba/templates/app/models/user.rb

@@ -0,0 +1,2 @@
+class User < ActiveRecord::Base
+end

data/lib/simba/templates/app/routes/app.rb

@@ -0,0 +1,3 @@
+get "/" do
+  slim :"home/index"
+end

data/lib/simba/templates/app/views/home/index.slim

@@ -0,0 +1,3 @@
+.hero-unit
+  .icon-logo
+  h3 Welcome to Simba!

data/lib/simba/templates/app/views/layout.slim

@@ -0,0 +1,10 @@
+doctype html
+html
+  head
+    title Simba
+    meta name="keywords" content="website"
+    link rel="stylesheet" href=asset_path("/assets/app.css")
+  body
+    == yield
+    script src=asset_path("/assets/app.js")
+    script =="require(\"app\")"

data/lib/simba/templates/config.ru

@@ -0,0 +1,7 @@
+require "./config/boot.rb"
+
+Process.fork do
+  exec "bundle exec linner watch"
+end if settings.development?
+
+run Sinatra::Application

data/lib/simba/templates/config/boot.rb.tt

@@ -0,0 +1,28 @@
+require "bundler"
+require "yaml"
+
+# require "bundle gems"
+ENV["RACK_ENV"] ||= "development"
+Bundler.require(:default, ENV["RACK_ENV"].to_sym)
+
+# init sinatra
+set :root, File.expand_path(".")
+set :sessions, true
+set :session_secret, "<%= @secret %>"
+set :views, settings.root + "/app/views"
+set :database_file, settings.root + "/config/database.yml"
+
+if production?
+  set :manifest, YAML::load(File.read(settings.root + "/public/manifest.yml"))
+end
+
+# sinatra reloader
+if development?
+  require "sinatra/reloader"
+  also_reload "lib/**/*.rb", "app/{models,helpers}/**/*.rb"
+end
+
+# require project files
+Dir.glob "./{lib,app/{models,helpers,routes}}/**/*.rb" do |f|
+  require f
+end

data/lib/simba/templates/config/database.yml

@@ -0,0 +1,17 @@
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000

data/lib/simba/templates/lib/tasks/assets.rake

@@ -0,0 +1,6 @@
+namespace :assets do
+  desc "precompile assets"
+  task :precompile do
+    exec "bundle exec linner build"
+  end
+end

data/lib/simba/{base_app → templates}/test/test_helper.rb

@@ -1,4 +1,4 @@
-ENV['RACK_ENV'] ||= "test"
+ENV["RACK_ENV"] ||= "test"
 require_relative "../config/boot.rb"
 
 # factory_girl

data/lib/simba/version.rb

@@ -1,3 +1,3 @@
 module Simba
-  VERSION = "0.0.5"
+  VERSION = "0.8.0"
 end

data/simba.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/simba/version', __FILE__)
+require File.expand_path("../lib/simba/version", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Saito"]
@@ -15,5 +15,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Simba::VERSION
 
-  gem.add_dependency("thor", "~> 0.14.6")
+  gem.add_dependency("thor", "~> 0.18")
 end

data/{lib/simba/base_app → template}/.gitignore

@@ -3,3 +3,4 @@
 *.db
 public/*.*
 coverage/
+.bundle

data/template/Gemfile

@@ -0,0 +1,25 @@
+source "https://rubygems.org"
+
+gem "sqlite3"
+gem "slim", "~> 2.0.1"
+gem "sinatra", "~> 1.4.3"
+gem "sinatra-contrib", "~> 1.4.1"
+gem "sinatra-activerecord", "~> 1.2.3"
+
+# If you want to use mail
+# gem "pony"
+
+group :development do
+  gem "linner", "~> 0.4"
+end
+
+group :production do
+  gem "puma"
+end
+
+group :test do
+  gem "pry"
+  gem "rack-test"
+  gem "factory_girl"
+  gem "database_cleaner"
+end

data/template/Rakefile

@@ -0,0 +1,3 @@
+# load rake tasks
+require "sinatra/activerecord/rake"
+Dir["./lib/tasks/**/*.rake"].sort.each { |ext| load ext }

data/template/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+get "/" do
+  slim :"home/index"
+end

data/template/app/helpers/application_helper.rb

@@ -0,0 +1,14 @@
+helpers do
+  include Sprockets::Helpers
+
+  def js file
+    file = "js/#{file}.js"
+    %Q|<script src="#{asset_path file}"></script>|
+  end
+
+  def css file
+    file = "css/#{file}.css"
+    %Q|<link rel="stylesheet" href="#{asset_path file}"/>|
+  end
+
+end

data/{lib/simba/base_app → template}/config/boot.rb.tt

@@ -21,19 +21,6 @@ if development?
   also_reload "lib/**/*.rb", "app/{models,helpers}/**/*.rb"
 end
 
-# assetpack support
-assets do
-  serve "/js", :from => "app/assets/js"
-  serve "/css", :from => "app/assets/css"
-  serve "/img", :from => "app/assets/img"
-
-  css_compression :sass
-  js_compression  :uglify
-
-  js :application, ["/js/*.js"]
-  css :application, ["/css/*.css"]
-end
-
 # require project files
 Dir.glob "./{lib,app/models,app/helpers,app/controllers}/**/*.rb" do |f|
   require f

data/template/config/database.yml

@@ -0,0 +1,2 @@
+default:
+  url: sqlite://db/development.db # postgres://user:password@host:port/database_name

data/{lib/simba/base_app → template}/lib/tasks/stat.rake

@@ -1,11 +1,11 @@
 namespace :metric do
 
   desc "project statistics"
-  task 'stat' do
+  task "stat" do
     puts "All:"
-    stat_files Dir.glob('**/*.{rb,slim,coffee,scss}')
+    stat_files Dir.glob("**/*.{rb,slim,coffee,scss}")
     puts "\nRuby:"
-    stat_files Dir.glob('**/*.rb') - Dir.glob('test/**/*.rb')
+    stat_files Dir.glob("**/*.rb") - Dir.glob("test/**/*.rb")
   end
 end
 

data/template/test/factory/user_factory.rb

@@ -0,0 +1,6 @@
+# https://github.com/thoughtbot/factory_girl/wiki/Usage
+FactoryGirl.define do
+  factory :user do
+    name "simba"
+  end
+end

data/template/test/functional/user_controller_test.rb

@@ -0,0 +1,4 @@
+require_relative "../test_helper"
+
+class UserControllerTest < FunctionalTestCase
+end

data/template/test/test_helper.rb

@@ -0,0 +1,27 @@
+ENV["RACK_ENV"] ||= "test"
+require_relative "../config/boot.rb"
+
+# factory_girl
+dir = File.expand_path File.dirname(__FILE__)
+Dir.glob "#{dir}/factory/**/*_factory.rb" do |f|
+  require f
+end
+
+require "minitest/autorun"
+require "rack/test"
+DatabaseCleaner.strategy = :truncation
+
+class TestCase < MiniTest::Unit::TestCase
+  include FactoryGirl::Syntax::Methods
+  def initialize *xs
+    super
+    DatabaseCleaner.clean
+  end
+end
+
+class FunctionalTestCase < TestCase
+  include Rack::Test::Methods
+  def app
+    Sinatra::Application
+  end
+end

data/template/test/unit/user_test.rb

@@ -0,0 +1,11 @@
+require_relative "../test_helper"
+
+class UserTest < TestCase
+  def setup
+    @user = build :user
+  end
+
+  def test_user_name
+    # dummy
+  end
+end

metadata

@@ -1,27 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: simba
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.8.0
 platform: ruby
 authors:
 - Saito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-29 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70204877263740 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.6
+        version: '0.18'
   type: :runtime
   prerelease: false
-  version_requirements: *70204877263740
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
 description: simba is a generator for sinatra applications.
 email:
 - saitowu@gmail.com
@@ -30,60 +32,77 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/simba
 - lib/simba.rb
-- lib/simba/base_app/.gitignore
-- lib/simba/base_app/Gemfile
-- lib/simba/base_app/Rakefile
-- lib/simba/base_app/app/assets/css/application.scss
-- lib/simba/base_app/app/assets/img/.gitkeep
-- lib/simba/base_app/app/assets/js/application.coffee
-- lib/simba/base_app/app/controllers/application_controller.rb
-- lib/simba/base_app/app/helpers/application_helper.rb
-- lib/simba/base_app/app/models/user.rb
-- lib/simba/base_app/app/views/home/index.slim.tt
-- lib/simba/base_app/app/views/layout.slim.tt
-- lib/simba/base_app/config.ru
-- lib/simba/base_app/config/boot.rb.tt
-- lib/simba/base_app/config/database.yml
-- lib/simba/base_app/db/migrations/1_create_users.rb
-- lib/simba/base_app/lib/tasks/db.rake
-- lib/simba/base_app/lib/tasks/stat.rake
-- lib/simba/base_app/lib/tasks/test.rake
-- lib/simba/base_app/test/factory/user_factory.rb
-- lib/simba/base_app/test/functional/user_controller_test.rb
-- lib/simba/base_app/test/test_helper.rb
-- lib/simba/base_app/test/unit/user_test.rb
+- lib/simba/command.rb
+- lib/simba/templates/Gemfile
+- lib/simba/templates/Linnerfile
+- lib/simba/templates/Rakefile
+- lib/simba/templates/app/assets/images/logo.png
+- lib/simba/templates/app/assets/scripts/app.coffee
+- lib/simba/templates/app/assets/scripts/welcome.coffee
+- lib/simba/templates/app/assets/styles/app.scss
+- lib/simba/templates/app/helpers/helper.rb
+- lib/simba/templates/app/models/user.rb
+- lib/simba/templates/app/routes/app.rb
+- lib/simba/templates/app/views/home/index.slim
+- lib/simba/templates/app/views/layout.slim
+- lib/simba/templates/config.ru
+- lib/simba/templates/config/boot.rb.tt
+- lib/simba/templates/config/database.yml
+- lib/simba/templates/lib/tasks/assets.rake
+- lib/simba/templates/test/factory/user_factory.rb
+- lib/simba/templates/test/functional/user_controller_test.rb
+- lib/simba/templates/test/test_helper.rb
+- lib/simba/templates/test/unit/user_test.rb
 - lib/simba/version.rb
 - simba.gemspec
+- template/.gitignore
+- template/Gemfile
+- template/Rakefile
+- template/app/assets/css/application.scss
+- template/app/assets/img/.gitkeep
+- template/app/assets/js/application.coffee
+- template/app/controllers/application_controller.rb
+- template/app/helpers/application_helper.rb
+- template/app/models/user.rb
+- template/app/views/home/index.slim.tt
+- template/app/views/layout.slim.tt
+- template/config.ru
+- template/config/boot.rb.tt
+- template/config/database.yml
+- template/lib/tasks/stat.rake
+- template/lib/tasks/test.rake
+- template/test/factory/user_factory.rb
+- template/test/functional/user_controller_test.rb
+- template/test/test_helper.rb
+- template/test/unit/user_test.rb
 homepage: https://github.com/SaitoWu/simba
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: simba aim to set up ruby off rails best practice.
 test_files: []
-has_rdoc: 

data/lib/simba/base_app/Gemfile

@@ -1,30 +0,0 @@
-source "https://rubygems.org"
-
-gem "slim"
-gem "sass"
-gem "sqlite3"
-gem "sequel"
-gem "sinatra"
-gem "coffee-script"
-gem "sinatra-contrib"
-gem "sinatra-flash"
-gem "sinatra-assetpack", :require => "sinatra/assetpack"
-
-group :development, :test do
-  gem "pry"
-end
-
-group :production do
-  gem "thin"
-end
-
-group :test do
-  gem "rack-test"
-  gem "factory_girl"
-  gem "database_cleaner"
-end
-
-group :deploy do
-  gem "uglifier"
-  gem "capistrano"
-end

data/lib/simba/base_app/Rakefile

@@ -1,7 +0,0 @@
-# load rake tasks
-Dir["./lib/tasks/**/*.rake"].sort.each { |ext| load ext }
-
-# load assetpacket tasks
-APP_FILE  = './config/boot.rb'
-APP_CLASS = 'Sinatra::Application'
-require 'sinatra/assetpack/rake'

data/lib/simba/base_app/app/controllers/application_controller.rb

@@ -1,3 +0,0 @@
-get '/' do
-  slim :'home/index'
-end

data/lib/simba/base_app/app/helpers/application_helper.rb

@@ -1,3 +0,0 @@
-helpers do
-  #dummy
-end

data/lib/simba/base_app/config/database.yml

@@ -1,2 +0,0 @@
-default:
-  url: sqlite://db/development.db #postgres://user:password@host:port/database_name

data/lib/simba/base_app/db/migrations/1_create_users.rb

@@ -1,8 +0,0 @@
-Sequel.migration do
-  change do
-    create_table(:users) do
-      primary_key :id
-      String :name, :null=>false
-    end
-  end
-end

data/lib/simba/base_app/lib/tasks/db.rake

@@ -1,40 +0,0 @@
-require "yaml"
-
-namespace :db do
-
-  database_url = YAML.load_file("./config/database.yml")["default"]["url"]
-
-  desc "Perform migration reset (full erase and migration up)"
-  task :reset do
-    puts `sequel -Etm ./db/migrations -M 0 #{database_url}`
-    puts `sequel -Etm ./db/migrations #{database_url}`
-    puts "<= rake db:reset executed"
-  end
-
-  desc "Perform migration up/down to VERSION"
-  task :version do
-    version = ENV['VERSION'].to_i
-    raise "No VERSION was provided" if version.nil?
-    puts `sequel -Etm db/migrations -M #{version} #{database_url}`
-    puts "<= rake db:version version=[#{version}] executed"
-  end
-
-  desc "Perform migration up to latest migration available"
-  task :migrate do
-    puts `sequel -Etm ./db/migrations #{database_url}`
-    puts "<= rake db:migrate executed"
-  end
-
-  desc "Perform migration down (erase all data)"
-  task :rollback do
-    puts `sequel -Etm ./db/migrations -M 0 #{database_url}`
-    puts "<= rake db:rollback executed"
-  end
-
-  desc "Perform schema dump (dumping the current schema as a migration)"
-  task :dump do
-    raise "No FILENAME was provided" if ENV["FILENAME"].nil?
-    puts `sequel -Etd #{database_url} > ./db/migrations/#{ENV["FILENAME"]}`
-    puts "<= rake db:dump executed"
-  end
-end