Skip to content

Commit

Permalink
Updated to latest version of libraries. Fixed errors in module genera…
Browse files Browse the repository at this point in the history
…tor passthrough. Updated version.
  • Loading branch information
mvandervoord committed Oct 28, 2016
1 parent 73f3605 commit fb08f93
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 17 deletions.
8 changes: 4 additions & 4 deletions lib/ceedling/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
module Ceedling
module Version
# @private
GEM = "0.21.0"
GEM = "0.22.0"
# @private
CEEDLING = GEM
# @private
CEXCEPTION = "1.3.17"
CEXCEPTION = "1.3.1"
# @private
CMOCK = "2.4.2"
CMOCK = "2.4.3"
# @private
UNITY = "2.3.2"
UNITY = "2.4.0"
end
end
8 changes: 4 additions & 4 deletions plugins/module_generator/lib/module_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ class ModuleGenerator < Plugin

attr_reader :config

def create(path, optz={})
def create(module_name, optz={})

require "generate_module.rb" #From Unity Scripts

if ((!optz.nil?) && (optz[:destroy]))
UnityModuleGenerator.new( divine_options(path) ).destroy(module_name)
UnityModuleGenerator.new( divine_options(optz) ).destroy(module_name)
else
UnityModuleGenerator.new( divine_options(path) ).generate(module_name)
UnityModuleGenerator.new( divine_options(optz) ).generate(module_name)
end
end

private

def divine_options(path, optz={})
def divine_options(optz={})
{
:path_src => MODULE_GENERATOR_SOURCE_ROOT.gsub('\\', '/').sub(/^\//, '').sub(/\/$/, ''),
:path_inc => MODULE_GENERATOR_SOURCE_ROOT.gsub('\\', '/').sub(/^\//, '').sub(/\/$/, ''),
Expand Down
12 changes: 6 additions & 6 deletions plugins/module_generator/module_generator.rake
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@ namespace :module do

desc "Generate module (source, header and test files)"
task :create, :module_path do |t, args|
args = args[:module_path].split(/,/)
files = [args[:module_path]] + (args.extras || [])
optz = {}
["dh", "dih", "mch", "mvp"].each do |pat|
p = args.delete(pat)
p = files.delete(pat)
optz[:pattern] = p unless p.nil?
end
args.each {|v| @ceedling[:module_generator].create(v, optz) }
files.each {|v| @ceedling[:module_generator].create(v, optz) }
end

desc "Destroy module (source, header and test files)"
task :destroy, :module_path do |t, args|
args = args[:module_path].split(/,/)
files = [args[:module_path]] + (args.extras || [])
optz = { :destroy => true }
["dh", "dih", "mch", "mvp"].each do |pat|
p = args.delete(pat)
p = files.delete(pat)
optz[:pattern] = p unless p.nil?
end
args.each {|v| @ceedling[:module_generator].create(v, optz) }
files.each {|v| @ceedling[:module_generator].create(v, optz) }
end

end
2 changes: 1 addition & 1 deletion vendor/c_exception
2 changes: 1 addition & 1 deletion vendor/cmock
2 changes: 1 addition & 1 deletion vendor/unity

0 comments on commit fb08f93

Please sign in to comment.