csd 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/csd.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{csd}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   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-20}
+  s.date = %q{2010-07-22}
   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}

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

@@ -5,6 +5,16 @@ module CSD
   module Application
     module Minisip
       class Darwin < Unix
+
+        def compile!
+          Cmd.mkdir Path.work
+          #checkout_hdviper
+          #make_hdviper
+          checkout_minisip
+          modify_minisip
+          checkout_plugins
+          make_minisip
+        end
         
       end
     end

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

@@ -6,15 +6,19 @@ module CSD
     module Minisip
       class Debian < Linux
         
-        # A list of apt-get packages that are required by this application. 
+        # A list of apt-get packages that are required to compile minisip including hdviper and ffmpeg
         #
-        DEBIAN_DEPENDENCIES = %w{ libxv-dev 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 }
-        
+        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 }
+
         def compile!
           install_aptitude_dependencies if Options.apt_get
+          after_aptitude_dependencies
           super
         end
         
+        def after_aptitude_dependencies
+        end
+        
         def package!
           modify_libminisip_rules
           super
@@ -22,9 +26,11 @@ 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
+          #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")
         end
         
         def modify_libminisip_rules

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

@@ -6,7 +6,7 @@ module CSD
     module Minisip
       class Ubuntu10 < Debian
         
-        def compile!
+        def after_aptitude_dependencies
           fix_ubuntu_10_04
           exit if Options.only_fix_giomm
           super

data/lib/csd/commands.rb

@@ -176,23 +176,24 @@ module CSD
     # [+: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+).
     #
     def run(cmd, params={})
-      default_params = { :die_on_failure => true, :silent => false, :announce_pwd => true, :verbose => false }
+      default_params = { :die_on_failure => true, :silent => false, :announce_pwd => true, :announce_cmd => true, :verbose => false }
       params[:verbose] = true if Options.verbose
       params = default_params.merge(params)
       result = CommandResult.new
       cmd = cmd.to_s
-      UI.error "The current working directory (aka 'pwd') could not be identified. It was probably deleted." and return unless pwd
+      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 unless params[:silent]
+      UI.info cmd.cyan if (!params[:silent] or params[:announce_cmd])
       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
+      #$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]
@@ -204,6 +205,7 @@ module CSD
           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
       result.success = $?.success?
       if params[:die_on_failure] and !result.success
@@ -240,20 +242,23 @@ module CSD
     # This command will not do anything if the destination already exists.
     #
     def git_clone(name, repository, destination, params={})
-      default_params = { :announce_pwd => false, :silent => true }
+      default_params = { :die_on_failure => false, :announce_cmd => true, :announce_pwd => false, :silent => false }
       params = default_params.merge(params)
       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.
-      UI.warn "Skipping #{name} download, because the directory already exists: #{destination.enquote}" and return if (destination.directory? and !Options.reveal)
-      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.merge({:die_on_failure => false})).success?
+      if (destination.directory? and !Options.reveal)
+        UI.warn "Skipping #{name} download, because the directory already exists: #{destination.enquote}"
       else
-        UI.error "Could not download #{name} (no permission): #{destination.enquote}"
-        result.success = false
+        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
       end
-      result
     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.chop if os == 'linux'
+          Cmd.run('uname --kernel-version', :silent => 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.chop if os == 'linux'
+          Cmd.run('uname --kernel-release', :silent => true).output.to_s.chop if os == 'linux'
         end
   
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: csd
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Technology Transfer Alliance Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-20 00:00:00 +02:00
+date: 2010-07-22 00:00:00 +02:00
 default_executable: ai
 dependencies: []