csd 0.1.4 → 0.1.5

data/COPYING

@@ -1,8 +1,8 @@
-Copyright (C) Technology Transfer Alliance
+Copyright (C) Communication Systems Design
 
 "CSD gem" refers to every file in this software, except the
 file "lib/active_support.rb", and the directories
-"lib/active_support" and "lib/term" and all its contents.
+"lib/active_support" and "lib/term" and their contents, respectively.
 
 The CSD gem is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License

data/README.rdoc

@@ -14,12 +14,11 @@ CSD stands for Communication Systems Design and is a project of the Telecommunic
 
 * Fork the project.
 * Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
+* Add tests for it. This is important so we don't break it in a future version unintentionally.
 * Commit, do not mess with Rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
+  (if you want to have your own version, that is fine but bump version in a commit by itself we can ignore when I pull)
+* Send us a pull request.
 
 == Copyright
 
-Copyright (c) 2010 TTA. See LICENSE for details.
+Copyright (c) 2010 Communication Systems Design. See COPYING for details.

data/Rakefile

@@ -17,7 +17,7 @@ begin
 
   Thank you for installing the Communication Systems and Design Automated Installer!
 
-  You can run it by just typing `ai´ in your command line.
+  You can run it by typing `ai´ in your command line.
 
   Note: On Debian and Ubuntu the executable `ai´ is not in your PATH by default.
         You can fix this by adding it to your .bashrc file with this command:
@@ -58,9 +58,9 @@ task :default => :test
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "csd #{version}"
   rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_files.include('lib/csd.rb')
+  rdoc.rdoc_files.include('lib/csd/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/bin/ai

@@ -1,19 +1,25 @@
 #!/usr/bin/env ruby
 
-# NOTE: If you would like to run this file as a developer, you can use the following command
-# ruby -I path/to/csd/lib path/to/csd/bin/ai
+# NOTE: If you would like to execute this file as a developer
+#       but not install the CSD gem, you can use this command:
+#       ruby -I path/to/csd/lib path/to/csd/bin/ai
 
-# First, load the Rubygems framework and the CSD gem.
-# Note: Rubygems is already included for Ruby >= 1.9, but we want to go sure here
+# First, let's load the RubyGems framework and the CSD gem.
+# Even though RubyGems is already loaded for Ruby >= 1.9,
+# we want to go sure here and load it to provide robustness
 require 'rubygems'
 require 'csd'
 
 begin
+  # Running the CSD library and telling it who started it
   CSD.bootstrap :executable => 'ai'
 rescue CSD::Error::CSDError => e
-  CSD.ui.error e.message unless e.status_code <= 49 # Everything under 50 shows help messages
+  # Here we catch CSD internal errors and exit with the propriate status code
+  # We output the error message for status codes 50+, because they are rather severe
+  CSD.ui.error e.message unless e.status_code <= 49
   exit e.status_code
 rescue Interrupt
-  CSD.ui.error "\nQuitting AI..."
+  # Lastly, close the AI gracefully on abnormal termination
+  CSD.ui.info "Quitting the AI...".red
   abort
-end
+end

data/csd.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{csd}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Technology Transfer Alliance Team"]
-  s.date = %q{2010-07-13}
+  s.date = %q{2010-07-14}
   s.default_executable = %q{ai}
   s.description = %q{CSD stands for Communication Systems Design and is a project of the Telecommunication Systems Laboratory (TSLab) of the Royal Institute of Technology in Stockholm, Sweden. Within CSD many software tools are used to build up various networks and services. This gem is supposed to automate processes to handle the compilation and installation of these software tools. Technology Transfer Alliance (TTA) is the project team, which maintains this code.}
   s.email = %q{mtoday11@gmail.com}
@@ -237,7 +237,11 @@ Gem::Specification.new do |s|
      "lib/csd/application/minisip/error.rb",
      "lib/csd/application/minisip/options/common.rb",
      "lib/csd/application/minisip/options/compile.rb",
-     "lib/csd/application/minisip/unix/base.rb",
+     "lib/csd/application/minisip/options/package.rb",
+     "lib/csd/application/minisip/unix.rb",
+     "lib/csd/application/minisip/unix/linux.rb",
+     "lib/csd/application/minisip/unix/linux/debian.rb",
+     "lib/csd/application/minisip/unix/linux/debian/ubuntu10.rb",
      "lib/csd/application/opensips/about.yml",
      "lib/csd/applications.rb",
      "lib/csd/commands.rb",
@@ -275,7 +279,7 @@ Gem::Specification.new do |s|
 
   Thank you for installing the Communication Systems and Design Automated Installer!
 
-  You can run it by just typing `ai´ in your command line.
+  You can run it by typing `ai´ in your command line.
 
   Note: On Debian and Ubuntu the executable `ai´ is not in your PATH by default.
         You can fix this by adding it to your .bashrc file with this command:

data/lib/csd.rb

@@ -1,7 +1,13 @@
 # encoding: utf-8
-# Loading all files in CSD
-require 'csd/error'
-require 'csd/options'
+
+# Loading vendor libraries
+require 'active_support'
+require 'term/ansicolor'
+
+# Loading all files in the subdirectory `csd´
+Dir[File.join(File.dirname(__FILE__), 'csd', '*.rb')].sort.each do |path|
+  require "csd/#{File.basename(path, '.rb')}"
+end
 
 # The CSD namespace is given to the entire gem.
 #
@@ -17,7 +23,7 @@ module CSD
       @executable = options[:executable]
       Options.parse!
       respond_to_incomplete_arguments
-      Applications.current.instance.send("#{Options.action}!".to_sym)
+      Applications.current.instance.send("#{Options.action}".to_sym)
     end
     
     # This method chooses and holds the user interface instance

data/lib/csd/application/default.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require File.join(File.dirname(__FILE__), 'default', 'base')
+
 module CSD
   # This namespace holds all individual application Modules
   #

data/lib/csd/application/minisip.rb

@@ -1,8 +1,9 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), 'default')
-Dir.glob(File.join(File.dirname(__FILE__), 'minisip', '*.rb')) { |file| require file }
-Dir.glob(File.join(File.dirname(__FILE__), 'minisip', 'unix', '*.rb')) { |file| require file }
 require 'ostruct'
+require File.join(File.dirname(__FILE__), 'default')
+require File.join(File.dirname(__FILE__), 'minisip', 'error')
+require File.join(File.dirname(__FILE__), 'minisip', 'base')
+require File.join(File.dirname(__FILE__), 'minisip', 'unix', 'linux', 'debian', 'ubuntu10')
 
 module CSD
   module Application
@@ -14,8 +15,17 @@ module CSD
         def instance
           @instance ||= case Gem::Platform.local.os
             when 'linux'
-              Unix::Base.new
+              UI.debug "Analyzing kernel version: #{Gem::Platform.local.kernel_version}"
+              case Gem::Platform.local.kernel_version
+                when /(36-Ubuntu)|(37-Ubuntu)/
+                  UI.debug "Ubuntu 10.04 identified"
+                  Ubuntu10.new
+                else
+                  UI.debug "Debian identified"
+                  Debian.new
+              end
             else
+              UI.debug "Nothing identified"
               Base.new
           end
         end

data/lib/csd/application/minisip/about.yml

@@ -8,7 +8,7 @@ actions:
     #- check: Checks whether the environment dependencies for the application are satisfied
   :developer:
     - compile: Downloads and compiles MiniSIP from scratch
-    #- package: Packages a compiled application
+    - package: Downloads, compiles and packages MiniSIP from scratch
     #- publish: Submits a compiled package to the CSD package repository
 scopes:
   --- {}

data/lib/csd/application/minisip/base.rb

@@ -6,38 +6,16 @@ module CSD
     module Minisip
       class Base < CSD::Application::Base
         
-        def compile!
-          define_root_path
-          define_paths
-          fix_ubuntu_10_04 and return if Options.only_fix_giomm
-          UI.separator
-          UI.info "This operation will download and compile MiniSIP.".green.bold
-          UI.separator
-          UI.info " Working directory:   ".green + Path.work.to_s.yellow
-          UI.info " Your Platform:       ".green + Gem::Platform.local.humanize.to_s.yellow
-          UI.info(" Application module:  ".green + self.class.name.to_s.yellow) if Options.developer
-          UI.separator
-          if Options.help
-            UI.info Options.helptext
-          else
-            unless Options.yes
-              exit unless UI.ask_yes_no("Continue?".red.bold, true)
-            end
-            compile_process
-          end
-          UI.separator
-        end
+        LIBRARIES = %w{ libmutil libmnetutil libmcrypto libmikey libmsip libmstun libminisip minisip } unless defined?(LIBRARIES)
 
-        def compile_process
-          before_compile
-          Cmd.mkdir Path.work
-          make_hdviper if checkout_hdviper or Options.dry
-          checkout_minisip
-          fix_ubuntu_10_04 if Gem::Platform.local.kernel_version == '#36-Ubuntu SMP Thu Jun 3 22:02:19 UTC 2010'
-          make_minisip
-          after_compile
+        def package
+          UI.error 'Currently not supported for this platform. Sorry.'
+        end
+        
+        def compile
+          UI.error 'Currently not supported for this platform. Sorry.'
         end
-                
+        
         def define_root_path
           if Options.path
             if File.directory?(Options.path)
@@ -49,10 +27,12 @@ module CSD
             Path.root = Options.temp ? Dir.mktmpdir : Dir.pwd
           end
         end
-
+        
         def define_paths
           Path.work                      = Pathname.new(File.join(Path.root, 'minisip'))
           Path.repository                = Pathname.new(File.join(Path.work, 'repository'))
+          Path.plugins                   = Pathname.new(File.join(Path.work, 'plugins'))
+          Path.packaging                 = Pathname.new(File.join(Path.work, 'packaging'))
           Path.open_gl_display           = Pathname.new(File.join(Path.repository, 'libminisip', 'source', 'subsystem_media', 'video', 'display', 'OpenGLDisplay.cxx'))
           Path.hdviper                   = Pathname.new(File.join(Path.work, 'hdviper'))
           Path.hdviper_x264              = Pathname.new(File.join(Path.hdviper, 'x264'))
@@ -68,97 +48,55 @@ module CSD
           Path.giomm_header              = Pathname.new(File.join('/', 'usr', 'include', 'giomm-2.4', 'giomm.h'))
         end
         
-        def checkout_hdviper
-          if Path.hdviper.directory?
-            UI.warn "Skipping hdviper, because the directory already exists: #{Path.hdviper}"
-          else
-            if Path.hdviper.parent.writable? or Options.dry
-              UI.info "Downloading hdviper to: #{Path.hdviper}".green.bold
-              Cmd.run("git clone http://github.com/csd/libraries.git #{Path.hdviper}", :die_on_failure => true)
-              #Cmd.run("svn co --quiet svn://hdviper.org/hdviper/wp3/src #{Path.hdviper}")
-              return true
-            else
-              UI.error "Could not download hdviper (no permission): #{Path.hdviper}"
-            end
-          end
-        end
-        
-        def make_hdviper
-          Cmd.cd Path.hdviper_x264
-          Cmd.run('./configure')
-          Cmd.run('make')
-          Cmd.cd Path.hdviper_x264_test_x264api
-          Cmd.run('make')
-        end
-        
         def checkout_minisip # TODO: Refactor because redudancy with checkout_hdviper
           if Path.repository.directory?
             UI.warn "Skipping repository download, because the directory already exists: #{Path.repository}"
           else
             if Path.repository.parent.writable? or Options.dry
               UI.info "Downloading minisip repository to: #{Path.repository}".green.bold
-              Cmd.run("git clone http://github.com/csd/minisip.git #{Path.repository}", :die_on_failure => true)
+              Cmd.run("git clone http://github.com/csd/minisip.git #{Path.repository}")
               # Fixing hard-coded stuff
               Cmd.replace(Path.open_gl_display, '/home/erik', Path.build)
             else
-              UI.error "Could not download minisip repository (no permission): #{Path.hdviper}"
+              UI.error "Could not download minisip repository (no permission): #{Path.repository}"
             end
           end
         end
         
-        def fix_ubuntu_10_04
-          # TODO put backup file in Path.xxx
-          if File.exist?("#{Path.giomm_header}.ai-backup")
-            UI.warn "giomm-2.4 seems to be fixed already, I won't touch it. Delete `#{"#{Path.giomm_header}.ai-backup"}´ to enforce it."
+        def checkout_plugins # TODO: Refactor because redudancy with checkout_hdviper
+          if Path.plugins.directory?
+            UI.warn "Skipping plugins download, because the directory already exists: #{Path.plugins}"
           else
-            Path.new_giomm_header = File.join(Dir.mktmpdir, 'giomm.h')
-            Cmd.copy(Path.giomm_header, Path.new_giomm_header)
-            Cmd.replace(Path.new_giomm_header, '#include <giomm/socket.h>', "/* ----- AI COMMENTING OUT START ----- \n#include <giomm/socket.h>")
-            Cmd.replace(Path.new_giomm_header, '#include <giomm/srvtarget.h>', "#include <giomm/srvtarget.h>\n ----- AI COMMENTING OUT END ----- */")
-            Cmd.replace(Path.new_giomm_header, '# include <giomm/unixconnection.h>', "// #include <giomm/unixconnection.h>  // COMMENTED OUT BY AI")
-            Cmd.run("sudo cp #{Path.giomm_header} #{Path.giomm_header}.ai-backup")
-            Cmd.run("sudo cp #{Path.new_giomm_header} #{Path.giomm_header}")
+            if Path.plugins.parent.writable? or Options.dry
+              UI.info "Downloading minisip plugins to: #{Path.plugins}".green.bold
+              Cmd.run("git clone http://github.com/csd/minisip-plugins.git #{Path.plugins}")
+            else
+              UI.error "Could not download minisip plugins (no permission): #{Path.plugins}"
+            end
           end
         end
         
-        def make_minisip
-          [Path.build, Path.build_include, Path.build_lib, Path.build_share, Path.build_share_aclocal].each { |target| Cmd.mkdir target }
-          ['libmutil', 'libmnetutil', 'libmcrypto', 'libmikey', 'libmsip', 'libmstun', 'libminisip', 'minisip'].each do |library|
-            directory = Pathname.new(File.join(Path.repository, library))
-            next if Options.only and !Options.only.include?(library)
-            if Cmd.cd(directory) or Options.dry
-              if Options.bootstrap
-                UI.info "Bootstrapping #{library}".green.bold
-                Cmd.run("./bootstrap -I #{Path.build_share_aclocal.enquote}", :die_on_failure => true)
-              end
-              if Options.configure
-                UI.info "Configuring #{library}".green.bold
-                individual_options = case library
-                  when 'libminisip'
-                    %Q{--enable-debug --enable-video --disable-mil --enable-decklink --enable-opengl --disable-sdl CPPFLAGS="-I#{Path.hdviper_x264_test_x264api} -I#{Path.hdviper_x264}" LDFLAGS="#{File.join(Path.hdviper_x264_test_x264api, 'libx264api.a')} #{File.join(Path.hdviper_x264, 'libtidx264.a')} -lpthread -lrt"}
-                    #%Q{--enable-debug --enable-video --disable-mil --disable-decklink --enable-opengl --disable-sdl CPPFLAGS="-I#{Path.hdviper_x264}" LDFLAGS="#{File.join(Path.hdviper_x264, 'libx264.a')} -lpthread -lrt"}
-                  when 'minisip'
-                    %Q{--enable-debug --enable-video --enable-textui --enable-opengl}
-                  else
-                    ''
-                end
-                Cmd.run(%Q{./configure #{individual_options} --prefix=#{Path.build.enquote} PKG_CONFIG_PATH=#{Path.build_lib_pkg_config.enquote} ACLOCAL_FLAGS=#{Path.build_share_aclocal} LD_LIBRARY_PATH=#{Path.build_lib.enquote} --silent}, :die_on_failure => true)
-              end
-              if Options.make
-                UI.info "Make #{library}".green.bold
-                Cmd.run("make", :die_on_failure => true)
-              end
-              if Options.make_install
-                maker_command = Options.make_dist ? 'dist' : 'install'
-                UI.info "Make #{maker_command} #{library}".green.bold
-                Cmd.run("make #{maker_command}", :die_on_failure => true)
-              end
+        def checkout_hdviper
+          if Path.hdviper.directory?
+            UI.warn "Skipping hdviper, because the directory already exists: #{Path.hdviper}"
+          else
+            if Path.hdviper.parent.writable? or Options.dry
+              UI.info "Downloading hdviper to: #{Path.hdviper}".green.bold
+              Cmd.run("git clone http://github.com/csd/libraries.git #{Path.hdviper}")
+              #Cmd.run("svn co --quiet svn://hdviper.org/hdviper/wp3/src #{Path.hdviper}")
+              return true
             else
-              UI.warn "Skipping minisip library #{library} because it not be found: #{directory}".green.bold
+              UI.error "Could not download hdviper (no permission): #{Path.hdviper}"
             end
           end
         end
         
+        def before_compile
+        end
+
+        def after_compile
+        end
+        
       end
     end
   end

data/lib/csd/application/minisip/options/package.rb

@@ -0,0 +1,13 @@
+# encoding: utf-8
+# This file gets eval'ed by the global options parser in lib/csd/rb
+# TODO: There must be a nicer solution for this.
+
+self.path = nil
+opts.on("--path [PATH]",
+        "Defines the working directory manually.") do |value|
+  self.path = value
+end
+
+opts.on("--only libmcrypto,libmnetuli,etc.", Array, "Process only these libraries") do |list|
+  self.only = list
+end

data/lib/csd/application/minisip/unix.rb

@@ -0,0 +1,134 @@
+# encoding: utf-8
+require File.join(File.dirname(__FILE__), 'base')
+
+module CSD
+  module Application
+    module Minisip
+      class Unix < Base
+        
+        def introduction
+          define_root_path
+          define_paths
+          UI.separator
+          UI.info " Working directory:   ".green + Path.work.to_s.yellow
+          UI.info " Your Platform:       ".green + Gem::Platform.local.humanize.to_s.yellow
+          UI.info(" Application module:  ".green + self.class.name.to_s.yellow) if Options.developer
+          UI.separator
+          if Options.help
+            UI.info Options.helptext
+            exit
+          else
+            exit unless (Options.yes or UI.ask_yes_no("Continue?".red.bold, true))
+          end
+        end
+        
+        def package
+          UI.separator
+          UI.info("This operation will package ".green.bold + "an already compiled".red.bold + " MiniSIP.".green.bold)
+          introduction
+          package!
+        end
+        
+        def compile
+          UI.separator
+          UI.info "This operation will download and compile MiniSIP.".green.bold
+          introduction
+          compile!
+        end
+        
+        def make_hdviper
+          Cmd.cd Path.hdviper_x264
+          Cmd.run('./configure')
+          Cmd.run('make')
+          Cmd.cd Path.hdviper_x264_test_x264api
+          Cmd.run('make')
+        end
+        
+        def make_minisip
+          [Path.build, Path.build_include, Path.build_lib, Path.build_share, Path.build_share_aclocal].each { |target| Cmd.mkdir target }
+          LIBRARIES.each do |library|
+            directory = Pathname.new(File.join(Path.repository, library))
+            next if Options.only and !Options.only.include?(library)
+            if Cmd.cd(directory) or Options.dry or Options.reveal
+              if Options.bootstrap
+                UI.info "Bootstrapping #{library}".green.bold
+                Cmd.run("./bootstrap -I #{Path.build_share_aclocal.enquote}")
+              end
+              if Options.configure
+                UI.info "Configuring #{library}".green.bold
+                individual_options = case library
+                  when 'libminisip'
+                    %Q{--enable-debug --enable-video --disable-mil --enable-decklink --enable-opengl --disable-sdl CPPFLAGS="-I#{Path.hdviper_x264_test_x264api} -I#{Path.hdviper_x264}" LDFLAGS="#{File.join(Path.hdviper_x264_test_x264api, 'libx264api.a')} #{File.join(Path.hdviper_x264, 'libtidx264.a')} -lpthread -lrt"}
+                    #%Q{--enable-debug --enable-video --disable-mil --disable-decklink --enable-opengl --disable-sdl CPPFLAGS="-I#{Path.hdviper_x264}" LDFLAGS="#{File.join(Path.hdviper_x264, 'libx264.a')} -lpthread -lrt"}
+                  when 'minisip'
+                    %Q{--enable-debug --enable-video --enable-textui --enable-opengl}
+                  else
+                    ''
+                end
+                Cmd.run(%Q{./configure #{individual_options} --prefix=#{Path.build.enquote} PKG_CONFIG_PATH=#{Path.build_lib_pkg_config.enquote} ACLOCAL_FLAGS=#{Path.build_share_aclocal} LD_LIBRARY_PATH=#{Path.build_lib.enquote} --silent})
+              end
+              if Options.make
+                UI.info "Make #{library}".green.bold
+                Cmd.run("make")
+              end
+              if Options.make_install
+                maker_command = Options.make_dist ? 'dist' : 'install'
+                UI.info "Make #{maker_command} #{library}".green.bold
+                Cmd.run("make #{maker_command}")
+              end
+            else
+              UI.warn "Skipping minisip library #{library} because it not be found: #{directory}".green.bold
+            end
+          end
+        end
+        
+        def package!
+          Cmd.mkdir(Path.packaging)
+          LIBRARIES.each do |library|
+            directory = Pathname.new(File.join(Path.repository, library))
+            next if Options.only and !Options.only.include?(library)
+            UI.info "Making #{library} with target dist".green.bold
+            if Cmd.cd(directory) or Options.dry or Options.reveal
+              Cmd.run("make dist")
+              
+              tar_filename = File.basename(Dir[File.join(directory, '*.tar.gz')].first)
+              Cmd.move(File.join(directory, tar_filename.to_s), Path.packaging) if tar_filename or Options.reveal
+              
+              if Cmd.cd(Path.packaging) or Options.dry or Options.reveal
+                Cmd.run("tar -xzf #{tar_filename}")
+                tar_dirname = File.basename(tar_filename.to_s, '.tar.gz')
+                if Cmd.cd(File.join(Path.packaging, tar_dirname))
+                  Cmd.run("dpkg-buildpackage -rfakeroot")
+                  if library == 'minisip'
+                    if Cmd.cd(Path.packaging)
+                      package = File.basename(Dir[File.join(Path.packaging, "#{library}*.deb")].first)
+                      Cmd.run("sudo dpkg -i #{package}") if package or Options.reveal
+                    end
+                  else
+                    if Cmd.cd(Path.packaging)
+                      package = File.basename(Dir[File.join(Path.packaging, "#{library}0*.deb")].first)
+                      Cmd.run("sudo dpkg -i #{package}") if package or Options.reveal
+                      dev_package = File.basename(Dir[File.join(Path.packaging, "#{library}-dev*.deb")].first)
+                      Cmd.run("sudo dpkg -i #{dev_package}") if dev_package or Options.reveal
+                    end
+                  end
+                else
+                  UI.error "Could not enter #{File.join(Path.packaging, tar_dirname)}."
+                end
+                
+              else
+                UI.error "Could not enter #{Path.packaging}."
+              end
+                
+            else
+              UI.error "Could not enter #{directory}."
+            end
+          end
+          Cmd.cd Path.root
+          Cmd.run 'minisip_gtkgui'
+        end
+        
+      end
+    end
+  end
+end

data/lib/csd/application/minisip/unix/linux.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+require File.join(File.dirname(__FILE__), '..', 'unix')
+
+module CSD
+  module Application
+    module Minisip
+      class Linux < Unix
+        
+        def compile!
+          before_compile
+          Cmd.mkdir Path.work
+          make_hdviper if checkout_hdviper or Options.dry
+          checkout_minisip
+          checkout_plugins
+          make_minisip
+          after_compile
+        end
+        
+      end
+    end
+  end
+end

data/lib/csd/application/minisip/unix/linux/debian.rb

@@ -0,0 +1,53 @@
+# encoding: utf-8
+require File.join(File.dirname(__FILE__), '..', 'linux')
+
+module CSD
+  module Application
+    module Minisip
+      class Debian < Linux
+        
+        # A list of apt-get packages that are required by this application. 
+        #
+        DEBIAN_DEPENDENCIES = %w{ libssl-dev libgtkmm-2.4-dev libglademm-2.4-dev libsdl-dev git-core subversion automake libtool libltdl3-dev build-essential libavcodec-dev libswscale-dev libasound2-dev libsdl-ttf2.0-dev nasm yasm ffmpeg }
+        
+        def before_compile
+          #fix_aclocal_dirlist
+          install_aptitude_dependencies if Options.apt_get
+        end
+        
+        def after_compile
+          ldconfig_and_gtkgui
+        end
+        
+        def install_aptitude_dependencies
+          Cmd.run("sudo apt-get update")
+          DEBIAN_DEPENDENCIES.each do |apt|
+            Cmd.run("sudo apt-get install #{apt} --yes --fix-missing")
+          end
+        end
+        
+        def fix_aclocal_dirlist
+          return
+          content = '/usr/local/share/aclocal'
+          target = Pathname.new('/usr/share/aclocal/dirlist')
+          unless target.exist? and File.new(target).read == content # TODO: replace with File.read
+            begin
+              File.new(target, 'w').write(content).close              
+            rescue Errno::EACCES => e
+              say "Please run the following commands with the right permissions.".red.bold
+              say "  sudo rm /usr/share/aclocal/dirlist".green.bold
+              say "  sudo touch /usr/share/aclocal/dirlist".green.bold
+              say "  sudo echo /usr/local/share/aclocal >> /usr/share/aclocal/dirlist".green.bold
+              exit
+            end
+          end
+        end
+        
+        def ldconfig_and_gtkgui
+          Cmd.run(Path.build_gtkgui)
+        end
+        
+      end
+    end
+  end
+end

data/lib/csd/application/minisip/unix/linux/debian/ubuntu10.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+require File.join(File.dirname(__FILE__), '..', 'debian')
+
+module CSD
+  module Application
+    module Minisip
+      class Ubuntu10 < Debian
+      
+        def before_compile
+          super
+          fix_ubuntu_10_04
+          exit if Options.only_fix_giomm
+        end
+        
+        def fix_ubuntu_10_04
+          # TODO put backup file in Path.xxx
+          if File.exist?("#{Path.giomm_header}.ai-backup")
+            UI.warn "giomm-2.4 seems to be fixed already, I won't touch it. Delete `#{"#{Path.giomm_header}.ai-backup"}´ to enforce it."
+          else
+            Path.new_giomm_header = File.join(Dir.mktmpdir, 'giomm.h')
+            Cmd.copy(Path.giomm_header, Path.new_giomm_header)
+            Cmd.replace(Path.new_giomm_header, '#include <giomm/socket.h>', "/* ----- AI COMMENTING OUT START ----- \n#include <giomm/socket.h>")
+            Cmd.replace(Path.new_giomm_header, '#include <giomm/tcpconnection.h>', "#include <giomm/tcpconnection.h>\n ----- AI COMMENTING OUT END ----- */")
+            Cmd.replace(Path.new_giomm_header, '# include <giomm/unixconnection.h>', "// #include <giomm/unixconnection.h>  // COMMENTED OUT BY AI")
+            Cmd.run("sudo cp #{Path.giomm_header} #{Path.giomm_header}.ai-backup")
+            Cmd.run("sudo cp #{Path.new_giomm_header} #{Path.giomm_header}")
+          end
+        end
+      
+      
+      end
+    end
+  end
+end

data/lib/csd/applications.rb

@@ -13,10 +13,13 @@ module CSD
     #
     def self.find(app_name)
       begin
+        UI.debug "Applications.find: Attempting to require `#{File.join(Path.applications, app_name.to_s)}´."
         require File.join(Path.applications, app_name.to_s)
+        UI.debug "Applications.find: Attempting to load `#{app_name}´."
         ActiveSupport::Inflector.constantize "CSD::Application::#{app_name.camelize}"
-      rescue LoadError
-        UI.debug "The Application `#{app_name}´ could not be loaded properly."
+      rescue LoadError => e
+        UI.debug "Applications.find: The Application `#{app_name}´ could not be loaded properly."
+        UI.debug "                   Reason: #{e}"
         nil
       end
     end
@@ -25,7 +28,9 @@ module CSD
       result = []
       Dir.directories(Path.applications) do |dir|
         next if dir == 'default'
+        UI.debug "Applications.all: Identified application directory `#{dir}´."
         if app = find(dir)
+          UI.debug "Applications.all: The application `#{dir}´ is valid."
           block_given? ? yield(app) : result << app
         end
       end

data/lib/csd/commands.rb

@@ -100,9 +100,17 @@ module CSD
     # Copies one or several files to the destination
     #
     def copy(src, dest)
+      UI.info "Copying `#{src}´ to `#{dest}´".cyan
       FileUtils.cp(src, dest) unless (Options.dry or Options.reveal)
     end
     
+    # Moves one or several files to the destination
+    #
+    def move(src, dest)
+      UI.info "Moving `#{src}´ to `#{dest}´".cyan
+      FileUtils.mv(src, dest) unless (Options.dry or Options.reveal)
+    end
+    
     # This returns the current pwd. However, it will return a fake result if we are in reveal-commands-mode.
     #
     def pwd
@@ -163,12 +171,12 @@ module CSD
           ret << line
         end
       end
-      die_if_last_command_had_errors if params[:exit_on_failure]
+      die_if_last_command_had_errors if params[:die_on_failure]
       ret
     end
     
     def die_if_last_command_had_errors
-      UI.die "The last command was unsuccessful." unless $?.try(:success?)
+      UI.die "The last command was unsuccessful." unless $?.success?
     end
   
   end
@@ -182,7 +190,7 @@ module CSD
   # Wrapping the CommandsInstance class
   #
   class Cmd
-    COMMANDS = %w{ mkdir cd run replace copy }
+    COMMANDS = %w{ mkdir cd run replace copy move } unless defined?(COMMANDS)
     
     def self.instance
       @@instance ||= CommandsInstance.new

data/lib/csd/ui/ui.rb

@@ -6,7 +6,7 @@ module CSD
     
     # These are all possible user interactions provided by the UI
     #
-    INTERACTIONS = %w{ separator debug info warn error ask ask_yes_no }
+    INTERACTIONS = %w{ separator debug info warn error ask ask_yes_no die }
     
     def separator
       say
@@ -21,18 +21,16 @@ module CSD
     end
     
     def warn(message)
-      say message.red if !Options.silent
+      say 'NOTE: '.red + message.red if !Options.silent
     end
 
     def error(message)
-      if !Options.silent
-        say 'ERROR: '.red.blink + message.red
-      end
+      say('ERROR: '.red.blink + message.red) if !Options.silent
     end
     
     def die(message)
-      say message.red.blink if !Options.silent
-      exit
+      say('ERROR: '.red.blink + message.red) if !Options.silent
+      abort
     end
     
     protected

data/lib/csd/version.rb

@@ -5,6 +5,6 @@ module CSD
   
   # This global variable holds the version number of this gem by reading the VERSION file.
   #
-  Version = VERSION = File.read(File.join(Path.gem, 'VERSION'))
+  Version = VERSION = File.read(File.join(Path.gem, 'VERSION')) unless defined?(Version)
   
 end

data/test/helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'test/unit'
-require 'shoulda'
 require 'tmpdir'
+require 'shoulda'
 require 'redgreen'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: csd
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Technology Transfer Alliance Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-13 00:00:00 +02:00
+date: 2010-07-14 00:00:00 +02:00
 default_executable: ai
 dependencies: []
 
@@ -247,7 +247,11 @@ files:
 - lib/csd/application/minisip/error.rb
 - lib/csd/application/minisip/options/common.rb
 - lib/csd/application/minisip/options/compile.rb
-- lib/csd/application/minisip/unix/base.rb
+- lib/csd/application/minisip/options/package.rb
+- lib/csd/application/minisip/unix.rb
+- lib/csd/application/minisip/unix/linux.rb
+- lib/csd/application/minisip/unix/linux/debian.rb
+- lib/csd/application/minisip/unix/linux/debian/ubuntu10.rb
 - lib/csd/application/opensips/about.yml
 - lib/csd/applications.rb
 - lib/csd/commands.rb
@@ -283,7 +287,7 @@ homepage: http://github.com/csd/csd
 licenses: []
 
 post_install_message: "\n\
-  ================================================================================================\n\n  Thank you for installing the Communication Systems and Design Automated Installer!\n\n  You can run it by just typing `ai\xC2\xB4 in your command line.\n\n  Note: On Debian and Ubuntu the executable `ai\xC2\xB4 is not in your PATH by default.\n        You can fix this by adding it to your .bashrc file with this command:\n      \n  echo \"export PATH=\\$PATH:$(gem env | grep \"E D\" | sed \"s/[^\\w]* //\")\" >> ~/.bashrc;. ~/.bashrc\n       \n\
+  ================================================================================================\n\n  Thank you for installing the Communication Systems and Design Automated Installer!\n\n  You can run it by typing `ai\xC2\xB4 in your command line.\n\n  Note: On Debian and Ubuntu the executable `ai\xC2\xB4 is not in your PATH by default.\n        You can fix this by adding it to your .bashrc file with this command:\n      \n  echo \"export PATH=\\$PATH:$(gem env | grep \"E D\" | sed \"s/[^\\w]* //\")\" >> ~/.bashrc;. ~/.bashrc\n       \n\
   ================================================================================================\n    "
 rdoc_options: 
 - --charset=UTF-8

data/lib/csd/application/minisip/unix/base.rb

@@ -1,54 +0,0 @@
-# encoding: utf-8
-require File.join(File.dirname(__FILE__), '..', 'base')
-
-module CSD
-  module Application
-    module Minisip
-      module Unix
-        class Base < CSD::Application::Minisip::Base
-          
-          # A list of apt-get packages that are required by this application. 
-          #
-          DEBIAN_DEPENDENCIES = %w{ libssl-dev libglademm-2.4-dev libsdl-dev git-core subversion automake libtool libltdl3-dev build-essential libavcodec-dev libswscale-dev libasound2-dev libsdl-ttf2.0-dev nasm yasm ffmpeg }
-          
-          def before_compile
-            #fix_aclocal_dirlist
-            install_aptitude_dependencies if Options.apt_get
-          end
-        
-          def after_compile
-            ldconfig_and_gtkgui
-          end
-
-          def install_aptitude_dependencies
-            DEBIAN_DEPENDENCIES.each do |apt|
-              Cmd.run("sudo apt-get install #{apt} --yes --fix-missing", :die_on_failure => true)
-            end
-          end
-        
-          def fix_aclocal_dirlist
-            return
-            content = '/usr/local/share/aclocal'
-            target = Pathname.new('/usr/share/aclocal/dirlist')
-            unless target.exist? and File.new(target).read == content # TODO: replace with File.read
-              begin
-                File.new(target, 'w').write(content).close              
-              rescue Errno::EACCES => e
-                say "Please run the following commands with the right permissions.".red.bold
-                say "  sudo rm /usr/share/aclocal/dirlist".green.bold
-                say "  sudo touch /usr/share/aclocal/dirlist".green.bold
-                say "  sudo echo /usr/local/share/aclocal >> /usr/share/aclocal/dirlist".green.bold
-                exit
-              end
-            end
-          end
-
-          def ldconfig_and_gtkgui
-            Cmd.run(Path.build_gtkgui)
-          end
-        
-        end
-      end
-    end
-  end
-end