csd 0.1.7 → 0.1.8

data/Rakefile

@@ -11,20 +11,21 @@ begin
     gemspec.email = "mtoday11@gmail.com"
     gemspec.homepage = "http://github.com/csd/csd"
     gemspec.authors = ["Technology Transfer Alliance Team"]
-    gemspec.executables = ["ai"]
+    gemspec.executables = ['tta', 'ai']
     gemspec.post_install_message = %q{
-================================================================================================
+============================================================
 
-  Thank you for installing the Communication Systems and Design Automated Installer!
+ Thank you for installing the TTA Automated Installer!
 
-  You can run it by typing `ai´ in your command line.
+ You can run it by typing `tta´ in your command line.
 
-  Note: On Debian and Ubuntu the executable `ai´ is maybe not in your PATH by default.
-        If that is the case, you can fix it by running this command:
+ NOTE: On DEBIAN and UBUNTU the executable `tta´ is *maybe*
+       not in your PATH by default. If that is the case,
+       you can fix it by running this command:
       
-  echo "export PATH=\$PATH:$(gem env | grep "E D" | sed "s/[^\w]* //")" >> ~/.bashrc;. ~/.bashrc
+ echo "export PATH=\$PATH:$(gem env | grep "E D" | sed "s/[^\w]* //")" >> ~/.bashrc;. ~/.bashrc
        
-================================================================================================
+============================================================
     }
   end
 rescue LoadError
@@ -52,7 +53,7 @@ begin
   end
 rescue LoadError
   task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install rcov"
   end
 end
 

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/bin/ai

@@ -1,25 +1,23 @@
 #!/usr/bin/env ruby
 
-# 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, 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
+
+# This executable is DEPRECATED
+# Please use 'tta' instead.
+
+puts
+puts "`ai´ is DEPRECATED. Please use `tta´ instead."
+
 require 'rubygems'
 require 'csd'
 
 begin
-  # Running the CSD library and telling it who started it
   CSD.bootstrap :executable => 'ai'
 rescue CSD::Error::CSDError => e
-  # 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
-  # Lastly, close the AI gracefully on abnormal termination
+  CSD.ui.separator
   CSD.ui.info "Quitting the AI...".red
-  abort
+  exit
 end

data/bin/tta

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+# 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/tta
+
+# 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 => 'tta'
+rescue CSD::Error::CSDError => e
+  # Here we catch CSD internal errors and exit with the propriate status code
+  # We output the error message only for status codes 50 and higher, because they are rather severe
+  CSD.ui.error e.message unless e.status_code <= 49
+  exit e.status_code
+rescue Interrupt
+  # Lastly, close the AI gracefully on abnormal termination
+  CSD.ui.separator
+  CSD.ui.info "Quitting the AI...".red
+  exit
+end

data/csd.gemspec

@@ -5,15 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{csd}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   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-22}
-  s.default_executable = %q{ai}
+  s.date = %q{2010-07-28}
   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}
-  s.executables = ["ai"]
+  s.executables = ["tta", "ai"]
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
@@ -25,6 +24,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "bin/ai",
+     "bin/tta",
      "csd.gemspec",
      "lib/csd.rb",
      "lib/csd/application.rb",
@@ -64,6 +64,7 @@ Gem::Specification.new do |s|
      "lib/csd/vendor/active_support/inflector.rb",
      "lib/csd/vendor/term/GPL2-LICENSE",
      "lib/csd/vendor/term/ansicolor.rb",
+     "lib/csd/vendor/zentest/zentest_assertions.rb",
      "lib/csd/version.rb",
      "test/application/test_minisip.rb",
      "test/functional/test_applications.rb",
@@ -76,18 +77,19 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/csd/csd}
   s.post_install_message = %q{
-================================================================================================
+============================================================
 
-  Thank you for installing the Communication Systems and Design Automated Installer!
+ Thank you for installing the TTA Automated Installer!
 
-  You can run it by typing `ai´ in your command line.
+ You can run it by typing `tta´ in your command line.
 
-  Note: On Debian and Ubuntu the executable `ai´ is maybe not in your PATH by default.
-        If that is the case, you can fix it by running this command:
+ NOTE: On DEBIAN and UBUNTU the executable `tta´ is *maybe*
+       not in your PATH by default. If that is the case,
+       you can fix it by running this command:
       
-  echo "export PATH=\$PATH:$(gem env | grep "E D" | sed "s/[^\w]* //")" >> ~/.bashrc;. ~/.bashrc
+ echo "export PATH=\$PATH:$(gem env | grep "E D" | sed "s/[^\w]* //")" >> ~/.bashrc;. ~/.bashrc
        
-================================================================================================
+============================================================
     }
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]

data/lib/csd.rb

@@ -44,8 +44,8 @@ module CSD
         UI.info opts.help
       end
       UI.separator
-      UI.info '  For more information type:   '.green.bold + "#{executable} [APPLICATION NAME]".cyan.bold
-      UI.info '                For example:   '.green.bold + "#{executable} minisip".cyan.bold
+      UI.info '  For more information type:   '.green.bold + "#{executable} [APPLICATION NAME]".cyan.bold + "     Example: #{executable} minisip".dark
+      #UI.info '                For example:   '.green.bold + "#{executable} minisip".cyan.bold
       UI.separator
       UI.warn "You did not specify a valid application name."
       raise Error::Argument::NoApplication
@@ -66,9 +66,11 @@ module CSD
         UI.info opts.help
       end
       UI.separator
-      UI.info '  To execute the task:   '.green.bold + "#{executable} [TASK] #{Applications.current.name}".cyan.bold
-      UI.info '     For more details:   '.green.bold + "#{executable} help [TASK] #{Applications.current.name}".cyan.bold
-      UI.info '              Example:   '.green.bold + "#{executable} help install #{Applications.current.name}".cyan.bold
+      UI.info '  To execute a task:   '.green.bold + "#{executable} [TASK] #{Applications.current.name}".cyan.bold + "          Example: #{executable} compile minisip".dark
+      #UI.info '  To execute a task:   '.green.bold + "#{executable} [TASK] #{Applications.current.name}".cyan.bold
+      UI.info '   For more details:   '.green.bold + "#{executable} help [TASK] #{Applications.current.name}".cyan.bold + "     Example: #{executable} help compile minisip".dark
+      #UI.info '   For more details:   '.green.bold + "#{executable} help [TASK] #{Applications.current.name}".cyan.bold
+      #UI.info '            Example:   '.green.bold + "#{executable} help install #{Applications.current.name}".cyan.bold
       UI.separator
       UI.warn "You did not specify a valid task name."
       raise Error::Argument::NoAction

data/lib/csd/application/default.rb

@@ -1,5 +1,6 @@
 # -*- encoding: UTF-8 -*-
 require 'csd/application/default/base'
+require 'yaml'
 
 module CSD
   # This namespace holds all individual application Modules

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

@@ -24,32 +24,32 @@ module CSD
           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)
+          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)
           UI.separator
           if Options.help
             UI.info Options.helptext
-            abort
+            exit
           else
-            raise(Interrupt) unless (Options.yes or UI.ask_yes_no("Continue?".red.bold, true))
+            raise Interrupt unless (Options.yes or Options.reveal or UI.ask_yes_no("Continue?".red.bold, true))
           end
         end
         
-        # CROSS-PLATFORM TASKS
+        # OTHER CROSS-PLATFORM TASKS
         
+        # Determines which libraries of MiniSIP should be processed, because the --only parameter might be set.
+        #
         def libraries
           Options.only ? LIBRARIES.map { |lib| lib if Options.only.to_a.include?(lib) }.compact : LIBRARIES
         end
+
+        # CHECKOUTS
         
         def checkout_minisip
           Cmd.git_clone('MiniSIP repository', 'http://github.com/csd/minisip.git', Path.repository)
         end
         
-        def modify_minisip
-          Cmd.replace(Path.repository_open_gl_display, '/home/erik', Path.build)
-        end
-
         def checkout_plugins
           Cmd.git_clone('additional MiniSIP plugins', 'http://github.com/csd/minisip-plugins.git', Path.plugins)
         end
@@ -58,14 +58,58 @@ module CSD
           Cmd.git_clone('HDVIPER', 'http://github.com/csd/libraries.git', Path.hdviper)
         end
         
-        # CROSS-PLATFORM INFORMATION
+        def checkout_ffmpeg
+          Cmd.git_clone('ffmpeg repository', 'http://github.com/csd/ffmpeg.git', Path.ffmpeg_repository)
+        end
+        
+        def checkout_libswscale
+          Cmd.git_clone('ffmpeg libswscale sub-repository', 'http://github.com/csd/libswscale.git', Path.ffmpeg_libswscale)
+        end
         
-        def cpp_flags
-          "CPPFLAGS=\"-I#{Path.hdviper_x264} -I#{Path.hdviper_x264_test_x264api} -I#{Path.repository_grabber} -I#{Path.repository_decklinksdk}\""
+        def checkout_x264
+          Cmd.git_clone('x264 repository', 'http://github.com/csd/x264.git', Path.x264_repository)
         end
         
-        def ld_flags
-          "LDFLAGS=\"#{Path.hdviper_libx264api} #{Path.hdviper_libtidx264} -lpthread -lrt\""
+        # MODIFYING FILES
+        
+        def modify_minisip
+          Cmd.replace(Path.repository_open_gl_display, '/home/erik', Path.build)
+          if Options.ffmpeg_first
+            # See http://www.howgeek.com/2010/03/01/ffmpeg-php-error-‘pix_fmt_rgba32’-undeclared-first-use-in-this-function/
+            # and http://ffmpeg.org/doxygen/0.5/pixfmt_8h.html#33d341c4f443d24492a95fb7641d0986
+            Cmd.replace(Path.repository_avcoder_cxx,   'PIX_FMT_RGBA32', 'PIX_FMT_RGB32')
+            Cmd.replace(Path.repository_avdecoder_cxx, 'PIX_FMT_RGBA32', 'PIX_FMT_RGB32')
+          end
+        end
+        
+        def modify_libavutil
+          if Path.ffmpeg_libavutil_common_backup.file?
+            UI.warn "The libavutil common.h file seems to be fixed already, I won't touch it now. Delete #{Path.ffmpeg_libavutil_common_backup.enquote} to enforce it."
+          else
+            Cmd.copy Path.ffmpeg_libavutil_common, Path.ffmpeg_libavutil_common_backup
+            Cmd.replace Path.ffmpeg_libavutil_common, '    if ((a+0x80000000u) & ~UINT64_C(0xFFFFFFFF)) return (a>>63) ^ 0x7FFFFFFF;', "    // MODIFIED BY THE AUTOMATED INSTALLER\n    // if ((a+0x80000000u) & ~UINT64_C(0xFFFFFFFF)) return (a>>63) ^ 0x7FFFFFFF;\n    if ((a+0x80000000u) & ~(0xFFFFFFFFULL)) return (a>>63) ^ 0x7FFFFFFF;"
+          end
+        end
+        
+        # FLAGS
+        
+        # See http://code.google.com/p/ffmpegsource/issues/detail?id=11
+        # But for some reason it did not fix tue issue for us :|
+        #
+        def libminisip_c_flags
+          %{CFLAGS="-D__STDC_CONSTANT_MACROS"}
+        end
+
+        def libminisip_cpp_flags
+          if Options.ffmpeg_first?
+            %{CPPFLAGS="-I#{Path.hdviper_x264} -I#{Path.hdviper_x264_test_x264api} -I#{Path.ffmpeg_libavutil} -I#{Path.ffmpeg_libavcodec} -I#{Path.ffmpeg_libswscale} -I#{Path.repository_grabber} -I#{Path.repository_decklinksdk}"}
+          else
+            %{CPPFLAGS="-I#{Path.hdviper_x264} -I#{Path.hdviper_x264_test_x264api} -I#{Path.repository_grabber} -I#{Path.repository_decklinksdk}"}
+          end
+        end
+        
+        def libminisip_ld_flags
+          %{LDFLAGS="#{Path.hdviper_libx264api} #{Path.hdviper_libtidx264} -lpthread -lrt"}
         end
         
         # DEFINING PATHS ETC...
@@ -83,7 +127,7 @@ module CSD
         end
         
         def define_paths
-          Path.work                               = Pathname.new(File.join(Path.root, 'minisip'))
+          Path.work                               = Pathname.new(File.join(Path.root, 'minisip.ai'))
           Path.giomm_header                       = Pathname.new(File.join('/', 'usr', 'include', 'giomm-2.4', 'giomm.h'))
           Path.giomm_header_backup                = Pathname.new(File.join('/', 'usr', 'include', 'giomm-2.4', 'giomm.h.ai-backup'))
           Path.repository                         = Pathname.new(File.join(Path.work, 'repository'))
@@ -91,8 +135,16 @@ module CSD
           Path.repository_libminisip_rules_backup = Pathname.new(File.join(Path.repository, 'libminisip', 'debian', 'rules.ai-backup'))
           Path.repository_grabber                 = Pathname.new(File.join(Path.repository, 'libminisip', 'source', 'subsystem_media', 'video', 'grabber'))
           Path.repository_open_gl_display         = Pathname.new(File.join(Path.repository, 'libminisip', 'source', 'subsystem_media', 'video', 'display', 'OpenGLDisplay.cxx'))
+          Path.repository_avcoder_cxx             = Pathname.new(File.join(Path.repository, 'libminisip', 'source', 'subsystem_media', 'video', 'codec', 'AVCoder.cxx'))
+          Path.repository_avdecoder_cxx           = Pathname.new(File.join(Path.repository, 'libminisip', 'source', 'subsystem_media', 'video', 'codec', 'AVDecoder.cxx'))
           Path.repository_decklinksdk             = Pathname.new(File.join(Path.repository_grabber, 'decklinksdk'))
-          Path.plugins                            = Pathname.new(File.join(Path.work, 'plugins'))
+          Path.ffmpeg_repository                  = Pathname.new(File.join(Path.work, 'ffmpeg'))
+          Path.ffmpeg_libavutil                   = Pathname.new(File.join(Path.ffmpeg_repository, 'libavutil'))
+          Path.ffmpeg_libavutil_common            = Pathname.new(File.join(Path.ffmpeg_libavutil, 'common.h'))
+          Path.ffmpeg_libavutil_common_backup     = Pathname.new(File.join(Path.ffmpeg_libavutil, 'common.h.ai-backup'))
+          Path.ffmpeg_libavcodec                  = Pathname.new(File.join(Path.ffmpeg_repository, 'libavcodec'))
+          Path.ffmpeg_libswscale                  = Pathname.new(File.join(Path.ffmpeg_repository, 'libswscale'))
+          Path.x264_repository                    = Pathname.new(File.join(Path.work, 'x264'))
           Path.packaging                          = Pathname.new(File.join(Path.work, 'packaging'))
           Path.hdviper                            = Pathname.new(File.join(Path.work, 'hdviper'))
           Path.hdviper_x264                       = Pathname.new(File.join(Path.hdviper, 'x264'))
@@ -107,6 +159,8 @@ module CSD
           Path.build_lib_pkg_config               = Pathname.new(File.join(Path.build_lib, 'pkgconfig'))
           Path.build_share                        = Pathname.new(File.join(Path.build, 'share'))
           Path.build_share_aclocal                = Pathname.new(File.join(Path.build_share, 'aclocal'))
+          Path.plugins                            = Pathname.new(File.join(Path.work, 'plugins'))
+          Path.plugins_destination                = Pathname.new(File.join(Path.build_lib, 'libminisip', 'plugins'))
         end
         
       end

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

@@ -25,11 +25,21 @@ end
 #  end
 #end
 
+#self.debug_minisip = false
+#opts.on("--debug-minisip","Compile MiniSIP using the --enable-debug flag.") do |value|
+#  self.debug_minisip = value
+#end
+
 self.only_fix_giomm = false
 opts.on("--only-fix-giomm","Forces the AI to do nothing except trying to bugfix the Ubuntu 10.04 giomm") do |value|
   self.only_fix_giomm = value
 end
 
+self.ffmpeg_first = false
+opts.on("--ffmpeg-first","Compile FFmpeg before compiling MiniSIP. Default is first MiniSIP.") do |value|
+  self.ffmpeg_first = value
+end
+
 self.apt_get = true
 opts.on("--no-apt-get","Don't run any apt-get commands") do |value|
   self.apt_get = value

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

@@ -6,14 +6,16 @@ module CSD
     module Minisip
       class Unix < Base
         
-        # OPERATION INTRODUCTION
-        
+        # This method presents a general overview about the task that is to be performed.
+        #
         def introduction
           UI.separator
-          UI.info " Libraries to process:   ".green + libraries.join(', ').yellow
+          UI.info " MiniSIP libraries to process:   ".green + libraries.join(', ').yellow
           super
         end
         
+        # This method is called by the AI when the user requests the task "compile" for MiniSIP.
+        #
         def compile
           UI.separator
           UI.info "This operation will download and compile MiniSIP.".green.bold
@@ -22,6 +24,8 @@ module CSD
           run_minisip_gtk_gui
         end
         
+        # This method is called by the AI when the user requests the task "package" for MiniSIP.
+        #
         def package
           UI.separator
           UI.info("This operation will package ".green.bold + "an already compiled".red.bold + " MiniSIP.".green.bold)
@@ -29,31 +33,78 @@ module CSD
           package!
         end
         
-        # OPERATIONS
-        
+        # This is the internal compile procedure for MiniSIP
+        #
         def compile!
           Cmd.mkdir Path.work
-          checkout_hdviper
-          make_hdviper
-          checkout_minisip
-          modify_minisip
+          make_hdviper   unless checkout_hdviper.already_exists?
+          modify_minisip unless checkout_minisip.already_exists?
           checkout_plugins
-          make_minisip
+          if Options.ffmpeg_first
+            make_x264 unless checkout_x264.already_exists?
+            unless checkout_ffmpeg.already_exists?
+              modify_libavutil
+              checkout_libswscale
+              make_ffmpeg
+            end
+            make_minisip
+          else
+            make_minisip
+            make_x264 unless checkout_x264.already_exists?
+            unless checkout_ffmpeg.already_exists?
+              checkout_libswscale
+              make_ffmpeg
+            end
+          end
+          copy_plugins
+        end
+        
+        # This method compiles FFmpeg, given that FFmpeg was downloaded before.
+        #
+        def make_ffmpeg
+          Cmd.cd Path.ffmpeg_repository, :internal => true
+          Cmd.run('./configure --enable-gpl --enable-libx264 --enable-x11grab')
+          Cmd.run('make')
+          Cmd.run('sudo checkinstall --pkgname=ffmpeg --pkgversion "99:-`git log -1 --pretty=format:%h`" --backup=no --default')
         end
         
+        # This method compiles x264, given that x264 was downloaded before.
+        #
+        def make_x264
+          Cmd.cd Path.x264_repository, :internal => true
+          Cmd.run('./configure')
+          Cmd.run('make')
+          Cmd.run('sudo checkinstall --pkgname=x264 --pkgversion "99:-`git log -1 --pretty=format:%h`" --backup=no --default')
+        end
+        
+        # This method compiles HDVIPER, given that HDVIPER was downloaded before.
+        #
         def make_hdviper
-          Cmd.cd Path.hdviper_x264
+          Cmd.cd Path.hdviper_x264, :internal => true
           Cmd.run('./configure')
           Cmd.run('make')
-          Cmd.cd Path.hdviper_x264_test_x264api
+          Cmd.cd Path.hdviper_x264_test_x264api, :internal => true
           Cmd.run('make')
         end
         
+        # Creates all build directories such as +lib+, +share+, +bin+, etc.
+        #
         def create_build_dir
           UI.info "Creating target build directories".green.bold
           [Path.build, Path.build_include, Path.build_lib, Path.build_share, Path.build_share_aclocal].each { |target| Cmd.mkdir target }
         end
         
+        # Copies the plugins from the repository to the final destination.
+        #
+        def copy_plugins
+          UI.info "Creating plugin target directory".green.bold
+          # result = Path.plugins_destination.parent.directory? ? Cmd.run("sudo mkdir #{Path.plugins_destination}") : CommandResult.new
+          # TODO: This will maybe need sudo rights in the future
+          Cmd.copy(Dir[File.join('Path.plugins', '*.{l,la,so}')], Path.plugins_destination) if Path.plugins_destination.directory?
+        end
+        
+        # Iteratively configures and compiles the internal MiniSIP libraries.
+        #
         def make_minisip
           create_build_dir
           libraries.each do |library|
@@ -68,8 +119,7 @@ module CSD
                 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}" #{ld_flags}}
-                    #%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"}
+                    %Q{--enable-debug --enable-video --disable-mil --enable-decklink --enable-opengl --disable-sdl #{libminisip_c_flags} #{libminisip_cpp_flags} #{libminisip_ld_flags}}
                   when 'minisip'
                     %Q{--enable-debug --enable-video --enable-textui --enable-opengl}
                   else
@@ -92,6 +142,8 @@ module CSD
           end
         end
         
+        # Iteratively makes debian packages of the internal MiniSIP libraries.
+        #
         def package!
           Cmd.mkdir(Path.packaging)
           libraries.each do |library|
@@ -135,8 +187,11 @@ module CSD
             end
           end
           Cmd.cd Path.root
+          Cmd.run('minisip_gtk_gui')
         end
         
+        # Executed the MiniSIP GTK GUI.
+        #
         def run_minisip_gtk_gui
           Cmd.run(Path.build_gtkgui, :die_on_failure => false)
         end

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

@@ -8,7 +8,7 @@ module CSD
         
         # A list of apt-get packages that are required to compile minisip including hdviper and ffmpeg
         #
-        DEBIAN_DEPENDENCIES = %w{ automake build-essential ffmpeg git-core libasound2-dev libavcodec-dev libglademm-2.4-dev libgtkmm-2.4-dev libltdl3-dev libsdl-dev libsdl-ttf2.0-dev libssl-dev libswscale-dev libtool libxv-dev nasm subversion yasm }
+        DEBIAN_DEPENDENCIES = %w{ automake build-essential checkinstall git-core libasound2-dev libavcodec-dev libglademm-2.4-dev libgtkmm-2.4-dev libltdl3-dev libsdl-dev libsdl-ttf2.0-dev libssl-dev libtool libswscale-dev libx11-dev libxv-dev nasm subversion yasm }
 
         def compile!
           install_aptitude_dependencies if Options.apt_get
@@ -26,19 +26,15 @@ module CSD
         
         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
-          # We could also do all in one command:
-          Cmd.run("sudo apt-get install #{DEBIAN_DEPENDENCIES.join(' ')} --yes --fix-missing")
+          Cmd.run("sudo apt-get install #{DEBIAN_DEPENDENCIES.sort.join(' ')} --yes --fix-missing")
         end
         
         def modify_libminisip_rules
-          if File.exist? Path.repository_libminisip_rules_backup
+          if Path.repository_libminisip_rules_backup.file?
             UI.warn "The libminisip rules seem to be fixed already, I won't touch them now. Delete #{Path.repository_libminisip_rules_backup.enquote} to enforce it."
           else
             Cmd.copy Path.repository_libminisip_rules, Path.repository_libminisip_rules_backup
-            Cmd.replace Path.repository_libminisip_rules, 'AUTOMATED_INSTALLER_PLACEHOLDER=""', [cpp_flags, ld_flags].join(' ')
+            Cmd.replace Path.repository_libminisip_rules, 'AUTOMATED_INSTALLER_PLACEHOLDER=""', [libminisip_cpp_flags, libminisip_ld_flags].join(' ')
           end
         end
         

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

@@ -13,7 +13,7 @@ module CSD
         end
         
         def fix_ubuntu_10_04
-          if File.exist? Path.giomm_header_backup
+          if Path.giomm_header_backup.file?
             UI.warn "giomm-2.4 seems to be fixed already, I won't touch it now. Delete #{Path.giomm_header_backup.enquote} to enforce it."
           else
             Path.new_giomm_header = File.join(Dir.mktmpdir, 'giomm.h')

data/lib/csd/commands.rb

@@ -1,6 +1,7 @@
 # -*- encoding: UTF-8 -*-
 require 'pathname'
 require 'ostruct'
+require 'open3'
 
 module CSD
   # This class contains wrapper methods for standard file system operations. They are meant to be
@@ -34,7 +35,7 @@ module CSD
     #  mkdir('i/can/create/directories/recursively')
     #
     def mkdir(target, params={})
-      default_params = { :die_on_failure => true, :show_output => false }
+      default_params = { :die_on_failure => true, :internal => false }
       params = default_params.merge(params)
       target = target.pathnamify
       result = CommandResult.new
@@ -43,7 +44,7 @@ module CSD
         result.already_existed = true
       else
         begin
-          UI.info "Creating directory: #{target}".cyan
+          UI.info "Creating directory: #{target}".cyan unless params[:internal]
           # Try to create the directory
           target.mkpath unless Options.reveal
         rescue Errno::EACCES => e
@@ -65,11 +66,11 @@ module CSD
     # [+success?+] +true+ if pwd is where it was requested to be after the operation, +nil+ if not.
     #
     def cd(target, params={})
-      default_params = { :die_on_failure => true, :show_output => false }
+      default_params = { :die_on_failure => true, :internal => false }
       params = default_params.merge(params)
       target = target.pathnamify
       result = CommandResult.new
-      UI.info "cd #{target}".yellow
+      UI.info "cd #{target}".yellow unless params[:internal]
       if Options.reveal
         # We need to fake changing the directory in reveal mode.
         @pwd = target.to_s
@@ -150,11 +151,18 @@ module CSD
         default_params = { :die_on_failure => true }
         params = default_params.merge(params)
         begin
-          UI.info "   `#{pattern}´  =>  `#{substitution}´".blue
+          UI.info "   Modifying".yellow
+          UI.info "   `#{pattern}´".blue
+          UI.info "   to".yellow
+          UI.info "   `#{substitution.to_s.gsub("\n", "\n    ")}´".white
           new_file_content = File.read(self.filepath).gsub(pattern.to_s, substitution.to_s)
           File.open(self.filepath, 'w+') { |file| file << new_file_content } unless Options.reveal
           result.success = true
         rescue Errno::ENOENT => e
+          if Options.reveal
+            result.success = true
+            return result
+          end
           result.success = false
           result.reason = "Could not perform replace operation! #{e.message}"
           params[:die_on_failure] ? UI.die(result.reason) : UI.error(result.reason)
@@ -165,48 +173,46 @@ module CSD
     
     # Runs a command on the system.
     #
-    # ==== Returns
-    #
-    # The command's output as a +String+ (with newline delimiters). Note that the exit code can be accessed via the global variable <tt>$?</tt>
-    #
     # ==== Options
     #
     # The following options can be passed as a hash.
     #
-    # [+:exit_on_failure+] If the exit code of the command was not 0, exit the CSD application (default: +true+).
-    # [+:silent+] Don't show the command's output prints by any means (default: +false+).
-    # [+:announce_pwd+] Before running the command, say in which path the command will be executed (default: +true+).
-    # [+:announce_cmd+] Before running the command, state the command to be executed. Used to overwrite the +silent+ parameter (default: +true+).
-    # [+:verbose+] Instead of printing just one `.´ per command output line, print the original command output lines (default: +false+).
+    # [+:die_on_failure+] If the exit code of the command was not 0, exit the CSD application (default: +true+).
+    # [+:announce_pwd+] Before running the command, announce in which path the command will be executed (default: +true+).
+    # [+:verbose+] Instead of printing just one `.´ per command output line, print the full command output lines (default: +false+).
+    # [+:internal+] If this parameter is +true+, there will be no output what-so-ever for running this command. (default: +false+).
+    #
+    # ==== Returns
+    #
+    # This method returns a CommandResult object with the following values:
+    #
+    # [+success?+] +true+ if the command was successful, +nil+ if not.
+    # [+output?+] The command's output as a +String+ (with newline delimiters). Note that the exit code can be accessed via the global variable <tt>$?</tt>
     #
     def run(cmd, params={})
-      default_params = { :die_on_failure => true, :silent => false, :announce_pwd => true, :announce_cmd => true, :verbose => false }
-      params[:verbose] = true if Options.verbose
+      default_params = { :die_on_failure => true, :announce_pwd => true, :verbose => Options.verbose, :internal => Options.testmode }
       params = default_params.merge(params)
       result = CommandResult.new
       cmd = cmd.to_s
-      UI.error "The current working directory (a.k.a. 'pwd') could not be identified. It was probably deleted." and return unless pwd
-      UI.info "Running command in #{pwd}".yellow unless (!params[:announce_pwd] or params[:silent])
-      UI.info cmd.cyan if (!params[:silent] or params[:announce_cmd])
+      UI.info "Running command in #{pwd}".yellow if params[:announce_pwd] and !params[:internal]
+      UI.info cmd.cyan unless params[:internal]
       if Options.reveal
         result.success = true
         return result
       end
       result.output = ''
-      #$stderr.reopen '/dev/null' if params[:silent] # This prevents even output of error messages from the executed commands
-      IO.popen(cmd) do |stdout|
-        stdout.each do |line|
-          if params[:verbose]
-            UI.info "       #{line}" unless params[:silent]
-          else
-            $stdout.putc '.' unless params[:silent]
-            $stdout.flush
+      STDOUT.sync = true # Because we redirect stderr into stdout to get the output and it needs to be flushing automatically
+      IO.popen("#{cmd} 2>&1") do |pipe| # IO redirection is performed using operators
+        pipe.sync = true
+        while line = pipe.gets
+          unless params[:internal] # No output needed for the unit-tests and AI-internal use
+            params[:verbose] ? UI.info("       #{line}") : UI.indicate_activity
           end
           result.output << line
         end
       end
-      #$stderr.reopen STDERR if params[:silent] # Setting the error output back to normal
-      UI.separator if (!params[:silent] and !params[:verbose]) # i.e. if dots are outputted, we should create a new line after them
+      UI.separator unless params[:verbose] or params[:internal] or Options.testmode # i.e. if dots are concatenated in the same line, we should create a new line after them
+      result.status = $?
       result.success = $?.success?
       if params[:die_on_failure] and !result.success
         UI.info result.output unless params[:verbose] # In verbose mode, we don't need to repeat the unsuccessful command's output
@@ -241,24 +247,22 @@ module CSD
     #
     # This command will not do anything if the destination already exists.
     #
-    def git_clone(name, repository, destination, params={})
-      default_params = { :die_on_failure => false, :announce_cmd => true, :announce_pwd => false, :silent => false }
-      params = default_params.merge(params)
+    def git_clone(name, repository, destination)
       result = CommandResult.new
       destination = destination.pathnamify
-      # At this point we break off if the destination already exists, but in reveal-mode we want to continue.
-      if (destination.directory? and !Options.reveal)
+      if destination.directory? and !Options.reveal
         UI.warn "Skipping #{name} download, because the directory already exists: #{destination.enquote}"
-      else
-        if destination.parent.writable? or Options.reveal
-          UI.info "Downloading #{name} to #{destination.enquote}".green.bold
-          result.success = Cmd.run("git clone #{repository} #{destination} #{('--quiet' if params[:silent])}", params).success?
-        else
-          UI.error "Could not download #{name} (no permission): #{destination.enquote}"
-          result.success = false
-        end
-        result
+        result.already_exists = true
+        return result
+      end
+      unless destination.parent.writable? or Options.reveal
+        UI.error "Could not download #{name} (no permission): #{destination.enquote}"
+        result.no_permission = true
+        return result
       end
+      UI.info "Downloading #{name} to #{destination.enquote}".green.bold
+      # We will simply return the CommandResult of the run-method.
+      Cmd.run("git clone #{repository} #{destination}", :announce_pwd => false, :verbose => true)
     end
   
   end

data/lib/csd/extensions/gem/platform.rb

@@ -19,13 +19,13 @@ module CSD
         # On linux systems, this method returns the current kernel version.
         #
         def kernel_version
-          Cmd.run('uname --kernel-version', :silent => true).output.to_s.chop if os == 'linux'
+          Cmd.run('uname --kernel-version', :internal => true).output.to_s.chop if os == 'linux'
         end
         
         # On linux systems, this method returns the current kernel release.
         #
         def kernel_release
-          Cmd.run('uname --kernel-release', :silent => true).output.to_s.chop if os == 'linux'
+          Cmd.run('uname --kernel-release', :internal => true).output.to_s.chop if os == 'linux'
         end
   
       end

data/lib/csd/options_parser.rb

@@ -44,7 +44,7 @@ module CSD
       self.action      = nil
       # Now we define the default options
       self.yes       = false
-      self.dry       = false
+      self.local     = false
       self.reveal    = false
       self.verbose   = false
       self.silent    = false
@@ -114,9 +114,9 @@ module CSD
         opts.on("-y", "--yes", "Answer all questions with `yes´ (batch mode)") do |value|
           self.yes = value
         end
-        opts.on("-p", "--dry","Don't actually execute any commands (preview mode)") do |value|
-          self.dry = value
-        end
+        #opts.on("-l", "--local","Assume that there is no uplink to the Internet") do |value|
+        #  self.online = !value
+        #end
         opts.on("-r", "--reveal","List all commands that normally would be executed in this operation") do |value|
           self.reveal = value
         end

data/lib/csd/user_interface/cli.rb

@@ -10,6 +10,11 @@ module CSD
       def separator
         say
       end
+      
+      def indicate_activity
+        $stdout.putc '.'
+        $stdout.flush
+      end
     
       def debug(message)
         say "DEBUG: #{message}".magenta if Options.debug and !Options.silent

data/lib/csd/vendor/active_support/inflector.rb

@@ -1,3 +1,5 @@
+# -*- encoding: UTF-8 -*-
+
 module CSD
   module Vendor
     # Author

data/lib/csd/vendor/term/ansicolor.rb

@@ -1,3 +1,5 @@
+# -*- encoding: UTF-8 -*-
+
 module CSD
   module Vendor
     # Author

data/lib/csd/vendor/zentest/zentest_assertions.rb

@@ -0,0 +1,62 @@
+# -*- encoding: UTF-8 -*-
+#
+# (The MIT License)
+# 
+# Copyright (c) 2001-2006 Ryan Davis, Eric Hodel, Zen Spider Software
+# 
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'test/unit/assertions'
+
+# Extra assertions for Test::Unit
+
+module Test::Unit::Assertions
+
+  # Captures $stdout and $stderr to StringIO objects and returns them.
+  # Restores $stdout and $stderr when done.
+  #
+  # Usage:
+  #   def test_puts
+  #     out, err = capture do
+  #       puts 'hi'
+  #       STDERR.puts 'bye!'
+  #     end
+  #     assert_equal "hi\n", out.string
+  #     assert_equal "bye!\n", err.string
+  #   end
+  #
+  def capture
+    require 'stringio'
+    orig_stdout = $stdout.dup
+    orig_stderr = $stderr.dup
+    captured_stdout = StringIO.new
+    captured_stderr = StringIO.new
+    $stdout = captured_stdout
+    $stderr = captured_stderr
+    yield
+    captured_stdout.rewind
+    captured_stderr.rewind
+    return captured_stdout.string, captured_stderr.string
+  ensure
+    $stdout = orig_stdout
+    $stderr = orig_stderr
+  end
+
+end

data/test/functional/test_commands.rb

@@ -163,6 +163,7 @@ That we in truth can nothing know!}
 
       teardown do
         assert FileUtils.rm_r(@tmp)
+        Dir.chdir '/' # Since we're removing the current directory, we should better not be in it
         @tmp = Pathname.new Dir.mktmpdir
       end
       
@@ -293,12 +294,30 @@ That we in truth can nothing know!}
     setup do
       Options.silent = true
       Options.reveal = false
+      Options.online = true # Some tests need an uplink to the Internet. For now, we will hardcode here so that they should be executed.
+      Options.testmode = true # This puts us in test-mode, basically to prevent STDOUT and STDERR to show unnecessary output.
     end
     
     should "return a successfull CommandResult if the command was OK" do
       assert_kind_of(CommandResult, result = Cmd.run('cd'))
+      assert_kind_of(Process::Status, result.status)
       assert result.success?
     end
+    
+    should "not produce any output in :internal mode and in non-verbose mode" do
+      Options.testmode = false
+      out, err = capture do
+        assert_kind_of(CommandResult, result = Cmd.run('ls', :internal => true))
+      end
+      assert_equal '', out
+    end
+    
+    should "should produce output in NON-:internal mode and in non-verbose mode" do
+      out, err = capture do
+        assert_kind_of(CommandResult, result = Cmd.run('which ls', :internal => false))
+      end
+      assert_equal('.', out)
+    end
 
     should "return a non-successfull CommandResult if the command was bad without die_on_failure" do
       assert_kind_of(CommandResult, result = Cmd.run('this-command-does-not-exist', :die_on_failure => false))
@@ -317,24 +336,19 @@ That we in truth can nothing know!}
       Options.reveal = false
       @tmp = Pathname.new Dir.mktmpdir
       @dir = Pathname.new(File.join(@tmp, 'dummy'))
-      Dir.chdir @tmp # Since we're removing the directory in the teardown, we should better not be in it
     end
 
     teardown do
       assert FileUtils.rm_r(@tmp)
+      Dir.chdir '/' # Since we're removing the current directory, we should better not be in it
     end
-    
-    should "not successfully download a non-existent git repository without die_on_failure" do
-      assert_kind_of(CommandResult, result = Cmd.git_clone('an invalid git repository', 'invalid_git_repository.git', @dir, :die_on_failure => false))
-      assert !result.success?
-    end
-    
+
     should "download a simple git repository" do
       assert_kind_of(CommandResult, result = Cmd.git_clone('a sample git repository', DUMMY_GIT, @dir))
       assert result.success?
       assert @dir.directory?
       assert File.exist?(File.join(@dir, 'dummy.txt'))
-    end
+    end if Options.online
     
     should "do nothing at the destination in reveal mode" do
       Options.reveal = true

data/test/helper.rb

@@ -7,6 +7,7 @@ require 'redgreen'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'csd'
+require 'csd/vendor/zentest/zentest_assertions'
 
 class Test::Unit::TestCase
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: csd
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Technology Transfer Alliance Team
@@ -15,13 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-22 00:00:00 +02:00
-default_executable: ai
+date: 2010-07-28 00:00:00 +02:00
+default_executable: 
 dependencies: []
 
 description: 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.
 email: mtoday11@gmail.com
 executables: 
+- tta
 - ai
 extensions: []
 
@@ -35,6 +36,7 @@ files:
 - Rakefile
 - VERSION
 - bin/ai
+- bin/tta
 - csd.gemspec
 - lib/csd.rb
 - lib/csd/application.rb
@@ -74,6 +76,7 @@ files:
 - lib/csd/vendor/active_support/inflector.rb
 - lib/csd/vendor/term/GPL2-LICENSE
 - lib/csd/vendor/term/ansicolor.rb
+- lib/csd/vendor/zentest/zentest_assertions.rb
 - lib/csd/version.rb
 - test/application/test_minisip.rb
 - test/functional/test_applications.rb
@@ -88,8 +91,8 @@ 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 typing `ai\xC2\xB4 in your command line.\n\n  Note: On Debian and Ubuntu the executable `ai\xC2\xB4 is maybe not in your PATH by default.\n        If that is the case, you can fix it by running this command:\n      \n  echo \"export PATH=\\$PATH:$(gem env | grep \"E D\" | sed \"s/[^\\w]* //\")\" >> ~/.bashrc;. ~/.bashrc\n       \n\
-  ================================================================================================\n    "
+  ============================================================\n\n Thank you for installing the TTA Automated Installer!\n\n You can run it by typing `tta\xC2\xB4 in your command line.\n\n NOTE: On DEBIAN and UBUNTU the executable `tta\xC2\xB4 is *maybe*\n       not in your PATH by default. If that is the case,\n       you can fix it by running 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
 require_paths: