mafia 0.1.0 → 0.1.2

data/lib/mafia.rb

@@ -37,7 +37,7 @@ module Mafia
     end
 
     def create_bin_file
-      if yes? "\n\nCreate a binary to run your application?", :yellow
+      if yes? "\n\nCreate a binary to run your application?", :green
         template("bin.tt", "#{name}/bin/#{name}")
       end
     end
@@ -69,7 +69,7 @@ module Mafia
     end
     
     def include_helpers
-      if yes? "\n\nInstall georgedrummond_sinatra_helpers gem into app?", :yellow
+      if yes? "\n\nInstall georgedrummond_sinatra_helpers gem into app?", :green
         insert_into_file "#{name}/#{name}.gemspec", "  s.add_dependency \"georgedrummond_sinatra_helpers\"\n", :after => "s.add_dependency \"sass\"\n"
         insert_into_file "#{name}/lib/#{name}/app.rb", "    include GeorgeDrummond::Sinatra::Helpers\n", :after => "class Application < Sinatra::Base\n"
         insert_into_file "#{name}/lib/#{name}/app.rb", "require \"georgedrummond_sinatra_helpers\"\n", :after => "require \"sass\"\n"
@@ -77,7 +77,7 @@ module Mafia
     end
     
     def create_license
-      if yes? "\n\nUse MIT License?", :yellow
+      if yes? "\n\nUse MIT License?", :green
         
         opts = {
           :name => name,
@@ -91,7 +91,7 @@ module Mafia
     
     def initalize_git_repo
       target = File.join(Dir.pwd, name)
-      say "\n\nInitializating git repo in #{target}", :yellow
+      say "\n\nInitializating git repo in #{target}", :green
       Dir.chdir(target) { 
         run "git init", :verbose => false
         run "git add .", :verbose => false
@@ -100,23 +100,22 @@ module Mafia
     
     def run_bundle_command
       target = File.join(Dir.pwd, name)
-      say "\n\nRunning Bundler", :yellow
+      say "\n\nRunning Bundler", :green
       Dir.chdir(target) { 
         run "bundle install", :verbose => false
       }
     end
     
     def show_complete_message
-      complete = <<-COMPLETE
+      complete = <<-COMPLETE   
       
-      
-        Sinatra gem has been generated
-        
-        For help using sinatra please visit www.sinatrarb.com
-        
-        COMPLETE
-      
-      say complete, :red
+Sinatra gem has been generated
+
+For help using sinatra please visit www.sinatrarb.com
+
+COMPLETE
+   
+      say complete, :green
         
     end
   end

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

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

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mafia
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70345886295140 !ruby/object:Gem::Requirement
+  requirement: &70363732672060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70345886295140
+  version_requirements: *70363732672060
 description: Generator to create sinatra apps that are also gems
 email:
 - george@accountsapp.com