csd 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

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

@@ -91,6 +91,13 @@ module CSD
             # On Windows it will just crash here, unless we determine where the heck sudo make install is targetting at :)
             raise Error::Minisip::BuildDirNotFound, "Sorry, `/usr/local´ could not be found but was requested as MiniSIP target. Use `#{CSD.executable}´ with the option `--this-user´ instead." unless Path.build.directory?
           end
+          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'))
+          else  
+            Path.phonebook = Pathname.new(File.join(ENV['HOME'], '.minisip', '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'))
           Path.build_include                      = Pathname.new(File.join(Path.build, 'include'))
@@ -129,7 +136,6 @@ module CSD
           Path.minisip_gnome_png_fallback         = Pathname.new(File.join(Path.repository, 'minisip', 'share', 'minisip.png'))
           Path.minisip_gnome_pixmap               = Pathname.new(File.join('/', 'usr', 'share', 'pixmaps', 'minisip_gnome.png'))
           Path.minisip_desktop_entry              = Pathname.new(File.join('/', 'usr', 'share', 'applications', 'minisip.desktop'))
-          Path.phonebook                          = Pathname.new(File.join(ENV['HOME'], '.minisip.addr'))
           Path.realtek_firmware                   = Pathname.new(File.join(Path.work, 'realtek'))
           Path.intel_firmware                     = Pathname.new(File.join(Path.work, 'intel'))
           Path.intel_firmware_src                 = Pathname.new(File.join(Path.intel_firmware, 'src'))

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

@@ -117,7 +117,8 @@ module CSD
               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();}
-              # Making
+              # 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
                 UI.info "Fixing MiniSIP Audio/Video en/decoder source code".green.bold
                 Cmd.replace Path.repository_avcoder_cxx,   'PIX_FMT_RGBA32', 'PIX_FMT_RGB32'
@@ -267,7 +268,7 @@ module CSD
             end
             
             def create_address_book
-              return if Path.phonebook.file?
+              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.touch_and_replace_content Path.phonebook, ::CSD::Application::Minisip::PHONEBOOK_EXAMPLE, :internal => true
               UI.info "  Phonebook successfully saved in #{Path.phonebook}".yellow

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

@@ -4,6 +4,13 @@ module CSD
   module Application
     module Minisip
       
+      # This Array holds SHA1 hashes of phonebooks that should be overwritten by the AI without asking.
+      #
+      OUTDATED_PHONEBOOKS = [
+        'ad51d1f3ec295dec000d9690bd1b7b801027c958', # This is the default MiniSIP phonebook
+        '611e86dfbf82457d6137371884b8f56d224fbf59'  # This is the AI-made phonebook up to version 0.3.1
+      ]
+      
       PHONEBOOK_EXAMPLE = %{
 <phonebook>
 	<name>

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

@@ -1,4 +1,5 @@
 # -*- encoding: UTF-8 -*-
+require 'digest/sha1'
 require 'csd/vendor/term/ansicolor'
 require 'csd/vendor/active_support/inflector'
 
@@ -19,6 +20,12 @@ module CSD
           %Q{"#{self}"}
         end
         
+        # Creates a SHA1 hash of the String object.
+        #
+        def hashed
+          Digest::SHA1.hexdigest self
+        end
+        
         # See CSD::Vendor::ActiveSupport::Inflector#constantize
         #
         def constantize

data/test/unit/test_string.rb

@@ -8,6 +8,10 @@ class TestString < Test::Unit::TestCase
       assert_equal '"wow it works"', 'wow it works'.enquote
     end
     
+    should "be one-way SHA hashable" do
+      assert_equal '9f4921b51c2e573cead9af22c0e0d1a14ad7b643', 'csd'.hashed
+    end
+    
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: csd
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Technology Transfer Alliance Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 +02:00
+date: 2010-09-09 00:00:00 +02:00
 default_executable: 
 dependencies: []