csd 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/csd.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{csd}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   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-25}
+  s.date = %q{2010-08-30}
   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"]

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

@@ -96,15 +96,16 @@ module CSD
             # with the most recent FFmpeg version. In fact, MiniSIP won't compile if FFmpeg is present
             # and this has not been modified.
             # See http://www.howgeek.com/2010/03/01/ffmpeg-php-error-‘pix_fmt_rgba32’-undeclared-first-use-in-this-function
-            # and http://ffmpeg.org/doxygen/0.5/pixfmt_8h.html#33d341c4f443d24492a95fb7641d0986 for more information.
+            # and http://ffmpeg.org/doxygen/0.5/pixfmt_8h.html#33d341c4f443d24492a95fb7641d0986 for more information
+            # about the FFmpeg pixel format constants.
             #
             def modify_source_code
               UI.info "Fixing MiniSIP OpenGL GUI source code".green.bold
-              Cmd.replace(Path.repository_open_gl_display, '/home/erik', Path.build)
+              Cmd.replace Path.repository_open_gl_display, /(\s+)(string path = ")(.+)(".+)/, "\1\2#{Path.build}\4"
               if Options.ffmpeg_first
                 UI.info "Fixing MiniSIP Audio/Video en/decoder source code".green.bold
-                Cmd.replace(Path.repository_avcoder_cxx,   'PIX_FMT_RGBA32', 'PIX_FMT_RGB32')
-                Cmd.replace(Path.repository_avdecoder_cxx, 'PIX_FMT_RGBA32', 'PIX_FMT_RGB32')
+                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
             end
             

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

@@ -46,8 +46,8 @@ module CSD
                 Cmd.copy Path.sysctl_conf, Path.new_sysctl_conf
                 UI.info "Adding modifications to #{Path.new_sysctl_conf}".cyan
                 modifications = ['# Changes made by the AI'] + OPTIMUM_BUFFERS.map { |key, value| %{#{key} = #{value}} }
-                modifications = content + "\n" + modifications
-                Cmd.touch_and_replace_content Path.new_sysctl_conf, modifications.join("\n"), :internal => true
+                modifications = content + "\n" + modifications.join("\n")
+                Cmd.touch_and_replace_content Path.new_sysctl_conf, modifications, :internal => true
                 # We cannot use Cmd.copy here, because Cmd.copy has no superuser privileges.
                 # And since we are for sure on Ubuntu, these commands will work.
                 Cmd.run "sudo cp #{Path.sysctl_conf} #{Path.sysctl_conf_backup}", :announce_pwd => false

data/lib/csd/commands.rb

@@ -144,7 +144,9 @@ module CSD
     # Otherwise it calls the replace function in the Replacer class. 
     #
     def replace(filepath, pattern='', substitution='', params={}, &block)
+      # In case of a block, the second argument might be the params
       params = pattern if pattern.is_a?(Hash)
+      # Setting default parameters
       default_params = { :die_on_failure => true }
       params = default_params.merge(params)
       UI.info "Modifying contents of `#{filepath}´ as follows:".cyan
@@ -178,10 +180,10 @@ module CSD
         begin
           new_file_content = if params[:only_first_occurence]
             UI.info "   Replacing the first occurence of".yellow
-            File.read(self.filepath).sub(pattern.to_s, substitution.to_s)
+            File.read(self.filepath).sub(pattern, substitution) unless Options.reveal
           else
             UI.info "   Replacing".yellow
-            File.read(self.filepath).gsub(pattern.to_s, substitution.to_s)
+            File.read(self.filepath).gsub(pattern, substitution) unless Options.reveal
           end
           UI.info "   `#{pattern}´".blue
           UI.info "   with".yellow

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: csd
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Technology Transfer Alliance Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-25 00:00:00 +02:00
+date: 2010-08-30 00:00:00 +02:00
 default_executable: 
 dependencies: []