showtime 0.1.4 → 0.2.1

data/Gemfile.lock

@@ -2,29 +2,27 @@ PATH
   remote: .
   specs:
     showtime (0.1.4)
-      thor (>= 0.14.3)
+      thor (~> 0.14.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.2)
-    rspec (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-      rspec-mocks (= 2.0.0)
-    rspec-core (2.0.0)
-    rspec-expectations (2.0.0)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-    thor (0.14.3)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    rspec-expectations (2.1.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.1.0)
+    thor (0.14.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.0.0)
-  rspec (>= 2.0.0)
+  bundler (~> 1.0)
+  rspec (~> 2.1)
   showtime!
-  thor (>= 0.14.3)
+  thor (~> 0.14.4)

data/TODO

@@ -1,2 +1 @@
-* Gemfile support
 * Lookup for default args on "~/.showtime".

data/lib/showtime/generator.rb

@@ -1,10 +1,15 @@
 module Showtime
   class Generator < Thor::Group
     include Thor::Actions
-    
-    argument :name, :optional => true, :default => '.'
-    class_options :heroku => :boolean, :views => :boolean
-    
+
+    argument :name, :optional => true, :default => '.', :desc => "Your application folder"
+    class_option :gemfile, :type => :boolean, :desc => "Create a Gemfile inside your application folder."
+    class_option :views, :type => :boolean, :desc => "creates the public/javascripts and public/stylesheets folders, and a sample index.erb view."
+
+    def self.banner
+      "showtime [app_name] [options]"
+    end
+
     def self.source_root
       File.join(File.dirname(__FILE__), "templates")
     end
@@ -12,9 +17,11 @@ module Showtime
     def create_application_file
       template("application.rb", "#{name}/application.rb")
     end
+    
     def create_rakefile
       template("Rakefile", "#{name}/Rakefile")
     end
+    
     def create_config_ru
       template("config.ru", "#{name}/config.ru")
     end
@@ -24,12 +31,14 @@ module Showtime
     end
 
     def create_spec_folder_and_helper
-      directory("spec", "#{name}/spec")
+      empty_directory("#{name}/spec")
+      template("spec/spec_helper.rb", "#{name}/spec/spec_helper.rb")
+      template("spec/application_spec.rb", "#{name}/spec/application_spec.rb")
     end
     
-    def create_gem_dependency_strategy
-      if options.heroku?
-        template(".gems", "#{name}/.gems")
+    def create_gemfile
+      if options.gemfile?
+        template("Gemfile", "#{name}/Gemfile")
       end
     end
     

data/lib/showtime/templates/Gemfile

@@ -0,0 +1,6 @@
+gem 'sinatra'
+
+group :test do
+  gem 'rspec'
+  gem 'rack-test', :require => 'rack/test'
+end

data/lib/showtime/templates/application.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'sinatra'
-
 get '/' do
 <% if options.views? %>
   @text = "Hello world!"

data/lib/showtime/templates/config.ru

@@ -1,12 +1,13 @@
-require 'application'
-
-<% unless options.heroku? %>
-root_dir = File.dirname(__FILE__)
+<% if options.gemfile? %>
+require 'rubygems'
+require 'bundler'
 
-set :environment, ENV['RACK_ENV'].to_sym
-set :root,        root_dir
-set :app_file,    File.join(root_dir, 'application.rb')
-disable :run
+Bundler.require
+<% else %>
+require 'rubygems'
+require 'sinatra'
 <% end %>
 
+require 'application'
+
 run Sinatra::Application

data/lib/showtime/templates/spec/spec_helper.rb

@@ -1,7 +1,11 @@
 require File.join(File.dirname(__FILE__), '..', 'application.rb')
 
+<% if options.gemfile? %>
+Bundler.require :test
+<% else %>  
 require 'rspec'
 require 'rack/test'
+<% end %>
 
 RSpec.configure do |config|
   config.include Rack::Test::Methods

data/showtime.gemspec

@@ -2,19 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name        = "showtime"
-  s.version     = "0.1.4"
+  s.version     = "0.2.1"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Lucas Mazza"]
-  s.date        = %q{2010-08-09}
   s.email       = ["luc4smazza@gmail.com"]
   s.homepage    = "http://rubygems.org/gems/showtime"
   s.summary     = "Simple Sinatra generator"
   s.description = "Application generator for simple Sinatra apps"
 
   s.required_rubygems_version = ">= 1.3.6"
-  s.add_development_dependency "bundler", ">= 1.0.0"
-  s.add_development_dependency "rspec", ">= 2.0.0"
-  s.add_runtime_dependency "thor", ">= 0.14.3"
+  s.add_development_dependency "bundler", "~> 1.0"
+  s.add_development_dependency "rspec", "~> 2.1"
+  s.add_runtime_dependency "thor", "~> 0.14.4"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/spec/generator_spec.rb

@@ -22,15 +22,15 @@ describe Showtime::Generator do
     end
   end
   
-  context "with the --heroku option" do
+  context "with the --gemfile option" do
     before(:each) do 
-      @path = invoke!("some_heroku_app", "--heroku")
+      @path = invoke!("app", "--gemfile")
     end
   
-    it "creates the .gems file for deployment" do
+    it "creates a basic Gemfile" do
       inside(@path) do
         verify_expected_files!
-        File.exists?(".gems").should be_true
+        File.exists?("Gemfile").should be_true
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: showtime
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 21
   prerelease: false
   segments: 
   - 0
+  - 2
   - 1
-  - 4
-  version: 0.1.4
+  version: 0.2.1
 platform: ruby
 authors: 
 - Lucas Mazza
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-09 00:00:00 -03:00
+date: 2010-11-15 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +24,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 15
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        version: "1.0"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,14 +39,13 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 1
         segments: 
         - 2
-        - 0
-        - 0
-        version: 2.0.0
+        - 1
+        version: "2.1"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -56,14 +54,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 33
+        hash: 47
         segments: 
         - 0
         - 14
-        - 3
-        version: 0.14.3
+        - 4
+        version: 0.14.4
   type: :runtime
   version_requirements: *id003
 description: Application generator for simple Sinatra apps
@@ -86,7 +84,7 @@ files:
 - bin/showtime
 - lib/showtime.rb
 - lib/showtime/generator.rb
-- lib/showtime/templates/.gems
+- lib/showtime/templates/Gemfile
 - lib/showtime/templates/Rakefile
 - lib/showtime/templates/application.rb
 - lib/showtime/templates/config.ru

data/lib/showtime/templates/.gems

@@ -1 +0,0 @@
-sinatra