Cleanup for gem.rake: more intelligent, removed obsolete code.

2 files changed, 11 insertions, 118 deletions

diff --git a/etc/coderay-lib.tmproj b/etc/coderay-lib.tmproj
index 16503f2..99bcdec 100644
--- a/etc/coderay-lib.tmproj
+++ b/etc/coderay-lib.tmproj
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>currentDocument</key>
-	<string>../test/scanners/coderay_suite.rb</string>
 	<key>documents</key>
 	<array>
 		<dict>
@@ -26,13 +24,13 @@
 			<key>filename</key>
 			<string>../diff</string>
 			<key>lastUsed</key>
-			<date>2009-12-30T07:16:15Z</date>
+			<date>2009-12-31T04:25:13Z</date>
 		</dict>
 		<dict>
 			<key>filename</key>
 			<string>../Changes.textile</string>
 			<key>lastUsed</key>
-			<date>2009-12-30T08:13:30Z</date>
+			<date>2009-12-31T03:02:34Z</date>
 		</dict>
 		<dict>
 			<key>filename</key>
@@ -106,9 +104,7 @@
 			<key>filename</key>
 			<string>../test/scanners/coderay_suite.rb</string>
 			<key>lastUsed</key>
-			<date>2009-12-30T09:08:29Z</date>
-			<key>selected</key>
-			<true/>
+			<date>2009-12-30T20:08:02Z</date>
 		</dict>
 		<dict>
 			<key>filename</key>
@@ -127,48 +123,6 @@
 	<integer>200</integer>
 	<key>metaData</key>
 	<dict>
-		<key>../lib/coderay/encoder.rb</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>213</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>178</integer>
-		</dict>
-		<key>../lib/coderay/encoders/json.rb</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>11</integer>
-				<key>line</key>
-				<integer>10</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>../lib/coderay/encoders/lines_of_code.rb</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>4</integer>
-				<key>line</key>
-				<integer>15</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
 		<key>../lib/coderay/helpers/file_type.rb</key>
 		<dict>
 			<key>caret</key>
@@ -183,20 +137,6 @@
 			<key>firstVisibleLine</key>
 			<integer>205</integer>
 		</dict>
-		<key>../lib/coderay/scanner.rb</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>42</integer>
-				<key>line</key>
-				<integer>59</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>40</integer>
-		</dict>
 		<key>../lib/coderay/scanners/_map.rb</key>
 		<dict>
 			<key>caret</key>
@@ -415,20 +355,6 @@
 				<integer>0</integer>
 			</dict>
 		</dict>
-		<key>../test/scanners/coderay_suite.rb</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>6</integer>
-				<key>line</key>
-				<integer>211</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>198</integer>
-		</dict>
 		<key>../test/scanners/suite.rb</key>
 		<dict>
 			<key>caret</key>
@@ -444,10 +370,6 @@
 			<integer>0</integer>
 		</dict>
 	</dict>
-	<key>openDocuments</key>
-	<array>
-		<string>../test/scanners/coderay_suite.rb</string>
-	</array>
 	<key>showFileHierarchyDrawer</key>
 	<true/>
 	<key>windowFrame</key>
diff --git a/rake_tasks/gem.rake b/rake_tasks/gem.rake
index 9f0b462..9db4442 100644
--- a/rake_tasks/gem.rake
+++ b/rake_tasks/gem.rake
@@ -3,7 +3,8 @@ require 'rake/gempackagetask.rb'
 def gemspec

   Gem::Specification.new do |s|

     # Basic Information

-    s.name = s.rubyforge_project = 'coderay'

+    # s.name will be set later

+    s.rubyforge_project = 'coderay'

     s.version = '0'

 

     s.platform = Gem::Platform::RUBY

@@ -24,14 +25,11 @@ def gemspec
   fully featured, complete, fast and efficient.

 

   Usage is simple:

-    require 'coderay'

-    code = 'some %q(weird (Ruby) can\'t shock) me!'

-    puts CodeRay.scan(code, :ruby).html

+    CodeRay.scan(code, :ruby).div

     EOF

 

     # Files

     s.require_path = 'lib'

-    # s.autorequire = 'coderay'

     s.executables = [ 'coderay', 'coderay_stylesheet' ]

 

     s.files = nil  # defined later

@@ -51,7 +49,7 @@ namespace :gem do
   end

 

   desc 'Create the gem again'

-  task :make => [:make_gemspec, :clean, :gem, :prepare_server]

+  task :make => [:make_gemspec, :clean, :gem]

 

   desc 'Delete previously created Gems'

   task :clean do

@@ -60,6 +58,7 @@ namespace :gem do
 

   desc 'Find out the current CodeRay version'

   task :get_version do

+    $gem_name = 'coderay'

     unless $version

       $: << './lib'

       require 'coderay'

@@ -68,7 +67,8 @@ namespace :gem do
     puts 'Current Version: %s' % $version

     if $version[/.0$/]

       sh 'svn up --ignore-externals'

-      $version << '.' << (`svn info`[/Revision: (\d+)/,1])

+      $version << '.' << `svn info`[/Revision: (\d+)/,1]

+      $gem_name << '-beta'

     end

   end

 

@@ -82,36 +82,7 @@ namespace :gem do
     s = gemtask.gem_spec

     s.files = candidates #.delete_if { |item| item[/(?:CVS|rdoc)|~$/] }

     gemtask.version = s.version = $version

-  end

-

-  GEMDIR = 'gem_server/gems'

-  task :prepare_server => :get_version do

-    $gemfile = "coderay-#$version.gem"

-    Dir[GEMDIR + '/*.gem'].each { |g| rm g }

-    cp "pkg/#$gemfile", GEMDIR

-    system 'gem generate_index -d gem_server'

-  end

-

-  desc 'Upload gemfile to ' + FTP_DOMAIN

-  task :upload => :make do

-    gn 'Uploading gem:'

-    cYcnus_ftp do |ftp|

-      Dir.chdir 'gem_server' do

-        uploader = uploader_for ftp

-        ftp.chdir FTP_CODERAY_DIR

-        %w(yaml).each(&uploader)

-        Dir.chdir 'gems' do

-          ftp.chdir 'gems'

-          uploader.call $gemfile

-        end

-      end

-    end

-    gn 'Gem successfully uploaded.'

-  end

-

-  desc 'Build the Gem and install it locally'

-  task :install => :make do

-    system "gem install --no-rdoc pkg/#{$gemfile}"

+    gemtask.name = s.name = $gem_name

   end

 

 end