csd 0.1.11 → 0.1.12

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.1.12

data/csd.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{csd}
-  s.version = "0.1.11"
+  s.version = "0.1.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Technology Transfer Alliance Team"]
@@ -46,8 +46,11 @@ Gem::Specification.new do |s|
      "lib/csd/application/minisip/component/x264.rb",
      "lib/csd/application/minisip/error.rb",
      "lib/csd/application/minisip/options/common.rb",
+     "lib/csd/application/minisip/options/common_defaults.rb",
      "lib/csd/application/minisip/options/compile.rb",
+     "lib/csd/application/minisip/options/compile_defaults.rb",
      "lib/csd/application/minisip/options/package.rb",
+     "lib/csd/application/minisip/options/package_defaults.rb",
      "lib/csd/application/minisip/phonebook_example.rb",
      "lib/csd/application/minisip/unix.rb",
      "lib/csd/application/minisip/unix/darwin.rb",

data/lib/csd.rb

@@ -31,7 +31,7 @@ module CSD
       if !Applications.current and ARGV.include?('update')
         # Updating the AI
         UI.info "Updating the AI to the newest version".green.bold
-        Cmd.run "sudo gem update csd", :announce_pwd => false, :verbose => true
+        Cmd.run "sudo gem update csd --no-ri --no-rdoc", :announce_pwd => false, :verbose => true
         exit # The only smooth status code 0 exit in this whole application :)
       else
         choose_application unless Applications.current

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

@@ -71,7 +71,7 @@ module CSD
           file = Dir[File.join(Path.packages, "Deck*#{archflag}*.deb")]
           UI.debug "#{self.class} identified these applicable packages: #{file.join(', ')}"
           UI.info "Installing Debian packages".green.bold
-          Cmd.run "sudo apt-get install #{DEBIAN_DEPENDENCIES} --yes", :announce_pwd => false
+          Cmd.run "sudo apt-get install #{DEBIAN_DEPENDENCIES.join(' ')} --yes", :announce_pwd => false
           Cmd.run "sudo dpkg -i #{file.first || '[DRIVER FILE FOR THIS ARCHITECTURE]'}", :announce_pwd => false
         end
         

data/lib/csd/application/default.rb

@@ -44,12 +44,12 @@ module CSD
       # If there are no files in myapplication/options, an empty +String+ is returned instead.
       #
       def options(action='')
-        options_dir      = File.join(Path.applications, name, 'options')
-        common_file      = File.join(options_dir, "common.rb")
-        specific_file    = File.join(options_dir, "#{action}.rb")
-        common_options   = File.file?(common_file) ? File.read(common_file) : ''
-        specific_options = File.file?(specific_file) ? File.read(specific_file) : ''
-        specific_options + common_options
+        result = ''
+        ["common_defaults.rb", "common.rb", "#{action}_defaults.rb", "#{action}.rb"].each do |filename|
+          file = File.join(Path.applications, name, 'options', filename)
+          result += File.file?(file) ? File.read(file) : ''
+        end
+        result
       end
     
       protected

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

@@ -112,7 +112,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.mktmpdir, 'dirlist')
+                Path.new_dirlist = Pathname.new File.join(Dir.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.mktmpdir, 'minisip.desktop')
+              Path.new_desktop_entry = Pathname.new File.join(Dir.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/options/common.rb

@@ -2,12 +2,10 @@
 
 opts.headline 'WORKING DIRECTORY OPTIONS'.green.bold
 
-self.temp = true
 opts.on("--no-temp", "Use a subdirectory in the current directory as working directory and not /tmp.") do |value|
   self.temp = value
 end
 
-self.work_dir = nil
 opts.on("--work-dir [PATH]", "Defines and/or creates the working directory. This will override the --no-temp option.") do |value|
   self.work_dir = value
 end

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

@@ -0,0 +1,2 @@
+self.temp = true
+self.work_dir = nil

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

@@ -1,49 +1,40 @@
 # -*- encoding: UTF-8 -*-
 # This file gets eval'ed by the global options parser in lib/csd/options_parser
 
-self.this_user = false
 opts.on("--this-user","Compile MiniSIP only for the current user (enforces the --no-temp option)") do |value|
   self.this_user = value
 end
 
-self.apt_get = true
 opts.on("--no-apt-get","Don't run any apt-get commands") do |value|
   self.apt_get = value
 end
 
-self.ffmpeg_first = false
 opts.on("--force-ffmpeg","Do not remove FFmpeg before compiling MiniSIP and compile FFmpeg before MiniSIP") do |value|
   self.ffmpeg_first = value
 end
 
-self.github_tar = false
 opts.on("--github-tar","Instead of fetching git repositories from Github, use tarball downloads") do |value|
   self.github_tar = value
 end
 
-self.branch = nil
 opts.on('--branch BRANCH', 'Choose another branch than `master´ when downloading the source code') do |lib|
   self.branch = value
 end
 
 opts.headline 'MINISIP LIBRARY OPTIONS'.green.bold
 
-self.bootstrap = true
 opts.on("--no-bootstrap","Don't run the bootstrap command on any MiniSIP library") do |value|
   self.bootstrap = value
 end
 
-self.configure = true
 opts.on("--no-configure","Don't run the configure command on any MiniSIP library") do |value|
   self.configure = value
 end
 
-self.make = true
 opts.on("--no-make","Don't run the make command on any MiniSIP library") do |value|
   self.make = value
 end
 
-self.make_install = true
 opts.on("--no-make-install","Don't run the make install command on any MiniSIP library") do |value|
   self.make_install = value
 end

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

@@ -0,0 +1,10 @@
+self.this_user = false
+self.apt_get = true
+self.ffmpeg_first = false
+self.github_tar = false
+self.branch = nil
+self.bootstrap = true
+self.configure = true
+self.make = true
+self.make_install = true
+self.only = nil

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

@@ -2,7 +2,6 @@
 # This file gets eval'ed by the global options parser in lib/csd/rb
 # TODO: There must be a nicer solution for this.
 
-self.path = nil
 opts.on("--path [PATH]",
         "Defines the working directory manually.") do |value|
   self.path = value

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

@@ -0,0 +1,2 @@
+self.path = nil
+self.only = nil

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

@@ -11,7 +11,7 @@ module CSD
 	</name>
 	<contact>
 		<name>
-			TTA HDVC
+			HDVC Clients
 		</name>
 		<pop>
 			<desc>
@@ -42,7 +42,7 @@ module CSD
 				Client4
 			</desc>
 			<uri>
-				ip:client4@carenet-se.se
+				sip:client4@carenet-se.se
 			</uri>
 		</pop>
 		<pop>
@@ -50,15 +50,15 @@ module CSD
 				Client5
 			</desc>
 			<uri>
-				ip:client5@carenet-se.se
+				sip:client5@carenet-se.se
 			</uri>
 		</pop>
 		<pop>
 			<desc>
-				Clien6
+				Client6
 			</desc>
 			<uri>
-				ip:client6@carenet-se.se
+				sip:client6@carenet-se.se
 			</uri>
 		</pop>
 	</contact>
@@ -68,12 +68,20 @@ module CSD
 		</name>
 		<pop>
 			<desc>
-				Reflector
+				Multiparty Conference Room
 			</desc>
 			<uri>
 				sip:mcu@carenet-se.se
 			</uri>
 		</pop>
+		<pop>
+			<desc>
+				Carenet Support Hotline
+			</desc>
+			<uri>
+				sip:uri@carenet-se.se
+			</uri>
+		</pop>
 	</contact>
 	<contact>
 		<name>
@@ -87,11 +95,6 @@ module CSD
 				sip:tandberg1@carenet-se.se
 			</uri>
 		</pop>
-	</contact>
-	<contact>
-		<name>
-			Tandberg
-		</name>
 		<pop>
 			<desc>
 				Tandberg Client2

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.mktmpdir, 'giomm.h')
+            Path.new_giomm_header = File.join(Dir.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/options_parser.rb

@@ -122,9 +122,9 @@ module CSD
         opts.on("-s", "--silent","Don't show any output") do |value|
           self.silent = value
         end
-        #opts.on_tail("-a", "--developer", "Activating advanced AI functionality (developers only)") do |value|
-        #  self.developer = value
-        #end
+        opts.on_tail("-a", "--developer", "Show information only relevant to AI and MiniSIP developers") do |value|
+          self.developer = value
+        end
         opts.on_tail("-h", "--help", "Show detailed help (regarding the given ACTION and APPLICATION)") do |value|
           self.help = value
         end

data/test/application/test_minisip.rb

@@ -6,39 +6,19 @@ class TestMinisip < Test::Unit::TestCase
   include CSD
   include Application::Minisip::Component
   
-  context "The MiniSIP instance" do
-    
+  context "MiniSIP's" do
+
     setup do
-      ARGV.clear
       Options.clear
-      ARGV.push(@name)
-      Applications.current
-      @app = Application::Minisip::Base.new
-    end
-    
-    should "respond to a valid action" do
-      assert @app.respond_to?(:compile)
+      @default_minisip_options = Application::Minisip.options
     end
-    
-    context "in the whole workflow" do
-      
-      setup do
-        Options.clear
-      end
 
-      should "remove the working directory when in root installation mode and using tmp" do
-        Options.this_user = false
-        Options.temp = true
-        
-        
-      end
+    context "Core component" do
       
-    end # context "in the whole workflow"
-    
-    context "in the Core component" do
-
       setup do
-        Options.clear
+        @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
@@ -67,7 +47,7 @@ class TestMinisip < Test::Unit::TestCase
           assert_no_match /git pull/, out
           assert err.empty?
         end
-        
+      
         should "know how to checkout a particular branch of the source code" do
           Options.branch = 'cuttingedge'
           out, err = capture { Core.checkout }
@@ -75,13 +55,19 @@ class TestMinisip < Test::Unit::TestCase
           assert_match /git pull .+ cuttingedge/, out
           assert err.empty?
         end
-        
+      
         should "use sudo make install instead of make install by default" do
           Options.make_install = true
           out, err = capture { Core.compile }
           # TODO: This should be a more strict test
           assert_match /sudo make install/, out
         end
+      
+        should "description" do
+          out, err = capture { Core.compile }
+          #puts out
+        
+        end
 
       end # context "in theory"
 
@@ -97,8 +83,8 @@ class TestMinisip < Test::Unit::TestCase
 
       end # context "in practice"
 
-    end # context "The Minisip Core component"
+    end # context "Core component"
     
-  end # context "The MiniSIP instance"
+  end # context "MiniSIP's"
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: csd
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 1
-  - 11
-  version: 0.1.11
+  - 12
+  version: 0.1.12
 platform: ruby
 authors: 
 - Technology Transfer Alliance Team
@@ -56,8 +56,11 @@ files:
 - lib/csd/application/minisip/component/x264.rb
 - lib/csd/application/minisip/error.rb
 - lib/csd/application/minisip/options/common.rb
+- lib/csd/application/minisip/options/common_defaults.rb
 - lib/csd/application/minisip/options/compile.rb
+- lib/csd/application/minisip/options/compile_defaults.rb
 - lib/csd/application/minisip/options/package.rb
+- lib/csd/application/minisip/options/package_defaults.rb
 - lib/csd/application/minisip/phonebook_example.rb
 - lib/csd/application/minisip/unix.rb
 - lib/csd/application/minisip/unix/darwin.rb