mafia 0.0.9 → 0.1.0

data/lib/mafia.rb

@@ -35,7 +35,13 @@ module Mafia
     def create_version_file
       template("version.rb.tt", "#{name}/lib/version.rb")
     end
-    
+
+    def create_bin_file
+      if yes? "\n\nCreate a binary to run your application?", :yellow
+        template("bin.tt", "#{name}/bin/#{name}")
+      end
+    end
+
     def create_gem_file
       template("gem.rb.tt", "#{name}/lib/#{name}.rb")
     end

data/lib/mafia/templates/app.rb.tt

@@ -4,10 +4,13 @@ require "sass"
 
 module <%= camelize(name) %>
   class Application < Sinatra::Base
-      
+
     set :public_folder, File.join(File.dirname(__FILE__), 'public')
-    set :views, File.join(File.dirname(__FILE__), 'views')  
-    
-    # Your actions go here  
+    set :views, File.join(File.dirname(__FILE__), 'views')
+
+    # Your actions go here
+    get '/' do
+      "Hello World. I am the template <%= camelize(name) %> application."
+    end
   end
-end
+end

data/lib/mafia/templates/bin.tt

@@ -0,0 +1,41 @@
+#!/usr/bin/env ruby
+
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
+
+require "rubygems"
+require "optparse"
+require "<%= name %>"
+require "version"
+
+options = {}
+
+optparse = OptionParser.new do |opts|
+  # Set a banner, displayed at the top
+  # of the help screen.
+  opts.banner = "Usage: <%= camelize(name) %> [options] ..."
+
+  opts.separator ''
+  opts.separator "Configuration options:"
+
+  opts.on_tail( "-v", "--version", "Show version") do
+    puts "<%= camelize(name) %> version #{<%= camelize(name) %>::VERSION}"
+    exit
+  end
+
+  opts.separator ""
+  opts.separator "Common options:"
+
+  opts.on_tail("-h", "--help", "Display this screen" ) do
+    puts opts
+    exit
+  end
+end
+
+begin
+  optparse.parse!
+  <%= camelize(name) %>::Application.run!
+rescue OptionParser::InvalidArgument, OptionParser::InvalidOption, OptionParser::MissingArgument
+  puts $!.to_s
+  puts optparse
+  exit
+end

data/lib/mafia/templates/gem.rb.tt

@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 $:.unshift File.dirname(__FILE__)
 require "version"
-require "<%= name %>/app.rb"
+require "<%= name %>/app.rb"
+=======
+require "version"
+require "<%= name %>/app"
+>>>>>>> c86ce73715b1a50cfbe767fb819a280a1ef28a09

data/lib/mafia/templates/gemspec.tt

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "sinatra"
+  s.add_dependency "sinatra", "1.3.1"
   s.add_dependency "haml"
   s.add_dependency "sass"
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Mafia
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mafia
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-23 00:00:00.000000000Z
+date: 2011-10-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70194082494300 !ruby/object:Gem::Requirement
+  requirement: &70345886295140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70194082494300
+  version_requirements: *70345886295140
 description: Generator to create sinatra apps that are also gems
 email:
 - george@accountsapp.com
@@ -42,6 +42,7 @@ files:
 - lib/mafia/templates/README.md.tt
 - lib/mafia/templates/Rakefile
 - lib/mafia/templates/app.rb.tt
+- lib/mafia/templates/bin.tt
 - lib/mafia/templates/config.ru.tt
 - lib/mafia/templates/gem.rb.tt
 - lib/mafia/templates/gemspec.tt