ultraviolet1x 0.13.0 → 0.14.0

data/Gemfile

@@ -1,7 +1,7 @@
 source :rubygems
 
 gem 'oniguruma', :platform => :ruby_18
-gem 'textpow1x', '>=1'
+gem 'textpow1x', '>=1.2'
 
 group :dev do
   gem 'rake', '0.8.7'

data/Gemfile.lock

@@ -13,7 +13,7 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    textpow1x (1.0.0)
+    textpow1x (1.2.0)
       plist (>= 3.0.1)
 
 PLATFORMS
@@ -23,4 +23,4 @@ DEPENDENCIES
   oniguruma
   rake (= 0.8.7)
   rspec
-  textpow1x (>= 1)
+  textpow1x (>= 1.2)

data/Rakefile

@@ -4,3 +4,17 @@ Bundler::GemHelper.install_tasks
 task :default do
   sh "rspec spec/"
 end
+
+rule /^version:bump:.*/ do |t|
+  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
+  index = ['major', 'minor','patch'].index(t.name.split(':').last)
+  file = 'lib/uv/version.rb'
+
+  version_file = File.read(file)
+  old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
+  version_parts[index] = version_parts[index].to_i + 1
+  new_version = version_parts * '.'
+  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
+
+  sh "bundle && git add #{file} Gemfile.lock && git commit -m 'bump version to #{new_version}'"
+end

data/lib/uv.rb

@@ -16,80 +16,77 @@ module Uv
   self.default_style = 'mac_classic'
   self.syntaxes      = {}
   
-  def Uv.path
+  def self.path
     result = []
     result << File.join(File.dirname(__FILE__), ".." )
   end
 
   def self.syntax_node_for(syntax)
-    if !@syntaxes.key?(syntax)
-      filename = File.join(@syntax_path, "#{syntax}.syntax")
-      @syntaxes[syntax] = if File.exist?(filename)
-        Textpow::SyntaxNode.load(filename)
-      else
-        false
-      end
-    end
-    if !@syntaxes[syntax]
-      raise ArgumentError, "No #{syntax}.syntax file in #{@syntax_path}"
+    if @syntaxes.key?(syntax)
+      @syntaxes[syntax]
+    else
+      @syntaxes[syntax] = Textpow.syntax(syntax) || raise(ArgumentError, "No syntax found for #{syntax}")
     end
-    @syntaxes[syntax]
   end
 
-  def Uv.copy_files output, output_dir
+  def self.copy_files(output, output_dir)
     Uv.path.each do |dir|
       dir_name = File.join( dir, "render", output, "files" )
       FileUtils.cp_r( Dir.glob(File.join( dir_name, "." )), output_dir ) if File.exists?( dir_name )
     end
   end
 
-  def Uv.syntaxes
+  def self.syntaxes
     Dir.glob( File.join(@syntax_path, '*.syntax') ).collect do |f| 
       File.basename(f, '.syntax')
     end
   end
 
-  def Uv.themes
+  def self.themes
     Dir.glob( File.join(@theme_path, '*.css') ).collect do |f| 
       File.basename(f, '.css')
     end
   end
 
-  def Uv.syntax_for_file file_name
+  def self.syntax_for_file(file_name)
     init_syntaxes unless @syntaxes
+
+    # get first non-empty line
     first_line = ""
     File.open( file_name, 'r' ) { |f|
       while (first_line = f.readline).strip.size == 0; end
     }
+
+
+    # find syntax by file-extension
     result = []
-    @syntaxes.each do |key, value|
+    @syntaxes.each do |key, syntax|
       assigned = false
-      if value.fileTypes
-        value.fileTypes.each do |t|
+      if syntax.fileTypes
+        syntax.fileTypes.each do |t|
           if t == File.basename( file_name ) || t == File.extname( file_name )[1..-1]
-            result << [key, value] 
+            result << [key, syntax]
             assigned = true
             break
           end
         end
       end
       unless assigned
-        if value.firstLineMatch && value.firstLineMatch =~ first_line
-          result << [key, value] 
+        if syntax.firstLineMatch && syntax.firstLineMatch =~ first_line
+          result << [key, syntax]
         end
       end
     end
     result
   end
 
-  def Uv.parse text, output = "xhtml", syntax_name = nil, line_numbers = false, render_style = nil, headers = false
+  def self.parse(text, output = "xhtml", syntax_name = nil, line_numbers = false, render_style = nil, headers = false)
     RenderProcessor.load(output, render_style, line_numbers, headers) do |processor|
       syntax_node_for(syntax_name).parse(text, processor)
     end.string
   end
 
-  def Uv.debug text, syntax_name
+  def self.debug(text, syntax_name)
     syntax_node_for(syntax_name).parse(text, Textpow::DebugProcessor.new)
   end
-
 end

data/lib/uv/version.rb

@@ -1,3 +1,3 @@
 module Uv
-  Version = "0.13.0"
+  Version = "0.14.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ultraviolet1x
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 39
   prerelease: 
   segments: 
   - 0
-  - 13
+  - 14
   - 0
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors: 
 - Dizan Vasquez
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-02 00:00:00 +02:00
+date: 2011-10-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency