Fix several problems with bin/refinerycms.rb and lib/gemspec.rb

bin/refinerycms

@@ -18,7 +18,7 @@ require 'optparse'
 require 'child_labor' if RUBY_PLATFORM !~ /mswin3?2?/
 
 # Load refinerycms
-require Pathname.new(File.expand_path(File.dirname(__FILE__) << "/..")).join('vendor', 'refinerycms', 'core', 'lib', 'refinery.rb')
+require Pathname.new(File.expand_path(File.dirname(__FILE__) << "/..")).join('vendor', 'refinerycms', 'refinerycms.rb')
 
 module Refinery
   class AppGenerator
@@ -143,10 +143,9 @@ module Refinery
         f.write "\n" + refinery_gems
       end
 
-      # Hack to make work on development computers
-      # TODO: Change this when/if separate gems are released for each engine
-      find_and_replace('Gemfile', "path 'vendor/refinerycms' do",
-                        "path '#{Pathname.new(File.expand_path(File.dirname(__FILE__) << "/..")).join('vendor').to_s}/refinerycms' do")
+      # Change from development to production
+      find_and_replace('Gemfile', "gem 'refinerycms', :path => '.'",
+                        "gem 'refinerycms', '~> #{Refinery.version}'")
 
       # Replace app constant with Refinery
       # TODO: Find a way around this

lib/gemspec.rb

@@ -35,6 +35,7 @@
   s.summary           = %q{A beautiful open source Ruby on Rails content manager for small business.}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
+  s.rubyforge_project = %q{refinerycms}
   s.authors           = ['Resolve Digital', 'David Jones', 'Philip Arndt']
   s.require_paths     = %w(vendor/refinerycms)
   s.executables       = %w(refinerycms)
@@ -51,6 +52,11 @@
   s.add_dependency    'rmagick'
   s.add_dependency    'rack-cache'
   s.add_dependency    'dragonfly'
+
+  s.files             = [
+    '#{files.join("',\n    '")}'
+  ]
+end
 EOF
 
 File.open(File.expand_path("../../refinerycms.gemspec", __FILE__), 'w').puts(gemspec)