csd 0.1.16 → 0.1.17

data/VERSION

@@ -1 +1 @@
-0.1.16
+0.1.17

data/csd.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{csd}
-  s.version = "0.1.16"
+  s.version = "0.1.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Technology Transfer Alliance Team"]

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

@@ -47,7 +47,8 @@ module CSD
         if !Options.work_dir and Options.temp and !Options.this_user and Path.work.directory?
           UI.info "Removing working directory".green.bold
           UI.debug "MILESTONE: deleting-work-dir"
-          Cmd.run "rm -Rf #{Path.work}", :announce_pwd => false
+          # TODO: Make this Windows working
+          Cmd.run "sudo rm -Rf #{Path.work}", :announce_pwd => false
         end
       end
       

data/lib/csd/application/minisip/component/core.rb

@@ -41,6 +41,7 @@ module CSD
             def remove_ffmpeg
               ffmpeg_available = Cmd.run('ffmpeg -h', :internal => true, :die_on_failure => false).success?
               return if Options.ffmpeg_first or !Options.configure or !libraries.include?('libminisip') or !ffmpeg_available
+              UI.debug "MILESTONE: removing_ffmpeg"
               if Gem::Platform.local.debian?
                 # Note that FFmpeg must have been installed via apt-get or via the AI in order for this to work,
                 # because manual compilations of FFmpeg cannot be removed automatically
@@ -49,7 +50,7 @@ module CSD
                 Cmd.run "sudo apt-get remove ffmpeg --yes", :announce_pwd => false
               else
                 # On other linux distributions we don't know how to remove ffmpeg
-                UI.debug "MILESTONE: cannot-remove-ffmpeg"
+                UI.debug "MILESTONE: cannot_remove_ffmpeg"
                 raise Error::Minisip::Core::FFmpegInstalled, "Please remove ffmpeg from your system first, or run the #{CSD.executable} with --no-configure" unless Options.testmode
               end
             end
@@ -144,6 +145,7 @@ module CSD
               libraries.each do |library|
                 directory = Pathname.new(File.join(Path.repository, library))
                 if Cmd.cd(directory, :internal => true).success? or Options.reveal
+                  UI.debug "MILESTONE: processing_#{library}"
                   UI.info "Processing MiniSIP -> #{library}".green.bold
                   bootstrap
                   configure library

data/lib/csd/application/minisip/component/gnome.rb

@@ -34,7 +34,9 @@ Categories=Application;Internet;Network;Chat;AudioVideo}
             end
             
             def create_desktop_entry
-              return if Path.minisip_gnome_pixmap.file? and Path.minisip_desktop_entry.file?
+              # In fact, we would like to update the desktop entry it each time the AI (re-)compiles minisip
+              # So we do not return here now
+              # return if Path.minisip_gnome_pixmap.file? and Path.minisip_desktop_entry.file?
               UI.info "Installing Gnome menu item".green.bold
               Cmd.run("sudo cp #{Path.minisip_gnome_png} #{Path.minisip_gnome_pixmap}", :announce_pwd => false)
               Path.new_desktop_entry = Pathname.new File.join(Path.work, 'minisip.desktop')

data/test/application/test_minisip.rb

@@ -32,7 +32,7 @@ class TestMinisip < Test::Unit::TestCase
         assert_equal %w{ libmutil minisip }, Core.libraries
       end
 
-      context "in theory when compiling" do
+      context "*in theory* when compiling" do
 
         setup do
           Options.clear
@@ -42,8 +42,11 @@ class TestMinisip < Test::Unit::TestCase
           Options.testmode = true
         end
 
-        should "by default use the configure option" do
+        should "by default use all minisip compiling options" do
+          assert Options.bootstrap
           assert Options.configure
+          assert Options.make
+          assert Options.make_install
         end
 
         should "know how to checkout the default branch of the source code" do
@@ -62,17 +65,22 @@ class TestMinisip < Test::Unit::TestCase
         end
       
         should "use sudo make install instead of make install by default" do
-          Options.make_install = true
-          Options.force_ffmpeg = true
           out, err = capture { Core.compile }
           # TODO: This should be a more strict test
           assert_match /sudo make install/, out
         end
       
-        should "" do
-          #out, err = capture { Core.compile }
-          #puts out
+        should "proclaim that it was called in debug mode" do
+          Options.debug = true
+          out, err = capture { Core.compile }
+          assert_match /Minisip::Component::Core\.compile was called/, out
+        end
         
+        should "remove ffmpeg before compiling minisip" do
+          Options.debug = true
+          out, err = capture { Core.compile }
+          assert_match /MILESTONE: removing_ffmpeg.+MILESTONE: processing_libminisip/m, out
+          assert_no_match /MILESTONE: processing_libminisip.+MILESTONE: removing_ffmpeg/m, out
         end
 
       end # context "in theory when compiling"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: csd
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 1
-  - 16
-  version: 0.1.16
+  - 17
+  version: 0.1.17
 platform: ruby
 authors: 
 - Technology Transfer Alliance Team