csd 0.1.12 → 0.1.13

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.1.13

data/csd.gemspec

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

@@ -44,12 +44,23 @@ module CSD
       # If there are no files in myapplication/options, an empty +String+ is returned instead.
       #
       def options(action='')
-        result = ''
-        ["common_defaults.rb", "common.rb", "#{action}_defaults.rb", "#{action}.rb"].each do |filename|
+        result = []
+        ["common.rb", "#{action}.rb"].each do |filename|
           file = File.join(Path.applications, name, 'options', filename)
-          result += File.file?(file) ? File.read(file) : ''
+          result << File.read(file) if File.file?(file)
         end
-        result
+        default_options + result.join("\n")
+      end
+      
+      # Comes in handy for the test suite
+      #
+      def default_options(action='')
+        result = []
+        ["common_defaults.rb", "#{action}_defaults.rb"].each do |filename|
+          file = File.join(Path.applications, name, 'options', filename)
+          result << File.read(file) if File.file?(file)
+        end
+        result.join("\n")
       end
     
       protected

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

@@ -48,7 +48,8 @@ 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
-                raise Error::Minisip::Core::FFmpegInstalled, "Please remove ffmpeg from your system first, or run the #{CSD.executable} with --no-configure"
+                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
             

data/lib/csd/options_parser.rb

@@ -34,9 +34,9 @@ module CSD
       end
     end
     
-    def clear
+    def clear(additional_options='')
       # Resetting all attributes to nil (because e.g. an application instance might have modified or added some).
-      super
+      super()
       # First we define all valid actions and scopes
       self.actions = []
       self.scopes  = []
@@ -53,6 +53,8 @@ module CSD
       self.developer = false
       # Shortcut to allow for debugging the options parser itself
       self.debug     = (ARGV.include?('--debug') or ARGV.include?('-d'))
+      # For our test suite we might want to inject more options here
+      eval additional_options
     end
 
     # Here we check for literals, i.e. "help", ACTION and APPLICATION.

data/test/application/test_minisip.rb

@@ -10,15 +10,12 @@ class TestMinisip < Test::Unit::TestCase
 
     setup do
       Options.clear
-      @default_minisip_options = Application::Minisip.options
     end
 
     context "Core component" do
       
       setup do
         @base = Application::Minisip::Base.new
-        @base.define_relative_paths
-        #CSD.options.eval @default_minisip_options
       end
 
       should "know how to identify and sort a subset of internal MiniSIP libraries with --only" do
@@ -34,10 +31,12 @@ class TestMinisip < Test::Unit::TestCase
         assert_equal %w{ libmutil minisip }, Core.libraries
       end
 
-      context "in theory" do
+      context "in theory when compiling" do
 
         setup do
           Options.clear
+          @base.define_relative_paths
+          CSD.options.clear Application::Minisip.default_options('compile')
           Options.reveal = true
         end
 
@@ -63,13 +62,13 @@ class TestMinisip < Test::Unit::TestCase
           assert_match /sudo make install/, out
         end
       
-        should "description" do
-          out, err = capture { Core.compile }
+        should "" do
+          #out, err = capture { Core.compile }
           #puts out
         
         end
 
-      end # context "in theory"
+      end # context "in theory when compiling"
 
       context "in practice" do
 

metadata

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