veracode 1.0.0.alpha → 1.0.0.alpha2

data/bin/veracode

@@ -13,6 +13,7 @@ APP_NAME = File.basename(Dir.pwd)
 COMMAND = "#{$0} #{ARGV.join(' ')}"
 
 require 'veracode'
+require 'veracode/version'
 
 $options =  {
               :phase1 => false, 
@@ -58,12 +59,18 @@ case subcommand
 
     Veracode.prepare
 
+  when "version", "--version", "-v"
+    puts File.basename($0, '.*') + " " + Veracode::VERSION
+
   when "help", nil
     ARGV.clear
     ARGV.unshift "--help"
 
     OptionParser.new do |opts|
-      opts.banner = "Usage: veracode prepare [options]"
+      opts.banner = "#{opts.program_name} #{Veracode::VERSION}\n" + 
+                    "Usage: #{opts.program_name} prepare [options]\n" + 
+                    "       #{opts.program_name} version\n" + 
+                    "       #{opts.program_name} help"
     end.parse!
 
   else

data/lib/veracode.rb

@@ -101,6 +101,8 @@ module Veracode
       @manifest |= Dir[File.join("**","*.rb")]
       # Add any other erb files not already added
       @manifest |= Dir[File.join("**","*.erb")]
+      # Add any other builder files not already added
+      @manifest |= Dir[File.join("**","*.builder")]
       # Add any other haml files not already added
       @manifest |= Dir[File.join("**","*.haml")]
     end
@@ -491,6 +493,80 @@ module Veracode
   end
 
 
+  def self.archive_schema
+    puts "Archiving schema information" if $options[:verbose]
+    schema_file = File.join("db", "schema.rb")
+    begin
+      add_to_archive  %Q|module "Veracode::Schema"\n| + 
+                      %Q|singleton_method "main" []\n| + 
+                      RubyVM::InstructionSequence.compile_file(schema_file).disasm + 
+                      %Q|== end disasm\n| + 
+                      %Q|endmodule\n\n|
+    rescue Exception => e
+      puts "Unable to retrieve schema information from 'db/schema.rb'. Are your migrations up to date?"
+      log_error "Unable to archive 'db/schema.rb' (#{e.message})"
+    end
+  end
+
+
+  def self.compile_templates
+
+    begin
+      require 'action_view' unless defined? ActionView
+      require 'action_controller' unless defined? ActionController
+    rescue Exception => e
+      log_error "Unable to satisfy haml dependencies (#{e.message})"
+      return
+    end
+
+    types = %w{ erb builder haml }
+    
+    view_paths = []
+    view_paths += ActionController::Base.view_paths.to_a.map(&:to_s)
+    view_paths |= [File.expand_path("app/views")]
+
+    puts "Looking for templates in #{view_paths.join(", ")}" if $options[:verbose]
+
+    templates = view_paths.map { |vp|
+      Dir[File.join(vp, "**", "*.erb")] + 
+      Dir[File.join(vp, "**", "*.builder")] + 
+      Dir[File.join(vp, "**", "*.haml")]
+    }.flatten
+
+    return unless templates.count > 0
+
+    puts "Found #{templates.count} templates" if $options[:verbose]
+
+    haml_templates = templates.grep(/\.haml$/)
+    if haml_templates.any?
+      begin
+        require 'haml' unless defined? Haml
+        require 'haml/template/plugin' unless defined? Haml::Plugin
+      rescue Exception => e
+        puts "Unable to satisfy haml dependencies"
+        log_error "Unable to satisfy haml dependencies (#{e.message})"
+        templates -= haml_templates
+        puts "      #{templates.count} templates" if $options[:verbose]
+      end
+    end
+
+    assigns = {}
+    view = ActionView::Base.new(view_paths, assigns)
+    controller_view = ApplicationController.new.view_context
+
+    templates.each { |template|
+      puts "Compiling template #{template}" if $options[:verbose]
+
+      begin
+        view.render(:file => template)
+      rescue Exception => e
+        log_error "Compiled template #{template} #{e.message}"
+      end
+    }
+
+    puts "Compiled #{ActionView::CompiledTemplates.instance_methods.count.to_s} templates " if $options[:verbose]
+  end
+
   def self.compile_erb_templates
 
     # Rails 3 has wrapped Erubis to handle block helpers in ERB templates
@@ -654,6 +730,9 @@ module Veracode
     puts "Phase 2 - Load Rails" if $options[:verbose]
     begin
       require "rails"
+      require 'action_controller'
+      require 'action_view'
+      require 'active_record'
     rescue Exception => e
       puts "Unable to require rails: #{e.message}"
       log_error "Unable to require rails: #{e.message}"
@@ -714,8 +793,7 @@ module Veracode
     glob_require "app/controllers/application_controller.rb"
     glob_require "app/controllers/**/*.rb"
 
-    compile_erb_templates
-    compile_haml_templates
+    compile_templates
 
     self.update
     self.stats if $options[:verbose]
@@ -726,6 +804,8 @@ module Veracode
       archive(@modules - @baseline_modules, true)
     end
 
+    archive_schema
+
     ## /phase 3 - require app
     ################################################################
 

data/lib/veracode/version.rb

@@ -1,3 +1,3 @@
 module Veracode
-  VERSION = "1.0.0.alpha"
+  VERSION = "1.0.0.alpha2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: veracode
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha
+  version: 1.0.0.alpha2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000 Z
+date: 2012-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70257511683960 !ruby/object:Gem::Requirement
+  requirement: &70309839816480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70257511683960
+  version_requirements: *70309839816480
 description: Prepares your Ruby on Rails app for submission to Veracode.
 email: devcontact@veracode.com
 executables: