csd 0.3.7 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.4.0

data/csd.gemspec

@@ -0,0 +1,206 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{csd}
+  s.version = "0.4.0"
+
+  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-09-23}
+  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}
+  s.executables = ["ai", "ttai"]
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "COPYING",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bin/ai",
+     "bin/ttai",
+     "csd.gemspec",
+     "img/3d1.png",
+     "img/bios0.jpg",
+     "img/bios1.jpg",
+     "img/bios2.jpg",
+     "img/camera1.jpg",
+     "img/camera2.jpg",
+     "img/checkminisip.png",
+     "img/decklink1.png",
+     "img/decklink2.png",
+     "img/graphics1.png",
+     "img/graphics2.png",
+     "img/graphics3.png",
+     "img/graphics4.png",
+     "img/graphics5.png",
+     "img/installer1.jpg",
+     "img/installer2.jpg",
+     "img/installer3.jpg",
+     "img/minisip1.png",
+     "img/minisip2.png",
+     "img/minisip3.png",
+     "img/minisip4.png",
+     "img/minisip5.png",
+     "img/minisip6.png",
+     "img/minisip7.png",
+     "img/reboot.png",
+     "img/ruby1.png",
+     "img/ruby2.png",
+     "img/ruby3.png",
+     "img/ruby4.png",
+     "img/update1.png",
+     "img/update2.png",
+     "lib/csd.rb",
+     "lib/csd/application.rb",
+     "lib/csd/application/decklink.rb",
+     "lib/csd/application/decklink/about.yml",
+     "lib/csd/application/decklink/base.rb",
+     "lib/csd/application/decklink/options/common.rb",
+     "lib/csd/application/decklink/options/common_defaults.rb",
+     "lib/csd/application/default.rb",
+     "lib/csd/application/default/base.rb",
+     "lib/csd/application/graphics.rb",
+     "lib/csd/application/graphics/about.yml",
+     "lib/csd/application/graphics/base.rb",
+     "lib/csd/application/graphics/error.rb",
+     "lib/csd/application/graphics/options/common.rb",
+     "lib/csd/application/graphics/options/common_defaults.rb",
+     "lib/csd/application/graphics/options/install.rb",
+     "lib/csd/application/graphics/options/install_defaults.rb",
+     "lib/csd/application/i2conf.rb",
+     "lib/csd/application/i2conf/about.yml",
+     "lib/csd/application/i2conf/base.rb",
+     "lib/csd/application/i2conf/config_example.rb",
+     "lib/csd/application/i2conf/options/common.rb",
+     "lib/csd/application/i2conf/options/common_defaults.rb",
+     "lib/csd/application/i2conf/options/install.rb",
+     "lib/csd/application/i2conf/options/install_defaults.rb",
+     "lib/csd/application/minisip.rb",
+     "lib/csd/application/minisip/about.yml",
+     "lib/csd/application/minisip/base.rb",
+     "lib/csd/application/minisip/component.rb",
+     "lib/csd/application/minisip/component/core.rb",
+     "lib/csd/application/minisip/component/core_packaging.rb",
+     "lib/csd/application/minisip/component/ffmpeg.rb",
+     "lib/csd/application/minisip/component/gnome.rb",
+     "lib/csd/application/minisip/component/hdviper.rb",
+     "lib/csd/application/minisip/component/network.rb",
+     "lib/csd/application/minisip/component/plugins.rb",
+     "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/install.rb",
+     "lib/csd/application/minisip/options/install_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",
+     "lib/csd/application/minisip/unix/linux.rb",
+     "lib/csd/application/minisip/unix/linux/debian.rb",
+     "lib/csd/application/minisip/unix/linux/debian/ubuntu10.rb",
+     "lib/csd/application/mslog.rb",
+     "lib/csd/application/mslog/about.yml",
+     "lib/csd/application/mslog/base.rb",
+     "lib/csd/application/mslog/options/common.rb",
+     "lib/csd/application/mslog/options/common_defaults.rb",
+     "lib/csd/applications.rb",
+     "lib/csd/commands.rb",
+     "lib/csd/container.rb",
+     "lib/csd/error.rb",
+     "lib/csd/extensions.rb",
+     "lib/csd/extensions/core/array.rb",
+     "lib/csd/extensions/core/dir.rb",
+     "lib/csd/extensions/core/kernel.rb",
+     "lib/csd/extensions/core/object.rb",
+     "lib/csd/extensions/core/open_struct.rb",
+     "lib/csd/extensions/core/option_parser.rb",
+     "lib/csd/extensions/core/pathname.rb",
+     "lib/csd/extensions/core/string.rb",
+     "lib/csd/extensions/gem/platform.rb",
+     "lib/csd/options_parser.rb",
+     "lib/csd/path_container.rb",
+     "lib/csd/user_interface.rb",
+     "lib/csd/user_interface/base.rb",
+     "lib/csd/user_interface/cli.rb",
+     "lib/csd/user_interface/silent.rb",
+     "lib/csd/vendor/active_support/MIT-LICENSE",
+     "lib/csd/vendor/active_support/inflector.rb",
+     "lib/csd/vendor/active_support/object_extensions.rb",
+     "lib/csd/vendor/term/GPL2-LICENSE",
+     "lib/csd/vendor/term/ansicolor.rb",
+     "lib/csd/vendor/zentest/zentest_assertions.rb",
+     "lib/csd/version.rb",
+     "test/application/test_minisip.rb",
+     "test/functional/test_application_base.rb",
+     "test/functional/test_application_default.rb",
+     "test/functional/test_applications.rb",
+     "test/functional/test_cli.rb",
+     "test/functional/test_commands.rb",
+     "test/functional/test_csd.rb",
+     "test/functional/test_options.rb",
+     "test/helper.rb",
+     "test/unit/test_container.rb",
+     "test/unit/test_dir.rb",
+     "test/unit/test_open_struct.rb",
+     "test/unit/test_pathname.rb",
+     "test/unit/test_platform.rb",
+     "test/unit/test_string.rb"
+  ]
+  s.homepage = %q{http://github.com/csd/csd}
+  s.post_install_message = %q{
+============================================================
+
+  Thank you for installing the TTA Automated Installer!
+
+  NOTE: On DEBIAN and UBUNTU the executable `ai´ is *maybe*
+        not in your PATH by default. If that is the case,
+        you can fix it by running this command:
+
+  echo "export PATH=\$PATH:$(gem env | grep "E D" | sed "s/[^\w]* //")" >> ~/.bashrc;. ~/.bashrc
+
+  You can run the AI by typing `ai´ in your command line.
+
+============================================================
+}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Installation and compilation handler for software used in CSD projects.}
+  s.test_files = [
+    "test/application/test_minisip.rb",
+     "test/functional/test_application_base.rb",
+     "test/functional/test_application_default.rb",
+     "test/functional/test_applications.rb",
+     "test/functional/test_cli.rb",
+     "test/functional/test_commands.rb",
+     "test/functional/test_csd.rb",
+     "test/functional/test_options.rb",
+     "test/helper.rb",
+     "test/unit/test_container.rb",
+     "test/unit/test_dir.rb",
+     "test/unit/test_open_struct.rb",
+     "test/unit/test_pathname.rb",
+     "test/unit/test_platform.rb",
+     "test/unit/test_string.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

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

@@ -10,6 +10,14 @@ module CSD
         #
         DEBIAN_DEPENDENCIES = %w{ libnotify-bin libmng1 dkms }
         
+        MODPROBE_BLACKLIST = %{# Minisip.org
+# We know that BlackMagic Design Decklink conflicts
+# with fglrx. We would like to load it manually later
+# via "sudo modprobe blackmagic"
+#
+blacklist blackmagic
+}
+        
         # This method notifies users about following operation of AI, and initiates introduction method.
         # The actual installation process is carried out by method install! for the purpose of keeping source code clean.
         #
@@ -34,7 +42,7 @@ module CSD
           extract
           apply
           add_boot_loader
-          update_firmware
+          load_kernel_module
           send_notification
           cleanup_working_directory
         end
@@ -104,19 +112,21 @@ module CSD
         end
         
         def add_boot_loader
-          content = Path.kernel_module.file? ? File.read(Path.kernel_module) : ''
-          if content !~ /\nblackmagic/m or Options.reveal
-            UI.info "Adding Blackmagic drivers to the boot loader".green.bold
-            Cmd.touch_and_replace_content Path.new_kernel_module, "#{content}\nblackmagic"
-            Cmd.run "sudo cp #{Path.new_kernel_module} #{Path.kernel_module}", :announce_pwd => false
-          end
-        end
-
-        def update_firmware
-          UI.info "Updating Decklink Firmware (if needed)".green.bold
-          Cmd.run "BlackmagicFirmwareUpdater update", :announce_pwd => false
+          UI.info "Adding Blackmagic to the kernel module blacklist".green.bold
+          Cmd.touch_and_replace_content Path.new_blacklist, MODPROBE_BLACKLIST
+          Cmd.run "sudo cp #{Path.new_blacklist} #{Path.blacklist}", :announce_pwd => false
+          UI.info "Creating Ubuntu init.d to load Blackmagic on runtime instead".green.bold
+          Cmd.touch_and_replace_content Path.new_upstart, "#!/bin/sh\nsudo /sbin/modprobe blackmagic"
+          Cmd.run "sudo cp #{Path.new_upstart} #{Path.upstart}", :announce_pwd => false
+          Cmd.run "sudo chmod +x #{Path.upstart}", :announce_pwd => false
+          Cmd.run "sudo update-rc.d blackmagic defaults", :announce_pwd => false
         end
         
+        def load_kernel_module
+          UI.info "Loading Decklink drivers".green.bold
+          Cmd.run "sudo modprobe blackmagic", :announce_pwd => false
+        end
+
         def send_notification
           Cmd.run %{notify-send --icon=gdm-setup "DeckLink installation complete" "You are now ready to use your Blackmagic Design DeckLink device." }, :internal => true, :die_on_failure => false
         end
@@ -128,8 +138,10 @@ module CSD
           Path.decklink_url      = blacklink_repository + decklink_basename + decklink_extension
           Path.tar               = Pathname.new(File.join(Path.work, "#{decklink_basename + decklink_extension}"))
           Path.packages          = Pathname.new(File.join(Path.work, decklink_basename))
-          Path.new_kernel_module = Pathname.new(File.join(Path.work, 'modules'))
-          Path.kernel_module     = Pathname.new(File.join('/', 'etc', 'modules'))
+          Path.new_blacklist     = Pathname.new(File.join(Path.work, 'blacklist-minisip.conf'))
+          Path.blacklist         = Pathname.new(File.join('/', 'etc', 'modprobe.d', 'blacklist-minisip.conf'))
+          Path.new_upstart       = Pathname.new(File.join(Path.work, 'blackmagic'))
+          Path.upstart           = Pathname.new(File.join('/', 'etc', 'init.d', 'blackmagic'))
         end
         
       end

data/lib/csd/application/minisip/about.yml

@@ -3,13 +3,11 @@ human: MiniSIP
 description: SIP client for high-definition video conferencing.
 actions:
   public:
-    #- show: Shows further information about MiniSIP
     #- download: Downloads MiniSIP components (e.g. source code, configurations, docs,...)
     - install: Downloads and compiles MiniSIP from scratch
-    #- install: Installs an application
-  developer:
-    - check: Checks whether the environment dependencies for MiniSIP are satisfied
+    - check: Checks whether critical environment dependencies for MiniSIP are satisfied
     - package: Downloads, compiles and packages MiniSIP from scratch
+  developer:
     #- publish: Submits a compiled package to the CSD package repository
 scopes:
   install:

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

@@ -22,6 +22,11 @@ module CSD
         def install
           compile
         end
+        
+        # Checking MiniSIP OS dependencies
+        def check
+          UI.error 'Currently not supported for this platform. Sorry.'
+        end
 
         # Running the compile task.
         #

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

@@ -16,7 +16,7 @@ module CSD
           # This is an +Array+ containing the names of the internal MiniSIP libraries. Note that they
           # are sorted according to the sequence in which they need to be compiled (because they depend on each other).
           #
-          LIBRARIES = %w{ libmutil libmnetutil libmcrypto libmikey libmsip libmstun libminisip minisip }
+          LIBRARIES = %w{ libmutil libmnetutil libmcrypto libmikey libmsip libmstun libminisip minisip mloggingutil }
           
           class << self
             
@@ -40,6 +40,7 @@ module CSD
               link_libraries
               create_address_book
               ensure_ati_vsync
+              update_decklink_firmware
             end
             
             def remove_ffmpeg
@@ -129,7 +130,12 @@ module CSD
               # Removing the default SIP proxy server from the Configuration generator
               Cmd.replace Path.repository_sip_conf, 'sip.domain.example', ''
               # We would like decklink to be the default video device
-              Cmd.replace Path.repository_sip_conf, 'be->commit();', %{be->save("video_device", "decklink:0/720p50@25");be->commit();}
+              Cmd.replace Path.repository_sip_conf, 'be->commit();', %{
+                be->save("video_device", "decklink:0/720p50@25");
+                be->save("display_frame_size", "hd720");
+                be->save("display_frame_rate", "24");
+                be->commit();
+              }
               # Switching logging to ON as default, as opposed to OFF
               Cmd.replace Path.repository_sip_conf, 'be->saveBool("logging",false)', 'be->saveBool("logging",true)'
               if Options.ffmpeg_first
@@ -187,6 +193,8 @@ module CSD
               UI.debug "MILESTONE_processing_libraries"
               libraries.each do |library|
                 directory = Pathname.new(File.join(Path.repository, library))
+                # The mloggingutil is more or less optional because it might not be checked in as of today yet
+                next if !directory.directory? and library == 'mloggingutil'
                 if Cmd.cd(directory, :internal => true).success? or Options.reveal
                   UI.debug "MILESTONE_processing_#{library}"
                   UI.info "Processing MiniSIP -> #{library}".green.bold
@@ -309,6 +317,11 @@ module CSD
               Cmd.run "sudo aticonfig --set-pcs-u32=BUSID-2:0:0-0/OpenGL,VSyncControl,2", :announce_pwd => false
             end
             
+            def update_decklink_firmware
+              UI.info "Updating Decklink Firmware (if needed)".green.bold
+              Cmd.run "BlackmagicFirmwareUpdater update", :announce_pwd => false, :die_on_failure => false
+            end
+            
           end
         end
       end

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

@@ -16,6 +16,17 @@ module CSD
           super
         end
         
+        def check
+          Core.ensure_ati_vsync
+          Core.update_decklink_firmware
+          load_decklink_on_runtime
+        end
+        
+        def load_decklink_on_runtime
+          UI.info "Loading Decklink drivers in case they were not loaded already".green.bold
+          Cmd.run "sudo /sbin/modprobe blackmagic", :announce_pwd => false, :die_on_failure => false
+        end
+        
         def after_aptitude
         end
         

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: csd
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 7
-  version: 0.3.7
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Technology Transfer Alliance Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 +02:00
+date: 2010-09-23 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -37,12 +37,14 @@ files:
 - VERSION
 - bin/ai
 - bin/ttai
+- csd.gemspec
 - img/3d1.png
 - img/bios0.jpg
 - img/bios1.jpg
 - img/bios2.jpg
 - img/camera1.jpg
 - img/camera2.jpg
+- img/checkminisip.png
 - img/decklink1.png
 - img/decklink2.png
 - img/graphics1.png
@@ -56,6 +58,10 @@ files:
 - img/minisip1.png
 - img/minisip2.png
 - img/minisip3.png
+- img/minisip4.png
+- img/minisip5.png
+- img/minisip6.png
+- img/minisip7.png
 - img/reboot.png
 - img/ruby1.png
 - img/ruby2.png