sinatra_generator 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 721ab02964e1d2364eba628fcfbbddfa5d4b6c7f
-  data.tar.gz: d816c5b87f62cc18d95af24baa40d3b1340bc390
+  metadata.gz: fb29a37ff62006294c417ae6279632dde6732e35
+  data.tar.gz: fc8616025a0b1029543f30ce93e4b0a9f60e5967
 SHA512:
-  metadata.gz: 36d92f03b191e9c8dd81c1c44d33fb05bf3ad2b8588af6af970192a67a2c5f0b402290f62920d8cafd6072ef8e298771065cf04145ca24f46aa54b913efb69cd
-  data.tar.gz: 75b08c6a720730f1a7d02777d0db1f7ea248d629167dde1e86fd2a64936eaf3d563e628d85144b20fff546e518576f12928d0b51221801a9eb7c3d35d95524d7
+  metadata.gz: ad1b9af34a0f7b28820ebd5aa8e251a909ab20c3a0d2101722bc4fc5ab7e4dfa08dda42ea1871747c791b532801f548fd3ddcc1195431a36b4d84b3557497a4a
+  data.tar.gz: 723d08a3629ecbfd93dd21e01ff6e30658461549a506fffeada2c20a2ef5f261e02dcaf57cae5c9ecf81896149f7d04eae0e305dcf73d0e777b824a846f0660f

data/README.md

@@ -12,6 +12,6 @@ Install it yourself as:
 
 ## Usage
 
-    sinatragen app_name
+    sinatra new app_name
 
-    eg: sinatragen my_blog
+    eg: sinatra new blog

data/Rakefile

@@ -1,2 +1,8 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.pattern = "test/*_test.rb"
+end
 

data/bin/sinatra

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'thor'
+
+require_relative "../lib/sinatra_generator"
+
+SinatraGenerator::CLI.start  
+
+
+

data/lib/sinatra_generator/cli.rb

@@ -0,0 +1,12 @@
+require 'thor'
+
+module SinatraGenerator
+  class CLI < Thor
+
+    # register(class_name, subcommand_alias, usage_list_string, description_string)
+
+    register SinatraGenerator::Generator, "new", "new [APP_NAME]", "Generate a basic hello world app", options
+    tasks["new"].options = SinatraGenerator::Generator.class_options
+
+  end
+end

data/lib/sinatra_generator/generator.rb

@@ -0,0 +1,67 @@
+require 'thor/group'
+
+module SinatraGenerator
+  class Generator < Thor::Group
+    include Thor::Actions
+
+    desc "Generate a basic hello world application"
+
+    argument :folder_name, :type => :string
+
+    class_option :modular, aliases: "-m", desc: "modular style. Inherits from Sinatra::Base"
+    class_option :views, aliases: "-v", desc: "include views folder, index.erb and layout.erb"
+    class_option :assets, aliases: "-a", desc: "include public, javascripts and stylesheets folder" 
+    class_option :procfile, aliases: "-p", desc: "include Procfile" 
+
+    def self.source_root
+      File.dirname(__FILE__)
+    end
+
+    def create_root
+      empty_directory folder_name
+      #FileUtils.cd destination_root
+    end
+
+    def main_rb
+      template "#{Generator.source_root}/templates/main.rb", "#{folder_name}/main.rb"
+    end
+
+    def gemfile
+      template "#{Generator.source_root}/templates/Gemfile", "#{folder_name}/Gemfile"
+    end
+
+    def config_ru
+      template "#{Generator.source_root}/templates/config.ru", "#{folder_name}/config.ru"
+    end
+
+    def procfile
+      template "#{Generator.source_root}/templates/Procfile", "#{folder_name}/Procfile" if options[:procfile]
+    end
+
+    def views
+      if options[:views]
+        inside folder_name do
+
+          empty_directory 'views'
+
+          inside 'views' do
+            copy_file "#{Generator.source_root}/templates/layout.erb", "layout.erb"
+            copy_file "#{Generator.source_root}/templates/index.erb", "index.erb"     
+          end
+        end
+      end
+    end
+
+    def public
+      if options[:assets] 
+        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">',
+            :after => '<title>Hello World</title>'
+        end
+      end
+    end
+
+  end
+end

data/lib/sinatra_generator/templates/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'sinatra'

data/lib/sinatra_generator/templates/Procfile

@@ -0,0 +1 @@
+web: bundle exec rackup config.ru -p $PORT

data/lib/sinatra_generator/templates/config.ru

@@ -0,0 +1,11 @@
+<%- if options[:modular] %>
+require 'bundler'
+Bundler.require
+<% end %>
+
+require './main'
+<%- if options[:modular] %>
+run HelloWorld
+<% else %>
+run Sinatra::Application
+<% end %>

data/lib/sinatra_generator/templates/index.erb

@@ -0,0 +1 @@
+<h1>hello world</h1>

data/lib/sinatra_generator/templates/layout.erb

@@ -0,0 +1,11 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Hello World</title>
+</head>
+<body>
+
+  <%= yield %>
+
+</body>

data/lib/sinatra_generator/templates/main.rb

@@ -0,0 +1,23 @@
+<% if options[:modular] %>
+
+require 'sinatra/base' 
+
+class HelloWorld < Sinatra::Base
+  get '/' do
+    'hello world'
+  end
+end
+
+<% else %>     
+
+require 'sinatra'
+
+get '/' do
+  'hello world'
+end
+
+<% end %>
+
+
+
+

data/lib/sinatra_generator/version.rb

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

data/lib/sinatra_generator.rb

@@ -1,53 +1,121 @@
-require "sinatra_generator/version"
-require 'fileutils'
+require_relative "sinatra_generator/version"
+require_relative "sinatra_generator/generator"
+require_relative "sinatra_generator/cli"
+
+#require 'fileutils'
 
 module SinatraGenerator
-  class Generator
+end
 
-MAIN_RB = %{require 'sinatra'
 
-get '/' do
-  erb :index
-end
-}      
+# MAIN_RB = %{require 'sinatra'
 
-LAYOUT_ERB = %{<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Hello World</title>
-</head>
-<body>
+# get '/' do
+#   'hello world'
+# end
+# }
 
-  <%= yield %>
+# MAIN_RB_MODULAR = %{require 'sinatra/base'      
 
-</body>  
-}
+# class HelloWorld < Sinatra::Base
 
-INDEX_ERB = %{<h1>hello world</h1>
-}
+#   get '/' do
+#     'hello world'
+#   end
 
+# end
+# }
 
-    def new_app(folder_name)
-      FileUtils.mkdir folder_name
-      FileUtils.chdir folder_name do
 
-        File.write 'main.rb', MAIN_RB
+# LAYOUT_ERB = %{<!doctype html>
+# <html lang="en">
+# <head>
+#   <meta charset="UTF-8">
+#   <title>Hello World</title>
+# </head>
+# <body>
 
-        FileUtils.mkdir 'views'
-        FileUtils.mkdir 'public'
+#   <%= yield %>
 
-        FileUtils.chdir 'public' do
-          FileUtils.mkdir 'stylesheets'
-          FileUtils.mkdir 'javascripts'
-        end
+# </body>  
+# }
 
-        FileUtils.chdir 'views' do
-          File.write 'layout.erb', LAYOUT_ERB
-          File.write 'index.erb', INDEX_ERB
-        end        
-      end
+# INDEX_ERB = %{<h1>hello world</h1>
+# }
 
-    end
-  end
-end
+# CONFIG_RU_MODULAR = %{require 'bundler'
+# Bundler.require
+
+# require './main'
+# run HelloWorld
+# }
+
+# CONFIG_RU = %{require './main'
+# run Sinatra::Application
+# }
+
+# GEMFILE = %{source "https://rubygems.org"
+
+# gem 'sinatra'
+# }
+
+# PROCFILE = %{web: bundle exec rackup config.ru -p $PORT
+# }
+
+#     HOME_RC_FILE = "~/.sinatra_generator.json"
+
+#     def initialize(folder_name)
+#       @folder_name = folder_name
+#       config = load_config
+#       @css_dir = config['css_dir'] || 'stylesheets'
+#       @js_dir = config['js_dir'] || 'javascripts'
+#     end
+
+#     def load_config
+#       config = JSON File.read(File.expand_path(HOME_RC_FILE))
+#     rescue
+#       config = {}
+#     end
+
+#     def generate(options = {})
+
+#       begin
+#         FileUtils.mkdir folder_name
+#       rescue StandardError => e
+#         return "Error: #{e.message}"
+#       end
+
+#       FileUtils.chdir folder_name do
+
+#         if options[:modular]
+#           File.write 'config.ru', CONFIG_RU_MODULAR
+#           File.write 'main.rb', MAIN_RB_MODULAR
+#         else
+#           File.write 'config.ru', CONFIG_RU
+#           File.write 'main.rb', MAIN_RB
+#         end
+
+#         File.write 'Gemfile', GEMFILE
+
+#         File.write 'Procfile', PROCFILE if options[:procfile]
+
+#         FileUtils.mkdir 'public'
+#         FileUtils.chdir 'public' do
+#           FileUtils.mkdir css_dir
+#           FileUtils.mkdir js_dir
+#         end
+
+#         if options[:views]
+#           FileUtils.mkdir 'views'
+#           FileUtils.chdir 'views' do
+#             File.write 'layout.erb', LAYOUT_ERB
+#             File.write 'index.erb', INDEX_ERB
+#           end     
+#         end
+           
+#       end
+#       "app generated in #{folder_name}/"
+#     end
+#   end
+
+# end

data/sinatra_generator.gemspec

@@ -14,10 +14,14 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = ['sinatragen']
+  spec.executables   = ['sinatra']
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake", "~> 0.9"
+  spec.add_development_dependency "minitest", "~> 5.3"
+  spec.add_development_dependency 'simplecov', '~> 0.7'
+
+  spec.add_runtime_dependency 'thor', '~> 0.19'
 end

data/test/cli_test.rb

@@ -0,0 +1,61 @@
+require 'test_helper'
+
+class CLI < MiniTest::Unit::TestCase
+
+  def setup
+    @templates_path = "#{File.dirname(__FILE__)}/../lib/sinatra_generator/templates"
+    @tmp_dir = Dir.mktmpdir
+    Dir.chdir @tmp_dir
+  end
+
+  def teardown
+    Dir.chdir('..')
+    FileUtils.remove_entry @tmp_dir
+  end
+
+  # sinatra new blog
+  def test_command_new
+    SinatraGenerator::CLI.start ['new','blog']
+    assert File.directory? "blog"
+
+    Dir.chdir 'blog' do
+      assert File.exist?('main.rb'), 'main.rb not found'
+      assert File.exist?('Gemfile'), 'Gemfile not found'
+      assert File.exist?('config.ru'), 'config.ru not found'
+    end
+  end
+
+  # sinatra new blog -p
+  def test_option_profile
+    SinatraGenerator::CLI.start ['new','blog', '-p']
+    Dir.chdir 'blog' do
+      assert_equal File.read('Procfile'), File.read("#{@templates_path}/Procfile")
+    end
+  end
+
+  # sinatra new blog -v
+  def test_option_views
+    SinatraGenerator::CLI.start ['new','blog', '-v']
+    Dir.chdir 'blog' do
+      assert File.directory?('views'), 'views not found'
+      Dir.chdir 'views' do
+        assert_equal File.read('index.erb'), File.read("#{@templates_path}/index.erb")
+      end
+    end
+  end  
+
+  # sinatra new blog -av
+  def test_option_assets_with_views
+    SinatraGenerator::CLI.start ['new','blog', '-av']
+    Dir.chdir 'blog' do
+      assert File.directory?('public'), 'public not found'
+      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">'
+      end      
+    end
+  end  
+
+end

data/test/test_helper.rb

@@ -0,0 +1,8 @@
+require 'simplecov'
+SimpleCov.start
+
+require 'sinatra_generator'
+require 'minitest/unit'
+require 'minitest/autorun'
+require 'minitest/pride'
+require 'tmpdir'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra_generator
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Daniel Tsui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,22 +28,64 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.3'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.19'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
 description: Intended as a quick demo on how to make a ruby gem. Generate a simple
   hello world sinatra app
 email:
 - tsui.daniel@gmail.com
 executables:
-- sinatragen
+- sinatra
 extensions: []
 extra_rdoc_files: []
 files:
@@ -52,10 +94,22 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/sinatragen
+- bin/sinatra
 - lib/sinatra_generator.rb
+- lib/sinatra_generator/cli.rb
+- lib/sinatra_generator/generator.rb
+- lib/sinatra_generator/templates/Gemfile
+- lib/sinatra_generator/templates/Procfile
+- lib/sinatra_generator/templates/config.ru
+- lib/sinatra_generator/templates/index.erb
+- lib/sinatra_generator/templates/layout.erb
+- lib/sinatra_generator/templates/main.rb
+- lib/sinatra_generator/templates/public/javascripts/application.js
+- lib/sinatra_generator/templates/public/stylesheets/main.css
 - lib/sinatra_generator/version.rb
 - sinatra_generator.gemspec
+- test/cli_test.rb
+- test/test_helper.rb
 homepage: ''
 licenses:
 - MIT
@@ -80,4 +134,6 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Generate a simple hello world sinatra app
-test_files: []
+test_files:
+- test/cli_test.rb
+- test/test_helper.rb

data/bin/sinatragen

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-if ARGV[0]
-  require 'sinatra_generator'
-
-  generator = SinatraGenerator::Generator.new
-  generator.new_app ARGV[0]
-  puts "new app generated." 
-else
-  puts "Usage: sinatragen [FOLDER_NAME]"
-end
-