hisyo 0.1.0 → 0.2.0

data/Changes

@@ -1,3 +1,18 @@
+= 0.2.0 / 2012-06-09
+
+  * Added: `-k sprockets` generator
+
+  * Changed: Rakefile will be generated by default
+
+  * Changed: Generated app is extend Sinatra::Base instead Sinatra::Application
+
+  * Changed: MyApp.controllers is deprecated,
+    use MyApp.namespace (Sinatra::Namespace at sinatra-contrib)
+
+  * Added: `-h` or `--help` will be display about assistance(e.g. travis, sprockets)
+
+  * Changed: if generated file path is exist, Hisyo try merging it
+
 = 0.1.0 / 2012-05-30
 
   * Generated app has no dependency on `hisyo`

data/Gemfile

@@ -1,6 +1,7 @@
 source :rubygems
 
 gem "sinatra", :require => "sinatra/base"
+gem "erubis"
 gem "tilt"
 gem "sinatra-contrib", :require => "sinatra/contrib"
 
@@ -9,4 +10,7 @@ group :test do
   gem "rack-test", :require => "rack/test"
   gem "simplecov", :require => false
   gem "rake" # for Travis CI
+
+  # for sprockets generator
+  gem "sprockets"
 end

data/Gemfile.lock

@@ -3,7 +3,9 @@ GEM
   specs:
     backports (2.5.3)
     diff-lcs (1.1.3)
+    erubis (2.7.0)
     eventmachine (0.12.10)
+    hike (1.2.1)
     multi_json (1.3.5)
     rack (1.4.1)
     rack-protection (1.2.0)
@@ -34,16 +36,23 @@ GEM
       rack-test
       sinatra (~> 1.3.0)
       tilt (~> 1.3)
+    sprockets (2.4.3)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     tilt (1.3.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  erubis
   rack-test
   rake
   rspec
   simplecov
   sinatra
   sinatra-contrib
+  sprockets
   tilt

data/README.mkd

@@ -1,6 +1,6 @@
 [![Travis CI Build Status](https://secure.travis-ci.org/uu59/hisyo.png?branch=master)](http://travis-ci.org/uu59/hisyo)
 
-Hisyo is a generator that for your Sinatra project to play.
+Hisyo is a generator that for your pure Sinatra project to play.
 
     $ gem install hisyo
     $ rbenv rehash; rehash; # if necessary
@@ -39,6 +39,10 @@ Hisyo is a generator that for your Sinatra project to play.
     [2012-05-28 02:24:32] INFO  WEBrick 1.3.1
     [2012-05-28 02:24:32] INFO  ruby 1.9.3 (2012-02-16) [x86_64-linux]
     [2012-05-28 02:24:32] INFO  WEBrick::HTTPServer#start: pid=11232 port=9292
+    ^C
+    $ hisyo -r . -k travis
+    create: ./.travis.yml
+    create: ./Rakefile
 
 Generated project(as below) is a purely Sinatra application.
 That means you can `gem uninstall hisyo` after generation.

data/Rakefile

@@ -7,5 +7,6 @@ task :default => :spec
 
 desc "Run all examples"
 RSpec::Core::RakeTask.new(:spec) do |t|
+  ENV["SPEC_OPTS"] = "-c -f d"
   #t.ruby_opts = %w[-w]
 end

data/data/generators/assistance/sprockets/Gemfile.erubis

@@ -0,0 +1,4 @@
+<%= yield %>
+
+# sprockets
+gem 'sprockets', '~> 2.0'

data/data/generators/assistance/sprockets/Rakefile.erubis

@@ -0,0 +1,8 @@
+<%= yield %>
+
+require "rake/sprocketstask"
+Rake::SprocketsTask.new do |t|
+  t.environment = MyApp.sprockets
+  t.output      = "./public/assets"
+  t.assets      = %w( * ) # or you want such as %w(application.js style.css)
+end

data/data/generators/assistance/sprockets/app/assets/javascripts/app.js

@@ -0,0 +1,2 @@
+// https://github.com/sstephenson/sprockets
+//= require foo.js

data/data/generators/assistance/sprockets/app/assets/javascripts/foo.js

@@ -0,0 +1 @@
+"hello sprockets";

data/data/generators/assistance/sprockets/app/sprockets.rb

@@ -0,0 +1,47 @@
+MyApp.class_eval do
+  set :sprockets, Sprockets::Environment.new(root)
+  set :assets_prefix, '/assets'
+  set :assets_digest, true
+
+  configure do
+    sprockets.append_path File.join(root, 'app', 'assets', 'stylesheets')
+    sprockets.append_path File.join(root, 'app', 'assets', 'javascripts')
+
+    #sample config for compression
+    #sprockets.js_compressor = Uglifier.new
+    #sprockets.css_compressor = YUI::CssCompressor.new
+  end
+
+  helpers do
+    def javascript_path(path)
+      path << ".js" if File.extname(path).empty?
+      asset_path(path)
+    end
+
+    def stylesheet_path(path)
+      path << ".css" if File.extname(path).empty?
+      asset_path(path)
+    end
+
+    def asset_path(path)
+      return path if path.match %r!^(?:https?:)//!
+
+      asset = settings.sprockets.find_asset(path)
+      raise "asset not found for '#{path}'" unless asset
+      basename = settings.assets_digest ? asset.digest_path : asset.logical_path
+      File.join(settings.assets_prefix, basename)
+    end
+  end
+
+  get "#{settings.assets_prefix}/*" do
+    path = params[:splat].last.sub(%r!^/!, "")
+    if digest = path[/-[0-9a-f]+\./]
+      path.sub!(digest, ".")
+      expires 8640000, :public
+    end
+    asset = settings.sprockets.index.find_asset path
+    halt 404, "asset not found '#{path}'" unless asset
+    content_type File.extname(path)
+    asset
+  end
+end

data/data/generators/assistance/test/foo.txt

@@ -0,0 +1,2 @@
+foo
+

data/data/generators/assistance/test/test.txt.erubis

@@ -0,0 +1,2 @@
+<%= yield %>
+template

data/data/generators/assistance/travis/.travis.yml.erubis

@@ -0,0 +1,10 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - rbx-19mode
+  - jruby-19mode
+  - ruby-head
+notifications:
+  email:
+    - <%= email %>

data/data/generators/assistance/travis/Rakefile.erubis

@@ -0,0 +1,7 @@
+<%= yield %>
+task :default => :spec
+
+desc "Run all examples"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  #t.ruby_opts = %w[-w]
+end

data/data/generators/project/Gemfile

@@ -3,6 +3,7 @@ source :rubygems
 gem "sinatra"
 gem "sinatra-contrib", :require => "sinatra/contrib"
 gem "tilt"
+gem "rake"
 
 group :test do
   gem "rspec"

data/data/generators/project/Rakefile

@@ -0,0 +1,5 @@
+require File.expand_path("../spec/spec_helper.rb", __FILE__)
+
+require "rspec/core/rake_task"
+require "rspec/core/version"
+

data/data/generators/project/app/app.rb

@@ -1,12 +1,22 @@
 # Feel free to rename from "MyApp" to anything
 # if so, remember changing config.ru, config/boot.rb
-class MyApp < Sinatra::Application
+class MyApp < Sinatra::Base
   set :root, File.expand_path("../../", __FILE__)
   set :views, File.join(root, "app/views")
   set :public_folder, File.join(root, "public")
 
-  def self.controllers(&block)
-    instance_eval &block
+  register Sinatra::RespondWith
+  register Sinatra::Namespace
+
+  helpers do
+    include Sinatra::Streaming
+    include Sinatra::ContentFor
+    include Sinatra::JSON
+  end
+
+  configure :development do
+    MyApp.reset!
+    use Rack::Reloader
   end
 
   def self.setup

data/data/generators/project/app/controllers.rb

@@ -1,11 +1,19 @@
-MyApp.controllers do
-  get "/" do
+MyApp.namespace "/" do
+  get do
     # render "index.str" at app/views/index.str
     render :str, :index
   end
 
-  get "/hi/:name" do
+  get "hi/:name" do
     # `hi` is helper at app/helpers.rb
     hi(params[:name] || "joe")
   end
+
+  # /admin/*
+  namespace "admin" do
+    before { halt 403, "Secret zone" }
+    get "/secret" do
+      "foobar"
+    end
+  end
 end

data/lib/hisyo.rb

@@ -1,6 +1,20 @@
-Dir.glob("#{File.dirname(__FILE__)}/hisyo/**/*.rb") do |file|
-  require file
-end
+require "fileutils"
+require "optparse"
+require "find"
 
 module Hisyo
+  DIR = File.expand_path("../../data/generators", __FILE__)
+  HELP = []
+
+  def self.help(str)
+    HELP << str
+  end
+
+  dir = File.dirname(__FILE__)
+  $LOAD_PATH.unshift(dir) if $LOAD_PATH.grep(dir).empty?
 end
+
+require "hisyo/util"
+require "hisyo/generator"
+require "hisyo/cli"
+require "hisyo/version"

data/lib/hisyo/cli.rb

@@ -1,20 +1,8 @@
-require "optparse"
-
 module Hisyo
   module CLI
     def self.run(argv)
-      Hisyo.generate_project parse_options(argv)
-    end
-
-    def self.parse_options(argv)
-      options = {}
-      OptionParser.new do |opts|
-        opts.on('-n', '--dry-run', 'Do not actually run'){|v| options[:dryrun] = true}
-        opts.on('-v', '--verbose', 'Verbose mode'){|v| options[:verbose] = true}
-        opts.on('-r VAL', '--root=VAL', 'Application root directory'){|v| options[:root] = v}
-        opts.parse!(argv)
-      end
-      options
+      gen = Generator.new(argv)
+      gen.run
     end
   end
 end

data/lib/hisyo/generator.rb

@@ -1,34 +1,89 @@
-require "fileutils"
+Dir.glob("#{File.dirname(__FILE__)}/generator/*.rb") do |file|
+  require file
+end
 
 module Hisyo
-  def self.generate_project(options = {})
-    root = options[:root] || Dir.pwd
-    klass = options[:dryrun] ? FileUtils::NoWrite : FileUtils
-    %w!lib config views public spec app/views app/assets db tmp log!.each do |dir|
-      dir = File.join(root, dir)
-      if File.directory?(dir)
-        puts "\e[31mskip: \e[0m#{dir.gsub(root + "/", "")}/" if options[:verbose]
-      else
-        puts "\e[1m\e[32mcreate:  \e[0m#{dir.gsub(root + "/", "")}/" if options[:verbose]
-        klass.mkdir_p dir
+  class Generator
+    include Hisyo::Util
+
+    attr_reader :params, :options
+
+    def initialize(argv = [])
+      @params = {}
+      @argv = argv
+      parse
+    end
+
+    def parse
+      @options = begin
+        options = {
+          :dryrun => false,
+          :color => false,
+          :verbose => true,
+          :root => Dir.pwd,
+        }
+        OptionParser.new do |opts|
+          opts.on('-n', '--dryrun', 'Do not actually run'){|v| options[:dryrun] = true}
+          opts.on('-v', '--verbose', 'Verbose mode'){|v| options[:verbose] = true}
+          opts.on('-q', '--quite', 'Non-verbose mode'){|v| options[:verbose] = false}
+          opts.on('-c', '--color', 'Colorise'){|v| options[:color] = true}
+          opts.on('-r VAL', '--root=VAL', 'Application root directory'){|v| options[:root] = v}
+
+          opts.on('-k VAL', '--kind=VAL', 'What to generate'){|v| options[:kind] = v}
+
+          opts.on_tail("-h", "--help", "Show this message") do
+            puts opts
+            puts
+            puts "Hisyo assistance help e.g. `hisyo -k foo bar=baz`"
+            puts HELP.join("\n")
+            exit
+          end
+
+          begin
+            opts.parse!(@argv)
+          rescue OptionParser::InvalidOption => e
+            $stderr.puts e
+            $stderr.puts opts.help
+            exit 1
+          end
+        end
+        options
+      end
+
+      @argv.each do |kv|
+        k,v = kv.split("=")
+        @params[k] = v
       end
     end
 
-    skelton = File.expand_path("../../../data/generators/project", __FILE__)
-    Dir.glob("#{skelton}/**/*", File::FNM_DOTMATCH) do |file|
-      next if File.directory?(file)
-      path = File.join(root, file.gsub(skelton, ""))
-      if File.file?(path)
-        puts "\e[31mskip: \e[0m#{path.gsub(root + "/", "")}/" if options[:verbose]
+    def run
+      if options[:kind]
+        gen_assistance
       else
-        puts "\e[1m\e[32mcopy to: \e[0m#{path.gsub(root + "/", "")}" if options[:verbose]
-        klass.cp(file, path)
+        gen_project
       end
     end
 
-    puts "Complete."
-    puts "  $ cd #{root}/"
-    puts '  $ rackup (or `rspec spec/`, `vim app/helpers.rb`, etc)'
+    def gen_project
+      root = options[:root]
+      src_dir = File.expand_path("project", DIR)
+      copy(src_dir)
+
+      puts "Complete."
+      puts "  $ cd #{root}/"
+      puts '  $ rackup (or `rspec spec/`, `vim app/helpers.rb`, etc)'
+    end
+
+    def generators
+      methods.grep(/^generate_/)
+    end
+
+    def gen_assistance
+      unless method = generators.find{|g| g.to_s == "generate_#{options[:kind]}"}
+        raise "unknown"
+      end
+      __send__(method)
+    end
   end
 end
 

data/lib/hisyo/generator/sprockets.rb

@@ -0,0 +1,13 @@
+module Hisyo
+  class Generator
+    def generate_sprockets
+      src = File.expand_path("assistance/sprockets", DIR)
+      root = options[:root]
+      copy(src)
+    end
+  end
+
+  help <<-TEXT
+  -k sprockets: for Sprockets and helpers generation
+  TEXT
+end

data/lib/hisyo/generator/test.rb

@@ -0,0 +1,10 @@
+# This is test generator for test
+module Hisyo
+  class Generator
+    def generate_test
+      src = File.expand_path("assistance/test", DIR)
+      root = options[:root]
+      copy(src)
+    end
+  end
+end

data/lib/hisyo/generator/travis.rb

@@ -0,0 +1,18 @@
+module Hisyo
+  class Generator
+    def generate_travis
+      src = File.expand_path("assistance/travis", DIR)
+      root = options[:root]
+      @params = {
+        "email" => command("git config user.email") || "foo@example.com"
+      }.merge(@params)
+      copy(src)
+    end
+  end
+
+  help <<-TEXT
+  -k travis: for Travis CI files
+    * email=foo@example.com 
+    Notification email address (default is `git config user.email`)
+  TEXT
+end

data/lib/hisyo/util.rb

@@ -0,0 +1,84 @@
+module Hisyo
+  module Util
+    COLORS = {
+      :black => 30,
+      :red => 31,
+      :green => 32,
+      :yellow => 33,
+      :blue => 34,
+      :magenta => 35,
+      :cyan => 36,
+      :while => 37,
+    }
+
+    def copy(src)
+      Find.find(src) do |file|
+        next if file == src
+        is_dir = File.directory?(file)
+        dest = File.join(options[:root], file.gsub(src, ""))
+        dir = is_dir ? dest : File.dirname(dest)
+        if File.exists?(dest)
+          skip(dest)
+          next
+        end
+        FileUtils.mkdir_p(dir) unless options[:dryrun]
+        next if is_dir
+
+        if file.match(/\.erubis$/)
+          dest.gsub!(/\.erubis$/, "")
+          template = Tilt.new(file)
+          content = template.render(Object.new, @params) do
+            File.exist?(dest) ? File.read(dest) : ""
+          end
+          if File.exist?(dest) && File.file?(dest)
+            tmp = template.render(Object.new, @params) { "" }.strip
+            if File.read(dest)[tmp]
+              skip(dest)
+              next
+            end
+          end
+        else
+          content = File.read(file)
+          if File.exist?(dest) && File.read(dest)[content]
+            skip(dest)
+          end
+        end
+
+        if File.exist?(dest)
+          merge(dest)
+        else
+          create(dest)
+        end
+
+        unless options[:dryrun]
+          File.open(dest, "w"){|f| f.write content}
+        end
+      end
+    end
+
+    def command(cmd)
+      begin
+        ret = %x!#{cmd}!
+        return ret if $?.exitstatus == 0
+      rescue Errno::ENOENT
+        nil
+      end
+    end
+
+    def color(text, color = :green)
+      options[:color] ? "\e[1m\e[#{COLORS[color] || "33"}m#{text}\e[0m" : text
+    end
+
+    def create(dest)
+      puts color("create: ", :green) + dest if @options[:verbose]
+    end
+
+    def skip(dest)
+      puts color("skip: ", :yellow) + dest if @options[:verbose]
+    end
+
+    def merge(dest)
+      puts color("merge: ", :magenta) + dest if @options[:verbose]
+    end
+  end
+end

data/lib/hisyo/version.rb

@@ -1,3 +1,3 @@
 module Hisyo
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/cli_spec.rb

@@ -1,10 +1,9 @@
 require "spec_helper"
 
-describe "Hisyo.parse_options" do
-  it "should parse options" do
-    options = Hisyo::CLI.parse_options(%w!-n -v --root=/tmp!)
-    options[:dryrun].should be_true
-    options[:verbose].should be_true
-    options[:root].should == "/tmp"
+describe "Hisyo::CLI options" do
+  it "should run Generator.new.run" do
+    capture_io do
+      lambda { Hisyo::CLI.run(%w!--help!) }.should raise_error(SystemExit)
+    end
   end
 end

data/spec/generate_app_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+describe "Hisyo::Generator app" do
+  before(:each) do
+    generate(
+      :root => @approot,
+    )
+  end
+
+  after(:each) do
+    FileUtils.rm_rf @approot
+  end
+
+  it_should_behave_like "rackapp"
+end

data/spec/generate_assistance_spec.rb

@@ -0,0 +1,36 @@
+require "spec_helper"
+
+describe "Hisyo::Generator assistance" do
+  context "travis" do
+    let(:kind) { "travis" }
+    include_context "assistance"
+
+    it "should create .travis.yml " do
+      File.exists?("#{@approot}/.travis.yml").should be_true
+      yml = YAML.load File.read("#{@approot}/.travis.yml")
+      yml["notifications"]["email"].should_not be_empty
+    end
+  end
+
+  context "sprockets" do
+    let(:kind) { "sprockets" }
+    include_context "assistance"
+
+    it "should get under the /assets" do
+      genapp do
+        get "/assets/app.js"
+        last_response.body.should =~ /sprockets/
+      end
+    end
+
+    it "should compile by Rake" do
+      approot = @approot
+      capture_io do
+        rake do
+          tasks.find{|t| t.name == "assets"}.execute
+        end
+      end
+      Dir.entries("#{approot}/public/assets").should_not be_empty
+    end
+  end
+end

data/spec/generator_spec.rb

@@ -1,41 +1,88 @@
 require "spec_helper"
 
-describe "Hisyo.generate_project" do
+describe "Hisyo::Generator basic" do
   after(:each) do
     FileUtils.rm_rf @approot
   end
 
-  it "should same data/ and approot/" do
-    generate_app(
+  it "should parse options" do
+    gen = Hisyo::Generator.new(%w!-k travis -n -v --root=/tmp!)
+    options = gen.options
+    options[:dryrun].should be_true
+    options[:verbose].should be_true
+    options[:color].should be_false
+    options[:root].should == "/tmp"
+    options[:kind].should == "travis"
+  end
+
+  it "should parse params" do
+    gen = Hisyo::Generator.new(%w!-k travis -n -v --root=/tmp foo=bar!)
+    gen.params["foo"].should == "bar"
+  end
+
+  it "should exit invalid option given" do
+    out, err = capture_io do
+      lambda { Hisyo::Generator.new(%w!--invalid-option!) }.should raise_error(SystemExit)
+    end
+    err["Usage"].should_not be_nil
+  end
+
+  it "should run command" do
+    gen = Hisyo::Generator.new
+    gen.command("/bin/true").should == ""
+    gen.command("does_not_exists_command").should be_nil
+  end
+
+  it "should same data/project/ and approot/" do
+    # https://github.com/rubinius/rubinius/blob/17aa445116/lib/find.rb#L39
+    pending "Rubinius's Find.find raise LocalJumpError if no block given" if defined?(Rubinius)
+    generate(
       :root => @approot,
     )
-    dest= Dir.glob("#{@approot}/**/*", File::FNM_DOTMATCH).find_all{|f| File.file?(f)}.map{|f| f.gsub(@approot, "")}
+    dest = Find.find(@approot).map{|f| f.gsub(@approot, "")}.sort
     src_dir = "#{@root}/data/generators/project"
-    src = Dir.glob("#{src_dir}/**/*", File::FNM_DOTMATCH).find_all{|f| File.file?(f)}.map{|f| f.gsub(src_dir, "")}
+    src = Find.find(src_dir).map{|f| f.gsub(src_dir, "")}.sort
     dest.should == src
   end
 
   it "should not create files when :dryrun option given" do
-    generate_app(
+    # https://github.com/rubinius/rubinius/blob/17aa445116/lib/find.rb#L39
+    pending "Rubinius's Find.find raise LocalJumpError if no block given" if defined?(Rubinius)
+    generate(
       :root => @approot,
       :dryrun => true,
     )
-    Dir.glob("#{@approot}/**/*", File::FNM_DOTMATCH).to_a.should == []
+    lambda { Find.find(@approot).to_a }.should raise_error(Errno::ENOENT)
   end
 
   it "should skip if file exists" do
-    generate_app(
+    generate(
       :root => @approot,
-      :verbose => true,
     )
 
-    out, err = generate_app(
+    out, err = generate(
       :root => @approot,
-      :verbose => true,
+      :color => false,
     )
-    messages = out.split("\n").map{|line| line.gsub(/\e\[\d+m/, "")}.map{|line| line.split(": ").first}.uniq
-    messages.include?("copy to").should be_false
-    messages.include?("create").should be_false
-    messages.include?("skip").should be_true
+    messages = out.split("\n").grep(/^[a-z]+:/i)
+    messages.grep(/^create/).should be_empty
+    messages.grep(/^skip/).length.should == messages.length
+  end
+
+  it "should merge exists content" do
+    generate(:root => @approot)
+    File.open("#{@approot}/test.txt", "w"){|f| f.write "original"}
+    generate(:root => @approot, :kind => "test")
+    File.read("#{@approot}/test.txt").rstrip.should == "original\ntemplate"
+    File.read("#{@approot}/foo.txt").rstrip.should == "foo"
+  end
+
+  it "should dedup merge" do
+    generate(:root => @approot)
+    generate(:root => @approot, :kind => "test")
+    File.read("#{@approot}/foo.txt").rstrip.should == "foo"
+
+    generate(:root => @approot, :kind => "test")
+    File.read("#{@approot}/foo.txt").rstrip.should == "foo"
   end
 end

data/spec/spec_helper.rb

@@ -3,10 +3,10 @@ require "bundler/setup"
 Bundler.require(:default, :test)
 if ENV["COVERAGE"]
   require "simplecov"
-  SimpleCov.start
+  SimpleCov.start "test_frameworks"
 end
 require File.expand_path("../../lib/hisyo.rb", __FILE__)
-
+Dir["./spec/support/**/*.rb"].each{|f| require f}
 
 RSpec.configure do |conf|
   conf.before(:all) do
@@ -38,10 +38,59 @@ RSpec.configure do |conf|
     $stderr = orig_stderr
   end
 
-  def generate_app(options = {})
+  def generate(options = {}, params = {})
     capture_io do
-      Hisyo.generate_project(options)
+      gen = Hisyo::Generator.new
+      gen.instance_variable_set(:@options, options)
+      gen.instance_variable_set(:@params, params)
+      gen.run
+    end
+  end
+
+  def genapp(&block)
+    pending "jruby does not support fork" if defined? JRUBY_VERSION
+    generate(
+      :root => @approot,
+    )
+    pid = fork do 
+      @mock = Class.new
+      configru = "#{@approot}/config.ru"
+      bootrb = "#{@approot}/config/boot.rb"
+      @mock.class_eval do
+        require bootrb
+
+        include Rack::Test::Methods
+        @configru = configru
+
+        def self.configru
+          @configru
+        end
+
+        def app
+          Rack::Builder.parse_file(self.class.configru).first
+        end
+      end
+      @mock.new.instance_eval &block
+    end
+    Process.wait pid
+  end
+
+  def rake(rakefile = nil, &block)
+    pending "jruby does not support fork" if defined? JRUBY_VERSION
+    rakefile ||= File.join(@approot, "Rakefile")
+    pid = fork do
+      Dir.chdir(File.dirname(rakefile))
+      app = Rake::Application.new
+      Rake.application = app
+      app.instance_eval do
+        @rakefiles.clear
+        @rakefiles << rakefile
+        init
+        load_rakefile
+        self.instance_eval &block
+      end
     end
+    Process.waitpid pid
   end
 
 end

data/spec/support/assistance_context.rb

@@ -0,0 +1,17 @@
+shared_context "assistance" do
+  it_behaves_like "rackapp"
+
+  before(:each) do
+    generate(
+      :root => @approot,
+    )
+    generate(
+      :root => @approot,
+      :kind => kind,
+    )
+  end
+
+  after(:each) do
+    FileUtils.rm_rf @approot
+  end
+end

data/spec/support/rackup.rb

@@ -0,0 +1,26 @@
+require "spec_helper"
+
+shared_examples_for "rackapp" do
+  after(:each) do
+    FileUtils.rm_rf @approot
+  end
+
+  it "should rackup" do
+    genapp do
+      get "/"
+      last_response.body.rstrip.should == "Hello, MyApp!"
+
+      get "/hi/uu59"
+      last_response.body.should == "Hi, uu59!"
+
+      get "/admin/secret"
+      last_response.status.should == 403
+      last_response.body.should == "Secret zone"
+    end
+  end
+
+  it "should rake run" do
+    pending "jruby does not support fork" if defined? JRUBY_VERSION
+    lambda { rake{} }.should_not raise_error
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hisyo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000 Z
+date: 2012-06-08 00:00:00.000000000 Z
 dependencies: []
 description: Create simple Sinatra project template
 email:
@@ -28,8 +28,18 @@ files:
 - README.mkd
 - Rakefile
 - bin/hisyo
+- data/generators/assistance/sprockets/Gemfile.erubis
+- data/generators/assistance/sprockets/Rakefile.erubis
+- data/generators/assistance/sprockets/app/assets/javascripts/app.js
+- data/generators/assistance/sprockets/app/assets/javascripts/foo.js
+- data/generators/assistance/sprockets/app/sprockets.rb
+- data/generators/assistance/test/foo.txt
+- data/generators/assistance/test/test.txt.erubis
+- data/generators/assistance/travis/.travis.yml.erubis
+- data/generators/assistance/travis/Rakefile.erubis
 - data/generators/project/.gitignore
 - data/generators/project/Gemfile
+- data/generators/project/Rakefile
 - data/generators/project/app/app.rb
 - data/generators/project/app/controllers.rb
 - data/generators/project/app/helpers.rb
@@ -42,11 +52,18 @@ files:
 - lib/hisyo.rb
 - lib/hisyo/cli.rb
 - lib/hisyo/generator.rb
+- lib/hisyo/generator/sprockets.rb
+- lib/hisyo/generator/test.rb
+- lib/hisyo/generator/travis.rb
+- lib/hisyo/util.rb
 - lib/hisyo/version.rb
 - spec/cli_spec.rb
-- spec/generated_app_spec.rb
+- spec/generate_app_spec.rb
+- spec/generate_assistance_spec.rb
 - spec/generator_spec.rb
 - spec/spec_helper.rb
+- spec/support/assistance_context.rb
+- spec/support/rackup.rb
 homepage: https://github.com/uu59/hisyo
 licenses: []
 post_install_message: 
@@ -73,6 +90,9 @@ specification_version: 3
 summary: Create simple Sinatra project template
 test_files:
 - spec/cli_spec.rb
-- spec/generated_app_spec.rb
+- spec/generate_app_spec.rb
+- spec/generate_assistance_spec.rb
 - spec/generator_spec.rb
 - spec/spec_helper.rb
+- spec/support/assistance_context.rb
+- spec/support/rackup.rb

data/spec/generated_app_spec.rb

@@ -1,49 +0,0 @@
-require "spec_helper"
-
-describe "Hisyo generated app" do
-  def genapp(&block)
-    pending "jruby does not support fork" if defined? JRUBY_VERSION
-    pid = fork do 
-      generate_app(
-        :root => @approot,
-      )
-      @mock = Class.new
-      configru = "#{@approot}/config.ru"
-      bootrb = "#{@approot}/config/boot.rb"
-      @mock.class_eval do
-        require bootrb
-
-        include Rack::Test::Methods
-        @configru = configru
-
-        def self.configru
-          @configru
-        end
-
-        def app
-          Rack::Builder.parse_file(self.class.configru).first
-        end
-      end
-      @mock.new.instance_eval &block
-    end
-    Process.wait pid
-  end
-
-  after(:each) do
-    FileUtils.rm_rf @approot
-  end
-
-  it "should rackup" do
-    genapp do
-      get "/"
-      last_response.body.rstrip.should == "Hello, MyApp!"
-    end
-  end
-
-  it "controllers" do
-    genapp do
-      get "/hi/uu59"
-      last_response.body.should == "Hi, uu59!"
-    end
-  end
-end