rubber-generate 0.0.10 → 0.0.11

data/README.textile

@@ -1,6 +1,6 @@
 h1. Rubber Generate
 
-h2. v0.0.9
+h2. v0.0.11
  
 Template language for generating Ruby bindings for C libraries
 by Geoff Youngs <g@intersect-uk.co.uk>
@@ -20,6 +20,9 @@ functions and some rudimentary understanding of C code.
 
 h3. Changes
 
+ * 0.0.11 - 27th Apr 2011
+   - Fix parsing of %min-version numbers
+
  * 0.0.10 - 27th Apr 2011
    - Add --install flag
 
@@ -50,7 +53,7 @@ Sample file:
 
 Usage:
 <pre>
-  $ rubber-generate --generate --build vte.cr
+  $ rubber-generate --generate --build --install vte.cr
 </pre>
 
 Which should generate

data/bin/rubber-generate

@@ -33,7 +33,7 @@ OptionParser.new { |opts|
   opts.on("--build-dir DIR", 'Directory for generating/building extension') do |dir|
     Args.build_dir = dir
   end
-  opts.on('--configure', 'Run generated extconf.rb') do 
+  opts.on('--configure', 'Run generated extconf.rb') do
     Args.configure = true
   end
   opts.on('--build', 'Build extension') do
@@ -76,7 +76,7 @@ OptionParser.new { |opts|
         if system('sudo', '-k', '-n', 'make')
           # System is setup to allow make to be run without password
           system('sudo', 'make', 'install')
-        else 
+        else
           # Password required
           system('sudo', '-k', '-p', 'Enter password to install: ', 'make', 'install')
         end

data/lib/rubber/scanner.rb

@@ -1,6 +1,9 @@
 require 'rubber/struct'
 module Rubber
-VERSION = [0,0,10]
+VERSION = [0,0,11]
+def VERSION.to_s
+	self.map{|i|i.to_s}.join('.')
+end
 class ScanState
   define_members(:in_code, :in_class, :in_func, :braces)
 end
@@ -116,11 +119,11 @@ def _scan(fp)
     elsif @str.skip(/%name */) # Extension name
       @ext = @str.scan(/[a-zA-Z0-9]+/)
 	elsif @str.skip(/%min-version */)
-	  @version = @str.scan(/([0-9]+)\.([0-9]+)\.([0-9])/)
+	  @version = @str.scan(/([0-9]+)\.([0-9]+)\.([0-9]+)/)
 	  version = [1,2,3].map{|i|@str[i].to_i}
 	  Rubber::VERSION.each_with_index do |ver,idx|
 		  if ver < version[idx]
-			  misc_error "This version of rubber-generate (#{Rubber::VERSION}) is too old: #{@file} requires version #{version.map{|i|i.to_s}.join('.')}"
+			  misc_error "This version of rubber-generate (#{Rubber::VERSION}) is too old: #{@file} requires version #{version.map{|i|i.to_s}.join('.')}", false
 		  end
 	  end
     elsif @str.skip(/%pkg-config\s*([-a-z.0-9+]+)/) # pkg-config library
@@ -495,12 +498,14 @@ end
 	end
 	exit 1
   end
-  def misc_error(message)
+  def misc_error(message, show_location=true)
 	STDERR.puts "Error: #{message} at line #{current_line}\n"
-	if @str.rest.size > 255
-		STDERR.puts @str.rest[0..255]+"..."
-	else
-		STDERR.puts @str.rest
+	if show_location
+		if @str.rest.size > 255
+			STDERR.puts @str.rest[0..255]+"..."
+		else
+			STDERR.puts @str.rest
+		end
 	end
 	exit 1
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubber-generate
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Geoff Youngs