csd 0.1.13 → 0.1.14

data/VERSION

@@ -1 +1 @@
-0.1.13
+0.1.14

data/csd.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{csd}
-  s.version = "0.1.13"
+  s.version = "0.1.14"
 
   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/minisip/component/core.rb

@@ -113,7 +113,7 @@ module CSD
               Path.dirlist     = Pathname.new File.join('/', 'usr', 'share', 'aclocal', 'dirlist')
               if !Path.dirlist.file? and Gem::Platform.local.debian?
                 UI.info "Fixing broken Debian aclocal path".green.bold
-                Path.new_dirlist = Pathname.new File.join(Dir.work, 'dirlist')
+                Path.new_dirlist = Pathname.new File.join(Path.work, 'dirlist')
                 Cmd.touch_and_replace_content Path.new_dirlist, '/usr/local/share/aclocal'
                 Cmd.run "sudo mv #{Path.new_dirlist} #{Path.dirlist}", :announce_pwd => false
               end

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

@@ -37,7 +37,7 @@ Categories=Application;Internet;Network;Chat;AudioVideo}
               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(Dir.work, 'minisip.desktop')
+              Path.new_desktop_entry = Pathname.new File.join(Path.work, 'minisip.desktop')
               Cmd.touch_and_replace_content Path.new_desktop_entry, DESKTOP_ENTRY, :internal => true
               Cmd.run "sudo mv #{Path.new_desktop_entry} #{Path.minisip_desktop_entry}", :announce_pwd => false
             end

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

@@ -16,7 +16,7 @@ module CSD
           if Path.giomm_header_backup.file? and !Options.reveal
             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.work, 'giomm.h')
+            Path.new_giomm_header = File.join(Path.work, 'giomm.h')
             Cmd.copy(Path.giomm_header, Path.new_giomm_header)
             Cmd.replace Path.new_giomm_header do |r|
               r.replace '#include <giomm/socket.h>', "/* ----- AI COMMENTING OUT START ----- \n#include <giomm/socket.h>"

data/lib/csd/container.rb

@@ -70,8 +70,8 @@ module CSD
   class Options
     # Because the Options class will respond to clear, we must pass it on explicitly to the OptionsParser instance residing in CSD.options
     #
-    def self.clear
-      ::CSD.options.clear
+    def self.clear(*args)
+      ::CSD.options.clear(*args)
     end
     def self.method_missing(meth, *args, &block)
       ::CSD.options.send(meth, *args, &block)

data/test/application/test_minisip.rb

@@ -36,7 +36,7 @@ class TestMinisip < Test::Unit::TestCase
         setup do
           Options.clear
           @base.define_relative_paths
-          CSD.options.clear Application::Minisip.default_options('compile')
+          Options.clear Application::Minisip.default_options('compile')
           Options.reveal = true
         end
 
@@ -57,6 +57,7 @@ class TestMinisip < Test::Unit::TestCase
       
         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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: csd
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 1
-  - 13
-  version: 0.1.13
+  - 14
+  version: 0.1.14
 platform: ruby
 authors: 
 - Technology Transfer Alliance Team