sinatra_generator 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb29a37ff62006294c417ae6279632dde6732e35
-  data.tar.gz: fc8616025a0b1029543f30ce93e4b0a9f60e5967
+  metadata.gz: c40d1f01b92a2fbaa3a6a743b822010cc1d756f3
+  data.tar.gz: aa5d252c1a5dcd67d3cc4925421c71c5e1a1c92a
 SHA512:
-  metadata.gz: ad1b9af34a0f7b28820ebd5aa8e251a909ab20c3a0d2101722bc4fc5ab7e4dfa08dda42ea1871747c791b532801f548fd3ddcc1195431a36b4d84b3557497a4a
-  data.tar.gz: 723d08a3629ecbfd93dd21e01ff6e30658461549a506fffeada2c20a2ef5f261e02dcaf57cae5c9ecf81896149f7d04eae0e305dcf73d0e777b824a846f0660f
+  metadata.gz: 2bedb86c1aff3f564048b2c3280754ab82ab04f09d780b712b2bcd52a2054dd79acdafd66c5c469a263440567592ae85915d13e6bce28f5793d020a52dd40860
+  data.tar.gz: e69bb4278440e02ead0f8211a9802b141c4a034316b9806f3e6c972e03ff2aa6287dda028440762d2f54233c956833f092fc88af427abac3442d4982a02a6fc1

data/README.md

@@ -1,7 +1,5 @@
 # SinatraGenerator
 
-quick demo of how to make a gem
-
 generate a simple hello world sinatra app
 
 ## Installation
@@ -10,8 +8,32 @@ Install it yourself as:
 
     $ gem install sinatra_generator
 
-## Usage
 
-    sinatra new app_name
+## Usage:
+
+    sinatra new [APP_NAME]
+
+## Options:
+
+    -m, [--modular=MODULAR]    # modular style. Inherits from Sinatra::Base
+    -v, [--views=VIEWS]        # include views folder, index.erb and layout.erb
+    -a, [--assets=ASSETS]      # include public, javascripts and stylesheets folder
+    -p, [--procfile=PROCFILE]  # include Procfile
+
+## example
 
-    eg: sinatra new blog
+    sinatra new blog -mvpa
+        
+    .
+    ├── config.ru
+    ├── Gemfile
+    ├── main.rb
+    ├── Procfile
+    ├── public
+    │   ├── javascripts
+    │   │   └── application.js
+    │   └── stylesheets
+    │       └── main.css
+    └── views
+        ├── index.erb
+        └── layout.erb

data/lib/sinatra_generator/generator.rb

@@ -57,7 +57,7 @@ module SinatraGenerator
         directory "#{Generator.source_root}/templates/public", "#{folder_name}/public"
 
         if options[:views]
-          insert_into_file "#{folder_name}/views/layout.erb", '<link rel="stylesheet" href="/stylesheets/main.css">',
+          insert_into_file "#{folder_name}/views/layout.erb", "\n  <link rel='stylesheet' href='/stylesheets/main.css'>",
             :after => '<title>Hello World</title>'
         end
       end

data/lib/sinatra_generator/templates/main.rb

@@ -1,22 +1,21 @@
-<% if options[:modular] %>
-
+<%- options[:views] ? @view = 'erb: index' : @view = 'hello world' -%>
+<%- if options[:modular] -%>
 require 'sinatra/base' 
 
 class HelloWorld < Sinatra::Base
   get '/' do
-    'hello world'
+    <%= @view %>
   end
 end
 
-<% else %>     
-
+<%- else -%>     
 require 'sinatra'
 
 get '/' do
-  'hello world'
+  <%= @view %>
 end
 
-<% end %>
+<%- end -%>
 
 
 

data/lib/sinatra_generator/version.rb

@@ -1,3 +1,3 @@
 module SinatraGenerator
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/sinatra_generator.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["tsui.daniel@gmail.com"]
   spec.summary       = %q{Generate a simple hello world sinatra app}
   spec.description   = %q{Intended as a quick demo on how to make a ruby gem. Generate a simple hello world sinatra app}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/epoch/sinatra_generator"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/test/cli_test.rb

@@ -38,6 +38,7 @@ class CLI < MiniTest::Unit::TestCase
     SinatraGenerator::CLI.start ['new','blog', '-v']
     Dir.chdir 'blog' do
       assert File.directory?('views'), 'views not found'
+      assert_includes File.read('main.rb'), "erb: index"
       Dir.chdir 'views' do
         assert_equal File.read('index.erb'), File.read("#{@templates_path}/index.erb")
       end
@@ -52,8 +53,7 @@ class CLI < MiniTest::Unit::TestCase
       assert File.directory?('views'), 'views not found'
 
       Dir.chdir 'views' do
-        assert_match /<link rel="stylesheet" href="\/stylesheets\/main.css">/, File.read('layout.erb')
-        # assert_includes File.read('layout.erb'), '<link rel="stylesheet" href="/stylesheets/main.css">'
+        assert_match /\n\s\s<link rel='stylesheet' href='\/stylesheets\/main.css'>/, File.read('layout.erb')
       end      
     end
   end  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Daniel Tsui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,7 +110,7 @@ files:
 - sinatra_generator.gemspec
 - test/cli_test.rb
 - test/test_helper.rb
-homepage: ''
+homepage: https://github.com/epoch/sinatra_generator
 licenses:
 - MIT
 metadata: {}