textpow 1.3.0 → 1.3.1

data/Gemfile

@@ -4,7 +4,6 @@ gemspec
 
 gem 'oniguruma', :platform => :ruby_18
 
-group :dev do
-  gem 'rake', '0.8.7'
-  gem 'rspec'
-end
+gem 'rake'
+gem 'rspec'
+gem 'bump'

data/Gemfile.lock

@@ -1,30 +1,32 @@
 PATH
   remote: .
   specs:
-    textpow (1.3.0)
+    textpow (1.3.1)
       plist (>= 3.0.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    bump (0.3.9)
     diff-lcs (1.1.3)
     oniguruma (1.1.0)
     plist (3.1.0)
-    rake (0.8.7)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    rake (10.0.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bump
   oniguruma
-  rake (= 0.8.7)
+  rake
   rspec
   textpow!

data/README.rdoc

@@ -17,6 +17,10 @@ Install oniguruma
   # Then
   gem install oniguruma
 
+== Demo
+* {Ultraviolet}[http://grosser.github.com/ultraviolet/] uses testpow to generate html syntax highlighting
+* {Ruco (Ruby commandline editor)}[https://github.com/grosser/ruco] uses textpow to colorize the console
+
 == USAGE:
 
 1. Load a Syntax File {list of included syntax}[https://github.com/grosser/textpow/tree/master/lib/textpow/syntax]
@@ -80,3 +84,5 @@ having <tt>name="text.string", position=10</tt> and the second having
 * Copyright (c) 2010 {Chris Hoffman}[http://github.com/cehoffman]
 * Copyright (c) 2009 {Spox}[http://github.com/spox]
 * Copyright (c) 2007-2008 Dizan Vasquez
+
+{<img src="https://secure.travis-ci.org/grosser/textpow.png" />}[http://travis-ci.org/grosser/textpow]

data/Rakefile

@@ -1,4 +1,6 @@
+require "bundler/setup"
 require "bundler/gem_tasks"
+require "bump/tasks"
 
 task :default do
   sh "rspec spec/"
@@ -9,23 +11,6 @@ task :convert, :in, :out do |t,args|
   convert(args[:in], args[:out] || 'out.syntax')
 end
 
-# extracted from https://github.com/grosser/project_template
-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/textpow/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
-  version_parts[2] = 0 if index < 2 # remove patch for minor
-  version_parts[1] = 0 if index < 1 # remove minor for major
-  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
-
 desc "update syntaxes from their original source"
 task :update_syntax do
   {

data/lib/textpow.rb

@@ -14,11 +14,11 @@ module Textpow
 
   @@syntax = {}
   def self.syntax(syntax_name)
-    syntax_name = syntax_name.downcase
-    if @@syntax.has_key?(syntax_name)
-      @@syntax[syntax_name]
+    key = syntax_name.downcase
+    if @@syntax.has_key?(key)
+      @@syntax[key]
     else
-      @@syntax[syntax_name] = uncached_syntax(syntax_name)
+      @@syntax[key] = uncached_syntax(syntax_name)
     end
   end
 
@@ -27,8 +27,8 @@ private
   def self.uncached_syntax(name)
     path = (
       find_syntax_by_path(name) ||
-      find_syntax_by_scope_name(name) ||
-      find_syntax_by_fuzzy_name(name)
+      find_syntax_by_scope_name(name.downcase) ||
+      find_syntax_by_fuzzy_name(name.downcase)
     )
     SyntaxNode.load(path) if path
   end

data/lib/textpow/syntax.rb

@@ -135,13 +135,15 @@ module Textpow
 
     def self.convert_file_to_table(file)
       raise "File not found: #{file}" unless File.exist?(file)
-      case file
+      table = case file
       when /(\.tmSyntax|\.plist)$/
         require 'plist'
         Plist::parse_xml(file)
       else
         YAML.load_file(file)
       end
+      raise "Could not parse file #{file} to a table" if table.is_a?(String)
+      table
     end
 
     def parse_repository(repository)

data/lib/textpow/version.rb

@@ -1,3 +1,3 @@
 module Textpow
-  VERSION = Version = "1.3.0"
+  VERSION = Version = "1.3.1"
 end

data/spec/fixtures/objeck.tmSyntax

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BBEditDocumentType</key>
+	<string>CodelessLanguageModule</string>
+	<key>BBLMColorsSyntax</key>
+	<true/>
+	<key>BBLMIsCaseSensitive</key>
+	<true/>
+	<key>BBLMKeywordList</key>
+	<array>
+		<string>and</string>
+		<string>or</string>
+		<string>xor</string>
+		<string>virtual</string>
+		<string>if</string>
+		<string>else</string>
+		<string>do</string>
+		<string>while</string>
+		<string>use</string>
+		<string>bundle</string>
+		<string>native</string>
+		<string>static</string>
+		<string>public</string>
+		<string>private</string>
+		<string>class</string>
+		<string>interface</string>
+		<string>select</string>
+		<string>other</string>
+		<string>enum</string>
+		<string>for</string>
+		<string>each</string>
+		<string>label</string>
+		<string>return</string>
+		<string>Byte</string>
+		<string>Int</string>
+		<string>Parent</string>
+		<string>from</string>
+		<string>Float</string>
+		<string>Char</string>
+		<string>Bool</string>
+		<string>String</string>
+		<string>Nil</string>
+		<string>true</string>
+		<string>false</string>
+		<string>function</string>
+		<string>method</string>
+	</array>
+	<key>BBLMLanguageCode</key>
+	<string>LSL</string>
+	<key>BBLMLanguageDisplayName</key>
+	<string>Objeck</string>
+	<key>BBLMScansFunctions</key>
+	<true/>
+	<key>BBLMSuffixMap</key>
+	<array>
+		<dict>
+			<key>BBLMLanguageSuffix</key>
+			<string>.obs</string>
+		</dict>
+	</array>
+	<key>Language Features</key>
+	<dict>
+		<key>Close Block Comments</key>
+		<string>~#</string>
+		<key>Close Parameter Lists</key>
+		<string>)</string>
+		<key>Close Statement Blocks</key>
+		<string>}</string>
+		<key>Close Strings 1</key>
+		<string>&quot;</string>
+		<key>Close Strings 2</key>
+		<string>&apos;</string>
+		<key>End-of-line Ends Strings 1</key>
+		<false/>
+		<key>End-of-line Ends Strings 2</key>
+		<false/>
+		<key>Escape Char in Strings 1</key>
+		<string>\</string>
+		<key>Escape Char in Strings 2</key>
+		<string>\</string>
+		<key>Identifier and Keyword Characters</key>
+		<string>@0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz</string>
+		<key>Open Block Comments</key>
+		<string>#~</string>
+		<key>Open Line Comments</key>
+		<string>#</string>
+		<key>Open Parameter Lists</key>
+		<string>(</string>
+		<key>Open Statement Blocks</key>
+		<string>{</string>
+		<key>Open Strings 1</key>
+		<string>&quot;</string>
+		<key>Open Strings 2</key>
+		<string>&apos;</string>
+		<key>Prefix for Functions</key>
+		<string></string>
+		<key>Prefix for Procedures</key>
+		<string></string>
+		<key>Terminator for Prototypes 1</key>
+		<string></string>
+		<key>Terminator for Prototypes 2</key>
+		<string></string>
+	</dict>
+</dict>
+</plist>

data/spec/textpow_spec.rb

@@ -21,6 +21,16 @@ describe Textpow do
       Textpow.syntax('lib/textpow/syntax/source.ruby.syntax').name.should == 'Ruby'
     end
 
+    it "finds syntax by path with capital letters" do
+      Textpow.syntax('spec/fixtures/objeck.tmSyntax').class.should == Textpow::SyntaxNode
+    end
+
+    it "complains about unreadable files" do
+      expect{
+        Textpow.syntax('Rakefile')
+      }.to raise_error(/Could not parse file Rakefile/)
+    end
+
     it "finds a syntax by scopeName" do
       Textpow.syntax('source.ruby').name.should == 'Ruby'
     end

data/textpow.gemspec

@@ -1,12 +1,11 @@
 $LOAD_PATH.push File.expand_path("../lib", __FILE__)
-require "textpow/version"
+name = "textpow"
+require "#{name}/version"
 
-Gem::Specification.new do |s|
-  s.name                  = "textpow"
-  s.version               = Textpow::Version
+Gem::Specification.new name, Textpow::Version do |s|
   s.authors               = ["Dizan Vasquez", "Spox", "Chris Hoffman", "Michael Grosser"]
   s.email                 = ["michael@grosser.it"]
-  s.homepage              = "http://github.com/grosser/textpow"
+  s.homepage              = "https://github.com/grosser/#{name}"
   s.summary               = "A library for parsing TextMate bundles"
   s.description           = s.summary
   s.license               = "MIT"
@@ -15,5 +14,5 @@ Gem::Specification.new do |s|
   s.executables = ["plist2yaml", "plist2syntax"]
   s.rdoc_options = ["--main", "README.rdoc"]
 
-  s.add_dependency "plist", '>=3.0.1'
+  s.add_runtime_dependency "plist", '>=3.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textpow
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-19 00:00:00.000000000 Z
+date: 2013-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist
@@ -221,6 +221,7 @@ files:
 - lib/textpow/syntax/text.xml.xsl.syntax
 - lib/textpow/version.rb
 - spec/fixtures/objeck.plist
+- spec/fixtures/objeck.tmSyntax
 - spec/fixtures/utf8.txt
 - spec/spec_helper.rb
 - spec/textpow/score_manager_spec.rb
@@ -228,7 +229,7 @@ files:
 - spec/textpow/syntax_spec.rb
 - spec/textpow_spec.rb
 - textpow.gemspec
-homepage: http://github.com/grosser/textpow
+homepage: https://github.com/grosser/textpow
 licenses:
 - MIT
 post_install_message: 
@@ -245,7 +246,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1600551724538838794
+      hash: -2419766218424752244
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -254,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1600551724538838794
+      hash: -2419766218424752244
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24