erlbox 1.6.0 → 1.7.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :patch: 0
 :major: 1
-:minor: 6
+:minor: 7

data/bin/erlbox

@@ -70,13 +70,13 @@ def load_config()
   config
 end
 
-def download_app(appname, appurl)
+def download_app(appname, appurl, appvers)
   # Work directory will be /tmp/erlbox.<pid>
   tmpdir = "/tmp/erlbox_#{appname}.#{Process.pid}"
   
   # Clone the desired url using GIT
   # TODO: Support alternative systems
-  cmd = "git clone #{appurl} #{tmpdir}/"
+  cmd = "git clone -n #{appurl} #{tmpdir}/"
   puts cmd
   system cmd
   if $? != 0
@@ -88,6 +88,14 @@ def download_app(appname, appurl)
     system "(cd #{tmpdir} && git submodule update --init)"
   end
 
+  # Check out appropriate version of the repo
+  cmd = "(cd #{tmpdir} && git checkout #{appvers})"
+  puts cmd
+  system cmd
+  if $? != 0
+    exit 1
+  end
+
   # Return the tmp directory path 
   puts tmpdir
   tmpdir
@@ -111,12 +119,24 @@ def install_deps(workdir, appname = nil, stack = [])
 end
 
 def install_app(appname, stack = [])
+  puts "Installing #{appname}"
   # Check for a dependency cycle
   if stack.include?(appname)
     puts "#{appname} already scheduled for installation"
     return
   end
 
+  # Split app name on whitespace -- we pass the desired tag/branch in this way
+  if not appname.nil?
+    app_parts = appname.split(nil, 2)
+    if app_parts.length == 2
+      appname = app_parts[0]
+      appvers = app_parts[1]
+    else
+      appvers = "HEAD"
+    end
+  end
+
   # Default workdir is current working directory -- examination of appname may 
   # override this.
   workdir = ""
@@ -135,12 +155,12 @@ def install_app(appname, stack = [])
       if File.directory?(appname_path)
         workdir = appname_path
       else
-        workdir = download_app(appname, File.join(CONFIG['default_repo'], appname))
+        workdir = download_app(appname, File.join(CONFIG['default_repo'], appname), appvers)
         is_temp = true
       end
     else
       # Appname is a proper URL -- we'll pass this to git
-      workdir = download_app(appname, appname)
+      workdir = download_app(appname, appname, appvers)
       is_temp = true
     end
   end
@@ -192,7 +212,11 @@ CONFIG = load_config()
 action = ARGV[0]
 case action
 when 'install'
-  install_app(ARGV[1])
+  if ARGV.length > 2
+    install_app(ARGV[1] + " " + ARGV[2])
+  else
+    install_app(ARGV[1])
+  end
 when 'cleanup'
   FileUtils.rm_rf Dir.glob("/tmp/erlbox_*")
 when 'ensure'

data/erlbox.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{erlbox}
-  s.version = "1.6.0"
+  s.version = "1.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Phillip Toland"]
-  s.date = %q{2009-07-27}
+  s.date = %q{2009-09-26}
   s.default_executable = %q{erlbox}
   s.description = %q{Rake tasks and helper scripts for building Erlang applications.}
   s.email = %q{phil.toland@gmail.com}

data/lib/erlbox/build.rb

@@ -53,7 +53,7 @@ directory 'ebin'
 
 rule(%r(^ebin/.*\.beam$) => ["%{ebin,src}X.erl"]) do |t|
   puts "compiling #{t.source}..."
-  sh "erlc #{print_flags(ERLC_FLAGS)} #{expand_path(ERL_PATH)} -o ebin #{t.source}"
+  sh "erlc #{print_flags(ERLC_FLAGS)} #{expand_path(ERL_PATH)} -o ebin #{t.source}", :verbose => verbose?
 end
 
 ## -------------------------------------------------------------------

data/lib/erlbox/eunit.rb

@@ -79,6 +79,7 @@ def run_eunit(dir, cover = false, rest = '')
   log_dir = abspath(EUNIT_LOG_DIR)
 
   cover_flags = cover ? "-cover -o #{log_dir}/coverage" : ''
+  verbose_flags = verbose? ? '-v' : ''
 
   suites = ENV['suites']
   all_suites = ''
@@ -87,10 +88,16 @@ def run_eunit(dir, cover = false, rest = '')
   script = __FILE__.sub('.rb', '')
 
   cmd = "cd #{EUNIT_WORK_DIR} &&\
-         #{script} -b #{abspath('./ebin')} -l #{log_dir}/eunit.log\
+         #{script} #{verbose_flags} #{expand_erl_path()} \
+                   -b #{abspath('./ebin')} -l #{log_dir}/eunit.log\
                    #{cover_flags} #{all_suites} #{abspath(dir)}"
 
   puts cmd.squeeze(' ') if verbose?
 
   sh cmd
 end
+
+def expand_erl_path()
+  # Add the ERL_PATH includes using multiple -b arguments 
+  ERL_PATH.empty? ? '' : "-b #{ERL_PATH.join(' -b ')}"
+end

data/lib/erlbox/install.rb

@@ -23,6 +23,14 @@
 ##
 ## -------------------------------------------------------------------
 
+task :install => [:'install:build', :'install:deps'] do
+  erl_install()
+end
+
+task :install_no_deps => [:'install:build'] do
+  erl_install()
+end
+
 namespace :install do
 
   task :appid, [:root_dir] do |t, args|
@@ -35,4 +43,8 @@ namespace :install do
   desc "Build the application for installation"
   task :build => [:compile]
 
+  desc "Installs all the dependencies for the current app"
+  task :deps do
+    erl_install_dependencies(APP_NAME)
+  end
 end

data/lib/erlbox/utils.rb

@@ -23,6 +23,10 @@
 ##
 ## -------------------------------------------------------------------
 
+require 'yaml'
+require 'uri'
+include FileUtils
+
 def debug?
   !ENV['debug'].nil?
 end
@@ -81,7 +85,7 @@ end
 
 def erl_app_version(app, extra_args = {})
   script = <<-ERL
-     ok = application:load(#{app}),
+     application:load(#{app}),
      {ok, Vsn} = application:get_key(#{app}, vsn),
      io:format("~s\\n", [Vsn]).
      ERL
@@ -91,7 +95,7 @@ end
 
 def erl_app_modules(app)
   script = <<-ERL
-      ok = application:load(#{app}),
+      application:load(#{app}),
       {ok, M} = application:get_key(#{app}, modules),
       [io:format("~s\\n", [Mod]) || Mod <- M].
       ERL
@@ -99,11 +103,193 @@ def erl_app_modules(app)
   output = erl_run(script, "-pa ebin")
   if output[/badmatch/]
     puts "Error processing .app file: #{output}"
+    []
+  else
+    output.split("\n")
+  end
+end
+
+def erl_app_applications(app)
+  script = <<-ERL
+      ok = application:load(#{app}),
+      {ok, A} = application:get_key(#{app}, applications),
+      [io:format("~s\\n", [App]) || App <- A].
+      ERL
+
+  output = erl_run(script, "-pa ebin")
+  if output[/badmatch/]
+    puts "Error processing .app file: #{output}"
+    []
   else
     output.split("\n")
   end
 end
 
+def erl_app_versioned_dependencies(app)
+  script = <<-ERL
+    {ok, [{application, _AppName, AppConfig}]} = file:consult("ebin/#{app}.app"),
+    VDeps = case lists:keyfind(versioned_dependencies, 1, AppConfig) of
+      {versioned_dependencies, Deps} -> Deps;
+      Other -> []
+    end,
+
+    [io:format("~p~n", [tuple_to_list(Dep)]) || Dep <- VDeps].
+  ERL
+
+  output = erl_run(script, "-pa ebin")
+
+  # maps from a string to a list of lists, where each list is:
+  # [app, version, nil | gt | gte | e]
+  # (less than, less than or equal, etc.)
+  deps = output.split("\n").map{|d| d.gsub(/[\[\"\']/, '').split(',')}
+
+  deps
+end
+
+def erl_app_needs_upgrade?(app, requested_ver)
+  # if it's nil, force us to have something installed
+  requested_ver ||= '0.0.0.001' 
+
+  installed_ver = erl_app_version(app)
+
+  if installed_ver =~ /init terminating/
+    installed_ver = "0.0.0"
+  end
+
+  return erl_version_needs_upgrade?(installed_ver, requested_ver)
+end
+
+def erl_version_needs_upgrade?(installed_version, requested_version)
+  iv = installed_version.split('.')
+  rv = requested_version.split('.')
+
+  iv.each_with_index do |n, i|
+    if rv[i].nil?
+      # installed version is longer, and all previous parts equal
+      return false
+    elsif rv[i].to_i > iv[i].to_i
+      return true # requested version is greater
+    elsif iv[i].to_i > rv[i].to_i
+      return false # installed version is greater
+    end
+  end
+
+  if rv.length > iv.length
+    return true # they're equal, but requested version has extra
+  else
+    return false # they're equal
+  end
+end
+
+def erl_install_dependencies(app)
+  erl_app_versioned_dependencies(app).each do |dep|
+    erl_install_dep(*dep)
+  end
+
+  erl_app_applications(app).each do |dep|
+    erl_install_dep(dep)
+  end
+end
+
+##
+# It appears that faxien allows us to specify that a version must
+# be exactly equal to the requested version. I'm ignoring this for now,
+# but in this case, the extra argument here would be 'e'
+##
+def erl_install_dep(app, ver = nil, extra = nil)
+  appstr = ver ? "#{app}-#{ver}" : "#{app}"
+
+  if erl_app_needs_upgrade?(app, ver)
+    # do we have a ~/.erlbox.yaml file?
+    
+    puts "Trying to install #{appstr}..."
+    erl_install_app(app)
+
+    # Check again, to make sure it was installed correctly
+    if erl_app_needs_upgrade?(app, ver)
+      STDERR.puts "ERROR: Failed to install dependency #{appstr}"
+      exit(1)
+    end
+  end
+end
+
+def load_yaml(file)
+  filename = File.expand_path(file)
+  return nil if not File.exist?(filename)
+  YAML::load(File.read(filename))
+end
+
+def load_config()
+  # Check for existence of the config file -- we MUST have one
+  config = load_yaml("~/.erlbox.yaml")
+
+  # Load the file and make sure required parameters are present
+  if config.nil? || config.empty?
+    STDERR.puts "To install dependencies from source, you must have a ~/.erlbox.yaml file with the key 'default_repo' (where git sources are) and optional keys 'erlang' (erlang root) and 'site_dir' (where to install applications. This must be in your ERL_LIBS path)"
+    config = []
+  end
+
+  # Fix up default repo URL
+  if config.has_key?('default_repo')
+    url = URI(config['default_repo'])
+    if url.scheme == nil || url.scheme == "file"
+      config['default_repo'] = File.expand_path(url.path)
+    end
+  end
+
+  # If erlang repo is specified, expand the path and use that to determine the root
+  if config.has_key?('erlang')
+    config['erlang_root'] = erl_root(File.expand_path(config['erlang'])).strip()
+  else
+    config['erlang_root'] = erl_root().strip()
+  end
+
+  if !config.has_key?('site_dir')
+    config['site_dir'] = File.join(config['erlang_root'], "lib")
+  end
+
+  config
+end
+
+# install the latest version of the requested app
+def erl_install_app(appname)
+  config = load_config()
+  if config.empty?
+    STDERR.puts "Sorry, we currently only support installing dependencies from source"
+    exit 1
+  end
+
+  # TODO: deal with other schemes than just files
+  workdir = File.join(config['default_repo'], appname)
+  if !File.exist?(workdir)
+    STDERR.puts "No such directory: #{workdir}"
+    exit 1
+  end
+
+  sh "cd #{workdir} && rake install"
+end
+
+##
+# install the current app without checking dependencies
+##
+def erl_install
+  config = load_config()
+
+  appid = "#{APP_NAME}-#{erl_app_version(APP_NAME)}"
+  install_dir = File.join(config['site_dir'], appid)
+
+  if File.exist?(install_dir)
+    rm_rf install_dir
+  end
+
+  mkdir install_dir
+  ['ebin', 'src', 'include', 'priv', 'mibs', 'deps'].each do |dir|
+    cp_r dir, install_dir if File.exist?(dir)
+  end
+
+  puts "Successfully installed #{appid} into #{install_dir}"
+end
+
 # Returns true if running on Linux
 def linux?
   platform? 'linux'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: erlbox
 version: !ruby/object:Gem::Version 
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors: 
 - Phillip Toland
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-27 00:00:00 -05:00
+date: 2009-09-26 00:00:00 -05:00
 default_executable: erlbox
 dependencies: 
 - !ruby/object:Gem::Dependency