csd 0.1.17 → 0.1.18

data/VERSION

@@ -1 +1 @@
-0.1.17
+0.1.18

data/csd.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{csd}
-  s.version = "0.1.17"
+  s.version = "0.1.18"
 
   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-08-04}
+  s.date = %q{2010-08-10}
   s.default_executable = %q{ai}
   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}

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

@@ -24,6 +24,7 @@ module CSD
           download
           extract
           apply
+          add_boot_loader
           send_notification
         end
         
@@ -75,17 +76,28 @@ module CSD
           Cmd.run "sudo dpkg -i #{file.first || '[DRIVER FILE FOR THIS ARCHITECTURE]'}", :announce_pwd => false
         end
         
+        def add_boot_loader
+          content = Path.kernel_module.file? ? File.read(Path.kernel_module) : ''
+          if content !~ /\nblackmagic/m
+            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 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
         
         def define_relative_paths
-          blacklink_repository  = 'http://www.blackmagic-design.com/downloads/software/'
-          decklink_basename     = 'DeckLink_Linux_7.7.3'
-          decklink_extension    = '.tar.gz'
-          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))
+          blacklink_repository   = 'http://www.blackmagic-design.com/downloads/software/'
+          decklink_basename      = 'DeckLink_Linux_7.7.3'
+          decklink_extension     = '.tar.gz'
+          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'))
         end
         
       end

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

@@ -46,7 +46,7 @@ module CSD
       def cleanup_working_directory
         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"
+          UI.debug "MILESTONE: deleting_work_dir"
           # TODO: Make this Windows working
           Cmd.run "sudo rm -Rf #{Path.work}", :announce_pwd => false
         end

data/lib/csd/application/minisip.rb

@@ -48,19 +48,29 @@ module CSD
             
             when 'linux'
               # Linux
-              UI.debug "#{self}.instance supports Linux"
-              UI.debug "#{self}.instance analyzes the Linux kernel release #{Gem::Platform.local.kernel_release.to_s.enquote}"
-              case Gem::Platform.local.kernel_release
-                
-                when '2.6.32-21-generic', '2.6.32-22-generic'
-                  # Ubuntu 10.04
-                  UI.debug "#{self}.instance supports Ubuntu 10.04"
-                  Ubuntu10.new
+              case Gem::Platform.local.cpu
+
+                when 'x86'
+                  # 32 bit
+                  UI.debug "#{self}.instance supports Linux (32 bit)"
+                  UI.debug "#{self}.instance analyzes the Linux kernel release #{Gem::Platform.local.kernel_release.to_s.enquote}"
+                  case Gem::Platform.local.kernel_release
+
+                    when '2.6.32-21-generic', '2.6.32-22-generic'
+                      # Ubuntu 10.04
+                      UI.debug "#{self}.instance supports Ubuntu 10.04"
+                      Ubuntu10.new
+
+                    else
+                      # Any other Linux (currently only Debian is supported)
+                      UI.debug "#{self}.instance supports Debian"
+                      Debian.new
+                  end
                 
                 else
-                  # Any other Linux (currently only Debian is supported)
-                  UI.debug "#{self}.instance supports Debian"
-                  Debian.new
+                  # 64 bit
+                  UI.debug "#{self}.instance found the architecture to be other than 'x86', but 64 bit is not supported"
+                  raise Error::Minisip::Amd64NotSupported, "Sorry, 64-bit systems are currently not supported by MiniSIP."
               end
               
             else

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

@@ -24,7 +24,7 @@ module CSD
             #
             def compile
               UI.debug "#{self}.compile was called"
-              UI.debug "The current Options are: #{CSD.options.inspect}"
+              UI.debug "The current Options are: #{::CSD.options.inspect_for_debug}"
               remove_ffmpeg
               if Path.repository.directory? and !Options.reveal
                 UI.warn "The MiniSIP source code will not be downloaded, because the directory #{Path.repository.enquote} already exists."
@@ -86,7 +86,7 @@ module CSD
               Cmd.git_clone 'MiniSIP repository', 'http://github.com/csd/minisip.git', Path.repository
               if Options.branch
                 Cmd.cd Path.repository, :internal => true
-                Cmd.run "git pull origin #{Options.branch}"
+                Cmd.run "git checkout -b #{Options.branch} origin/#{Options.branch}"
               end
             end
             
@@ -112,8 +112,8 @@ module CSD
             # +dirlist+ in <tt>/usr/share/aclocal</tt> which contains the path to the other directory.
             #
             def modify_dirlist
-              Path.dirlist     = Pathname.new File.join('/', 'usr', 'share', 'aclocal', 'dirlist')
-              if !Path.dirlist.file? and Gem::Platform.local.debian?
+              Path.dirlist = Pathname.new File.join('/', 'usr', 'share', 'aclocal', 'dirlist')
+              if !Path.dirlist.file? and Gem::Platform.local.debian? or Options.reveal
                 UI.info "Fixing broken Debian aclocal path".green.bold
                 Path.new_dirlist = Pathname.new File.join(Path.work, 'dirlist')
                 Cmd.touch_and_replace_content Path.new_dirlist, '/usr/local/share/aclocal'
@@ -122,6 +122,7 @@ module CSD
             end
             
             def link_libraries
+              return if Options.this_user
               UI.info "Linking shared MiniSIP libraries".green.bold
               Cmd.run "sudo ldconfig #{Path.build_lib_libminisip_so}", :announce_pwd => false
             end

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

@@ -29,6 +29,7 @@ Categories=Application;Internet;Network;Chat;AudioVideo}
                 Cmd.run "nautilus #{Path.build_bin}"
               else
                 create_desktop_entry
+                update_gnome_menu_cache
               end
               send_notification
             end
@@ -44,6 +45,16 @@ Categories=Application;Internet;Network;Chat;AudioVideo}
               Cmd.run "sudo mv #{Path.new_desktop_entry} #{Path.minisip_desktop_entry}", :announce_pwd => false
             end
             
+            # Every desktop entry file not created via dpkg will not update the gnome menus cache. We need to
+            # do this manually here. See https://bugs.launchpad.net/ubuntu/+source/gnome-menus/+bug/581838
+            # If this step would not be done, the MiniSIP menu item would disappear after restarting Ubuntu.
+            #
+            def update_gnome_menu_cache
+              Cmd.run %{sudo sh -c "/usr/share/gnome-menus/update-gnome-menus-cache /usr/share/applications/ > /usr/share/applications/desktop.${LANG}.cache"}, :announce_pwd => false
+            end
+            
+            # Sends an OSD notification.
+            #
             def send_notification
               Cmd.run %{notify-send --icon=minisip_gnome "MiniSIP installation complete" "Please have a look in your Applications menu -> Internet." }, :internal => true, :die_on_failure => false
             end

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

@@ -8,6 +8,7 @@ module CSD
       # See 'csd/error' to find out which status code range has been assigned to MiniSIP
       
       class BuildDirNotFound < CSDError; status_code(200); end
+      class Amd64NotSupported < CSDError; status_code(201); end
       
       module Core
         class FFmpegInstalled < CSDError; status_code(210); end

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

@@ -17,7 +17,7 @@ opts.on("--github-tar","Instead of fetching git repositories from Github, use ta
   self.github_tar = value
 end
 
-opts.on('--branch BRANCH', 'Choose another branch than `master´ when downloading the source code') do |lib|
+opts.on('--branch BRANCH', 'Choose another branch than `master´ when downloading the source code') do |value|
   self.branch = value
 end
 

data/lib/csd/extensions/core/open_struct.rb

@@ -16,6 +16,14 @@ module CSD
           self.testmode = testmode
         end
         
+        # A nicer version of inspect (it only removes the helptext attribute)
+        #
+        def inspect_for_debug
+          result = self.dup
+          result.helptext = nil
+          result.inspect
+        end
+        
       end
     end
   end

data/test/application/test_minisip.rb

@@ -53,6 +53,7 @@ class TestMinisip < Test::Unit::TestCase
           out, err = capture { Core.checkout }
           assert_match /git clone /, out
           assert_no_match /git pull/, out
+          assert_no_match /git checkout/, out
           assert err.empty?
         end
       
@@ -60,7 +61,7 @@ class TestMinisip < Test::Unit::TestCase
           Options.branch = 'cuttingedge'
           out, err = capture { Core.checkout }
           assert_match /git clone /, out
-          assert_match /git pull .+ cuttingedge/, out
+          assert_match /git checkout .+ cuttingedge/, out
           assert err.empty?
         end
       
@@ -82,6 +83,14 @@ class TestMinisip < Test::Unit::TestCase
           assert_match /MILESTONE: removing_ffmpeg.+MILESTONE: processing_libminisip/m, out
           assert_no_match /MILESTONE: processing_libminisip.+MILESTONE: removing_ffmpeg/m, out
         end
+        
+        should "not link the library in this-user-mode" do
+          out, err = capture { Core.compile }
+          assert_match /ldconfig/, out
+          Options.this_user=true
+          out, err = capture { Core.compile }
+          assert_no_match /ldconfig/, out
+        end
 
       end # context "in theory when compiling"
 

data/test/functional/test_application_base.rb

@@ -9,11 +9,8 @@ class TestApplicationBase < Test::Unit::TestCase
   context "An application instance" do
   
     setup do
-      ARGV.clear
       Options.clear
-      @name = 'minisip'
-      ARGV.push(@name)
-      assert @app = Applications.find(@name).instance
+      @app = Application::Base.new
     end
     
     should "use a temporary directory as working directory when the --temp options is given" do
@@ -48,7 +45,7 @@ class TestApplicationBase < Test::Unit::TestCase
     should "take the current pwd with a subdirectory in the name of the application as working directory by default" do
       @app.define_working_directory
       assert_kind_of Pathname, Path.work
-      assert_equal File.join(Dir.pwd, "#{@name}.ai"), Path.work.to_s
+      assert_equal File.join(Dir.pwd, "application.ai"), Path.work.to_s
     end
     
   end # context "An application instance"

data/test/unit/test_open_struct.rb

@@ -17,6 +17,14 @@ class TestOpenStruct < Test::Unit::TestCase
       assert_nil @os.steve
     end
     
+    should "give a nice debugging output" do
+      @os.myoption = 'I am cool'
+      @os.helptext = 'I am helpful'
+      assert_match /helptext/, @os.inspect
+      assert_no_match /helptext=nil/, @os.inspect
+      assert_match /helptext=nil/, @os.inspect_for_debug
+    end
+    
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: csd
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 1
-  - 17
-  version: 0.1.17
+  - 18
+  version: 0.1.18
 platform: ruby
 authors: 
 - Technology Transfer Alliance Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-04 00:00:00 +02:00
+date: 2010-08-10 00:00:00 +02:00
 default_executable: ai
 dependencies: []