auser-skelerl 0.0.4 → 0.0.5

data/generators/makefile/makefile_generator.rb

@@ -0,0 +1,68 @@
+class MakefileGenerator < RubiGen::Base
+
+  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
+                              Config::CONFIG['ruby_install_name'])
+
+  default_options :author => nil
+
+  attr_reader :app_name, :version
+
+  def initialize(runtime_args, runtime_options = {})
+    super
+    usage if args.empty?
+    # @app_name = args.shift
+    # @destination_root = File.expand_path(".")
+    @destination_root = args.shift
+    @app_name     = File.basename(File.expand_path(@destination_root))
+    
+    @name = base_name    
+    extract_options
+  end
+
+  def manifest    
+    record do |m|
+      m.template "Makefile", "Makefile"
+      m.template "Emakefile", "Emakefile"
+      m.directory "ebin"
+      m.template "appfile.app.erb", "ebin/#{@app_name}.app"
+      m.template "start.sh", "start.sh", { :chmod => 0755 }
+      m.directory "src"
+      m.template "make_boot.erl.erb", "src/make_boot.erl"
+    end
+  end
+
+  protected
+    def banner
+      <<-EOS
+Creates a makefile project with a bootscript generator
+
+USAGE: #{spec.name} name
+EOS
+    end
+
+    def add_options!(opts)
+      opts.separator ''
+      opts.separator 'Options:'
+      # For each option below, place the default
+      # at the top of the file next to "default_options"
+      # opts.on("-a", "--author=\"Your Name\"", String,
+      #         "Some comment about this option",
+      #         "Default: none") { |options[:author]| }
+      opts.on("-n", "--name", "Name the app") { |options[:app_name]| }
+      opts.on("-d", "--desc", "Description of the app") { |options[:description]| }
+      opts.on("-m", "--modules", "Modules used in the application") { |options[:modules]| }
+      opts.on("-r", "--registered", "Modules registered in the application") { |options[:registered]| }
+      opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
+    end
+
+    def extract_options
+      # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
+      # Templates can access these value via the attr_reader-generated methods, but not the
+      # raw instance variable value.
+      # @author = options[:author]
+      @description = options[:desc] || "Description of your project"
+      @version = options[:version] || "0.1"
+      @modules = options[:modules] || "#{@name}_app"
+      @registered = options[:registered] || ""
+    end
+end

data/generators/makefile/templates/Emakefile

@@ -0,0 +1,5 @@
+{ ['./src/*', 'src/*/*', 'src/*/*/*'], [
+  {i, "./include"},
+  {outdir, "./ebin"},
+  debug_info
+]}.

data/generators/makefile/templates/Makefile

@@ -0,0 +1,31 @@
+LIBDIR					= `erl -eval 'io:format("~s~n", [code:lib_dir()])' -s init stop -noshell`
+VERSION					= <%= version -%>
+CC							= erlc
+ERL							= erl
+EBIN						= ebin
+CFLAGS					= -I include -pa $(EBIN)
+COMPILE					= $(CC) $(CFLAGS) -o $(EBIN)
+EBIN_DIRS				= $(wildcard deps/*/ebin)
+WEB_DIR					= web/
+APP							= <%= app_name %>
+
+all: ebin compile boot
+
+compile:
+	@$(ERL) -pa $(EBIN_DIRS) -noinput +B -eval 'case make:all() of up_to_date -> halt(0); error -> halt(1) end.'
+
+edoc:
+	@echo Generating $(APP) documentation from srcs
+	@$(ERL) -noinput -eval 'edoc:application($(APP), "./", [{doc, "doc/"}, {files, "src/"}])' -s erlang halt
+	
+boot:
+	(cd ebin; erl -pa ebin -noshell -run make_boot write_scripts $(APP))
+
+start_all:
+	(cd ebin; erl -pa ebin -noshell -boot $(APP))
+
+ebin:
+	@mkdir ebin
+
+clean:
+	rm -rf ebin/*.beam ebin/erl_crash.dump erl_crash.dump ebin/*.boot ebin/*.rel ebin/*.script 

data/{ebin/packager.app → generators/makefile/templates/appfile.app.erb}

@@ -1,19 +1,19 @@
-{application, packager,
+{application, <%= app_name %>,
   [
 		% Quick description of the server
-		{description, "Package manager"},
+		{description, "Description of the application"},
 		% Version
-		{vsn, "0.1"},
+		{vsn, "<%= version -%>"},
 		% All modules used by the application.  
-		{modules, [packager_app]},
+		{modules, []},
 		% All the registered names in the application
-		{registered, [packager]},
+		{registered, []},
 		% These must be started for application to run
 		{applications, [kernel, stdlib]},
 		% Environment vars
 		{env, []},
 		% Module and Args used to start
-		{mod, {packager_app, []}},
+		{mod, {<%= app_name -%>, []}},
 		{start_phases, []}
 	]
 }.

data/generators/makefile/templates/make_boot.erl.erb

@@ -0,0 +1,29 @@
+-module(make_boot).
+-export([write_scripts/1]).
+
+write_scripts(Args) -> 
+  [Name] = Args,
+  io:format("write_scripts for ~p~n", [Name]),
+  Erts = erlang:system_info(version),
+  application:load(sasl),
+  Version = "0.1",
+  {value, {kernel, _, Kernel}} = lists:keysearch(kernel, 1,
+          application:loaded_applications()),
+  {value, {stdlib, _, Stdlib}} = lists:keysearch(stdlib, 1,
+          application:loaded_applications()),
+  {value, {sasl, _, Sasl}} = lists:keysearch(sasl, 1,
+          application:loaded_applications()),
+
+  Rel = "{release, {\"~s\", \"~s\"}, {erts, \"~s\"}, ["
+         "{kernel, \"~s\"}, {stdlib, \"~s\"}, {sasl, \"~s\"}, {~s, \"~s\"}]}.",
+  Lowername = string:to_lower(Name),
+
+  Filename = lists:flatten(Lowername ++ ".rel"),
+  io:format("Writing to ~p (as ~s)~n", [Filename, Lowername]),
+  {ok, Fs} = file:open(Filename, [write]),
+
+  io:format(Fs, Rel, [Name, Version, Erts, Kernel, Stdlib, Sasl, Lowername, Version]),
+  file:close(Fs),
+
+  systools:make_script(Lowername, [local]),
+  halt().

data/generators/makefile/templates/start.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+# start.sh
+cd `dirname $0`
+erl -pa $PWD/ebin -pa $PWD/deps/*/ebin -name <%= app_name -%> -s reloader -boot <%= app_name -%> $1

data/generators/skeleton/skeleton_generator.rb

@@ -39,6 +39,8 @@ class SkeletonGenerator < RubiGen::Base
       %w(ebin include src).each do |directory|
         m.directory "test/#{directory}"
       end
+
+      m.directory "priv/tasks"
       
       include_eunit
       include_configerl

data/generators/skeleton/templates/Rakefile

@@ -1 +1,2 @@
-require "skelerl"
+require "skelerl"
+Dir.glob(File.dirname(__FILE__) + "/priv/tasks/*.rake").each {|f| load f}

data/generators/skeleton/templates/gitignore

@@ -1,2 +1,16 @@
 *.beam
-erl_crash.dump
+erl_crash.dump
+html
+.erlang.cookie
+.autosession.vim
+.DS_Store
+tags
+coverage
+.session.vim
+*-ttb
+*-ttb.ti
+doc/edoc-info
+doc/erlang.png
+doc/*.html
+doc/stylesheet.css
+.dialyzer_plt

data/script/generate

@@ -11,4 +11,4 @@ require 'rubigen/scripts/generate'
 
 ARGV.shift if ['--help', '-h'].include?(ARGV[0])
 RubiGen::Base.use_component_sources! [:appfile, :test_unit]
-RubiGen::Scripts::Generate.new.run(ARGV)
+RubiGen::Scripts::Generate.new.run(ARGV)

data/tasks/build.rake

@@ -12,7 +12,7 @@ EXTRA_ERLC = DEPS_FILES.map {|a| "-pa #{a}/ebin" }.join(" ")
 
 ERLC_FLAGS = "-I#{INCLUDE} +warn_unused_vars +warn_unused_import -o ebin -W0 #{EXTRA_ERLC}"
 
-SRC        = FileList["src/*.erl"]
+SRC        = FileList["src/**/*.erl"]
 SRC_OBJ    = SRC.pathmap("%{src,ebin}X.beam")
 
 DEP        = DEPS_FILES.map {|d| FileList["#{d}/src/*.erl"]}
@@ -55,7 +55,8 @@ task :run_tests => :compile do
   TEST_OBJ.each do |obj|
     obj[%r{.*/(.*).beam}]
     mod = $1
-    test_cmd = "erl -pa ebin -pa test/ebin -run #{mod} test -run init stop"
+    test_cmd = "erl -pa ebin -pa test/ebin #{EXTRA_ERLC} -run #{mod} test -run init stop"
+    $stdout.puts test_cmd
     test_output = `#{test_cmd}`
     
     puts test_output if Rake.application.options.trace
@@ -70,6 +71,74 @@ task :run_tests => :compile do
   end
 end
 
+class << self
+    %w{src ebin}.each do |type|
+        define_method "#{type}_dirs" do
+          Dir[Dir.pwd + "/#{type}"]  +
+          Dir[Dir.pwd + "/**/deps/**/#{type}"] +
+          Dir[Dir.pwd + "/test/#{type}"]
+        end
+    end
+end
+
+desc "Run all tests with coverage"
+task :coverage => :compile do
+  puts "Modules under test:"
+  TEST_OBJ.each do |obj|
+    obj[%r{.*/(.*).beam}]
+    mod = $1
+    next if ENV['MODULE'] && mod != ENV['MODULE']
+
+    FileUtils.mkdir(Dir.pwd + "/coverage") unless File.exists?(Dir.pwd + "/coverage")
+    compile = ebin_dirs.collect{|dir| "cover:compile_beam_directory(\"#{dir}\")," }.join("\n  ")
+    analyse = src_dirs.inject([]) do |mem,dir|
+      Dir[dir + "/*.erl"].each do |file|
+        base = File.basename(file, ".erl") 
+        mem << "cover:analyse_to_file(#{base}, \"coverage/#{base}.html\", [html]),"
+      end
+      mem
+    end.join("\n  ")
+
+    test_cmd =<<EOF
+
+erl +A 10 -sname #{$$} -pa ebin -pa test/ebin #{EXTRA_ERLC} -eval '
+  Module = list_to_atom (hd(init:get_plain_arguments())),
+  {value, {exports, E}} = lists:keysearch (exports,
+                                             1,
+                                             Module:module_info()),
+  case lists:member({test, 0}, E) of
+    true -> ok;
+    false -> io:format("error, ~p:test/0 not exported; " ++
+                        "possibly you do not have eunit installed~n",
+                        [Module]),
+             halt(77)
+  end,
+  #{compile}
+  io:format("~p:test () ...", [Module]),
+  ok = Module:test(),
+  #{analyse}
+  ok
+' -noshell -run init stop -extra "#{mod}"
+EOF
+
+    # $stdout.puts test_cmd
+    test_output = `#{test_cmd}`
+    
+    puts test_output if Rake.application.options.trace
+
+    if /\*failed\*/ =~ test_output
+      test_output[/(Failed.*Aborted.*Skipped.*Succeeded.*$)/]
+    else
+      test_output[/1>\s*(.*)\n/]
+    end
+
+    puts "#{mod}: #{$1}"
+
+    exit 1 if /\*failed\*/ =~ test_output
+  end
+end
+
+
 desc "Clean the beams from the ebin directory"
 task :clean do
   # cmd = "rm #{::File.dirname(__FILE__)}/ebin/*.beam"
@@ -90,11 +159,13 @@ desc "Rebuild the boot scripts"
 task :build_boot_scripts => [:recompile] do
   puts "Rebuilding boot scripts"
   
-  root_dir = ::File.expand_path( ::File.join(::File.dirname(__FILE__)) )
+  rakefile, location = Rake.application.find_rakefile_location
+  root_dir = ::File.expand_path( ::File.join(location) )
   @version = ENV["VERSION"] || ENV["V"] || "0.1"
-  @name = ENV["NAME"] || ::File.basename(::File.dirname( root_dir ))
+  @name = ENV["NAME"] || ::File.basename(root_dir)
   
   cmd = "erl -pa ./ebin/ -run packager start #{@name} #{@version} -run init stop -noshell"
+  puts cmd
   Kernel.system cmd
 end
 
@@ -131,6 +202,15 @@ namespace(:deps) do
   
   desc "Update and compile deps/"
   task :up => [:update, :compile]
+  
+  desc "Clean the deps"
+  task :clean do
+    DEPS_FILES.each do |dir|
+      cmd = "cd #{dir}/ebin && rm *.beam"
+      puts cmd if Rake.application.options.trace
+      Kernel.system cmd
+    end
+  end
 end
 
 desc "Build eunit"
@@ -140,4 +220,16 @@ task :build_eunit do
 end
 
 desc "Compile and get a shell"
-task :compile_shell => [:compile, :shell]
+task :compile_shell => [:compile, :shell]
+
+desc "Generate ctags"
+task :ctags do
+    ctags_cmd =  "ctags -R --language-force=Erlang -F tags src/ deps/*/src test/src"
+    puts ctags_cmd
+    exec ctags_cmd
+end
+
+desc "Generate Documentation"
+task :doc do
+    sh("cd doc && erl -noshell -run edoc files ../#{SRC.join(" ../")} -run init stop")
+end

metadata

@@ -1,89 +1,82 @@
 --- !ruby/object:Gem::Specification 
 name: auser-skelerl
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Ari Lerner
+- Michael Fairchild
+- Nate Murray
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-02-09 00:00:00 -08:00
+date: 2009-08-17 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.0
-    version: 
-description: This skeleton app takes care of everything you'd need in an erlang application, but don't want to do yourself... Check out the README for more!   Mon Feb 09 18:49:15 -0800 2009
-email: 
-- arilerner@mac.com
+dependencies: []
+
+description: Erlang skeleton application
+email: arilerner@mac.com
 executables: 
 - gen_server
+- makefile
 - skelerl
+- skelerl-gen_server
+- skelerl-makefile
 extensions: []
 
 extra_rdoc_files: 
 - History.txt
-- Manifest.txt
 - README.txt
-- generators/skeleton/templates/README.txt
 files: 
-- History.txt
-- Manifest.txt
-- README.txt
 - Rakefile
+- VERSION.yml
 - bin/gen_server
+- bin/makefile
 - bin/skelerl
-- config/hoe.rb
+- bin/skelerl-gen_server
+- bin/skelerl-makefile
+- config/jeweler.rb
 - config/requirements.rb
-- ebin/packager.app
-- examples/example_runner.rb
 - generators/appfile/USAGE
 - generators/appfile/appfile_generator.rb
 - generators/appfile/templates/appfile.app
 - generators/gen_server/USAGE
 - generators/gen_server/gen_server_generator.rb
+- generators/gen_server/templates/README.txt
+- generators/gen_server/templates/Rakefile
 - generators/gen_server/templates/gen_server.erl
+- generators/gen_server/templates/gitignore
+- generators/makefile/USAGE
+- generators/makefile/makefile_generator.rb
+- generators/makefile/templates/Emakefile
+- generators/makefile/templates/Makefile
+- generators/makefile/templates/appfile.app.erb
+- generators/makefile/templates/make_boot.erl.erb
+- generators/makefile/templates/start.sh
 - generators/skeleton/USAGE
 - generators/skeleton/skeleton_generator.rb
 - generators/skeleton/templates/README.txt
 - generators/skeleton/templates/Rakefile
 - generators/skeleton/templates/gitignore
-- include/empty
-- lib/skelerl.rb
-- lib/skelerl/core/object.rb
-- lib/skelerl/erlpers/core/array.rb
-- lib/skelerl/erlpers/core/object.rb
-- lib/skelerl/erlpers/erl_mapper.rb
-- lib/skelerl/erlpers/mappers/command.rb
-- lib/skelerl/erlpers/mappers/context.rb
-- lib/skelerl/erlpers/mappers/namespace.rb
-- lib/skelerl/init.rb
 - script/generate
-- setup.rb
-- skelerl.gemspec
-- src/packager.erl
 - tasks/build.rake
-- tasks/deployment.rake
 - tasks/environment.rake
 - tasks/generate.rake
 - tasks/website.rake
-- test/erlpers/erl_mapper_spec.rb
-- test/erlpers/object_spec.rb
-- test/helper.rb
-has_rdoc: true
-homepage: http://skelerl.rubyforge.org
-post_install_message: ""
+- History.txt
+- README.txt
+has_rdoc: false
+homepage: http://poolpartyrb.com
+licenses: 
+post_install_message: 
 rdoc_options: 
+- --quiet
+- --title
+- Skelerl documentation
+- --line-numbers
 - --main
-- README.txt
+- README
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -100,10 +93,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: skelerl
-rubygems_version: 1.2.0
+rubyforge_project: 
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
-summary: This skeleton app takes care of everything you'd need in an erlang application, but don't want to do yourself... Check out the README for more!   Mon Feb 09 18:49:15 -0800 2009
+specification_version: 3
+summary: The most awesomenest erlang skeleton and generator!
 test_files: []