hisyo 0.0.3 → 0.1.0

data/.travis.yml

@@ -0,0 +1,9 @@
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - rbx-19mode
+  - jruby-19mode
+  - ruby-head
+notifications:
+  email:
+    - k@uu59.org

data/Changes

@@ -0,0 +1,4 @@
+= 0.1.0 / 2012-05-30
+
+  * Generated app has no dependency on `hisyo`
+    You can remove `hisyo` gem after generation.

data/Gemfile

@@ -7,5 +7,6 @@ gem "sinatra-contrib", :require => "sinatra/contrib"
 group :test do
   gem "rspec"
   gem "rack-test", :require => "rack/test"
-  gem "simplecov"
+  gem "simplecov", :require => false
+  gem "rake" # for Travis CI
 end

data/Gemfile.lock

@@ -10,6 +10,7 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
+    rake (0.9.2.2)
     rspec (2.10.0)
       rspec-core (~> 2.10.0)
       rspec-expectations (~> 2.10.0)
@@ -40,6 +41,7 @@ PLATFORMS
 
 DEPENDENCIES
   rack-test
+  rake
   rspec
   simplecov
   sinatra

data/README.mkd

@@ -1,34 +1,25 @@
-Hisyo is a thin wrapper for your Sinatra project
+[![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.
 
     $ gem install hisyo
     $ rbenv rehash; rehash; # if necessary
-    $ hisyo -v -r ~/myapp
-    create:  lib/
-    create:  config/
-    create:  views/
-    create:  public/
-    create:  spec/
-    create:  app/views/
-    create:  app/assets/
-    create:  db/
-    create:  tmp/
-    create:  log/
-    copy to: spec/spec_helper.rb
-    copy to: spec/hello_spec.rb
-    copy to: config.ru
-    copy to: config/boot.rb
-    copy to: Gemfile
-    copy to: app/helpers.rb
-    copy to: app/app.rb
+    $ hisyo -r ~/myapp
+    Complete.
+      $ cd ~/myapp
+      $ rackup (or `rspec spec/`, `vim app/helpers.rb`, etc)
     $ cd ~/myapp
-    $ tree -F
+    $ tree -Fa
     .
+    ├── .gitignore
     ├── Gemfile
     ├── app/
     │   ├── app.rb
     │   ├── assets/
+    │   ├── controllers.rb
     │   ├── helpers.rb
     │   └── views/
+    │       └── index.str
     ├── config/
     │   └── boot.rb
     ├── config.ru
@@ -42,10 +33,12 @@ Hisyo is a thin wrapper for your Sinatra project
     ├── tmp/
     └── views/
 
-    11 directories, 7 files
+    11 directories, 10 files
+
     $ rackup
     [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
 
-
+Generated project(as below) is a purely Sinatra application.
+That means you can `gem uninstall hisyo` after generation.

data/Rakefile

@@ -0,0 +1,11 @@
+require File.expand_path("../spec/spec_helper.rb", __FILE__)
+
+require "rspec/core/rake_task"
+require "rspec/core/version"
+
+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,7 +3,6 @@ source :rubygems
 gem "sinatra"
 gem "sinatra-contrib", :require => "sinatra/contrib"
 gem "tilt"
-gem "hisyo"
 
 group :test do
   gem "rspec"

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

@@ -1,5 +1,19 @@
-class MyApp < Hisyo::Application
-  get "/" do
-    hello("MyApp")
+# Feel free to rename from "MyApp" to anything
+# if so, remember changing config.ru, config/boot.rb
+class MyApp < Sinatra::Application
+  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
+  end
+
+  def self.setup
+    %w!config lib app!.each do |dir|
+      Dir.glob("#{root}/#{dir}/**/*.rb") do |file|
+        require file
+      end
+    end
   end
 end

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

@@ -0,0 +1,11 @@
+MyApp.controllers do
+  get "/" do
+    # render "index.str" at app/views/index.str
+    render :str, :index
+  end
+
+  get "/hi/:name" do
+    # `hi` is helper at app/helpers.rb
+    hi(params[:name] || "joe")
+  end
+end

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

@@ -1,6 +1,6 @@
-Hisyo::Application.helpers do
-  def hello(word)
-    "Hello, #{word}!"
+MyApp.helpers do
+  def hi(word)
+    "Hi, #{word}!"
   end
 end
 

data/data/generators/project/app/views/index.str

@@ -0,0 +1 @@
+Hello, MyApp!

data/data/generators/project/config.ru

@@ -1,9 +1,7 @@
 #!/usr/bin/env rackup
 # encoding: utf-8
 
-# This file can be used to start Padrino,
-# just execute it from the command line.
-
 require File.expand_path("../config/boot.rb", __FILE__)
 
+# app/app.rb
 run MyApp

data/data/generators/project/config/boot.rb

@@ -4,4 +4,5 @@ require "bundler/setup"
 Bundler.require(:default, ENV["RACK_ENV"] || "development")
 
 # load .rb files at lib/**, config/**, app/**
-Hisyo.setup
+require File.expand_path("../../app/app.rb", __FILE__)
+MyApp.setup

data/data/generators/project/spec/spec_helper.rb

@@ -6,10 +6,3 @@ RSpec.configure do |conf|
   #conf.include Rack::Test::Methods
   #conf.include Capybara::DSL
 end
-
-def app
-  ##
-  # You can handle all padrino applications using instead:
-  #   Padrino.application
-  Dara.tap { |app| p app  }
-end

data/hisyo.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["k@uu59.org"]
   gem.description   = %q{Create simple Sinatra project template}
   gem.summary       = %q{Create simple Sinatra project template}
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/uu59/hisyo"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/hisyo/cli.rb

@@ -9,9 +9,9 @@ module Hisyo
     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'){|v| options[:verbose] = true}
-        opts.on('-r VAL', '--root=VAL', 'copy to files dir'){|v| options[:root] = v}
+        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

data/lib/hisyo/generator.rb

@@ -25,6 +25,10 @@ module Hisyo
         klass.cp(file, path)
       end
     end
+
+    puts "Complete."
+    puts "  $ cd #{root}/"
+    puts '  $ rackup (or `rspec spec/`, `vim app/helpers.rb`, etc)'
   end
 end
 

data/lib/hisyo/version.rb

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

data/spec/generated_app_spec.rb

@@ -1,29 +1,49 @@
 require "spec_helper"
 
-describe "Hisyo.generate_project" do
-  before(:each) do
-    Hisyo.generate_project(
-      :root => @approot,
-    )
-    @mock = Class.new
-    configru = "#{@approot}/config.ru"
-    @mock.class_eval do
-      include Rack::Test::Methods
-      RU = configru
-      def app
-        Rack::Builder.parse_file(RU).first
+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
-    system("rm -rf #{@approot}")
+    FileUtils.rm_rf @approot
   end
 
   it "should rackup" do
-    @mock.new.instance_eval do
+    genapp do
       get "/"
-      last_response.body.should == "Hello, MyApp!"
+      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

data/spec/generator_spec.rb

@@ -2,11 +2,11 @@ require "spec_helper"
 
 describe "Hisyo.generate_project" do
   after(:each) do
-    system("rm -rf #{@approot}")
+    FileUtils.rm_rf @approot
   end
 
   it "should same data/ and approot/" do
-    Hisyo.generate_project(
+    generate_app(
       :root => @approot,
     )
     dest= Dir.glob("#{@approot}/**/*", File::FNM_DOTMATCH).find_all{|f| File.file?(f)}.map{|f| f.gsub(@approot, "")}
@@ -16,7 +16,7 @@ describe "Hisyo.generate_project" do
   end
 
   it "should not create files when :dryrun option given" do
-    Hisyo.generate_project(
+    generate_app(
       :root => @approot,
       :dryrun => true,
     )
@@ -24,20 +24,18 @@ describe "Hisyo.generate_project" do
   end
 
   it "should skip if file exists" do
-    out,err = capture_io do
-      Hisyo.generate_project(
-        :root => @approot,
-        :verbose => true,
-      )
-    end
-    out.split("\n").map{|line| line.gsub(/\e\[\d+m/, "")}.map{|line| line.split(": ").first}.uniq.should == ["create", "copy to"]
+    generate_app(
+      :root => @approot,
+      :verbose => true,
+    )
 
-    out,err = capture_io do
-      Hisyo.generate_project(
-        :root => @approot,
-        :verbose => true,
-      )
-    end
-    out.split("\n").map{|line| line.gsub(/\e\[\d+m/, "")}.map{|line| line.split(": ").first}.uniq.should == ["skip"]
+    out, err = generate_app(
+      :root => @approot,
+      :verbose => true,
+    )
+    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
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,10 @@
 require "rubygems"
 require "bundler/setup"
 Bundler.require(:default, :test)
-SimpleCov.start if ENV["COVERAGE"]
+if ENV["COVERAGE"]
+  require "simplecov"
+  SimpleCov.start
+end
 require File.expand_path("../../lib/hisyo.rb", __FILE__)
 
 
@@ -35,4 +38,10 @@ RSpec.configure do |conf|
     $stderr = orig_stderr
   end
 
+  def generate_app(options = {})
+    capture_io do
+      Hisyo.generate_project(options)
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hisyo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-27 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies: []
 description: Create simple Sinatra project template
 email:
@@ -20,22 +20,26 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
+- Changes
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.mkd
+- Rakefile
 - bin/hisyo
 - data/generators/project/.gitignore
 - data/generators/project/Gemfile
 - data/generators/project/app/app.rb
+- data/generators/project/app/controllers.rb
 - data/generators/project/app/helpers.rb
+- data/generators/project/app/views/index.str
 - data/generators/project/config.ru
 - data/generators/project/config/boot.rb
 - data/generators/project/spec/hello_spec.rb
 - data/generators/project/spec/spec_helper.rb
 - hisyo.gemspec
 - lib/hisyo.rb
-- lib/hisyo/application.rb
 - lib/hisyo/cli.rb
 - lib/hisyo/generator.rb
 - lib/hisyo/version.rb
@@ -43,7 +47,7 @@ files:
 - spec/generated_app_spec.rb
 - spec/generator_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/uu59/hisyo
 licenses: []
 post_install_message: 
 rdoc_options: []

data/lib/hisyo/application.rb

@@ -1,24 +0,0 @@
-module Hisyo
-  class Application < Sinatra::Base
-  end
-
-  def self.env
-    @env ||= ENV["RACK_ENV"] ||= "development"
-  end
-
-  def self.setup
-    bootrb = caller.first.split(/:[0-9]+:/).first
-    approot = bootrb.gsub("/config/boot.rb", "")
-    %w!config lib app!.each do |dir|
-      Dir.glob("#{approot}/#{dir}/**/*.rb") do |file|
-        require file
-      end
-    end
-
-    Hisyo::Application.instance_eval do
-      set :root, approot
-      set :views, File.join(approot, "app/views")
-      set :public_folder, File.join(approot, "public")
-    end
-  end
-end