--- a/lib/gitorious/commands/support/ruby/gem.rb
+++ b/lib/gitorious/commands/support/ruby/gem.rb
@@ -4,12 +4,17 @@ require 'rubygems/builder'
 Gitorious.register_command :gem, "Gemify" do |options, summary|
   require_working_dir!
   
+  if summary.to_s.empty?
+    error("Summary is required")
+    raise Gitorious::EvalException
+  end
+  
   name = File.basename(Dir.getwd)
-  summary ||= ""
   description = ""
   
   files = []
   executables = []
+  options[:deps] ||= []
   config = get_config(Dir.getwd)
   
   git.ls_files({}) do |stdout, stderr|
@@ -29,32 +34,66 @@ Gitorious.register_command :gem, "Gemify" do |options, summary|
     version = time.strftime("%Y.#{day_of_year}")
   end
   
-  description = get_content_from_editor("gem description\n\n")
+  
+  description = nil
+  if options[:description]
+    if File.exist?(options[:description])
+      description = File.open(options[:description]).read
+    end
+  end
   
   gem_spec = Gem::Specification.new do |s|
     s.name = name
     s.version = version
     s.summary = summary
-    s.description = description.to_s
+    s.description = description if description
+    s.has_rdoc = true
     
     s.files = files
     s.executables = executables
+    s.has_rdoc = true if options[:has_rdoc]
     
     s.author = [ config["user"]["name"] ]
     s.email = [ config["user"]["email"] ]
     s.homepage = options[:homepage]
     s.rubyforge_project = options[:rubyforge]
+    
+    options[:deps].each { |dep|
+      s.add_dependency dep
+    }
   end
   
-  unless options[:only_spec]
-    info("Generating `#{name}-#{version}.gem`...")
-    Gem::Builder.new(gem_spec).build
-  else
+  if options[:only_spec]
     spec_name = "#{name}.gemspec"
     info("Generating `#{spec_name}`...")
     File.open(spec_name, "w") do |file|
       file << gem_spec.to_ruby
     end
+  elsif options[:gemify_spec]
+    info("Generating gemify spec")
+    File.open(".gemified", "w") do |file|
+      file << "---" << "\n"
+      file << ":name: " << gem_spec.name << "\n"
+      file << ":version: " << gem_spec.version << "\n"
+      file << ":summary: " << gem_spec.summary << "\n"
+      file << ":author: " << gem_spec.author << "\n"
+      file << ":email: " << gem_spec.email << "\n"
+      file << ":has_rdoc: " << "true" << "\n" if options[:has_rdoc]
+      file << ":homepage: " << gem_spec.homepage << "\n"
+      file << ":rubyforge_project: " << gem_spec.rubyforge_project << "\n"
+      unless options[:deps].empty?
+        file << ":dependencies: \n"
+        options[:deps].each { |dep|
+          file << "- #{dep}\n"
+        }
+      end
+    end
+    File.open(".manifiest", "w") do |file|
+      file << gem_spec.files.join("\n")
+    end
+  else
+    info("Generating `#{name}-#{version}.gem`...")
+    Gem::Builder.new(gem_spec).build
   end
 end
 
@@ -72,10 +111,26 @@ Gitorious.add_option(:gem, "--rubyforge=VALUE", "Specify the rubyforge project"
   options[:rubyforge] = value
 end
 
+Gitorious.add_option(:gem, "--description=FILE", "Set the description" ) do |options, value|
+  options[:description] = value
+end
+
 Gitorious.add_option(:gem, "-s", "--only-spec", "Generate the gemspec" ) do |options, value|
   options[:only_spec] = true
 end
 
+Gitorious.add_option(:gem, "--gemify-spec", "Generate gemify spec" ) do |options, value|
+  options[:gemify_spec] = true
+end
+
+Gitorious.add_option(:gem, "--dependency=DEP", "Add a dependency" ) do |options, value|
+  options[:deps] ||= []
+  options[:deps] << value
+end
+
+Gitorious.add_option(:gem, "--has-rdoc", "" ) do |options, value|
+  options[:has_rdoc] = true
+end
 
 # Gitorious.add_option(:gem, "--from-gitorious", "Use gitorious project info (project name, project home, ...)" ) do |options, value| TODO :)
 #   options[:gitorious] = true