mkerl 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/mkerl.rb

@@ -78,5 +78,4 @@ class Mkerl
     template = ERB.new open(File.join(File.dirname(__FILE__), "..", "templates", file)).read
     template.result(binding)
   end
-  
 end

data/mkerl.gemspec

@@ -0,0 +1,67 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{mkerl}
+  s.version = "0.0.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Ari Lerner"]
+  s.date = %q{2010-04-29}
+  s.default_executable = %q{mkerl}
+  s.description = %q{This includes tests, reloader, an application, supervisor and a boot file. It's pretty slick}
+  s.email = %q{arilerner@mac.com}
+  s.executables = ["mkerl"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bin/mkerl",
+     "lib/mkerl.rb",
+     "mkerl.gemspec",
+     "templates/Emakefile",
+     "templates/Makefile",
+     "templates/README.markdown",
+     "templates/app",
+     "templates/basic_file.erl",
+     "templates/basic_test.erl",
+     "templates/gitignore",
+     "templates/make_boot.erl",
+     "templates/reloader.erl",
+     "templates/start.sh",
+     "templates/supervisor.erl",
+     "templates/test_suite.erl",
+     "templates/the_app.erl",
+     "test/helper.rb",
+     "test/test_mkerl.rb"
+  ]
+  s.homepage = %q{http://github.com/auser/mkerl}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{A template to start erlang projects.}
+  s.test_files = [
+    "test/helper.rb",
+     "test/test_mkerl.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

data/templates/Emakefile

@@ -1,4 +1,6 @@
-{ [ 'src/*', 
+{ [ 
+    'deps/*/src/*',
+    'src/*', 
     'src/*/*'
     ], [
   {i, "include"},

data/templates/Makefile

@@ -1,76 +1,48 @@
 PACKAGE_NAME = <%= name %>
-PACKAGE_VERSION = 0.1
+PACKAGE_VERSION = <%= version %>
 VSN = $(PACKAGE_VERSION)
-ERLC_FLAGS := -W
 EBIN_DIR := ./ebin
-EMULATOR := beam
 ERL = `which erl`
 ERLC = `which erlc`
-DOC_DIR = ../doc
+DOC_DIR = ./doc
+ERLDIR = $(erl -eval 'io:format("~s~n", [code:lib_dir()])' -s init stop -noshell)
 SILENCE = @
 
-ERL_SOURCE_DIRS = \
-	./src
-
-TEST_DIRS = \
-	./test/src
-
 ####### 
 ## DON'T EDIT BELOW HERE, UNLESS YOU REALLY KNOW WHAT YOU ARE DOING
 #######
 
-ERL_SOURCES := $(wildcard src/*.erl)
-TEST_SOURCES := $(wildcard ../etest/test_*.erl)
-ERLDIR = $(erl -eval 'io:format("~s~n", [code:lib_dir()])' -s init stop -noshell)
-
-#Helper Functions
-get_src_from_dir  = $(wildcard $1/*.erl)
-get_src_from_dir_list = $(foreach dir, $1, $(call get_src_from_dir,$(dir)))				        
-src_to_beam = $(subst ./src, ./ebin, $(subst .erl,.beam,$1))
-# src_to_beam = $(subst .erl,.beam,$1)
-
-SRC = $(call get_src_from_dir_list, $(ERL_SOURCE_DIRS))
-OBJ = $(call src_to_beam,$(SRC))
-STUFF_TO_CLEAN += $(OBJ)
-
-TEST_SRC = $(call get_src_from_dir_list, $(TEST_DIRS))
-TEST_OBJ = $(call src_to_beam,$(TEST_SRC))
-STUFF_TO_CLEAN += $(TEST_OBJ)
+DEPS_DIRLIST=$(shell find ./deps -maxdepth 1 -mindepth 1 -type d | tr '\n' ' ')
+DEPS_PA_LIST=$(shell for dir in $(DEPS_DIRLIST); do echo "-pa $$dir"; done)
+ERLC_FLAGS := -W -pa ./ebin $(PA_EBIN_DIRS)
 
 DOC_FILES = $(DOC_DIR)/*.html $(DOC_DIR)/*.png $(DOC_DIR)/*.css $(DOC_DIR)/edoc-info
-
-ALL_OBJ = $(OBJ) $(TEST_OBJ)
-ALL_SRC = $(SRC) $(TEST_SRC)
+STUFF_TO_CLEAN += $(DOC_FILES)
  
-all: $(OBJ)
-	
+all: compile
+
 docs:
 	$(SILENCE) $(ERL) -noshell -run edoc_run application "'$(PACKAGE_NAME)'" '"."' '[{def,{vsn,"$(VSN)"}}, {dir, "$(DOC_DIR)"}]'
 
-$(OBJ): $(SRC)
-	$(SILENCE)echo compiling $(notdir $@)
-	$(SILENCE)$(ERLC) $(ERLC_FLAGS) -I./include -o $(EBIN_DIR) $^
-
-$(TEST_OBJ): $(TEST_SRC)
-	$(SILENCE)echo compiling $(notdir $@)
-	$(SILENCE)$(ERLC) $(ERLC_FLAGS) -I./include -o $(EBIN_DIR) $^
-
+compile:
+	$(SILENCE)erl -pa ./ebin $(DEPS_PA_LIST) -make
+	
 debug:
 	$(MAKE) DEBUG=-DDEBUG
 	
 test: all $(TEST_OBJ)
-	$(SILENCE) $(ERL)	-noshell \
-					-sname local_test \
-					-pa $(EBIN_DIR) \
-					-s test_suite test \
-					-s init stop
+	$(SILENCE) $(ERL)	$(ERLC_FLAGS) \
+				-pa ./test/ebin/ \
+				-noshell 	\
+				-sname local_test 	\
+				-s test_suite test 	\
+				-s init stop
 
 boot: all
-	$(SILENCE) $(ERL) -pa $(EBIN_DIR) -noshell -run make_boot write_scripts $(PACKAGE_NAME) $(VSN)
+	$(SILENCE) $(ERL) $(ERLC_FLAGS) -noshell -run make_boot write_scripts $(PACKAGE_NAME) $(VSN)
 	$(SILENCE) mv $(PACKAGE_NAME)-$(VSN).boot $(EBIN_DIR)
 	$(SILENCE) mv $(PACKAGE_NAME)-$(VSN).rel $(EBIN_DIR)
 	$(SILENCE) mv $(PACKAGE_NAME)-$(VSN).script $(EBIN_DIR)
 
 clean:
 	@(rm -rf $(EBIN_DIR)/*.beam erl_crash.dump $(DOC_FILES))
- 

data/templates/start.sh

@@ -1,10 +1,13 @@
 #!/bin/sh
 
-VERSION=$(cat VERSION | tr -d '\n')
+VERSION=<%= version %>
 PWD=$(dirname $0)
+DEPS_DIRS=$(find $PWD/deps -maxdepth 1 -mindepth 1 -type d | tr '\n' ' ')
+PA_DIRS=$(for dir in $DEPS_DIRS; do echo "-pa $dir"; done)
 CONFIG=$1
 
 erl -pa $PWD/ebin \
+    $PA_DIRS \
     -s reloader \
     -<%= name %> \
-    -boot <%=name %>-<%= version %>
+    -boot <%=name %>-$VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mkerl
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 -07:00
+date: 2010-04-29 00:00:00 -07:00
 default_executable: mkerl
 dependencies: []
 
@@ -31,6 +31,7 @@ files:
 - VERSION
 - bin/mkerl
 - lib/mkerl.rb
+- mkerl.gemspec
 - templates/Emakefile
 - templates/Makefile
 - templates/README.markdown