mafia 0.1.3 → 0.1.4

data/lib/mafia.rb

@@ -36,12 +36,6 @@ module Mafia
       template("version.rb.tt", "#{name}/lib/version.rb")
     end
 
-    def create_bin_file
-      if yes? "\n\nCreate a binary to run your application?", :green
-        template("bin.tt", "#{name}/bin/#{name}")
-      end
-    end
-
     def create_gem_file
       template("gem.rb.tt", "#{name}/lib/#{name}.rb")
     end
@@ -68,6 +62,13 @@ module Mafia
       empty_directory("#{name}/lib/#{name}/lib")      
     end
     
+    def create_bin_file
+      if yes? "\n\nCreate a binary to run your application?", :green
+        template("bin.tt", "#{name}/bin/#{name}")
+        inject_into_file "#{name}/#{name}.gemspec", "\n  s.add_dependency \"thor\"", :after => "s.add_dependency \"sinatra\", \"1.3.1\""
+      end
+    end
+    
     def create_license
       if yes? "\n\nUse MIT License?", :green
         

data/lib/mafia/templates/bin.tt

@@ -1,40 +1,17 @@
 #!/usr/bin/env ruby
 
-$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
+require 'rubygems' unless defined?(Gem) # Useful only on --dev mode
+require 'bundler/setup' if %w(Gemfile .components).all? { |f| File.exist?(f) }
 
-require "rubygems"
-require "<%= name %>"
-require "version"
+require 'thor'
 
-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
+module <%= camelize(name) %>
+  class Runner < Thor
+    desc "info", "about this gem"
+    def info
+      say "This is the command line executable and can be found in <%= name %>/bin"
+    end
   end
 end
 
-begin
-  optparse.parse!
-  <%= camelize(name) %>::Application.run!
-rescue OptionParser::InvalidArgument, OptionParser::InvalidOption, OptionParser::MissingArgument
-  puts $!.to_s
-  puts optparse
-  exit
-end
+<%= camelize(name) %>::Runner.start

data/lib/mafia/templates/gemspec.tt

@@ -10,10 +10,9 @@ Gem::Specification.new do |s|
   s.homepage    = ""
   s.summary     = %q{TODO: Write a gem summary}
   s.description = %q{TODO: Write a gem description}
-
-  s.files         = Dir[File.join(File.dirname(__FILE__), '**', '**')].find_all {|f| File.file?(f) }
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files         = Dir["lib/**/*"] + ["Rakefile", "README.md", "Gemfile", "Gemfile.lock", "config.ru"]
+  s.test_files    = Dir["{test, spec, features}/**/*"]
+  s.executables   = Dir["bin/*"].entries.map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   s.add_dependency "sinatra", "1.3.1"

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Mafia
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mafia
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000Z
+date: 2012-06-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70095716153660 !ruby/object:Gem::Requirement
+  requirement: &70288365289800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70095716153660
+  version_requirements: *70288365289800
 description: Generator to create sinatra apps that are also gems
 email:
 - george@accountsapp.com