conyard 0.1.4 → 0.1.5

data/bin/conyard-vector

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+
+require 'rubygems' if RUBY_VERSION < '1.9'
+require 'thor'
+require 'erb'
+
+$OLDDIR = Dir.pwd
+Dir.chdir File.expand_path(File.join(File.dirname(__FILE__),'..'))
+
+class VectorDispatcher < Thor
+
+  desc "generate NAME TYPE OUTFILE LOCALFILES GLOBALFILES", "Makes a new vector"
+  def generate(name, datatype, outfile, local_include_files, global_include_files)
+    @name = name or raise "Vector name cannot be nil"
+    @type = datatype or raise "Data type cannot be nil"
+    @outfile = File.expand_path(outfile) or raise "Outfile cannot be nil"
+    @guard = File.split(outfile).last.gsub(/\-/,'_').upcase
+    @include = File.split(@outfile).last
+    @local_include_files = local_include_files.match(/^nil$/) ? Array.new : local_include_files.split(/,\s*/)
+    @global_include_files = global_include_files.match(/^nil$/) ? Array.new : global_include_files.split(/,\s*/)
+
+    puts "Generating Vector:"
+    puts "  name: #{@name}"
+    puts "  type: #{@type}"
+    puts "  file: #{@outfile}"
+    puts "  local includes: #{@local_include_files}"
+    puts "  global includes: #{@global_include_files}"
+
+    ofh=File.new(@outfile+".gen.h", "w")
+    ofh.write(ERB.new(File.read('lib/vector/vector.h.erb')).result(binding))
+    ofh.close
+  
+    ofi=File.new(@outfile+".gen.c", "w")
+    ofi.write(ERB.new(File.read('lib/vector/vector.c.erb')).result(binding))
+    ofi.close
+  end
+  
+end
+
+VectorDispatcher.start

data/{structure-kits → lib}/vector/vector.c.erb

@@ -6,7 +6,7 @@
 //! regenerated again. I would suggest putting re-implementations
 //! and/or extensions in another file.
 
-#include "<%= @outfile.pathmap("%f") %>.gen.h"
+#include "<%= @include %>.gen.h"
 
 #ifdef __cplusplus
 extern "C" {

data/{structure-kits → lib}/vector/vector.h.erb

@@ -13,6 +13,13 @@
 #include <stdlib.h>
 #include <string.h>
 
+<% @local_include_files.each do |includefile| %>
+#include "<%= includefile %>"
+<% end %>
+<% @global_include_files.each do |includefile| %>
+#include <<%= includefile %>>
+<% end %>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: conyard
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Christopher Miller
@@ -14,16 +15,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-14 00:00:00 -06:00
-default_executable: 
+date: 2011-10-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: thor
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -32,20 +34,17 @@ dependencies:
 description: Conyard is a Ruby experiment in generating source code for use by C, C++, and Objective-C projects. It is designed to reduce the amount of typing (and therefore errors) introduced by sleep-deprived programmers.
 email: lordsauronthegreat@gmail.com
 executables: 
-- conyard
+- conyard-vector
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
-- structure-kits/vector/vector.c.erb
-- structure-kits/vector/vector.h.erb
-- structure-kits/vector/vector.rake
-- bin/conyard
-- Rakefile
+- lib/vector/vector.c.erb
+- lib/vector/vector.h.erb
+- bin/conyard-vector
 - README.md
 - COPYING.md
-has_rdoc: true
 homepage: https://github.com/NSError/Conyard/wiki
 licenses: []
 
@@ -55,18 +54,22 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3
@@ -75,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: conyard
-rubygems_version: 1.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Generators for typing-intensive programming tasks.

data/Rakefile

@@ -1,25 +0,0 @@
-# Created on 10 October 2011.
-# Copyright 2011 Chris Miller. All rights reserved.
-
-require 'rubygems' if RUBY_VERSION < '1.9'
-require 'rake'
-require 'erb'
-
-$CC = 'clang'
-$CXX = 'clang++'
-
-CLEAN = FileList['.o']
-
-Dir.glob('**/*.rake').each { |r| import r }
-
-desc 'Runs a task using a file for arguments'
-task :run, :argfile do |t, args|
-  argfile=args.argfile
-  raise 'Dude, no argument? You jerk!' unless argfile
-  config=File.read(File.expand_path(argfile))
-  lines = Array.new
-  config.each_line { |line| lines << line.strip }
-  tn = lines[0]
-  lines = lines[1 .. -1]
-  Rake::Task[tn].invoke *lines
-end

data/bin/conyard

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems' if RUBY_VERSION < '1.9'
-require 'rake'
-
-$OLDDIR = Dir.pwd
-Dir.chdir File.expand_path(File.join(File.dirname(__FILE__),'..'))
-
-Rake.application.run

data/structure-kits/vector/vector.rake

@@ -1,24 +0,0 @@
-def emit_vector name, datatype, outfile
-  @name = name
-  @type = datatype
-  @outfile = File.expand_path outfile
-  @guard = outfile.pathmap("%n").gsub(/\-/,'_').upcase
-  
-  headertmpl = 'structure-kits/vector/vector.h.erb'
-  impltmpl = 'structure-kits/vector/vector.c.erb'
-  
-  ofh=File.new(@outfile+".gen.h", "w")
-  ofh.write(ERB.new(File.read(headertmpl)).result)
-  ofh.close
-  ofi=File.new(@outfile+".gen.c", "w")
-  ofi.write(ERB.new(File.read(impltmpl)).result)
-  ofi.close
-end
-
-namespace :generate do
-  desc "Creates a new fast, lean C vector implementation; useage is: rake vector[name, type, outfile]"
-  task :vector, :name, :datatype, :outfile do |t, args|
-    args.with_defaults(:name => 'int_vector', :datatype => 'int', :outfile => 'int_vector')
-    emit_vector args.name, args.datatype, File.expand_path(File.join($OLDDIR,args.outfile))
-  end
-end