csd 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/csd.gemspec

@@ -0,0 +1,175 @@
+# 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.3.3"
+
+  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-10}
+  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",
+     "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!
+
+  You can run it by typing `ai´ in your command line.
+
+  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
+
+============================================================
+}
+  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/minisip/base.rb

@@ -94,9 +94,11 @@ module CSD
           if Options.branch == 'master'
             # Before TTA made changes in the edge version, this was the location of the address book.
             # The master branch resembles the vendor's SVN branch. Whereas any other branch is made by TTA.
-            Path.phonebook = Pathname.new(File.join(ENV['HOME'], '.minisip.addr'))
+            Path.phonebook_dir  = Pathname.new(ENV['HOME'])
+            Path.phonebook      = Pathname.new(File.join(Path.phonebook_dir, '.minisip.addr'))
           else  
-            Path.phonebook = Pathname.new(File.join(ENV['HOME'], '.minisip', 'minisip.addr'))
+            Path.phonebook_dir  = Pathname.new(File.join(ENV['HOME'], '.minisip'))
+            Path.phonebook      = Pathname.new(File.join(Path.phonebook_dir, 'minisip.addr'))
           end
           Path.build_bin                          = Pathname.new(File.join(Path.build, 'bin'))
           Path.build_gtkgui                       = Pathname.new(File.join(Path.build_bin, 'minisip_gtkgui'))

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

@@ -1,4 +1,5 @@
 # -*- encoding: UTF-8 -*-
+require 'csd/application/minisip/component/core_packaging'
 require 'csd/application/minisip/component/core'
 require 'csd/application/minisip/component/ffmpeg'
 require 'csd/application/minisip/component/gnome'

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

@@ -38,6 +38,10 @@ module CSD
               create_address_book
             end
             
+            def package!
+              Packaging.package!
+            end
+            
             def remove_ffmpeg
               ffmpeg_available = Cmd.run('ffmpeg -h', :internal => true, :die_on_failure => false).success?
               return if Options.ffmpeg_first or !libraries.include?('libminisip') or !ffmpeg_available
@@ -84,7 +88,9 @@ module CSD
             #
             def checkout
               Cmd.git_clone 'MiniSIP repository', 'http://github.com/csd/minisip.git', Path.repository
-              if Options.branch
+              # Note that the command above will checkout the master branch.
+              # In that case we are not allowed to checkout the master branch again.
+              if Options.branch and Options.branch != 'master'
                 Cmd.cd Path.repository, :internal => true
                 Cmd.run "git checkout -b #{Options.branch} origin/#{Options.branch}"
               end
@@ -124,6 +130,16 @@ module CSD
                 Cmd.replace Path.repository_avcoder_cxx,   'PIX_FMT_RGBA32', 'PIX_FMT_RGB32'
                 Cmd.replace Path.repository_avdecoder_cxx, 'PIX_FMT_RGBA32', 'PIX_FMT_RGB32'
               end
+              modify_libminisip_rules
+            end
+            
+            def modify_libminisip_rules
+              if Path.repository_libminisip_rules_backup.file?
+                UI.warn "The libminisip rules seem to be fixed already, I won't touch them now. Delete #{Path.repository_libminisip_rules_backup.enquote} to enforce it."
+              else
+                Cmd.copy Path.repository_libminisip_rules, Path.repository_libminisip_rules_backup
+                Cmd.replace Path.repository_libminisip_rules, 'AUTOMATED_INSTALLER_PLACEHOLDER=""', [libminisip_cpp_flags, libminisip_ld_flags].join(' ')
+              end
             end
             
             # Usually, Ubuntu ignores <tt>/usr/local/share/aclocal</tt>. So we need to create a file called
@@ -258,72 +274,14 @@ module CSD
               end
             end
             
-            def modify_libminisip_rules
-              if Path.repository_libminisip_rules_backup.file?
-                UI.warn "The libminisip rules seem to be fixed already, I won't touch them now. Delete #{Path.repository_libminisip_rules_backup.enquote} to enforce it."
-              else
-                Cmd.copy Path.repository_libminisip_rules, Path.repository_libminisip_rules_backup
-                Cmd.replace Path.repository_libminisip_rules, 'AUTOMATED_INSTALLER_PLACEHOLDER=""', [libminisip_cpp_flags, libminisip_ld_flags].join(' ')
-              end
-            end
-            
             def create_address_book
               return unless !Path.phonebook.file? or ::CSD::Application::Minisip::OUTDATED_PHONEBOOKS.include?(File.read(Path.phonebook).hashed)
               UI.info "Creating default MiniSIP phonebook".green.bold
+              Cmd.mkdir Path.phonebook_dir
               Cmd.touch_and_replace_content Path.phonebook, ::CSD::Application::Minisip::PHONEBOOK_EXAMPLE, :internal => true
               UI.info "  Phonebook successfully saved in #{Path.phonebook}".yellow
             end
             
-            # Iteratively makes debian packages of the internal MiniSIP libraries.
-            # TODO: Refactor this, it looks terribly sensitive.
-            # TODO: Check for GPL and LGLP license conflicts.
-            #
-            def package!
-              Cmd.mkdir(Path.packaging)
-              libraries.each do |library|
-                directory = Pathname.new(File.join(Path.repository, library))
-                next if Options.only and !Options.only.include?(library)
-                UI.info "Making #{library} with target dist".green.bold
-                if Cmd.cd(directory) or Options.reveal
-                  Cmd.run("make dist")
-                  
-                  tar_filename = File.basename(Dir[File.join(directory, '*.tar.gz')].first)
-                  Cmd.move(File.join(directory, tar_filename.to_s), Path.packaging) if tar_filename or Options.reveal
-                  
-                  if Cmd.cd(Path.packaging) or Options.reveal
-                    Cmd.run("tar -xzf #{tar_filename}")
-                    tar_dirname = File.basename(tar_filename.to_s, '.tar.gz')
-                    if Cmd.cd(File.join(Path.packaging, tar_dirname))
-                      Cmd.run("dpkg-buildpackage -rfakeroot")
-                      if library == 'minisip'
-                        if Cmd.cd(Path.packaging)
-                          package = File.basename(Dir[File.join(Path.packaging, "#{library}*.deb")].first)
-                          Cmd.run("sudo dpkg -i #{package}") if package or Options.reveal
-                        end
-                      else
-                        if Cmd.cd(Path.packaging)
-                          package = File.basename(Dir[File.join(Path.packaging, "#{library}0*.deb")].first)
-                          Cmd.run("sudo dpkg -i #{package}") if package or Options.reveal
-                          dev_package = File.basename(Dir[File.join(Path.packaging, "#{library}-dev*.deb")].first)
-                          Cmd.run("sudo dpkg -i #{dev_package}") if dev_package or Options.reveal
-                        end
-                      end
-                    else
-                      UI.error "Could not enter #{File.join(Path.packaging, tar_dirname)}."
-                    end
-                    
-                  else
-                    UI.error "Could not enter #{Path.packaging}."
-                  end
-                  
-                else
-                  UI.error "Could not enter #{directory}."
-                end
-              end
-              Cmd.cd '/'
-              Cmd.run('minisip_gtkgui')
-            end
-            
           end
         end
       end

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

@@ -0,0 +1,66 @@
+# -*- encoding: UTF-8 -*-
+
+module CSD
+  module Application
+    module Minisip
+      module Component
+        module Core
+          # This "outsourced" module is responsible for the packaging action. It would be too complex to
+          # have this mixed with the installing logic.
+          #
+          module Packaging
+            
+            # Iteratively makes debian packages of the internal MiniSIP libraries.
+            # TODO: Refactor this, it looks terribly sensitive.
+            # TODO: Check for GPL and LGLP license conflicts.
+            #
+            def package!
+              Cmd.mkdir Path.packaging
+              libraries.each do |library|
+                directory = Pathname.new(File.join(Path.repository, library))
+                next if Options.only and !Options.only.include?(library)
+                UI.info "Making #{library} with target dist".green.bold
+                if Cmd.cd(directory) or Options.reveal
+                  Cmd.run("make dist")
+                  
+                  tar_filename = File.basename(Dir[File.join(directory, '*.tar.gz')].first)
+                  Cmd.move(File.join(directory, tar_filename.to_s), Path.packaging) if tar_filename or Options.reveal
+                  
+                  if Cmd.cd(Path.packaging) or Options.reveal
+                    Cmd.run("tar -xzf #{tar_filename}")
+                    tar_dirname = File.basename(tar_filename.to_s, '.tar.gz')
+                    if Cmd.cd(File.join(Path.packaging, tar_dirname))
+                      Cmd.run("dpkg-buildpackage -rfakeroot")
+                      if library == 'minisip'
+                        if Cmd.cd(Path.packaging)
+                          package = File.basename(Dir[File.join(Path.packaging, "#{library}*.deb")].first)
+                          Cmd.run("sudo dpkg -i #{package}") if package or Options.reveal
+                        end
+                      else
+                        if Cmd.cd(Path.packaging)
+                          package = File.basename(Dir[File.join(Path.packaging, "#{library}0*.deb")].first)
+                          Cmd.run("sudo dpkg -i #{package}") if package or Options.reveal
+                          dev_package = File.basename(Dir[File.join(Path.packaging, "#{library}-dev*.deb")].first)
+                          Cmd.run("sudo dpkg -i #{dev_package}") if dev_package or Options.reveal
+                        end
+                      end
+                    else
+                      UI.error "Could not enter #{File.join(Path.packaging, tar_dirname)}."
+                    end
+                    
+                  else
+                    UI.error "Could not enter #{Path.packaging}."
+                  end
+                  
+                else
+                  UI.error "Could not enter #{directory}."
+                end
+              end
+            end
+            
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module CSD
       #
       OUTDATED_PHONEBOOKS = [
         'ad51d1f3ec295dec000d9690bd1b7b801027c958', # This is the default MiniSIP phonebook
-        '611e86dfbf82457d6137371884b8f56d224fbf59'  # This is the AI-made phonebook up to version 0.3.1
+        '611e86dfbf82457d6137371884b8f56d224fbf59'  # This is the AI-made phonebook up to (and including) version 0.3.1
       ]
       
       PHONEBOOK_EXAMPLE = %{
@@ -75,7 +75,7 @@ module CSD
 		</name>
 		<pop>
 			<desc>
-				Carenet-SE MCU
+				Carenet-SE
 			</desc>
 			<uri>
 				mcu@carenet-se.se
@@ -83,7 +83,7 @@ module CSD
 		</pop>
 		<pop>
 			<desc>
-				CESNET MCU
+				CESNET
 			</desc>
 			<uri>
 				950087999@cesnet.cz
@@ -91,7 +91,7 @@ module CSD
 		</pop>
 		<pop>
 			<desc>
-				TTA MCU
+				TTA
 			</desc>
 			<uri>
 			ttamcu@carenet-se.se

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

@@ -21,7 +21,6 @@ module CSD
         
         def package!
           create_working_directory
-          Core.modify_libminisip_rules # TODO: Oursource into Component::Core
           super
         end
         

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: csd
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Technology Transfer Alliance Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 +02:00
+date: 2010-09-10 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -37,6 +37,7 @@ files:
 - VERSION
 - bin/ai
 - bin/ttai
+- csd.gemspec
 - lib/csd.rb
 - lib/csd/application.rb
 - lib/csd/application/decklink.rb
@@ -67,6 +68,7 @@ files:
 - 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